admin/spring-projects-spring-framework
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-framework synced 2026-06-08 17:33:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '7.0.x'

Browse Source
This commit is contained in:
Sam Brannen
2026-05-06 13:54:03 +02:00
parent 1a0bd12c34 987d6cca6d
commit ec8f0ca6b2
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
spring-expression/src/main/java/org/springframework/expression/spel/ast/OperatorMatches.java
+1 -1
View File
@@ -117,7 +117,7 @@ public class OperatorMatches extends Operator {
private void checkRegexLength(String regex) {
if (regex.length() > MAX_REGEX_LENGTH) {
throw new SpelEvaluationException(getStartPosition(),
throw new SpelEvaluationException(getRightOperand().getStartPosition(),
SpelMessage.MAX_REGEX_LENGTH_EXCEEDED, MAX_REGEX_LENGTH);
}
}
spring-expression/src/test/java/org/springframework/expression/spel/EvaluationTests.java
+2 -2
View File
@@ -534,7 +534,7 @@ class EvaluationTests extends AbstractExpressionTests {
void matchesWithPatternAccessThreshold() {
String pattern = "^(?=[a-z0-9-]{1,47})([a-z0-9]+[-]{0,1}){1,47}[a-z0-9]{1}$";
String expression = "'abcde-fghijklmn-o42pasdfasdfasdf.qrstuvwxyz10x.xx.yyy.zasdfasfd' matches '" + pattern + "'";
evaluateAndCheckError(expression, SpelMessage.FLAWED_PATTERN);
evaluateAndCheckError(expression, SpelMessage.FLAWED_PATTERN, 74);
}
@Test
@@ -546,7 +546,7 @@ class EvaluationTests extends AbstractExpressionTests {
pattern += "?";
assertThat(pattern).hasSize(1001);
evaluateAndCheckError("'X' matches '" + pattern + "'", Boolean.class, SpelMessage.MAX_REGEX_LENGTH_EXCEEDED);
evaluateAndCheckError("'X' matches '" + pattern + "'", Boolean.class, SpelMessage.MAX_REGEX_LENGTH_EXCEEDED, 12);
}
@Test