Skip to content

Commit 41c8a50

Browse files
mp911demp911de
committed
Polishing.
Reformat code. Simplify flow. Add ticket reference to test. See #3287 Original pull request: #3219
1 parent f9d5369 commit 41c8a50

File tree

2 files changed

+43
-33
lines changed

2 files changed

+43
-33
lines changed

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

+33-24
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,28 @@
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;
29+
2030
import org.springframework.beans.factory.config.BeanDefinition;
2131
import org.springframework.beans.factory.config.ConfigurableBeanFactory;
2232
import org.springframework.beans.factory.config.DependencyDescriptor;
2333
import org.springframework.beans.factory.parsing.BeanComponentDefinition;
24-
import org.springframework.beans.factory.support.*;
34+
import org.springframework.beans.factory.support.AutowireCandidateResolver;
35+
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
36+
import org.springframework.beans.factory.support.BeanDefinitionReaderUtils;
37+
import org.springframework.beans.factory.support.BeanDefinitionRegistry;
38+
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
39+
import org.springframework.beans.factory.support.RootBeanDefinition;
2540
import org.springframework.context.annotation.ContextAnnotationAutowireCandidateResolver;
2641
import org.springframework.context.support.GenericApplicationContext;
2742
import org.springframework.core.ResolvableType;
@@ -42,10 +57,6 @@
4257
import org.springframework.util.Assert;
4358
import org.springframework.util.StopWatch;
4459

45-
import java.lang.reflect.TypeVariable;
46-
import java.util.*;
47-
import java.util.stream.Collectors;
48-
4960
/**
5061
* Delegate for configuration integration to reuse the general way of detecting repositories. Customization is done by
5162
* providing a configuration format specific {@link RepositoryConfigurationSource} (currently either XML or annotations
@@ -64,6 +75,9 @@ public class RepositoryConfigurationDelegate {
6475
private static final String MULTIPLE_MODULES = "Multiple Spring Data modules found, entering strict repository configuration mode";
6576
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";
6677

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

6983
private final RepositoryConfigurationSource configurationSource;
@@ -81,7 +95,7 @@ public class RepositoryConfigurationDelegate {
8195
* @param environment must not be {@literal null}.
8296
*/
8397
public RepositoryConfigurationDelegate(RepositoryConfigurationSource configurationSource,
84-
ResourceLoader resourceLoader, Environment environment) {
98+
ResourceLoader resourceLoader, Environment environment) {
8599

86100
this.isXml = configurationSource instanceof XmlRepositoryConfigurationSource;
87101
boolean isAnnotation = configurationSource instanceof AnnotationRepositoryConfigurationSource;
@@ -106,7 +120,7 @@ public RepositoryConfigurationDelegate(RepositoryConfigurationSource configurati
106120
* {@link Environment}.
107121
*/
108122
private static Environment defaultEnvironment(@Nullable Environment environment,
109-
@Nullable ResourceLoader resourceLoader) {
123+
@Nullable ResourceLoader resourceLoader) {
110124

111125
if (environment != null) {
112126
return environment;
@@ -125,7 +139,7 @@ private static Environment defaultEnvironment(@Nullable Environment environment,
125139
* @see org.springframework.beans.factory.support.BeanDefinitionRegistry
126140
*/
127141
public List<BeanComponentDefinition> registerRepositoriesIn(BeanDefinitionRegistry registry,
128-
RepositoryConfigurationExtension extension) {
142+
RepositoryConfigurationExtension extension) {
129143

130144
if (logger.isInfoEnabled()) {
131145
logger.info(LogMessage.format("Bootstrapping Spring Data %s repositories in %s mode.", //
@@ -211,7 +225,7 @@ public List<BeanComponentDefinition> registerRepositoriesIn(BeanDefinitionRegist
211225
}
212226

213227
private void registerAotComponents(BeanDefinitionRegistry registry, RepositoryConfigurationExtension extension,
214-
Map<String, RepositoryConfigurationAdapter<?>> metadataByRepositoryBeanName) {
228+
Map<String, RepositoryConfigurationAdapter<?>> metadataByRepositoryBeanName) {
215229

216230
BeanDefinitionBuilder repositoryAotProcessor = BeanDefinitionBuilder
217231
.rootBeanDefinition(extension.getRepositoryAotProcessor()).setRole(BeanDefinition.ROLE_INFRASTRUCTURE);
@@ -234,37 +248,32 @@ private void registerAotComponents(BeanDefinitionRegistry registry, RepositoryCo
234248
* @param registry must not be {@literal null}.
235249
*/
236250
private static void potentiallyLazifyRepositories(Map<String, RepositoryConfiguration<?>> configurations,
237-
BeanDefinitionRegistry registry, BootstrapMode mode) {
251+
BeanDefinitionRegistry registry, BootstrapMode mode) {
238252

239-
if (!DefaultListableBeanFactory.class.isInstance(registry) || BootstrapMode.DEFAULT.equals(mode)) {
253+
if (!(registry instanceof DefaultListableBeanFactory beanFactory) || BootstrapMode.DEFAULT.equals(mode)) {
240254
return;
241255
}
242256

243-
DefaultListableBeanFactory beanFactory = DefaultListableBeanFactory.class.cast(registry);
244257
AutowireCandidateResolver resolver = beanFactory.getAutowireCandidateResolver();
245258

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

249261
logger.warn(LogMessage.format(NON_DEFAULT_AUTOWIRE_CANDIDATE_RESOLVER, resolver.getClass().getName()));
250-
251262
return;
252263
}
253264

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

258269
beanFactory.setAutowireCandidateResolver(newResolver);
259270

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

262274
logger.debug("Registering deferred repository initialization listener.");
263-
264-
if (!beanFactory.containsBean(DeferredRepositoryInitializationListener.class.getName())) {
265-
beanFactory.registerSingleton(DeferredRepositoryInitializationListener.class.getName(),
266-
new DeferredRepositoryInitializationListener(beanFactory));
267-
}
275+
beanFactory.registerSingleton(DeferredRepositoryInitializationListener.class.getName(),
276+
new DeferredRepositoryInitializationListener(beanFactory));
268277
}
269278
}
270279

@@ -274,7 +283,7 @@ private static void potentiallyLazifyRepositories(Map<String, RepositoryConfigur
274283
* scanning.
275284
*
276285
* @return {@literal true} if multiple data store repository implementations are present in the application. This
277-
* 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.
278287
*/
279288
private boolean multipleStoresDetected() {
280289

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

+10-9
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,20 @@
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;
2128
import org.mockito.junit.jupiter.MockitoExtension;
2229
import org.mockito.junit.jupiter.MockitoSettings;
2330
import org.mockito.quality.Strictness;
31+
2432
import org.springframework.aop.framework.Advised;
2533
import org.springframework.aot.hint.RuntimeHints;
2634
import org.springframework.beans.factory.ListableBeanFactory;
@@ -52,13 +60,6 @@
5260
import org.springframework.data.repository.sample.AddressRepositoryClient;
5361
import org.springframework.data.repository.sample.ProductRepository;
5462

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-
6263
/**
6364
* Unit tests for {@link RepositoryConfigurationDelegate}.
6465
*
@@ -112,8 +113,8 @@ void registersDeferredRepositoryInitializationListener() {
112113
assertThat(beanFactory.getBeanNamesForType(DeferredRepositoryInitializationListener.class)).isNotEmpty();
113114
}
114115

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

118119
var beanFactory = assertLazyRepositoryBeanSetup(DeferredConfig.class, OtherDeferredConfig.class);
119120

0 commit comments

Comments
 (0)