Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe

Commits:

23 changed files:

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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -25,8 +25,8 @@ package fr.ird.observe.persistence.migration.old;
    25 25 
     import com.google.auto.service.AutoService;
    26 26 
     import org.apache.commons.lang3.tuple.Pair;
    27 27 
     import org.nuiton.topia.persistence.support.TopiaSqlQuery;
    28 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    29 28 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    29 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    30 30 
     import org.nuiton.version.Versions;
    31 31
    32 32 
     import java.sql.Connection;
    ... ... @@ -44,7 +44,7 @@ import java.util.List;
    44 44 
      * @since 3.1
    45 45 
      */
    46 46 
     @AutoService(MigrationVersionResource.class)
    47 
    -public class DataSourceMigrationForVersion_3_1 extends MigrationVersionResource {
    47 
    +public class DataSourceMigrationForVersion_3_1 extends LegacyMigrationVersionResource {
    48 48
    49 49 
         public DataSourceMigrationForVersion_3_1() {
    50 50 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 3.10
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_3_10 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_3_10 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_3_10() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 3.11
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_3_11 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_3_11 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_3_11() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 3.12
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_3_12 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_3_12 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_3_12() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 3.14
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_3_14 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_3_14 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_3_14() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 3.15
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_3_15 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_3_15 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_3_15() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,10 +23,10 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.apache.logging.log4j.Logger;
    27 26 
     import org.apache.logging.log4j.LogManager;
    28 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 
    +import org.apache.logging.log4j.Logger;
    29 28 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    29 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    30 30 
     import org.nuiton.version.Versions;
    31 31
    32 32 
     import java.sql.PreparedStatement;
    ... ... @@ -43,7 +43,7 @@ import java.util.Set;
    43 43 
      */
    44 44 
     @SuppressWarnings("SqlDialectInspection")
    45 45 
     @AutoService(MigrationVersionResource.class)
    46 
    -public class DataSourceMigrationForVersion_3_16 extends MigrationVersionResource {
    46 
    +public class DataSourceMigrationForVersion_3_16 extends LegacyMigrationVersionResource {
    47 47
    48 48 
         /** Logger. */
    49 49 
         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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     import java.util.Set;
    ... ... @@ -36,7 +36,7 @@ import java.util.Set;
    36 36 
      * @since 4.0
    37 37 
      */
    38 38 
     @AutoService(MigrationVersionResource.class)
    39 
    -public class DataSourceMigrationForVersion_3_5 extends MigrationVersionResource {
    39 
    +public class DataSourceMigrationForVersion_3_5 extends LegacyMigrationVersionResource {
    40 40
    41 41 
         private static final String[] TABLES = new String[]{
    42 42 
                 "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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 3.7
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_3_7 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_3_7 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_3_7() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 3.8
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_3_8 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_3_8 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_3_8() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 3.9
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_3_9 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_3_9 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_3_9() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 4.0
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_4_0 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_4_0 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_4_0() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -28,8 +28,8 @@ import com.google.common.collect.Multimap;
    28 28 
     import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine;
    29 29 
     import fr.ird.observe.entities.seine.GearUseFeaturesSeine;
    30 30 
     import fr.ird.observe.persistence.ObserveTopiaIdFactory;
    31 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    32 31 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    32 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    33 33 
     import org.nuiton.version.Versions;
    34 34
    35 35 
     import java.sql.PreparedStatement;
    ... ... @@ -47,7 +47,7 @@ import java.util.Set;
    47 47 
      */
    48 48 
     @SuppressWarnings("SqlDialectInspection")
    49 49 
     @AutoService(MigrationVersionResource.class)
    50 
    -public class DataSourceMigrationForVersion_4_0_1 extends MigrationVersionResource {
    50 
    +public class DataSourceMigrationForVersion_4_0_1 extends LegacyMigrationVersionResource {
    51 51
    52 52 
         public DataSourceMigrationForVersion_4_0_1() {
    53 53 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 4.0.1
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_4_0_2 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_4_0_2 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_4_0_2() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 4.0.1
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_4_0_4 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_4_0_4 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_4_0_4() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -24,8 +24,8 @@ package fr.ird.observe.persistence.migration.old;
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 26 
     import org.nuiton.topia.persistence.support.TopiaSqlQuery;
    27 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 27 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    28 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    29 29 
     import org.nuiton.version.Versions;
    30 30
    31 31 
     import java.sql.Connection;
    ... ... @@ -42,7 +42,7 @@ import java.util.Set;
    42 42 
      */
    43 43 
     @SuppressWarnings("SqlDialectInspection")
    44 44 
     @AutoService(MigrationVersionResource.class)
    45 
    -public class DataSourceMigrationForVersion_4_0_RC2 extends MigrationVersionResource {
    45 
    +public class DataSourceMigrationForVersion_4_0_RC2 extends LegacyMigrationVersionResource {
    46 46
    47 47 
         public DataSourceMigrationForVersion_4_0_RC2() {
    48 48 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,10 +23,10 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.apache.logging.log4j.Logger;
    27 26 
     import org.apache.logging.log4j.LogManager;
    28 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 
    +import org.apache.logging.log4j.Logger;
    29 28 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    29 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    30 30 
     import org.nuiton.version.Versions;
    31 31
    32 32 
     import java.sql.Connection;
    ... ... @@ -44,7 +44,7 @@ import java.util.Set;
    44 44 
      */
    45 45 
     @SuppressWarnings("SqlDialectInspection")
    46 46 
     @AutoService(MigrationVersionResource.class)
    47 
    -public class DataSourceMigrationForVersion_4_0_RC3 extends MigrationVersionResource {
    47 
    +public class DataSourceMigrationForVersion_4_0_RC3 extends LegacyMigrationVersionResource {
    48 48
    49 49 
         private static final Logger log = LogManager.getLogger(DataSourceMigrationForVersion_4_0_RC3.class);
    50 50

  • 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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 4.0-RC4
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_4_0_RC4 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_4_0_RC4 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_4_0_RC4() {
    40 40 
             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;
    10 10 
      * it under the terms of the GNU General Public License as
    11 11 
      * published by the Free Software Foundation, either version 3 of the
    12 12 
      * License, or (at your option) any later version.
    13 
    - *
    13 
    + *
    14 14 
      * This program is distributed in the hope that it will be useful,
    15 15 
      * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 16 
      * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 17 
      * GNU General Public License for more details.
    18 
    - *
    18 
    + *
    19 19 
      * You should have received a copy of the GNU General Public
    20 20 
      * License along with this program.  If not, see
    21 21 
      * <http://www.gnu.org/licenses/gpl-3.0.html>.
    ... ... @@ -23,8 +23,8 @@ package fr.ird.observe.persistence.migration.old;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 4.0-RC6
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_4_0_RC6 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_4_0_RC6 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_4_0_RC6() {
    40 40 
             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;
    23 23 
      */
    24 24
    25 25 
     import com.google.auto.service.AutoService;
    26 
    -import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    27 26 
     import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    27 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExecutor;
    28 28 
     import org.nuiton.version.Versions;
    29 29
    30 30 
     /**
    ... ... @@ -34,7 +34,7 @@ import org.nuiton.version.Versions;
    34 34 
      * @since 4.0-RC7
    35 35 
      */
    36 36 
     @AutoService(MigrationVersionResource.class)
    37 
    -public class DataSourceMigrationForVersion_4_0_RC7 extends MigrationVersionResource {
    37 
    +public class DataSourceMigrationForVersion_4_0_RC7 extends LegacyMigrationVersionResource {
    38 38
    39 39 
         public DataSourceMigrationForVersion_4_0_RC7() {
    40 40 
             super(Versions.valueOf("4.0-RC7"));

  • persistence/src/main/java/fr/ird/observe/persistence/migration/old/LegacyMigrationVersionResource.java
    1 
    +package fr.ird.observe.persistence.migration.old;
    2 
    +
    3 
    +/*
    4 
    + * #%L
    5 
    + * ObServe :: Persistence
    6 
    + * %%
    7 
    + * Copyright (C) 2008 - 2019 IRD, Code Lutin, Ultreia.io
    8 
    + * %%
    9 
    + * This program is free software: you can redistribute it and/or modify
    10 
    + * it under the terms of the GNU General Public License as
    11 
    + * published by the Free Software Foundation, either version 3 of the
    12 
    + * License, or (at your option) any later version.
    13 
    + *
    14 
    + * This program is distributed in the hope that it will be useful,
    15 
    + * but WITHOUT ANY WARRANTY; without even the implied warranty of
    16 
    + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    17 
    + * GNU General Public License for more details.
    18 
    + *
    19 
    + * You should have received a copy of the GNU General Public
    20 
    + * License along with this program.  If not, see
    21 
    + * <http://www.gnu.org/licenses/gpl-3.0.html>.
    22 
    + * #L%
    23 
    + */
    24 
    +
    25 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResource;
    26 
    +import org.nuiton.topia.service.migration.resources.MigrationVersionResourceScriptLayout;
    27 
    +import org.nuiton.version.Version;
    28 
    +
    29 
    +/**
    30 
    + * Created on 01/02/19.
    31 
    + *
    32 
    + * @author Tony Chemit - dev@tchemit.fr
    33 
    + * @since 7
    34 
    + */
    35 
    +public abstract class LegacyMigrationVersionResource extends MigrationVersionResource {
    36 
    +    public LegacyMigrationVersionResource(Version version) {
    37 
    +        super(version, new LegacyMigrationVersionResourceScriptLayout());
    38 
    +    }
    39 
    +
    40 
    +    static class LegacyMigrationVersionResourceScriptLayout implements MigrationVersionResourceScriptLayout {
    41 
    +        @Override
    42 
    +        public String getScriptPath(Version version, String rank, String prefix, String classifier) {
    43 
    +            String migrationScript = String.format("%s-%s.sql", prefix, classifier);
    44 
    +            return String.format("/db/migration/old/%s/V%s_%s_%s", version, version.getValidName(), rank, migrationScript);
    45 
    +        }
    46 
    +    }
    47 
    +}

  • pom.xml
    ... ... @@ -165,7 +165,7 @@
    165 165 
         <lib.version.h2>1.4.196</lib.version.h2>
    166 166 
         <!--<lib.version.java4all.jaxx>3.0-alpha-47-SNAPSHOT</lib.version.java4all.jaxx>-->
    167 167 
         <!--<lib.version.java4all.i18n>4.0-beta-8-SNAPSHOT</lib.version.java4all.i18n>-->
    168 
    -    <lib.version.java4all.topia>1.1.10</lib.version.java4all.topia>
    168 
    +    <lib.version.java4all.topia>1.1.11</lib.version.java4all.topia>
    169 169
    170 170 
         <!--<lib.version.nuiton.topia>3.6-SNAPSHOT</lib.version.nuiton.topia>-->
    171 171 
         <!--<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
    47 47 
     observe.validation.set.size.supportVesselName
    48 48 
     observe.validation.set.startTime.after.time
    49 49 
     observe.validation.setLongline.baitsComposition.uniqueKey
    50 
    +observe.validation.setLongline.branchlinesComposition.uniqueKey
    50 51 
     observe.validation.setLongline.duplicated.homeId
    51 52 
     observe.validation.setLongline.duplicated.number
    52 53 
     observe.validation.setLongline.floatlinesComposition.uniqueKey

    • —
    View it on GitLab.
    You're receiving this email because of your account on gitlab.com. If you'd like to receive fewer emails, you can adjust your notification settings.