diff --git a/src/main/java/org/springframework/data/mapping/model/InstanceCreatorMetadataDiscoverer.java b/src/main/java/org/springframework/data/mapping/model/InstanceCreatorMetadataDiscoverer.java index ba9fd730d..ad5509b58 100644 --- a/src/main/java/org/springframework/data/mapping/model/InstanceCreatorMetadataDiscoverer.java +++ b/src/main/java/org/springframework/data/mapping/model/InstanceCreatorMetadataDiscoverer.java @@ -32,7 +32,6 @@ import org.jspecify.annotations.Nullable; import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.KotlinDetector; -import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.annotation.MergedAnnotations; import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.core.TypeInformation; diff --git a/src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java b/src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java index 1aa2946a7..da47e5955 100644 --- a/src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java +++ b/src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java @@ -32,7 +32,6 @@ import org.jspecify.annotations.Nullable; import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.KotlinDetector; -import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.data.annotation.PersistenceCreator; import org.springframework.data.core.TypeInformation; diff --git a/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBeanDefinitionPropertiesDecorator.java b/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBeanDefinitionPropertiesDecorator.java index 0654d47d5..02d782048 100644 --- a/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBeanDefinitionPropertiesDecorator.java +++ b/src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBeanDefinitionPropertiesDecorator.java @@ -26,7 +26,6 @@ import javax.lang.model.element.Modifier; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.BeanDefinition; -import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.MethodParameter; import org.springframework.core.ResolvableType; import org.springframework.data.repository.aot.generate.AotRepositoryFragmentMetadata.ConstructorArgument; @@ -102,8 +101,6 @@ public class AotRepositoryBeanDefinitionPropertiesDecorator { for (int i = 0; i < it.getParameterCount(); i++) { MethodParameter parameter = new MethodParameter(it, i); - parameter.initParameterNameDiscovery(DefaultParameterNameDiscoverer.getSharedInstance()); - callbackMethod.addParameter(parameter.getParameterType(), parameter.getParameterName()); } diff --git a/src/main/java/org/springframework/data/repository/aot/generate/MethodMetadata.java b/src/main/java/org/springframework/data/repository/aot/generate/MethodMetadata.java index 99eb99cb5..dea656a64 100644 --- a/src/main/java/org/springframework/data/repository/aot/generate/MethodMetadata.java +++ b/src/main/java/org/springframework/data/repository/aot/generate/MethodMetadata.java @@ -27,9 +27,7 @@ import java.util.function.Function; import org.jspecify.annotations.Nullable; -import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.MethodParameter; -import org.springframework.core.ParameterNameDiscoverer; import org.springframework.core.ResolvableType; import org.springframework.data.core.TypeInformation; import org.springframework.data.javapoet.TypeNames; @@ -64,7 +62,7 @@ class MethodMetadata { ResolvableType repositoryInterface = ResolvableType.forClass(repositoryInformation.getRepositoryInterface()); - initializeMethodArguments(method, DefaultParameterNameDiscoverer.getSharedInstance(), repositoryInterface, methodArguments, methodParameters); + initializeMethodArguments(method, repositoryInterface, methodArguments, methodParameters); this.methodArguments = Collections.unmodifiableMap(methodArguments); this.methodParameters = Collections.unmodifiableMap(methodParameters); @@ -75,7 +73,7 @@ class MethodMetadata { : type.toResolvableType(); } - private static void initializeMethodArguments(Method method, ParameterNameDiscoverer nameDiscoverer, + private static void initializeMethodArguments(Method method, ResolvableType repositoryInterface, Map methodArguments, Map methodParameters) { @@ -85,7 +83,6 @@ class MethodMetadata { MethodParameter methodParameter = MethodParameter.forParameter(parameter) .withContainingClass(repositoryInterfaceType); - methodParameter.initParameterNameDiscovery(nameDiscoverer); TypeName parameterType = parameterTypeName(methodParameter, repositoryInterfaceType); diff --git a/src/main/java/org/springframework/data/repository/support/MethodParameters.java b/src/main/java/org/springframework/data/repository/support/MethodParameters.java index 8bef7fd32..3f801f07c 100644 --- a/src/main/java/org/springframework/data/repository/support/MethodParameters.java +++ b/src/main/java/org/springframework/data/repository/support/MethodParameters.java @@ -24,9 +24,7 @@ import java.util.stream.Collectors; import org.jspecify.annotations.Nullable; -import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.MethodParameter; -import org.springframework.core.ParameterNameDiscoverer; import org.springframework.data.util.Lazy; import org.springframework.util.Assert; @@ -65,7 +63,6 @@ class MethodParameters { for (int i = 0; i < method.getParameterCount(); i++) { MethodParameter parameter = new AnnotationNamingMethodParameter(method, i, namingAnnotation); - parameter.initParameterNameDiscovery(DefaultParameterNameDiscoverer.getSharedInstance()); parameters.add(parameter); } } diff --git a/src/main/java/org/springframework/data/util/NullnessMethodInvocationValidator.java b/src/main/java/org/springframework/data/util/NullnessMethodInvocationValidator.java index 84a74ed10..3560b49a4 100644 --- a/src/main/java/org/springframework/data/util/NullnessMethodInvocationValidator.java +++ b/src/main/java/org/springframework/data/util/NullnessMethodInvocationValidator.java @@ -28,11 +28,9 @@ import org.aopalliance.intercept.MethodInvocation; import org.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; -import org.springframework.core.DefaultParameterNameDiscoverer; import org.springframework.core.KotlinDetector; import org.springframework.core.MethodParameter; import org.springframework.core.Nullness; -import org.springframework.core.ParameterNameDiscoverer; import org.springframework.util.ClassUtils; import org.springframework.util.ObjectUtils; @@ -78,7 +76,7 @@ public class NullnessMethodInvocationValidator implements MethodInterceptor { if (nullness == null) { - nullness = MethodNullness.of(method, DefaultParameterNameDiscoverer.getSharedInstance()); + nullness = MethodNullness.of(method); nullabilityCache.put(method, nullness); } @@ -140,7 +138,7 @@ public class NullnessMethodInvocationValidator implements MethodInterceptor { this.methodParameters = methodParameters; } - static MethodNullness of(Method method, ParameterNameDiscoverer discoverer) { + static MethodNullness of(Method method) { boolean nullableReturn = isNullableParameter(new MethodParameter(method, -1)); boolean[] nullableParameters = new boolean[method.getParameterCount()]; @@ -149,7 +147,6 @@ public class NullnessMethodInvocationValidator implements MethodInterceptor { for (int i = 0; i < method.getParameterCount(); i++) { MethodParameter parameter = new MethodParameter(method, i); - parameter.initParameterNameDiscovery(discoverer); nullableParameters[i] = isNullableParameter(parameter); methodParameters[i] = parameter; } diff --git a/src/test/kotlin/org/springframework/data/repository/query/KParameterUnitTests.kt b/src/test/kotlin/org/springframework/data/repository/query/KParameterUnitTests.kt index 9c62078db..2f777cf5a 100644 --- a/src/test/kotlin/org/springframework/data/repository/query/KParameterUnitTests.kt +++ b/src/test/kotlin/org/springframework/data/repository/query/KParameterUnitTests.kt @@ -17,7 +17,6 @@ package org.springframework.data.repository.query import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test -import org.springframework.core.DefaultParameterNameDiscoverer import org.springframework.core.MethodParameter import org.springframework.data.core.TypeInformation import kotlin.reflect.jvm.javaMethod @@ -34,7 +33,6 @@ class KParameterUnitTests { val methodParameter = MethodParameter(MyCoroutineRepository::hello.javaMethod!!, 0) - methodParameter.initParameterNameDiscovery(DefaultParameterNameDiscoverer()) val parameter = Parameter(methodParameter, TypeInformation.OBJECT) assertThat(parameter.name).isEmpty()