diff --git a/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java b/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java index 7e07e303ab..38d83ce5ba 100644 --- a/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java +++ b/core/src/main/java/org/springframework/security/core/parameters/DefaultSecurityParameterNameDiscoverer.java @@ -75,7 +75,7 @@ public class DefaultSecurityParameterNameDiscoverer extends PrioritizedParameter annotationClassesToUse.add(DATA_PARAM_CLASSNAME); } addDiscoverer(new AnnotationParameterNameDiscoverer(annotationClassesToUse)); - addDiscoverer(new DefaultParameterNameDiscoverer()); + addDiscoverer(DefaultParameterNameDiscoverer.getSharedInstance()); } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 3a42b45a51..f07284a8b1 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -12,7 +12,7 @@ org-jetbrains-kotlin = "2.2.21" org-jetbrains-kotlinx = "1.10.2" org-mockito = "5.17.0" org-opensaml5 = "5.1.6" -org-springframework = "7.0.2" +org-springframework = "7.0.3-SNAPSHOT" com-password4j = "1.8.4" [libraries] diff --git a/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java b/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java index 1a310a8e12..35e3ef23ac 100644 --- a/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java +++ b/messaging/src/test/java/org/springframework/security/messaging/handler/invocation/ResolvableMethod.java @@ -40,10 +40,8 @@ import org.springframework.cglib.proxy.Callback; import org.springframework.cglib.proxy.Enhancer; import org.springframework.cglib.proxy.Factory; import org.springframework.cglib.proxy.MethodProxy; -import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.MethodIntrospector; import org.springframework.core.MethodParameter; -import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotationUtils; @@ -132,8 +130,6 @@ public final class ResolvableMethod { private static final SpringObjenesis objenesis = new SpringObjenesis(); - private static final ParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer(); - // Matches ValueConstants.DEFAULT_NONE (spring-web and spring-messaging) private static final String DEFAULT_VALUE_NONE = "\n\t\t\n\t\t\n\uE000\uE001\uE002\n\t\t\t\t\n"; @@ -634,7 +630,6 @@ public final class ResolvableMethod { List matches = new ArrayList<>(); for (int i = 0; i < ResolvableMethod.this.method.getParameterCount(); i++) { MethodParameter param = new SynthesizingMethodParameter(ResolvableMethod.this.method, i); - param.initParameterNameDiscovery(nameDiscoverer); if (this.filters.stream().allMatch((p) -> p.test(param))) { matches.add(param); } diff --git a/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java b/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java index ad99723bfe..330ca6f7dc 100644 --- a/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java +++ b/web/src/test/java/org/springframework/security/web/method/ResolvableMethod.java @@ -40,10 +40,8 @@ import org.springframework.cglib.proxy.Callback; import org.springframework.cglib.proxy.Enhancer; import org.springframework.cglib.proxy.Factory; import org.springframework.cglib.proxy.MethodProxy; -import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.MethodIntrospector; import org.springframework.core.MethodParameter; -import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.ResolvableType; import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.core.annotation.AnnotationUtils; @@ -131,8 +129,6 @@ public final class ResolvableMethod { private static final SpringObjenesis objenesis = new SpringObjenesis(); - private static final ParameterNameDiscoverer nameDiscoverer = new DefaultParameterNameDiscoverer(); - private final Method method; private ResolvableMethod(Method method) { @@ -620,7 +616,6 @@ public final class ResolvableMethod { List matches = new ArrayList<>(); for (int i = 0; i < ResolvableMethod.this.method.getParameterCount(); i++) { MethodParameter param = new SynthesizingMethodParameter(ResolvableMethod.this.method, i); - param.initParameterNameDiscovery(nameDiscoverer); if (this.filters.stream().allMatch((p) -> p.test(param))) { matches.add(param); }