Polish

Co-authored-by: Stéphane Nicoll <[email protected]>

Author: philwebb

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/AutoConfigurationImportSelectorIntegrationTests.java

@@ -51,14 +51,14 @@ void singleSelector() {
 
 	@Test
 	void multipleSelectorsShouldMergeAndSortCorrectly() {
-		this.contextRunner.withUserConfiguration(Config.class, AnotherConfig.class)
+		this.contextRunner.withUserConfiguration(MultiConfig.class, AnotherMultiConfig.class)
 			.run((context) -> assertThat(getImportedConfigBeans(context)).containsExactly("ConfigA", "ConfigB",
 					"ConfigC", "ConfigD"));
 	}
 
 	@Test
 	void multipleSelectorsWithRedundantImportsShouldMergeAndSortCorrectly() {
-		this.contextRunner.withUserConfiguration(SingleConfig.class, Config.class, AnotherConfig.class)
+		this.contextRunner.withUserConfiguration(SingleConfig.class, MultiConfig.class, AnotherMultiConfig.class)
 			.run((context) -> assertThat(getImportedConfigBeans(context)).containsExactly("ConfigA", "ConfigB",
 					"ConfigC", "ConfigD"));
 	}
@@ -87,12 +87,12 @@ static class SingleConfig {
 	}
 
 	@ImportAutoConfiguration({ ConfigD.class, ConfigB.class })
-	static class Config {
+	static class MultiConfig {
 
 	}
 
 	@ImportAutoConfiguration({ ConfigC.class, ConfigA.class })
-	static class AnotherConfig {
+	static class AnotherMultiConfig {
 
 	}
 

spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/sql/init/SqlInitializationAutoConfigurationTests.java

@@ -22,6 +22,7 @@
 import org.junit.jupiter.api.Test;
 
 import org.springframework.beans.factory.config.BeanDefinition;
+import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.boot.autoconfigure.AutoConfigurations;
 import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
 import org.springframework.boot.autoconfigure.r2dbc.R2dbcAutoConfiguration;
@@ -112,9 +113,9 @@ void whenBeanIsAnnotatedAsDependingOnDatabaseInitializationThenItDependsOnR2dbcS
 		this.contextRunner.withConfiguration(AutoConfigurations.of(R2dbcAutoConfiguration.class))
 			.withUserConfiguration(DependsOnInitializedDatabaseConfiguration.class)
 			.run((context) -> {
-				BeanDefinition beanDefinition = context.getBeanFactory()
-					.getBeanDefinition(
-							"sqlInitializationAutoConfigurationTests.DependsOnInitializedDatabaseConfiguration");
+				ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+				BeanDefinition beanDefinition = beanFactory.getBeanDefinition(
+						"sqlInitializationAutoConfigurationTests.DependsOnInitializedDatabaseConfiguration");
 				assertThat(beanDefinition.getDependsOn()).containsExactlyInAnyOrder("r2dbcScriptDatabaseInitializer");
 			});
 	}
@@ -124,9 +125,9 @@ void whenBeanIsAnnotatedAsDependingOnDatabaseInitializationThenItDependsOnDataSo
 		this.contextRunner.withConfiguration(AutoConfigurations.of(DataSourceAutoConfiguration.class))
 			.withUserConfiguration(DependsOnInitializedDatabaseConfiguration.class)
 			.run((context) -> {
-				BeanDefinition beanDefinition = context.getBeanFactory()
-					.getBeanDefinition(
-							"sqlInitializationAutoConfigurationTests.DependsOnInitializedDatabaseConfiguration");
+				ConfigurableListableBeanFactory beanFactory = context.getBeanFactory();
+				BeanDefinition beanDefinition = beanFactory.getBeanDefinition(
+						"sqlInitializationAutoConfigurationTests.DependsOnInitializedDatabaseConfiguration");
 				assertThat(beanDefinition.getDependsOn())
 					.containsExactlyInAnyOrder("dataSourceScriptDatabaseInitializer");
 			});