Skip to content

Commit 2236da1

Browse files
mp911demp911de
committed
Polishing.
Reformat code. Simplify flow. Add ticket reference to test. See #3287 Original pull request: #3219
1 parent 3708b85 commit 2236da1

File tree

2 files changed

+41
-33
lines changed

2 files changed

+41
-33
lines changed

‎src/main/java/org/springframework/data/repository/config/RepositoryConfigurationDelegate.java‎

Lines changed: 32 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,15 @@
1515
*/
1616
package org.springframework.data.repository.config;
1717

18+
import java.lang.reflect.TypeVariable;
19+
import java.util.ArrayList;
20+
import java.util.Arrays;
21+
import java.util.Collection;
22+
import java.util.HashMap;
23+
import java.util.List;
24+
import java.util.Map;
25+
import java.util.stream.Collectors;
26+
1827
import org.apache.commons.logging.Log;
1928
import org.apache.commons.logging.LogFactory;
2029
import org.jspecify.annotations.Nullable;
@@ -23,7 +32,12 @@
2332
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
2433
import org.springframework.beans.factory.config.DependencyDescriptor;
2534
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
26-
import org.springframework.beans.factory.support.*;
35+
import org.springframework.beans.factory.support.AutowireCandidateResolver;
36+
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
37+
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
38+
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
39+
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
40+
import org.springframework.beans.factory.support.RootBeanDefinition;
2741
import org.springframework.context.annotation.ContextAnnotationAutowireCandidateResolver;
2842
import org.springframework.context.support.GenericApplicationContext;
2943
import org.springframework.core.ResolvableType;
@@ -43,10 +57,6 @@
4357
import org.springframework.util.Assert;
4458
import org.springframework.util.StopWatch;
4559

46-
import java.lang.reflect.TypeVariable;
47-
import java.util.*;
48-
import java.util.stream.Collectors;
49-
5060
/**
5161
* Delegate for configuration integration to reuse the general way of detecting repositories. Customization is done by
5262
* providing a configuration format specific {@link RepositoryConfigurationSource} (currently either XML or annotations
@@ -65,6 +75,9 @@ public class RepositoryConfigurationDelegate {
6575
private static final String MULTIPLE_MODULES = "Multiple Spring Data modules found, entering strict repository configuration mode";
6676
private static final String NON_DEFAULT_AUTOWIRE_CANDIDATE_RESOLVER = "Non-default AutowireCandidateResolver (%s) detected. Skipping the registration of LazyRepositoryInjectionPointResolver. Lazy repository injection will not be working";
6777

78+
private static final List<Class<?>> DEFAULT_AUTOWIRE_CANDIDATE_RESOLVERS = List
79+
.of(ContextAnnotationAutowireCandidateResolver.class, LazyRepositoryInjectionPointResolver.class);
80+
6881
private static final Log logger = LogFactory.getLog(RepositoryConfigurationDelegate.class);
6982

7083
private final RepositoryConfigurationSource configurationSource;
@@ -82,7 +95,7 @@ public class RepositoryConfigurationDelegate {
8295
* @param environment must not be {@literal null}.
8396
*/
8497
public RepositoryConfigurationDelegate(RepositoryConfigurationSource configurationSource,
85-
ResourceLoader resourceLoader, Environment environment) {
98+
ResourceLoader resourceLoader, Environment environment) {
8699

87100
this.isXml = configurationSource instanceof XmlRepositoryConfigurationSource;
88101
boolean isAnnotation = configurationSource instanceof AnnotationRepositoryConfigurationSource;
@@ -107,7 +120,7 @@ public RepositoryConfigurationDelegate(RepositoryConfigurationSource configurati
107120
* {@link Environment}.
108121
*/
109122
private static Environment defaultEnvironment(@Nullable Environment environment,
110-
@Nullable ResourceLoader resourceLoader) {
123+
@Nullable ResourceLoader resourceLoader) {
111124

112125
if (environment != null) {
113126
return environment;
@@ -126,7 +139,7 @@ private static Environment defaultEnvironment(@Nullable Environment environment,
126139
* @see org.springframework.beans.factory.support.BeanDefinitionRegistry
127140
*/
128141
public List<BeanComponentDefinition> registerRepositoriesIn(BeanDefinitionRegistry registry,
129-
RepositoryConfigurationExtension extension) {
142+
RepositoryConfigurationExtension extension) {
130143

131144
if (logger.isInfoEnabled()) {
132145
logger.info(LogMessage.format("Bootstrapping Spring Data %s repositories in %s mode.", //
@@ -212,7 +225,7 @@ public List<BeanComponentDefinition> registerRepositoriesIn(BeanDefinitionRegist
212225
}
213226

214227
private void registerAotComponents(BeanDefinitionRegistry registry, RepositoryConfigurationExtension extension,
215-
Map<String, RepositoryConfigurationAdapter<?>> metadataByRepositoryBeanName) {
228+
Map<String, RepositoryConfigurationAdapter<?>> metadataByRepositoryBeanName) {
216229

217230
BeanDefinitionBuilder repositoryAotProcessor = BeanDefinitionBuilder
218231
.rootBeanDefinition(extension.getRepositoryAotProcessor()).setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
@@ -235,37 +248,32 @@ private void registerAotComponents(BeanDefinitionRegistry registry, RepositoryCo
235248
* @param registry must not be {@literal null}.
236249
*/
237250
private static void potentiallyLazifyRepositories(Map<String, RepositoryConfiguration<?>> configurations,
238-
BeanDefinitionRegistry registry, BootstrapMode mode) {
251+
BeanDefinitionRegistry registry, BootstrapMode mode) {
239252

240-
if (!DefaultListableBeanFactory.class.isInstance(registry) || BootstrapMode.DEFAULT.equals(mode)) {
253+
if (!(registry instanceof DefaultListableBeanFactory beanFactory) || BootstrapMode.DEFAULT.equals(mode)) {
241254
return;
242255
}
243256

244-
DefaultListableBeanFactory beanFactory = DefaultListableBeanFactory.class.cast(registry);
245257
AutowireCandidateResolver resolver = beanFactory.getAutowireCandidateResolver();
246258

247-
if (!Arrays.asList(ContextAnnotationAutowireCandidateResolver.class, LazyRepositoryInjectionPointResolver.class)
248-
.contains(resolver.getClass())) {
259+
if (!DEFAULT_AUTOWIRE_CANDIDATE_RESOLVERS.contains(resolver.getClass())) {
249260

250261
logger.warn(LogMessage.format(NON_DEFAULT_AUTOWIRE_CANDIDATE_RESOLVER, resolver.getClass().getName()));
251-
252262
return;
253263
}
254264

255-
AutowireCandidateResolver newResolver = LazyRepositoryInjectionPointResolver.class.isInstance(resolver) //
256-
? LazyRepositoryInjectionPointResolver.class.cast(resolver).withAdditionalConfigurations(configurations) //
265+
AutowireCandidateResolver newResolver = resolver instanceof LazyRepositoryInjectionPointResolver lazy //
266+
? lazy.withAdditionalConfigurations(configurations) //
257267
: new LazyRepositoryInjectionPointResolver(configurations);
258268

259269
beanFactory.setAutowireCandidateResolver(newResolver);
260270

261-
if (mode.equals(BootstrapMode.DEFERRED)) {
271+
if (mode.equals(BootstrapMode.DEFERRED)
272+
&& !beanFactory.containsBean(DeferredRepositoryInitializationListener.class.getName())) {
262273

263274
logger.debug("Registering deferred repository initialization listener.");
264-
265-
if (!beanFactory.containsBean(DeferredRepositoryInitializationListener.class.getName())) {
266-
beanFactory.registerSingleton(DeferredRepositoryInitializationListener.class.getName(),
267-
new DeferredRepositoryInitializationListener(beanFactory));
268-
}
275+
beanFactory.registerSingleton(DeferredRepositoryInitializationListener.class.getName(),
276+
new DeferredRepositoryInitializationListener(beanFactory));
269277
}
270278
}
271279

@@ -275,7 +283,7 @@ private static void potentiallyLazifyRepositories(Map<String, RepositoryConfigur
275283
* scanning.
276284
*
277285
* @return {@literal true} if multiple data store repository implementations are present in the application. This
278-
* typically means an Spring application is using more than 1 type of data store.
286+
* typically means a Spring application is using more than 1 type of data store.
279287
*/
280288
private boolean multipleStoresDetected() {
281289

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@
1515
*/
1616
package org.springframework.data.repository.config;
1717

18+
import static org.assertj.core.api.Assertions.*;
19+
20+
import java.lang.reflect.TypeVariable;
21+
import java.util.List;
22+
import java.util.Optional;
23+
import java.util.UUID;
24+
1825
import org.junit.jupiter.api.Test;
1926
import org.junit.jupiter.api.extension.ExtendWith;
2027
import org.mockito.Mockito;
@@ -52,13 +59,6 @@
5259
import org.springframework.data.repository.sample.AddressRepositoryClient;
5360
import org.springframework.data.repository.sample.ProductRepository;
5461

55-
import java.lang.reflect.TypeVariable;
56-
import java.util.List;
57-
import java.util.Optional;
58-
import java.util.UUID;
59-
60-
import static org.assertj.core.api.Assertions.assertThat;
61-
6262
/**
6363
* Unit tests for {@link RepositoryConfigurationDelegate}.
6464
*
@@ -112,8 +112,8 @@ void registersDeferredRepositoryInitializationListener() {
112112
assertThat(beanFactory.getBeanNamesForType(DeferredRepositoryInitializationListener.class)).isNotEmpty();
113113
}
114114

115-
@Test
116-
void registersMultiDeferredRepositoryInitializationListener() {
115+
@Test // GH-3287
116+
void registersOneDeferredRepositoryInitializationListener() {
117117

118118
var beanFactory = assertLazyRepositoryBeanSetup(DeferredConfig.class, OtherDeferredConfig.class);
119119

0 commit comments

Comments
 (0)