Prevent duplicate DynamicPropertyRegistry beans

Remove the Spring Framework registered `DynamicPropertyRegistry` when
using Testcontainers.

See gh-41839
This commit is contained in:
Phillip Webb
2024-08-21 21:04:13 -07:00
parent c3ed545ffd
commit 4d4b189cce
2 changed files with 78 additions and 0 deletions

View File

@@ -16,6 +16,10 @@
package org.springframework.boot.testcontainers.properties;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.beans.factory.support.DefaultSingletonBeanRegistry;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.ConfigurableApplicationContext;
@@ -39,9 +43,27 @@ public class TestcontainersPropertySourceAutoConfiguration {
TestcontainersPropertySourceAutoConfiguration() {
}
@Bean
static RemoveTestDynamicPropertyRegistryBeanPostProcessor removeTestDynamicPropertyRegistryBeanPostProcessor() {
return new RemoveTestDynamicPropertyRegistryBeanPostProcessor();
}
@Bean
static DynamicPropertyRegistry dynamicPropertyRegistry(ConfigurableApplicationContext applicationContext) {
return TestcontainersPropertySource.attach(applicationContext);
}
static class RemoveTestDynamicPropertyRegistryBeanPostProcessor implements BeanFactoryPostProcessor {
@Override
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
if (beanFactory instanceof DefaultSingletonBeanRegistry singletonBeanRegistry) {
singletonBeanRegistry
.destroySingleton("org.springframework.test.context.support.DynamicPropertiesContextCustomizer"
+ ".dynamicPropertyRegistry");
}
}
}
}