Flyway changes

jknack · jknack · commit fbeee79c378c · 2018-02-20T19:12:02.000-03:00
- flyway: must favor existing datasource and should not create a new database connection fix jooby-project#1034 - flyway 5.0.7 fix jooby-project#1035
diff --git a/doc/doc/flyway/flyway.md b/doc/doc/flyway/flyway.md
@@ -1,10 +1,10 @@
 # flyway
 
-Evolve your Database Schema easily and reliably across all your instances.
+Evolve your database schema easily and reliably across all your instances.
 
-This module run {{flyway}} on startup and apply database migration.
+This module run {{flyway}} on startup and apply database migrations.
 
-> NOTE: This module depends on [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc) module so all the services provided by the [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc) module.
+> NOTE: This module depends on [jdbc](https://github.com/jooby-project/jooby/tree/master/jooby-jdbc) module to acquire a database connection.
 
 ## dependency
 
@@ -60,7 +60,7 @@ flyway.run = [clean, migrate, validate, info]
 ## configuration
 
 Configuration is done via ```application.conf``` under the ```flyway.*``` path.
-There are some defaults setting that you can see in the appendix.
+There are some defaults setting that you can see in the appendix section.
 
 
 For more information, please visit the {{flyway}} site.
diff --git a/modules/jooby-flyway/pom.xml b/modules/jooby-flyway/pom.xml
@@ -44,13 +44,6 @@
       <artifactId>flyway-core</artifactId>
     </dependency>
 
-    <!-- Hibernate -->
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-entitymanager</artifactId>
-      <optional>true</optional>
-    </dependency>
-
     <!-- Test dependencies -->
     <dependency>
       <groupId>org.jooby</groupId>
diff --git a/modules/jooby-flyway/src/main/java/org/jooby/flyway/Flywaydb.java b/modules/jooby-flyway/src/main/java/org/jooby/flyway/Flywaydb.java
@@ -203,26 +203,23 @@
  */
 package org.jooby.flyway;
 
+import com.google.inject.Binder;
 import com.google.inject.Key;
 import com.google.inject.name.Names;
+import com.typesafe.config.Config;
+import com.typesafe.config.ConfigFactory;
 import static java.util.Objects.requireNonNull;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Properties;
-import java.util.stream.Collectors;
-
 import org.flywaydb.core.Flyway;
 import org.jooby.Env;
 import org.jooby.Jooby.Module;
-
-import com.google.inject.Binder;
-import com.typesafe.config.Config;
-import com.typesafe.config.ConfigFactory;
 import org.jooby.funzy.Try;
 
 import javax.sql.DataSource;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Properties;
+import java.util.stream.Collectors;
 
 /**
  * <h1>flyway module</h1>
@@ -359,8 +356,8 @@ public Flywaydb() {
 
   @Override
   public void configure(final Env env, final Config conf, final Binder binder) {
-    Config $base = conf.getConfig("flyway");
-    Config $flyway = Try.apply(() -> conf.getConfig(name).withFallback($base))
+    Config $base = conf.getConfig("flyway").withoutPath(name);
+    Config $flyway = Try.apply(() -> conf.getConfig("flyway." + name).withFallback($base))
         .orElse($base);
 
     Flyway flyway = new Flyway();
@@ -376,9 +373,8 @@ public void configure(final Env env, final Config conf, final Binder binder) {
         .generate(Flyway.class, name, key -> binder.bind(key).toInstance(flyway));
     // run
     Iterable<Command> cmds = commands($flyway);
-    env.onStart(registry -> {
-      cmds.forEach(cmd -> cmd.run(flyway));
-    });
+    // eager initialization
+    cmds.forEach(cmd -> cmd.run(flyway));
   }
 
   @Override
diff --git a/pom.xml b/pom.xml
@@ -3031,7 +3031,7 @@ org.eclipse.jdt.apt.processorOptions/defaultOverwrite=true
     <commons-email.version>1.4</commons-email.version>
     <jongo.version>1.3.0</jongo.version>
     <bson4jackson.version>2.9.0</bson4jackson.version>
-    <flyway.version>4.2.0</flyway.version>
+    <flyway.version>5.0.7</flyway.version>
     <hazelcast.version>3.9.2</hazelcast.version>
     <less4j.version>1.13.0</less4j.version>
     <ebean.version>10.1.7</ebean.version>
