Skip to content

Commit 4d3efbf

Browse files
committed
Polishing.
Remove MethodParameter.initParameterNameDiscovery(…) calls using DefaultParameterNameDiscoverer as MethodParameter uses the shared DefaultParameterNameDiscoverer instance already. See #3431 Original pull request: #3432
1 parent da117b0 commit 4d3efbf

File tree

7 files changed

+4
-20
lines changed

7 files changed

+4
-20
lines changed

src/main/java/org/springframework/data/mapping/model/InstanceCreatorMetadataDiscoverer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
import org.springframework.core.DefaultParameterNameDiscoverer;
3434
import org.springframework.core.KotlinDetector;
35-
import org.springframework.core.ParameterNameDiscoverer;
3635
import org.springframework.core.annotation.MergedAnnotations;
3736
import org.springframework.data.annotation.PersistenceCreator;
3837
import org.springframework.data.core.TypeInformation;

src/main/java/org/springframework/data/mapping/model/PreferredConstructorDiscoverer.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
import org.springframework.core.DefaultParameterNameDiscoverer;
3434
import org.springframework.core.KotlinDetector;
35-
import org.springframework.core.ParameterNameDiscoverer;
3635
import org.springframework.core.annotation.AnnotationUtils;
3736
import org.springframework.data.annotation.PersistenceCreator;
3837
import org.springframework.data.core.TypeInformation;

src/main/java/org/springframework/data/repository/aot/generate/AotRepositoryBeanDefinitionPropertiesDecorator.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626

2727
import org.springframework.beans.factory.BeanFactory;
2828
import org.springframework.beans.factory.config.BeanDefinition;
29-
import org.springframework.core.DefaultParameterNameDiscoverer;
3029
import org.springframework.core.MethodParameter;
3130
import org.springframework.core.ResolvableType;
3231
import org.springframework.data.repository.aot.generate.AotRepositoryFragmentMetadata.ConstructorArgument;
@@ -102,8 +101,6 @@ public CodeBlock decorate() {
102101
for (int i = 0; i < it.getParameterCount(); i++) {
103102

104103
MethodParameter parameter = new MethodParameter(it, i);
105-
parameter.initParameterNameDiscovery(DefaultParameterNameDiscoverer.getSharedInstance());
106-
107104
callbackMethod.addParameter(parameter.getParameterType(), parameter.getParameterName());
108105
}
109106

src/main/java/org/springframework/data/repository/aot/generate/MethodMetadata.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@
2727

2828
import org.jspecify.annotations.Nullable;
2929

30-
import org.springframework.core.DefaultParameterNameDiscoverer;
3130
import org.springframework.core.MethodParameter;
32-
import org.springframework.core.ParameterNameDiscoverer;
3331
import org.springframework.core.ResolvableType;
3432
import org.springframework.data.core.TypeInformation;
3533
import org.springframework.data.javapoet.TypeNames;
@@ -64,7 +62,7 @@ class MethodMetadata {
6462

6563
ResolvableType repositoryInterface = ResolvableType.forClass(repositoryInformation.getRepositoryInterface());
6664

67-
initializeMethodArguments(method, DefaultParameterNameDiscoverer.getSharedInstance(), repositoryInterface, methodArguments, methodParameters);
65+
initializeMethodArguments(method, repositoryInterface, methodArguments, methodParameters);
6866

6967
this.methodArguments = Collections.unmodifiableMap(methodArguments);
7068
this.methodParameters = Collections.unmodifiableMap(methodParameters);
@@ -75,7 +73,7 @@ static ResolvableType resolvePrimaryIfNecessary(TypeInformation<?> type) {
7573
: type.toResolvableType();
7674
}
7775

78-
private static void initializeMethodArguments(Method method, ParameterNameDiscoverer nameDiscoverer,
76+
private static void initializeMethodArguments(Method method,
7977
ResolvableType repositoryInterface, Map<String, ParameterSpec> methodArguments,
8078
Map<String, MethodParameter> methodParameters) {
8179

@@ -85,7 +83,6 @@ private static void initializeMethodArguments(Method method, ParameterNameDiscov
8583

8684
MethodParameter methodParameter = MethodParameter.forParameter(parameter)
8785
.withContainingClass(repositoryInterfaceType);
88-
methodParameter.initParameterNameDiscovery(nameDiscoverer);
8986

9087
TypeName parameterType = parameterTypeName(methodParameter, repositoryInterfaceType);
9188

src/main/java/org/springframework/data/repository/support/MethodParameters.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525
import org.jspecify.annotations.Nullable;
2626

27-
import org.springframework.core.DefaultParameterNameDiscoverer;
2827
import org.springframework.core.MethodParameter;
29-
import org.springframework.core.ParameterNameDiscoverer;
3028
import org.springframework.data.util.Lazy;
3129
import org.springframework.util.Assert;
3230

@@ -65,7 +63,6 @@ public MethodParameters(Method method, Optional<AnnotationAttribute> namingAnnot
6563
for (int i = 0; i < method.getParameterCount(); i++) {
6664

6765
MethodParameter parameter = new AnnotationNamingMethodParameter(method, i, namingAnnotation);
68-
parameter.initParameterNameDiscovery(DefaultParameterNameDiscoverer.getSharedInstance());
6966
parameters.add(parameter);
7067
}
7168
}

src/main/java/org/springframework/data/util/NullnessMethodInvocationValidator.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,9 @@
2828
import org.jspecify.annotations.NullMarked;
2929
import org.jspecify.annotations.Nullable;
3030

31-
import org.springframework.core.DefaultParameterNameDiscoverer;
3231
import org.springframework.core.KotlinDetector;
3332
import org.springframework.core.MethodParameter;
3433
import org.springframework.core.Nullness;
35-
import org.springframework.core.ParameterNameDiscoverer;
3634
import org.springframework.util.ClassUtils;
3735
import org.springframework.util.ObjectUtils;
3836

@@ -78,7 +76,7 @@ public static boolean supports(Class<?> type) {
7876

7977
if (nullness == null) {
8078

81-
nullness = MethodNullness.of(method, DefaultParameterNameDiscoverer.getSharedInstance());
79+
nullness = MethodNullness.of(method);
8280
nullabilityCache.put(method, nullness);
8381
}
8482

@@ -140,7 +138,7 @@ private MethodNullness(boolean nullableReturn, boolean[] nullableParameters, Met
140138
this.methodParameters = methodParameters;
141139
}
142140

143-
static MethodNullness of(Method method, ParameterNameDiscoverer discoverer) {
141+
static MethodNullness of(Method method) {
144142

145143
boolean nullableReturn = isNullableParameter(new MethodParameter(method, -1));
146144
boolean[] nullableParameters = new boolean[method.getParameterCount()];
@@ -149,7 +147,6 @@ static MethodNullness of(Method method, ParameterNameDiscoverer discoverer) {
149147
for (int i = 0; i < method.getParameterCount(); i++) {
150148

151149
MethodParameter parameter = new MethodParameter(method, i);
152-
parameter.initParameterNameDiscovery(discoverer);
153150
nullableParameters[i] = isNullableParameter(parameter);
154151
methodParameters[i] = parameter;
155152
}

src/test/kotlin/org/springframework/data/repository/query/KParameterUnitTests.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ package org.springframework.data.repository.query
1717

1818
import org.assertj.core.api.Assertions.assertThat
1919
import org.junit.jupiter.api.Test
20-
import org.springframework.core.DefaultParameterNameDiscoverer
2120
import org.springframework.core.MethodParameter
2221
import org.springframework.data.core.TypeInformation
2322
import kotlin.reflect.jvm.javaMethod
@@ -34,7 +33,6 @@ class KParameterUnitTests {
3433

3534
val methodParameter =
3635
MethodParameter(MyCoroutineRepository::hello.javaMethod!!, 0)
37-
methodParameter.initParameterNameDiscovery(DefaultParameterNameDiscoverer())
3836
val parameter = Parameter(methodParameter, TypeInformation.OBJECT)
3937

4038
assertThat(parameter.name).isEmpty()

0 commit comments

Comments
 (0)