This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit b9657cba5f77d34a21f3ce1b54fa3e2a4d603f12 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Aug 21 19:07:30 2015 +0200 Deplacement de constantes + utilisation du mode autoMigrate dans la migration --- .../observe/ObserveTopiaApplicationContext.java | 24 +++++++++++++--------- .../migration/AbstractDataSourceMigration.java | 23 +-------------------- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index 38b05ea..cff5f03 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -10,8 +10,12 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat public static final String REPLICATION_SERVICE_NAME = "replication"; -// //FIXME Voir comment remplir ça. -// protected boolean autoMigrate; + public static final String DB_VERSION = "db.version"; + + public static final String AUTO_MIGRATE = "auto.migrate"; + + //FIXME Voir comment remplir ça. + protected boolean autoMigrate; /** * Mise à {@code true} quand au moins une connection a été effectuée. @@ -22,13 +26,13 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat super(topiaConfiguration); } -// public boolean isAutoMigrate() { -// return autoMigrate; -// } -// -// public void setAutoMigrate(boolean autoMigrate) { -// this.autoMigrate = autoMigrate; -// } + public boolean isAutoMigrate() { + return autoMigrate; + } + + public void setAutoMigrate(boolean autoMigrate) { + this.autoMigrate = autoMigrate; + } public boolean isOpen() { //FIXME utiliser le flag open @@ -47,4 +51,4 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat return getServices(TopiaReplicationService.class).get(REPLICATION_SERVICE_NAME); } - } +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 1464c00..6294e0c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -46,10 +46,6 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback static private Log log = LogFactory.getLog(AbstractDataSourceMigration.class); - public static final String DB_VERSION = "db.version"; - - public static final String AUTO_MIGRATE = "auto.migrate"; - public static final Version V_3_0 = Versions.valueOf("3.0"); public static final Version V_3_1 = Versions.valueOf("3.1"); @@ -96,16 +92,6 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback protected ObserveTopiaApplicationContext topiaApplicationContext; -// private static Supplier<ApplicationConfig> applicationConfigSupplier; -// -// public static void setApplicationConfigSupplier(Supplier<ApplicationConfig> applicationConfigSupplier) { -// AbstractDataSourceMigration.applicationConfigSupplier = applicationConfigSupplier; -// } -// -// public static Supplier<ApplicationConfig> getApplicationConfigSupplier() { -// return applicationConfigSupplier; -// } - protected AbstractDataSourceMigration(MigrationCallBackForVersionResolver callBackResolver) { super(callBackResolver); @@ -137,15 +123,8 @@ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallback boolean autoMigrate = topiaApplicationContext.isAutoMigrate(); -// Preconditions.checkNotNull(applicationConfigSupplier); -// ApplicationConfig config = applicationConfigSupplier.get(); -// ApplicationConfig config = -// ObserveServiceHelper.get().getContextValue( -// ApplicationConfig.class); -// boolean autoMigrate = config.getOptionAsBoolean(AUTO_MIGRATE); - if (autoMigrate) { - // auto-migration + if (log.isInfoEnabled()) { log.info("auto migrate mode"); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.