Merge pull request #98 from zalando-nakadi/fallback-to-spring-datasource-config

Fix #95 fall back to spring datasource config for missing flyway data…

Author: BGehrels

nakadi-producer-spring-boot-starter/src/main/java/org/zalando/nakadiproducer/FlywayMigrator.java

@@ -12,9 +12,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.flyway.FlywayDataSource;
 import org.springframework.boot.autoconfigure.flyway.FlywayProperties;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
 
 import java.sql.Connection;
 import java.util.List;
+import java.util.Optional;
 
 public class FlywayMigrator {
     @Autowired(required = false)
@@ -31,19 +33,24 @@ public class FlywayMigrator {
     @Autowired(required = false)
     private List<NakadiProducerFlywayCallback> callbacks;
 
-    @Autowired(required = false)
+    @Autowired
     private FlywayProperties flywayProperties;
 
+    @Autowired
+    private DataSourceProperties dataSourceProperties;
+
     @PostConstruct
     public void migrateFlyway() {
         Flyway flyway = new Flyway();
 
         if (this.nakadiProducerFlywayDataSource != null) {
             flyway.setDataSource(nakadiProducerFlywayDataSource);
         } else if (this.flywayProperties != null && this.flywayProperties.isCreateDataSource()) {
-            flyway.setDataSource(this.flywayProperties.getUrl(), this.flywayProperties.getUser(),
-                this.flywayProperties.getPassword(),
-                this.flywayProperties.getInitSqls().toArray(new String[0]));
+            flyway.setDataSource(
+                    Optional.ofNullable(this.flywayProperties.getUrl()).orElse(dataSourceProperties.getUrl()),
+                    Optional.ofNullable(this.flywayProperties.getUser()).orElse(dataSourceProperties.getUsername()),
+                    Optional.ofNullable(this.flywayProperties.getPassword()).orElse(dataSourceProperties.getPassword()),
+                    this.flywayProperties.getInitSqls().toArray(new String[0]));
         } else if (this.flywayDataSource != null) {
             flyway.setDataSource(this.flywayDataSource);
         } else {

nakadi-producer-spring-boot-starter/src/main/java/org/zalando/nakadiproducer/NakadiProducerAutoConfiguration.java

@@ -14,6 +14,9 @@
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.autoconfigure.flyway.FlywayProperties;
+import org.springframework.boot.autoconfigure.jdbc.DataSourceProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -41,6 +44,7 @@
 @Configuration
 @AutoConfigureAfter(name="org.zalando.tracer.spring.TracerAutoConfiguration")
 @EnableScheduling
+@EnableConfigurationProperties({ DataSourceProperties.class, FlywayProperties.class })
 public class NakadiProducerAutoConfiguration {
 
     @ConditionalOnMissingBean({NakadiPublishingClient.class, NakadiClient.class})