Use DefaultParameterNameDiscoverer#getSharedInstance

Closes: gh-18330

Signed-off-by: Andrey Litvitski <andrey1010102008@gmail.com>

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());
 	}
 
 }

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]

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<MethodParameter> 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);
 				}

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<MethodParameter> 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);
 				}