diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index eb84db68da7..a9db11550c6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java index 4f837fa1fbf..26a60b42b83 100644 --- a/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java +++ b/spring-expression/src/test/java/org/springframework/expression/spel/MethodInvocationTests.java @@ -16,7 +16,6 @@ package org.springframework.expression.spel; -import java.lang.annotation.Annotation; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.reflect.Method; @@ -183,7 +182,7 @@ class MethodInvocationTests extends AbstractExpressionTests { StandardEvaluationContext context = new StandardEvaluationContext(); context.setRootObject(new TestObject()); LocalFilter filter = new LocalFilter(); - context.registerMethodFilter(TestObject.class,filter); + context.registerMethodFilter(TestObject.class, filter); // Filter will be called but not do anything, so first doit() will be invoked SpelExpression expr = (SpelExpression) parser.parseExpression("doit(1)"); @@ -209,7 +208,7 @@ class MethodInvocationTests extends AbstractExpressionTests { // check de-registration works filter.filterCalled = false; - context.registerMethodFilter(TestObject.class,null);//clear filter + context.registerMethodFilter(TestObject.class, null); // clear filter context.setRootObject(new TestObject()); expr = (SpelExpression) parser.parseExpression("doit(1)"); result = expr.getValue(context, String.class); @@ -447,32 +446,20 @@ class MethodInvocationTests extends AbstractExpressionTests { // Simple filter static class LocalFilter implements MethodFilter { - public boolean removeIfNotAnnotated = false; + boolean removeIfNotAnnotated = false; - public boolean filterCalled = false; + boolean filterCalled = false; private boolean isAnnotated(Method method) { - Annotation[] anns = method.getAnnotations(); - if (anns == null) { - return false; - } - for (Annotation ann : anns) { - String name = ann.annotationType().getName(); - if (name.endsWith("Anno")) { - return true; - } - } - return false; + return method.isAnnotationPresent(Anno.class); } @Override public List filter(List methods) { - filterCalled = true; + this.filterCalled = true; List forRemoval = new ArrayList<>(); - for (Method method: methods) { - if (removeIfNotAnnotated && !isAnnotated(method)) { - forRemoval.add(method); - } + if (this.removeIfNotAnnotated) { + methods.stream().filter(method -> !isAnnotated(method)).forEach(forRemoval::add); } for (Method method: forRemoval) { methods.remove(method); @@ -495,7 +482,7 @@ class MethodInvocationTests extends AbstractExpressionTests { @Anno public String doit(double d) { - return "double "+d; + return "double " + d; } }