Skip to content

Commit 64c2851

Browse files
committed
#15 fix bean definition overriding that is disabled by default since Spring Boot 2.1.0
1 parent cf499d2 commit 64c2851

File tree

1 file changed

+6
-2
lines changed

1 file changed

+6
-2
lines changed

embedded-database-spring-test/src/main/java/io/zonky/test/db/postgres/EmbeddedPostgresContextCustomizerFactory.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,8 +158,12 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) t
158158
.addIndexedArgumentValue(1, new RuntimeBeanReference(contextInfo.getBeanName()));
159159
}
160160

161-
logger.info("Replacing '{}' DataSource bean with embedded version", dataSourceInfo.getBeanName());
162-
registry.registerBeanDefinition(dataSourceInfo.getBeanName(), dataSourceDefinition);
161+
String dataSourceBeanName = dataSourceInfo.getBeanName();
162+
if (registry.containsBeanDefinition(dataSourceBeanName)) {
163+
logger.info("Replacing '{}' DataSource bean with embedded version", dataSourceBeanName);
164+
registry.removeBeanDefinition(dataSourceBeanName);
165+
}
166+
registry.registerBeanDefinition(dataSourceBeanName, dataSourceDefinition);
163167
}
164168

165169
@Override

0 commit comments

Comments
 (0)