root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '2.5.x' into 2.6.x 

Closes gh-29103
This commit is contained in:
Stephane Nicoll 2021-12-17 16:37:53 +01:00
parent 1c35ec2c3c 2fec06ac7e
commit c077ebecf7
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -33,7 +33,7 @@ class AnnotationDependsOnDatabaseInitializationDetector implements DependsOnData
public Set<String> detect(ConfigurableListableBeanFactory beanFactory) { public Set<String> detect(ConfigurableListableBeanFactory beanFactory) {
Set<String> dependentBeans = new HashSet<>(); Set<String> dependentBeans = new HashSet<>();
for (String beanName : beanFactory.getBeanDefinitionNames()) { for (String beanName : beanFactory.getBeanDefinitionNames()) {
if (beanFactory.findAnnotationOnBean(beanName, DependsOnDatabaseInitialization.class) != null) { if (beanFactory.findAnnotationOnBean(beanName, DependsOnDatabaseInitialization.class, false) != null) {
dependentBeans.add(beanName); dependentBeans.add(beanName);
} }
} }

20
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/jdbc/AbstractDataSourceInitializerDependencyConfigurationTests.java
View File

@ -40,11 +40,13 @@ import static org.assertj.core.api.Assertions.assertThat;
class AbstractDataSourceInitializerDependencyConfigurationTests { class AbstractDataSourceInitializerDependencyConfigurationTests {
@Test @Test
void beanThatDependsOnDatabaseInitializationDependsOnAbstractDataSourceInitializerBeans() { void beansThatDependOnDatabaseInitializationDependOnAbstractDataSourceInitializerBeans() {
try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext( try (AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(
TestConfiguration.class)) { TestConfiguration.class)) {
assertThat(context.getBeanFactory().getBeanDefinition("dependsOnDataSourceInitialization").getDependsOn()) assertThat(context.getBeanFactory().getBeanDefinition("factoryMethodDependsOnDatabaseInitialization")
.contains("initializer"); .getDependsOn()).contains("initializer");
assertThat(context.getBeanFactory().getBeanDefinition("beanClassDependsOnDatabaseInitialization")
.getDependsOn()).contains("initializer");
} }
} }
@ -59,10 +61,15 @@ class AbstractDataSourceInitializerDependencyConfigurationTests {
@Bean @Bean
@DependsOnDatabaseInitialization @DependsOnDatabaseInitialization
String dependsOnDataSourceInitialization() { String factoryMethodDependsOnDatabaseInitialization() {
return "test"; return "test";
} }
@Bean
DatabaseInitializationDependent beanClassDependsOnDatabaseInitialization() {
return new DatabaseInitializationDependent();
}
@Bean @Bean
AbstractDataSourceInitializer initializer(DataSource dataSource, ResourceLoader resourceLoader) { AbstractDataSourceInitializer initializer(DataSource dataSource, ResourceLoader resourceLoader) {
return new AbstractDataSourceInitializer(dataSource, resourceLoader) { return new AbstractDataSourceInitializer(dataSource, resourceLoader) {
@ -82,4 +89,9 @@ class AbstractDataSourceInitializerDependencyConfigurationTests {
} }
@DependsOnDatabaseInitialization
static class DatabaseInitializationDependent {
}
} }