Merge pull request #80 from zonkyio/spring-cloud-hoxton

#79 Change the way the flyway datasource properties are replaced

Author: tomix26

build.gradle

@@ -156,6 +156,7 @@ project(':embedded-database-spring-test') {
         compile 'org.testcontainers:postgresql:1.12.1', optional
         compile 'com.opentable.components:otj-pg-embedded:0.13.1', optional
         compile 'ru.yandex.qatools.embed:postgresql-embedded:2.10', optional
+        compile 'org.springframework.boot:spring-boot-starter-test:1.5.22.RELEASE', optional
 
         compile 'org.springframework:spring-context:4.3.25.RELEASE'
         compile 'org.springframework:spring-test:4.3.25.RELEASE'
@@ -167,8 +168,7 @@ project(':embedded-database-spring-test') {
         compile('com.cedarsoftware:java-util:1.34.0') {
             exclude group: 'org.apache.logging.log4j'
         }
-        
-        testCompile 'org.springframework.boot:spring-boot-starter-test:1.5.22.RELEASE'
+
         testCompile 'ch.qos.logback:logback-classic:1.2.3'
     }
 

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

@@ -38,10 +38,12 @@
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanDefinitionHolder;
+import org.springframework.beans.factory.config.BeanPostProcessor;
 import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
 import org.springframework.beans.factory.support.BeanDefinitionRegistry;
 import org.springframework.beans.factory.support.BeanDefinitionRegistryPostProcessor;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.boot.autoconfigure.flyway.FlywayProperties;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.EnvironmentAware;
@@ -143,8 +145,6 @@ public int hashCode() {
 
     protected static class EnvironmentPostProcessor implements BeanDefinitionRegistryPostProcessor {
 
-        private static final NullPlaceholder NULL = new NullPlaceholder();
-
         private final ConfigurableEnvironment environment;
 
         public EnvironmentPostProcessor(ConfigurableEnvironment environment) {
@@ -155,31 +155,31 @@ public EnvironmentPostProcessor(ConfigurableEnvironment environment) {
         public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) throws BeansException {
             environment.getPropertySources().addFirst(new MapPropertySource(
                     PreloadableEmbeddedPostgresContextCustomizer.class.getSimpleName(),
-                    ImmutableMap.of(
-                            "spring.test.database.replace", "NONE",
-                            "spring.flyway.url", NULL,
-                            "spring.flyway.user", NULL,
-                            "flyway.url", NULL,
-                            "flyway.user", NULL
-                    )));
+                    ImmutableMap.of("spring.test.database.replace", "NONE")));
         }
 
         @Override
         public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
             // nothing to do
         }
+    }
 
-        protected static class NullPlaceholder {
+    protected static class FlywayPropertiesPostProcessor implements BeanPostProcessor {
 
-            // this method is required to hook up org.springframework.core.convert.support.FallbackObjectToStringConverter
-            public static NullPlaceholder valueOf(String value) {
-                throw new IllegalStateException("This method should never be called!");
-            }
+        @Override
+        public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
+            return bean;
+        }
 
-            @Override
-            public String toString() {
-                return null;
+        @Override
+        public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
+            if (bean instanceof FlywayProperties) {
+                FlywayProperties properties = (FlywayProperties) bean;
+                properties.setUrl(null);
+                properties.setUser(null);
+                properties.setPassword(null);
             }
+            return bean;
         }
     }
 
@@ -218,6 +218,9 @@ public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) t
             if (ClassUtils.isPresent("ru.yandex.qatools.embed.postgresql.EmbeddedPostgres", null)) {
                 registerBeanIfMissing(registry, "yandexPostgresProvider", YandexPostgresDatabaseProvider.class);
             }
+            if (ClassUtils.isPresent("org.springframework.boot.autoconfigure.flyway.FlywayProperties", null)) {
+                registerBeanIfMissing(registry, "flywayPropertiesPostProcessor", FlywayPropertiesPostProcessor.class);
+            }
 
             for (AutoConfigureEmbeddedDatabase databaseAnnotation : databaseAnnotations) {
                 DatabaseDescriptor databaseDescriptor = resolveDatabaseDescriptor(environment, databaseAnnotation);