This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 45bed333dfa309aa6615b62f2311475893c45d8c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 10:51:08 2016 +0100 Déplacement des call backs de version et utilisation de l'annotation MigrationVersion --- .../DataSourceMigrationForVersion_5_0.java | 116 +++++++++++++++++++++ .../DataSourceMigrationForVersion_5_1.java | 25 ++--- .../DataSourceMigrationForVersion_3_1.java | 15 +-- .../DataSourceMigrationForVersion_3_10.java | 7 +- .../DataSourceMigrationForVersion_3_11.java | 7 +- .../DataSourceMigrationForVersion_3_12.java | 7 +- .../DataSourceMigrationForVersion_3_14.java | 7 +- .../DataSourceMigrationForVersion_3_15.java | 7 +- .../DataSourceMigrationForVersion_3_16.java | 11 +- .../DataSourceMigrationForVersion_3_5.java | 7 +- .../DataSourceMigrationForVersion_3_7.java | 7 +- .../DataSourceMigrationForVersion_3_8.java | 7 +- .../DataSourceMigrationForVersion_3_9.java | 7 +- .../DataSourceMigrationForVersion_4_0.java | 7 +- .../DataSourceMigrationForVersion_4_0_1.java | 7 +- .../DataSourceMigrationForVersion_4_0_2.java | 7 +- .../DataSourceMigrationForVersion_4_0_4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 11 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 7 +- .../DataSourceMigrationForVersion_4_900.java | 73 ------------- .../DataSourceMigrationForVersion_4_901.java | 73 ------------- .../DataSourceMigrationForVersion_4_902.java | 73 ------------- .../DataSourceMigrationForVersion_4_903.java | 74 ------------- .../DataSourceMigrationForVersion_4_904.java | 70 ------------- .../DataSourceMigrationForVersion_4_905.java | 71 ------------- .../DataSourceMigrationForVersion_4_906.java | 81 -------------- .../DataSourceMigrationForVersion_5_0.java | 72 ------------- 30 files changed, 214 insertions(+), 670 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java new file mode 100644 index 0000000..997c7a4 --- /dev/null +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java @@ -0,0 +1,116 @@ +package fr.ird.observe.entities.migration; + +/* + * #%L + * ObServe :: Entities Migration + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.version.VersionBuilder; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Created on 25/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@MigrationVersion(version = "5.0") +public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_5_0(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(DataSourceMigrationForVersion_5_0.class, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) { + + // Suppression du champ open sur les entités anciennement du type Openable + // See https://forge.codelutin.com/issues/7469 + addScript(VersionBuilder.create("4.900").build(), "01", "remove_open_field", queries); + + // Ajout des champs lastUpdate + // See https://forge.codelutin.com/issues/7470 + addScript(VersionBuilder.create("4.901").build(), "01", "add_lastUpdateDate_field", queries); + + // Ajout de la table lastUpdateDate + // See https://forge.codelutin.com/issues/7470 + addScript(VersionBuilder.create("4.902").build(), "01", "add_lastUpdateDate_table", queries); + + + // Ajout de la table lastUpdateDate + // See https://forge.codelutin.com/issues/7470 + addScript(VersionBuilder.create("4.903").build(), "01", "remove_unit_field", queries); + addScript(VersionBuilder.create("4.903").build(), "02", "remove_gender_field", queries); + addScript(VersionBuilder.create("4.903").build(), "03", "remove_duplicate_rows", queries); + + + addScript(VersionBuilder.create("4.904").build(), "01", "drop_not_null_constraint_gearUseFeatures", queries); + + addScript(VersionBuilder.create("4.905").build(), "01", "drop_not_null_constraint_hauling_identifier", queries); + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + + super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); + + Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); + Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); + if (!collect.contains("fk_nontargetlength_sex")) { + addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + } + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + + super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); + + Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); + Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); + if (!collect.contains("fk_nontargetlength_sex")) { + addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + } + } + + + } + +} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java index 060953d..fd17c4b 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java @@ -1,13 +1,7 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMultimap; -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -27,13 +21,14 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ +@MigrationVersion(version = "5.1") public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationCallBack { /** Logger */ private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_5_1.class); public DataSourceMigrationForVersion_5_1(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_5_1.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_5_1.class, callBack, scriptSuffix); } @Override @@ -64,12 +59,12 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { - ImmutableMap<String,String> missingCodesMapping = ImmutableMap.<String,String>builder() - .put("LT ?","TL") - .put("FL","LF") - .put("L1","PDL") - .put("LC","DL") - .put("LT","TL") + ImmutableMap<String, String> missingCodesMapping = ImmutableMap.<String, String>builder() + .put("LT ?", "TL") + .put("FL", "LF") + .put("L1", "PDL") + .put("LC", "DL") + .put("LT", "TL") .build(); List<String> lengthMeasureTypes = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { @@ -97,7 +92,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement preparedStatement = connection.prepareStatement("SELECT topiaId FROM observe_common.sizeMeasureType WHERE code = '"+ finalLengthMeasureType +"'"); + PreparedStatement preparedStatement = connection.prepareStatement("SELECT topiaId FROM observe_common.sizeMeasureType WHERE code = '" + finalLengthMeasureType + "'"); return preparedStatement; } diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java similarity index 89% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java index 3576ed1..21ee5cb 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -43,10 +43,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.1 */ +@MigrationVersion(version = "3.1") public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_1(AbstractDataSourceMigration callBack) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_1.getVersion(), callBack, ""); + super(DataSourceMigrationForVersion_3_1.class, callBack, ""); } @Override @@ -94,10 +95,10 @@ public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationC @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { String sql = "SELECT e.espece%1$s, e.ocean, count(e.*) " + - "FROM espece%1$s_ocean e \n" + - "GROUP BY e.espece%1$s, e.ocean\n" + - "HAVING count(e.*) > 1\n" + - "ORDER BY e.espece%1$s, e.ocean;"; + "FROM espece%1$s_ocean e \n" + + "GROUP BY e.espece%1$s, e.ocean\n" + + "HAVING count(e.*) > 1\n" + + "ORDER BY e.espece%1$s, e.ocean;"; return connection.prepareStatement(String.format(sql, tableName)); } diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java index 87260c1..c4792b3 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ +@MigrationVersion(version = "3.10") public class DataSourceMigrationForVersion_3_10 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_10(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_10.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_10.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java index a042f45..5eef90c 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ +@MigrationVersion(version = "3.11") public class DataSourceMigrationForVersion_3_11 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_11(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_11.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_11.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java similarity index 89% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java index 3679bb3..9f978c5 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.12 */ +@MigrationVersion(version = "3.12") public class DataSourceMigrationForVersion_3_12 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_12(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_12.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_12.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java index 1e4c49e..50a28bd 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ +@MigrationVersion(version = "3.14") public class DataSourceMigrationForVersion_3_14 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_14(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_14.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_14.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java index eb3cda8..f6e408e 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.15 */ +@MigrationVersion(version = "3.15") public class DataSourceMigrationForVersion_3_15 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_15(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_15.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_15.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java similarity index 94% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java index 234a99b..179b307 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,13 +44,14 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ +@MigrationVersion(version = "3.16") public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigrationCallBack { /** Logger. */ private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_3_16.class); public DataSourceMigrationForVersion_3_16(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_16.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_16.class, callBack, scriptSuffix); } @Override @@ -66,7 +67,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration } - private void migrateTripSenneData(TopiaSqlSupport tx, List<String> queries) { + private void migrateTripSenneData(TopiaSqlSupport tx, List<String> queries) { String gearUseFeaturesIdPrefix = "fr.ird.observe.entities.seine.GearUseFeatures#1427183650941#"; @@ -98,7 +99,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration } } - protected Set<SenneData> getSenneData(TopiaSqlSupport tx) { + protected Set<SenneData> getSenneData(TopiaSqlSupport tx) { final Set<SenneData> result = new HashSet<>(); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java similarity index 97% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java index 61e1a0c..7e97871 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -39,6 +39,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ +@MigrationVersion(version = "3.5") public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveMigrationCallBack { protected static final String[] TABLES = new String[]{ @@ -92,7 +93,7 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM }; public DataSourceMigrationForVersion_3_5(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_5.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_5.class, callBack, scriptSuffix); } protected abstract void removeFK(TopiaSqlSupport tx, String tableName, List<String> queries) throws TopiaException; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java similarity index 91% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java index c6061c0..51cf18b 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ +@MigrationVersion(version = "3.7") public abstract class DataSourceMigrationForVersion_3_7 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_7(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_7.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_7.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java index f92ada7..1ad80aa 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ +@MigrationVersion(version = "3.8") public class DataSourceMigrationForVersion_3_8 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_8(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_8.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_8.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java index e767dd9..4e5016a 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ +@MigrationVersion(version = "3.9") public class DataSourceMigrationForVersion_3_9 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_9(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_9.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_9.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java index b9523b4..4740549 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ +@MigrationVersion(version = "4.0") public class DataSourceMigrationForVersion_4_0 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java similarity index 97% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java index 965932e..d489dbb 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -28,7 +28,7 @@ import fr.ird.observe.ObserveTopiaIdFactory; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; @@ -49,10 +49,11 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 4.0.1 */ +@MigrationVersion(version = "4.0.1") public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_1(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_1.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_1.class, callBack, scriptSuffix); } protected abstract void removeForeignKeys(TopiaSqlSupport tx, List<String> queries); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java index 3ce0e28..ce42d7f 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0.1 */ +@MigrationVersion(version = "4.0.2") public abstract class DataSourceMigrationForVersion_4_0_2 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_2(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_2.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_2.class, callBack, scriptSuffix); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_2 { diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java index b4015c7..f8876fb 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -38,10 +38,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0.1 */ +@MigrationVersion(version = "4.0.4") public abstract class DataSourceMigrationForVersion_4_0_4 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_4(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_4.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_4.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java similarity index 92% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java index e680989..23b7937 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -42,10 +42,11 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC2 */ +@MigrationVersion(version = "4.0-RC2") public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC2(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC2.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC2.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java similarity index 97% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java index 07ad461..44172ad 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,6 +46,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC3 */ +@MigrationVersion(version = "4.0-RC3") public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObserveMigrationCallBack { /** @@ -54,7 +55,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_4_0_RC3.class); public DataSourceMigrationForVersion_4_0_RC3(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC3.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC3.class, callBack, scriptSuffix); } protected abstract void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) throws TopiaException; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java similarity index 89% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java index ca40f59..e457ae2 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC4 */ +@MigrationVersion(version = "4.0-RC4") public class DataSourceMigrationForVersion_4_0_RC4 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC4(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC4.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC4.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java similarity index 89% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java index 71b9cef..acfaa12 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC6 */ +@MigrationVersion(version = "4.0-RC6") public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC6(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC6.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC6.class, callBack, scriptSuffix); } protected abstract void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries); @@ -67,7 +68,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObse } @Override - protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { + protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { H2DataSourceMigration.removeFK(tx, "observe_seine", "GEARUSEFEATURESMEASUREMENT", "GEARUSEFEATURES", queries); @@ -82,7 +83,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObse } @Override - protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { + protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { PGDataSourceMigration.removeFK(tx, "observe_seine", "GEARUSEFEATURESMEASUREMENT", "GEARUSEFEATURES", queries); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java index 24d030a..5dfe805 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC7 */ +@MigrationVersion(version = "4.0-RC7") public abstract class DataSourceMigrationForVersion_4_0_RC7 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC7(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC7.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC7.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java deleted file mode 100644 index cd49728..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java +++ /dev/null @@ -1,73 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_4_900 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_900(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_900.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Suppression du champ open sur les entités anciennement du type Openable - // See https://forge.codelutin.com/issues/7469 - addScript("01", "remove_open_field", queries); - - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_900 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_900 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java deleted file mode 100644 index 38c0b0a..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java +++ /dev/null @@ -1,73 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_4_901 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_901(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_901.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Ajout des champs lastUpdate - // See https://forge.codelutin.com/issues/7470 - addScript("01", "add_lastUpdateDate_field", queries); - - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_901 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_901 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java deleted file mode 100644 index db0ee11..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java +++ /dev/null @@ -1,73 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_4_902 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_902(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_902.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Ajout de la table lastUpdateDate - // See https://forge.codelutin.com/issues/7470 - addScript("01", "add_lastUpdateDate_table", queries); - - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_902 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_902 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java deleted file mode 100644 index 822a75f..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java +++ /dev/null @@ -1,74 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_4_903 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_903(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_903.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Ajout de la table lastUpdateDate - // See https://forge.codelutin.com/issues/7470 - addScript("01", "remove_unit_field", queries); - addScript("02", "remove_gender_field", queries); - addScript("03", "remove_duplicate_rows", queries); - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_903 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_903 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java deleted file mode 100644 index 48b0048..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java +++ /dev/null @@ -1,70 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 20/07/16. - * - * @author Samuel Maisonneuve - maisonneuve@codelutin.com - */ -public class DataSourceMigrationForVersion_4_904 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_904(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_904.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - addScript("01", "drop_not_null_constraint_gearUseFeatures", queries); - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_904 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_904 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java deleted file mode 100644 index a8bf82a..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java +++ /dev/null @@ -1,71 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/*- - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 02/09/16. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 5.0 - */ -public class DataSourceMigrationForVersion_4_905 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_905(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_905.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - addScript("01", "drop_not_null_constraint_hauling_identifier", queries); - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_905 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_905 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java deleted file mode 100644 index 4e01ab8..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java +++ /dev/null @@ -1,81 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/*- - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * Created on 02/09/16. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 5.0 - */ -public abstract class DataSourceMigrationForVersion_4_906 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_906(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_906.getVersion(), callBack, scriptSuffix); - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_906 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { - Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); - Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); - if (!collect.contains("fk_nontargetlength_sex")) { - addScript("01", "add_non_target_length_sex_fk", queries); - } - } - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_906 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { - Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); - Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); - if (!collect.contains("fk_nontargetlength_sex")) { - addScript("01", "add_non_target_length_sex_fk", queries); - } - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java deleted file mode 100644 index 6e3ab82..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java +++ /dev/null @@ -1,72 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * FIXME A utiliser en version final 5.0 - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_5_0 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_5_0(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_5_0.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Rien à faire - - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.