Skip to content

Commit cb6793f

Browse files
mp911demp911de
committed
Polishing.
Move off deprecated API in tests. See #3305 Original pull request: #3307
1 parent a0d8c7f commit cb6793f

15 files changed

+92
-77
lines changed

‎src/test/java/org/springframework/data/auditing/config/AuditingBeanDefinitionRegistrarSupportUnitTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
import org.junit.jupiter.api.extension.ExtendWith;
2626
import org.mockito.Mock;
2727
import org.mockito.junit.jupiter.MockitoExtension;
28+
2829
import org.springframework.beans.factory.config.BeanDefinition;
2930
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
3031
import org.springframework.core.type.AnnotationMetadata;
31-
import org.springframework.core.type.StandardAnnotationMetadata;
3232
import org.springframework.data.auditing.EnableAuditing;
3333

3434
/**
@@ -48,7 +48,7 @@ class AuditingBeanDefinitionRegistrarSupportUnitTests {
4848
void testRegisterBeanDefinitions() {
4949

5050
AuditingBeanDefinitionRegistrarSupport registrar = new DummyAuditingBeanDefinitionRegistrarSupport();
51-
AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfig.class);
51+
AnnotationMetadata metadata = AnnotationMetadata.introspect(SampleConfig.class);
5252

5353
registrar.registerBeanDefinitions(metadata, registry);
5454
verify(registry, times(1)).registerBeanDefinition(anyString(), any(BeanDefinition.class));
@@ -67,7 +67,7 @@ void rejectsNullAnnotationMetadata() {
6767
void rejectsNullRegistry() {
6868

6969
AuditingBeanDefinitionRegistrarSupport registrar = new DummyAuditingBeanDefinitionRegistrarSupport();
70-
AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfig.class);
70+
AnnotationMetadata metadata = AnnotationMetadata.introspect(SampleConfig.class);
7171

7272
assertThatIllegalArgumentException() //
7373
.isThrownBy(() -> registrar.registerBeanDefinitions(metadata, null));

‎src/test/java/org/springframework/data/mapping/model/ClassGeneratingPropertyAccessorFactoryTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public static List<Object[]> parameters() throws ReflectiveOperationException {
6868
Class<Object> defaultPackageClass = (Class) Class.forName("TypeInDefaultPackage");
6969

7070
parameters
71-
.add(new Object[] { defaultPackageClass.newInstance(), "", defaultPackageClass, "Class in default package" });
71+
.add(new Object[] { defaultPackageClass.getConstructor().newInstance(), "", defaultPackageClass,
72+
"Class in default package" });
7273

7374
return parameters;
7475
}

‎src/test/java/org/springframework/data/projection/ProxyProjectionFactoryUnitTests.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929
import java.util.Map;
3030
import java.util.Optional;
3131

32+
import org.jspecify.annotations.Nullable;
3233
import org.junit.jupiter.api.Disabled;
3334
import org.junit.jupiter.api.Test;
3435
import org.springframework.aop.Advisor;
3536
import org.springframework.aop.TargetClassAware;
3637
import org.springframework.aop.framework.Advised;
3738
import org.springframework.beans.factory.annotation.Value;
38-
import org.springframework.lang.Nullable;
3939
import org.springframework.test.util.ReflectionTestUtils;
4040

4141
/**
@@ -397,7 +397,8 @@ interface CustomerWithLocalDateTime {
397397

398398
interface CustomerProjectionWithNullables {
399399

400-
@Nullable String getFirstname();
400+
@Nullable
401+
String getFirstname();
401402
String getLastname();
402403
}
403404

‎src/test/java/org/springframework/data/repository/aot/generate/DummyModuleAotRepositoryContext.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import java.util.List;
2121
import java.util.Set;
2222

23+
import org.jspecify.annotations.Nullable;
24+
2325
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
2426
import org.springframework.core.annotation.MergedAnnotation;
2527
import org.springframework.core.env.Environment;
@@ -29,7 +31,6 @@
2931
import org.springframework.data.repository.config.RepositoryConfigurationSource;
3032
import org.springframework.data.repository.core.RepositoryInformation;
3133
import org.springframework.data.repository.core.support.RepositoryComposition;
32-
import org.springframework.lang.Nullable;
3334

3435
/**
3536
* Dummy {@link AotRepositoryContext} used to simulate module specific repository implementation.

‎src/test/java/org/springframework/data/repository/aot/generate/RepositoryContributorUnitTests.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
import org.springframework.data.repository.core.support.RepositoryComposition;
4141
import org.springframework.data.repository.core.support.RepositoryComposition.RepositoryFragments;
4242
import org.springframework.data.repository.core.support.RepositoryFragment;
43+
import org.springframework.data.repository.query.DefaultParameters;
4344
import org.springframework.data.repository.query.QueryMethod;
4445
import org.springframework.javapoet.CodeBlock;
4546
import org.springframework.util.ClassUtils;
@@ -61,7 +62,8 @@ void createsCompilableClassStub() {
6162
protected @Nullable MethodContributor<? extends QueryMethod> contributeQueryMethod(Method method) {
6263

6364
return MethodContributor
64-
.forQueryMethod(new QueryMethod(method, getRepositoryInformation(), getProjectionFactory()))
65+
.forQueryMethod(
66+
new QueryMethod(method, getRepositoryInformation(), getProjectionFactory(), DefaultParameters::new))
6567
.withMetadata(new QueryMetadata() {
6668

6769
@Override

‎src/test/java/org/springframework/data/repository/aot/generate/StubRepositoryInformation.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@
1919
import java.util.List;
2020
import java.util.Set;
2121

22+
import org.jspecify.annotations.Nullable;
23+
2224
import org.springframework.data.repository.core.CrudMethods;
2325
import org.springframework.data.repository.core.RepositoryInformation;
2426
import org.springframework.data.repository.core.RepositoryMetadata;
2527
import org.springframework.data.repository.core.support.AbstractRepositoryMetadata;
2628
import org.springframework.data.repository.core.support.RepositoryComposition;
2729
import org.springframework.data.repository.core.support.RepositoryFragment;
2830
import org.springframework.data.util.TypeInformation;
29-
import org.springframework.lang.Nullable;
3031

3132
/**
3233
* Stub {@link RepositoryInformation} used for testing.

‎src/test/java/org/springframework/data/repository/config/AnnotationRepositoryConfigurationSourceUnitTests.java

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
import org.springframework.core.io.DefaultResourceLoader;
3535
import org.springframework.core.io.ResourceLoader;
3636
import org.springframework.core.type.AnnotationMetadata;
37-
import org.springframework.core.type.StandardAnnotationMetadata;
3837
import org.springframework.data.repository.PagingAndSortingRepository;
3938
import org.springframework.data.repository.config.basepackage.repo.PersonRepository;
4039
import org.springframework.data.repository.core.support.DummyReactiveRepositoryFactory;
@@ -59,7 +58,7 @@ class AnnotationRepositoryConfigurationSourceUnitTests {
5958
@BeforeEach
6059
void setUp() {
6160

62-
AnnotationMetadata annotationMetadata = new StandardAnnotationMetadata(SampleConfiguration.class, true);
61+
AnnotationMetadata annotationMetadata = AnnotationMetadata.introspect(SampleConfiguration.class);
6362
environment = new StandardEnvironment();
6463
resourceLoader = new DefaultResourceLoader();
6564
registry = mock(BeanDefinitionRegistry.class);
@@ -120,8 +119,7 @@ void findsStringAttributeByName() {
120119
@Test // DATACMNS-502
121120
void returnsEmptyStringForBasePackage() throws Exception {
122121

123-
var metadata = new StandardAnnotationMetadata(
124-
getClass().getClassLoader().loadClass("TypeInDefaultPackage"), true);
122+
var metadata = AnnotationMetadata.introspect(getClass().getClassLoader().loadClass("TypeInDefaultPackage"));
125123
RepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(metadata,
126124
EnableRepositories.class, resourceLoader, environment, registry, null);
127125

@@ -138,7 +136,7 @@ void detectsExplicitFilterConfiguration() {
138136
@Test // DATACMNS-542
139137
void ignoresMissingRepositoryBaseClassNameAttribute() {
140138

141-
AnnotationMetadata metadata = new StandardAnnotationMetadata(ConfigWithSampleAnnotation.class, true);
139+
AnnotationMetadata metadata = AnnotationMetadata.introspect(ConfigWithSampleAnnotation.class);
142140
RepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(metadata,
143141
SampleAnnotation.class, resourceLoader, environment, registry, null);
144142

@@ -190,7 +188,7 @@ void considersDefaultFragmentsContributor() {
190188
RootBeanDefinition bd = new RootBeanDefinition(DummyRepositoryFactory.class);
191189
bd.getConstructorArgumentValues().addGenericArgumentValue(PersonRepository.class);
192190

193-
AnnotationMetadata metadata = new StandardAnnotationMetadata(ConfigurationWithFragmentsContributor.class, true);
191+
AnnotationMetadata metadata = AnnotationMetadata.introspect(ConfigurationWithFragmentsContributor.class);
194192
AnnotationRepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(metadata,
195193
EnableRepositoriesWithContributor.class, resourceLoader, environment, registry, null);
196194

@@ -204,8 +202,7 @@ void omitsUnspecifiedFragmentsContributor() {
204202
RootBeanDefinition bd = new RootBeanDefinition(DummyRepositoryFactory.class);
205203
bd.getConstructorArgumentValues().addGenericArgumentValue(PersonRepository.class);
206204

207-
AnnotationMetadata metadata = new StandardAnnotationMetadata(ReactiveConfigurationWithBeanNameGenerator.class,
208-
true);
205+
AnnotationMetadata metadata = AnnotationMetadata.introspect(ReactiveConfigurationWithBeanNameGenerator.class);
209206
AnnotationRepositoryConfigurationSource configurationSource = new AnnotationRepositoryConfigurationSource(metadata,
210207
EnableReactiveRepositories.class, resourceLoader, environment, registry, null);
211208

@@ -225,7 +222,7 @@ void considerBeanNameGeneratorForReactiveRepos() {
225222

226223
private AnnotationRepositoryConfigurationSource getConfigSource(Class<?> type) {
227224

228-
AnnotationMetadata metadata = new StandardAnnotationMetadata(type, true);
225+
AnnotationMetadata metadata = AnnotationMetadata.introspect(type);
229226
return new AnnotationRepositoryConfigurationSource(metadata, EnableRepositories.class, resourceLoader, environment,
230227
registry, null);
231228
}

‎src/test/java/org/springframework/data/repository/config/RepositoryBeanDefinitionRegistrarSupportUnitTests.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.springframework.core.env.StandardEnvironment;
3636
import org.springframework.core.io.DefaultResourceLoader;
3737
import org.springframework.core.type.AnnotationMetadata;
38-
import org.springframework.core.type.StandardAnnotationMetadata;
3938
import org.springframework.data.mapping.Person;
4039
import org.springframework.data.repository.Repository;
4140
import org.springframework.data.repository.config.basepackage.FragmentImpl;
@@ -67,7 +66,7 @@ void setUp() {
6766
@Test
6867
void registersBeanDefinitionForFoundBean() {
6968

70-
AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true);
69+
AnnotationMetadata metadata = AnnotationMetadata.introspect(SampleConfiguration.class);
7170

7271
registrar.registerBeanDefinitions(metadata, registry);
7372

@@ -81,7 +80,7 @@ void registersBeanDefinitionForFoundBean() {
8180
@Test // GH-2584
8281
void shouldExposeFragmentsAsBean() {
8382

84-
AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true);
83+
AnnotationMetadata metadata = AnnotationMetadata.introspect(SampleConfiguration.class);
8584

8685
registrar.registerBeanDefinitions(metadata, registry);
8786
verify(registry, atLeast(1)).registerBeanDefinition(eq("commons.MyRepository.fragments#0"),
@@ -103,7 +102,7 @@ void registersBeanDefinitionForNestedRepositories() {
103102
@Test // DATACMNS-1147
104103
void registersBeanDefinitionWithoutFragmentImplementations() {
105104

106-
AnnotationMetadata metadata = new StandardAnnotationMetadata(FragmentExclusionConfiguration.class, true);
105+
AnnotationMetadata metadata = AnnotationMetadata.introspect(FragmentExclusionConfiguration.class);
107106

108107
registrar.registerBeanDefinitions(metadata, registry);
109108

@@ -114,7 +113,7 @@ void registersBeanDefinitionWithoutFragmentImplementations() {
114113
@Test // DATACMNS-1172, GH-3090
115114
void shouldLimitImplementationBasePackages() {
116115

117-
AnnotationMetadata metadata = new StandardAnnotationMetadata(LimitsImplementationBasePackages.class, true);
116+
AnnotationMetadata metadata = AnnotationMetadata.introspect(LimitsImplementationBasePackages.class);
118117

119118
registrar.registerBeanDefinitions(metadata, registry);
120119

@@ -127,7 +126,7 @@ void shouldLimitImplementationBasePackages() {
127126
@Test // DATACMNS-360
128127
void registeredProfileRepositoriesIfProfileActivated() {
129128

130-
AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true);
129+
AnnotationMetadata metadata = AnnotationMetadata.introspect(SampleConfiguration.class);
131130
environment.setActiveProfiles("profile");
132131

133132
var registrar = new DummyRegistrar();
@@ -140,7 +139,7 @@ void registeredProfileRepositoriesIfProfileActivated() {
140139
@Test // DATACMNS-1497
141140
void usesBeanNameGeneratorProvided() {
142141

143-
AnnotationMetadata metadata = new StandardAnnotationMetadata(SampleConfiguration.class, true);
142+
AnnotationMetadata metadata = AnnotationMetadata.introspect(SampleConfiguration.class);
144143
BeanNameGenerator delegate = new AnnotationBeanNameGenerator();
145144

146145
var registrar = new DummyRegistrar();

‎src/test/java/org/springframework/data/repository/config/RepositoryConfigurationExtensionSupportUnitTests.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
import java.util.Collections;
2424

2525
import org.junit.jupiter.api.Test;
26+
2627
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
2728
import org.springframework.context.annotation.ComponentScan.Filter;
2829
import org.springframework.context.annotation.FilterType;
@@ -32,7 +33,6 @@
3233
import org.springframework.core.io.DefaultResourceLoader;
3334
import org.springframework.core.io.ResourceLoader;
3435
import org.springframework.core.type.AnnotationMetadata;
35-
import org.springframework.core.type.StandardAnnotationMetadata;
3636
import org.springframework.dao.InvalidDataAccessApiUsageException;
3737
import org.springframework.data.repository.CrudRepository;
3838
import org.springframework.data.repository.Repository;
@@ -74,7 +74,7 @@ void considersRepositoryInterfaceExtendingStoreInterfaceStrictMatch() {
7474
@Test // DATACMNS-1174
7575
void rejectsReactiveRepositories() {
7676

77-
AnnotationMetadata annotationMetadata = new StandardAnnotationMetadata(ReactiveConfiguration.class, true);
77+
AnnotationMetadata annotationMetadata = AnnotationMetadata.introspect(ReactiveConfiguration.class);
7878
Environment environment = new StandardEnvironment();
7979
ResourceLoader resourceLoader = new DefaultResourceLoader();
8080
var registry = mock(BeanDefinitionRegistry.class);

0 commit comments

Comments
 (0)