From c56bba98d9eaf2b3e2b6eb34ef3a5a72f31f0f47 Mon Sep 17 00:00:00 2001 From: Stephane Nicoll Date: Fri, 8 Oct 2021 15:45:36 +0200 Subject: [PATCH] Harmonize bean type visibility in TestDatabaseAutoConfiguration Closes gh-28264 --- .../jdbc/TestDatabaseAutoConfiguration.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java index 2da486df036..6548d2a39c6 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java @@ -72,12 +72,12 @@ public class TestDatabaseAutoConfiguration { @Bean @ConditionalOnProperty(prefix = "spring.test.database", name = "replace", havingValue = "ANY", matchIfMissing = true) - public static EmbeddedDataSourceBeanFactoryPostProcessor embeddedDataSourceBeanFactoryPostProcessor() { + static EmbeddedDataSourceBeanFactoryPostProcessor embeddedDataSourceBeanFactoryPostProcessor() { return new EmbeddedDataSourceBeanFactoryPostProcessor(); } @Order(Ordered.LOWEST_PRECEDENCE) - private static class EmbeddedDataSourceBeanFactoryPostProcessor implements BeanDefinitionRegistryPostProcessor { + static class EmbeddedDataSourceBeanFactoryPostProcessor implements BeanDefinitionRegistryPostProcessor { private static final Log logger = LogFactory.getLog(EmbeddedDataSourceBeanFactoryPostProcessor.class); @@ -133,8 +133,7 @@ public class TestDatabaseAutoConfiguration { } - private static class EmbeddedDataSourceFactoryBean - implements FactoryBean, EnvironmentAware, InitializingBean { + static class EmbeddedDataSourceFactoryBean implements FactoryBean, EnvironmentAware, InitializingBean { private EmbeddedDataSourceFactory factory; @@ -167,7 +166,7 @@ public class TestDatabaseAutoConfiguration { } - private static class EmbeddedDataSourceFactory { + static class EmbeddedDataSourceFactory { private final Environment environment;