Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Prevent repeat configuration of DB init bean dependencies

Browse Source 
Fixes gh-33374
This commit is contained in:
Andy Wilkinson
2022-11-30 12:34:09 +00:00
parent e1efdadfe3
commit 276b288891
2 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurer.java
View File

@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.springframework.aot.AotDetector;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.BeanDefinition;
@@ -95,6 +96,9 @@ public class DatabaseInitializationDependencyConfigurer implements ImportBeanDef
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
if (AotDetector.useGeneratedArtifacts()) {
return;
}
InitializerBeanNames initializerBeanNames = detectInitializerBeanNames(beanFactory);
if (initializerBeanNames.isEmpty()) {
return;

29
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/sql/init/dependency/DatabaseInitializationDependencyConfigurerTests.java
View File

@@ -169,6 +169,35 @@ class DatabaseInitializationDependencyConfigurerTests {
});
}
@Test
void whenInAnAotProcessedContextDependsOnDatabaseInitializationPostProcessorDoesNothing() {
withAotEnabled(() -> {
BeanDefinition alpha = BeanDefinitionBuilder.rootBeanDefinition(String.class).getBeanDefinition();
BeanDefinition bravo = BeanDefinitionBuilder.rootBeanDefinition(String.class).getBeanDefinition();
performDetection(Arrays.asList(MockDatabaseInitializerDetector.class,
MockedDependsOnDatabaseInitializationDetector.class), (context) -> {
context.registerBeanDefinition("alpha", alpha);
context.registerBeanDefinition("bravo", bravo);
context.register(DependencyConfigurerConfiguration.class);
context.refresh();
assertThat(alpha.getAttribute(DatabaseInitializerDetector.class.getName())).isNull();
assertThat(bravo.getAttribute(DatabaseInitializerDetector.class.getName())).isNull();
then(MockDatabaseInitializerDetector.instance).shouldHaveNoInteractions();
assertThat(bravo.getDependsOn()).isNull();
});
});
}
private void withAotEnabled(Runnable action) {
System.setProperty("spring.aot.enabled", "true");
try {
action.run();
}
finally {
System.clearProperty("spring.aot.enabled");
}
}
private void performDetection(Collection<Class<?>> detectors,
Consumer<AnnotationConfigApplicationContext> contextCallback) {
DetectorSpringFactoriesClassLoader detectorSpringFactories = new DetectorSpringFactoriesClassLoader(this.temp);