Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 980be722 by tchemit at 2019-02-01T13:34:53Z La migration v3 vers v7 ne passe pas (fichier mal localisé) - Closes #1209 - - - - - 21 changed files: - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java - persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java - + persistence/src/main/java/fr/ird/observe/entities/migration/old/LegacyMigrationVersionResource.java Changes: ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java ===================================== @@ -44,7 +44,7 @@ import java.util.List; * @since 3.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_1 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_1() { super(Versions.valueOf("3.1")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.10 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_10 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_10 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_10() { super(Versions.valueOf("3.10")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.11 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_11 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_11 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_11() { super(Versions.valueOf("3.11")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.12 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_12 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_12 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_12() { super(Versions.valueOf("3.12")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.14 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_14 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_14 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_14() { super(Versions.valueOf("3.14")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.15 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_15 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_15 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_15() { super(Versions.valueOf("3.15")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java ===================================== @@ -43,7 +43,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_16 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_16 extends LegacyMigrationVersionResource{ /** Logger. */ private static final Logger log = LogManager.getLogger(DataSourceMigrationForVersion_3_16.class); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java ===================================== @@ -36,7 +36,7 @@ import java.util.Set; * @since 4.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_5 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_5 extends LegacyMigrationVersionResource{ private static final String[] TABLES = new String[]{ "ParametrageTaillePoidsFaune", ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.7 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_7 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_7 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_7() { super(Versions.valueOf("3.7")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.8 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_8 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_8 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_8() { super(Versions.valueOf("3.8")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 3.9 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_3_9 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_3_9 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_3_9() { super(Versions.valueOf("3.9")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0() { super(Versions.valueOf("4.0")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java ===================================== @@ -45,7 +45,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_1 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_1 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_1() { super(Versions.valueOf("4.0.1")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_2 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_2 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_2() { super(Versions.valueOf("4.0.2")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0.1 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_4 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_4 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_4() { super(Versions.valueOf("4.0.4")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== @@ -42,7 +42,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC2 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC2 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_RC2() { super(Versions.valueOf("4.0-RC2")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== @@ -44,7 +44,7 @@ import java.util.Set; */ @SuppressWarnings("SqlDialectInspection") @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC3 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC3 extends LegacyMigrationVersionResource{ private static final Logger log = LogManager.getLogger(DataSourceMigrationForVersion_4_0_RC3.class); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC4 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC4 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC4 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_RC4() { super(Versions.valueOf("4.0-RC4")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC6 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC6 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC6 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_RC6() { super(Versions.valueOf("4.0-RC6")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java ===================================== @@ -34,7 +34,7 @@ import org.nuiton.version.Versions; * @since 4.0-RC7 */ @AutoService(MigrationVersionResource.class) -public class DataSourceMigrationForVersion_4_0_RC7 extends MigrationVersionResource { +public class DataSourceMigrationForVersion_4_0_RC7 extends LegacyMigrationVersionResource{ public DataSourceMigrationForVersion_4_0_RC7() { super(Versions.valueOf("4.0-RC7")); ===================================== persistence/src/main/java/fr/ird/observe/entities/migration/old/LegacyMigrationVersionResource.java ===================================== @@ -0,0 +1,47 @@ +package fr.ird.observe.entities.migration.old; + +/* + * #%L + * ObServe :: Persistence + * %% + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io + * %% + * 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.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceScriptLayout; +import org.nuiton.version.Version; + +/** + * Created on 01/02/19. + * + * @author Tony Chemit - dev@tchemit.fr + * @since 7 + */ +public abstract class LegacyMigrationVersionResource extends MigrationVersionResource{ + public LegacyMigrationVersionResource(Version version) { + super(version, new LegacyMigrationVersionResourceScriptLayout()); + } + + static class LegacyMigrationVersionResourceScriptLayout implements MigrationVersionResourceScriptLayout { + @Override + public String getScriptPath(Version version, String rank, String prefix, String classifier) { + String migrationScript = String.format("%s-%s.sql", prefix, classifier); + return String.format("/db/migration/old/%s/V%s_%s_%s", version, version.getValidName(), rank, migrationScript); + } + } +} View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/980be722a2d0a08047cdd601eeab... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/980be722a2d0a08047cdd601eeab... You're receiving this email because of your account on gitlab.com.