Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 0db4772e by tchemit at 2019-02-01T12:21:08Z add missing i18n key - - - - - 75a404fc by tchemit at 2019-02-01T12:24:48Z La migration v3 vers v7 ne passe pas (fichier mal localisé) - Closes #1209 - - - - - 23 changed files: - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_10.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_11.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_12.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_14.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_15.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_5.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_7.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_8.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_9.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_4.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC4.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC6.java - persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC7.java - + persistence/src/main/java/fr/ird/observe/persistence/migration/old/LegacyMigrationVersionResource.java - pom.xml - validation/src/main/i18n/getters/validation-messages.getter Changes: ===================================== persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_1.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -25,8 +25,8 @@ package fr.ird.observe.persistence.migration.old; import com.google.auto.service.AutoService; import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.persistence.support.TopiaSqlQuery; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.Connection; @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_10.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_11.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_12.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_14.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_15.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_16.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,10 +23,10 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.PreparedStatement; @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_5.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.util.Set; @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_7.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_8.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_3_9.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_4_0.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -28,8 +28,8 @@ import com.google.common.collect.Multimap; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.persistence.ObserveTopiaIdFactory; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.PreparedStatement; @@ -47,7 +47,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/persistence/migration/old/DataSourceMigrationForVersion_4_0_2.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_4_0_4.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -24,8 +24,8 @@ package fr.ird.observe.persistence.migration.old; import com.google.auto.service.AutoService; import org.nuiton.topia.persistence.support.TopiaSqlQuery; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.Connection; @@ -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/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,10 +23,10 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.apache.logging.log4j.Logger; import org.apache.logging.log4j.LogManager; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; +import org.apache.logging.log4j.Logger; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; import java.sql.Connection; @@ -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/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC4.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC6.java ===================================== @@ -10,12 +10,12 @@ package fr.ird.observe.persistence.migration.old; * 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>. @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC7.java ===================================== @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old; */ import com.google.auto.service.AutoService; -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.topia.service.migration.resources.MigrationVersionResource; +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor; import org.nuiton.version.Versions; /** @@ -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/persistence/migration/old/LegacyMigrationVersionResource.java ===================================== @@ -0,0 +1,47 @@ +package fr.ird.observe.persistence.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); + } + } +} ===================================== pom.xml ===================================== @@ -165,7 +165,7 @@ <lib.version.h2>1.4.196</lib.version.h2> <!--<lib.version.java4all.jaxx>3.0-alpha-47-SNAPSHOT</lib.version.java4all.jaxx>--> <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>--> - <lib.version.java4all.topia>1.1.10</lib.version.java4all.topia> + <lib.version.java4all.topia>1.1.11</lib.version.java4all.topia> <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>--> <!--<lib.version.java4all.eugene>3.0-alpha-21</lib.version.java4all.eugene>--> ===================================== validation/src/main/i18n/getters/validation-messages.getter ===================================== @@ -47,6 +47,7 @@ observe.validation.set.endSetTimeStamp.after.endPursingTimeStamp observe.validation.set.size.supportVesselName observe.validation.set.startTime.after.time observe.validation.setLongline.baitsComposition.uniqueKey +observe.validation.setLongline.branchlinesComposition.uniqueKey observe.validation.setLongline.duplicated.homeId observe.validation.setLongline.duplicated.number observe.validation.setLongline.floatlinesComposition.uniqueKey View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7ce42d932f7e815e33ff991863a... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/compare/7ce42d932f7e815e33ff991863a... You're receiving this email because of your account on gitlab.com.