diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizer.java b/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizer.java index bb2c12488e2..bc70c360661 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizer.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertiesContextCustomizer.java @@ -50,10 +50,6 @@ import org.springframework.util.ReflectionUtils; */ class DynamicPropertiesContextCustomizer implements ContextCustomizer { - private static final String DYNAMIC_PROPERTY_REGISTRAR_BEAN_INITIALIZER_BEAN_NAME = - DynamicPropertiesContextCustomizer.class.getName() + ".dynamicPropertyRegistrarBeanInitializer"; - - private final Set methods; @@ -70,11 +66,10 @@ class DynamicPropertiesContextCustomizer implements ContextCustomizer { throw new IllegalStateException("BeanFactory must be a BeanDefinitionRegistry"); } - if (!beanDefinitionRegistry.containsBeanDefinition(DYNAMIC_PROPERTY_REGISTRAR_BEAN_INITIALIZER_BEAN_NAME)) { + if (!beanDefinitionRegistry.containsBeanDefinition(DynamicPropertyRegistrarBeanInitializer.BEAN_NAME)) { BeanDefinition beanDefinition = new RootBeanDefinition(DynamicPropertyRegistrarBeanInitializer.class); beanDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); - beanDefinitionRegistry.registerBeanDefinition( - DYNAMIC_PROPERTY_REGISTRAR_BEAN_INITIALIZER_BEAN_NAME, beanDefinition); + beanDefinitionRegistry.registerBeanDefinition(DynamicPropertyRegistrarBeanInitializer.BEAN_NAME, beanDefinition); } if (!this.methods.isEmpty()) { diff --git a/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertyRegistrarBeanInitializer.java b/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertyRegistrarBeanInitializer.java index ecfa1d5736b..3f24c6dd8a2 100644 --- a/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertyRegistrarBeanInitializer.java +++ b/spring-test/src/main/java/org/springframework/test/context/support/DynamicPropertyRegistrarBeanInitializer.java @@ -30,16 +30,24 @@ import org.springframework.test.context.DynamicPropertyRegistrar; import org.springframework.test.context.DynamicPropertyRegistry; /** - * Internal component which eagerly initializes {@link DynamicPropertyRegistrar} + * {@link BeanFactoryInitializer} that eagerly initializes {@link DynamicPropertyRegistrar} * beans. * + *

Primarily intended for internal use within the Spring TestContext Framework. + * * @author Sam Brannen * @since 6.2 */ -class DynamicPropertyRegistrarBeanInitializer implements BeanFactoryInitializer, EnvironmentAware { +public class DynamicPropertyRegistrarBeanInitializer implements BeanFactoryInitializer, EnvironmentAware { private static final Log logger = LogFactory.getLog(DynamicPropertyRegistrarBeanInitializer.class); + /** + * The bean name of the internally managed {@code DynamicPropertyRegistrarBeanInitializer}. + */ + static final String BEAN_NAME = + "org.springframework.test.context.support.internalDynamicPropertyRegistrarBeanInitializer"; + @Nullable private ConfigurableEnvironment environment;