This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 9f5bcb99b71563658f211012391fd1afda2cb0e0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 26 09:14:19 2016 +0100 [iso] correction template --- .../application/swing/ui/storage/StorageUIModel.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index ade4992..bab7402 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.application.swing.ui.storage; +import fr.ird.observe.application.swing.I18nEnumHelper; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.ObserveSwingApplicationDataSourcesManager; import fr.ird.observe.application.swing.ObserveSwingTechnicalException; @@ -345,8 +346,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { return; } -// StorageUIHandler storageUIHandler = context.getContextValue(StorageUIHandler.class); - // ajout paramétrage depuis la configuration boolean isLocalStorageExist = config.isLocalStorageExist(); @@ -711,9 +710,11 @@ public class StorageUIModel extends WizardModel<StorageStep> { return adminAction; } -// public String getAdminActionLabel() { -// return I18nEnumHelper.getLabel(getAdminAction()); -// } + // Ne pas supprimer, utilisé dans les templates + @SuppressWarnings("unused") + public String getAdminActionLabel() { + return I18nEnumHelper.getLabel(getAdminAction()); + } public SelectionTreeModel getSelectDataModel() { return selectDataModel; @@ -1070,11 +1071,14 @@ public class StorageUIModel extends WizardModel<StorageStep> { firePropertyChange(ALREADY_APPLIED_PROPERTY_NAME, oldValue, alreadyApplied); } + // Ne pas supprimer, utilise dans des templates + @SuppressWarnings("unused") public boolean isUseSelectData() { return getSteps() != null && getSteps().contains(StorageStep.SELECT_DATA); } // Ne pas supprimer, utilise dans des templates + @SuppressWarnings("unused") public boolean isBackupAction() { return getSteps() != null && getStepIndex(StorageStep.BACKUP) == 0; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 924210adf5061f366f5425654331db427b1c1d22 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 26 09:39:02 2016 +0100 On passe en version 6.0 + simplification du nommage des scripts de migration --- application-swing-configuration/pom.xml | 2 +- application-swing-decoration/pom.xml | 2 +- application-swing-validation/pom.xml | 2 +- application-swing-validators/pom.xml | 2 +- application-swing/pom.xml | 2 +- application-web-configuration/pom.xml | 2 +- application-web/pom.xml | 2 +- entities-migration/pom.xml | 2 +- .../DataSourceMigrationForVersion_5_0.java | 18 ++++++------- ...java => DataSourceMigrationForVersion_6_0.java} | 31 +++++----------------- ...en_field-H2.sql => 01_remove_open_field-H2.sql} | 0 ...en_field-PG.sql => 01_remove_open_field-PG.sql} | 0 ...d-H2.sql => 02_add_lastUpdateDate_field-H2.sql} | 0 ...d-PG.sql => 02_add_lastUpdateDate_field-PG.sql} | 0 ...e-H2.sql => 03_add_lastUpdateDate_table-H2.sql} | 0 ...e-PG.sql => 03_add_lastUpdateDate_table-PG.sql} | 0 ...it_field-PG.sql => 04_remove_unit_field-H2.sql} | 0 ...it_field-H2.sql => 04_remove_unit_field-PG.sql} | 0 ..._field-PG.sql => 05_remove_gender_field-H2.sql} | 0 ..._field-H2.sql => 05_remove_gender_field-PG.sql} | 0 ...rows-H2.sql => 06_remove_duplicate_rows-H2.sql} | 0 ...rows-PG.sql => 06_remove_duplicate_rows-PG.sql} | 0 ...rop_not_null_constraint_gearUseFeatures-H2.sql} | 0 ...rop_not_null_constraint_gearUseFeatures-PG.sql} | 0 ..._not_null_constraint_hauling_identifier-H2.sql} | 0 ..._not_null_constraint_hauling_identifier-PG.sql} | 0 ....sql => 09_add_non_target_length_sex_fk-H2.sql} | 0 ....sql => 09_add_non_target_length_sex_fk-PG.sql} | 0 .../01_evol_8374_delete_sonarUsed-H2.sql} | 0 .../01_evol_8374_delete_sonarUsed-PG.sql} | 0 .../02_evol_7886_catch_add_set_idx-H2.sql} | 0 .../02_evol_7886_catch_add_set_idx-PG.sql} | 0 .../03_evol_6997_delete_supportVesselName-H2.sql} | 0 .../03_evol_6997_delete_supportVesselName-PG.sql} | 0 ...anchlineComposition_add_tracelineLength-H2.sql} | 0 ...anchlineComposition_add_tracelineLength-PG.sql} | 0 .../05_evol_6999_nonTargetCatch_add_well-H2.sql} | 0 .../05_evol_6999_nonTargetCatch_add_well-PG.sql} | 0 .../06_evol_8375_setSeine_add_booleans-H2.sql} | 0 .../06_evol_8375_setSeine_add_booleans-PG.sql} | 0 .../07_evol_8389_rename_source_columns-H2.sql} | 0 .../07_evol_8389_rename_source_columns-PG.sql} | 0 .../08_1_evol_8390_measure_type-H2.sql} | 0 .../08_1_evol_8390_measure_type-PG.sql} | 0 .../08_evol_8390_measure_type-H2.sql} | 0 .../08_evol_8390_measure_type-PG.sql} | 0 .../09_evol_7877_targetLength_add_sex-H2.sql} | 0 .../09_evol_7877_targetLength_add_sex-PG.sql} | 0 ...0_evol_8391_species_add_sizeMeasureType-H2.sql} | 0 ...0_evol_8391_species_add_sizeMeasureType-PG.sql} | 0 .../11_evol_8571_length_add_tagNumber-H2.sql} | 0 .../11_evol_8571_length_add_tagNumber-PG.sql} | 0 .../12_evol_8475_vessel_add_fields-H2.sql} | 0 .../12_evol_8475_vessel_add_fields-PG.sql} | 0 .../13_evol_7901_add_armateur_table-H2.sql} | 0 .../13_evol_7901_add_armateur_table-PG.sql} | 0 ...l_8196_lengthWeightParameter_add_source-H2.sql} | 0 ...l_8196_lengthWeightParameter_add_source-PG.sql} | 0 ...ol_8578_nonTargetLength_add_speciesFate-H2.sql} | 0 ...ol_8578_nonTargetLength_add_speciesFate-PG.sql} | 0 .../16_evol_8377_speciesFate_add_discard-H2.sql} | 0 .../16_evol_8377_speciesFate_add_discard-PG.sql} | 0 ...l_8376_vesselActivitySeine_add_allowFad-H2.sql} | 0 ...l_8376_vesselActivitySeine_add_allowFad-PG.sql} | 0 .../18_evol_8404_lengthLengthParameter-H2.sql} | 0 .../18_evol_8404_lengthLengthParameter-PG.sql} | 0 .../19_ano_8554_brancheline_add_section-H2.sql} | 0 .../19_ano_8554_brancheline_add_section-PG.sql} | 0 entities/pom.xml | 2 +- .../AbstractObserveMigrationCallBack.java | 6 +++-- pom.xml | 4 +-- services-configuration-rest/pom.xml | 2 +- services-configuration-topia/pom.xml | 2 +- services-configuration/pom.xml | 2 +- services-dto-gson/pom.xml | 2 +- services-dto-reference/pom.xml | 2 +- services-dto/pom.xml | 2 +- services-rest/pom.xml | 2 +- services-runner/pom.xml | 2 +- services-topia-binder/pom.xml | 2 +- services-topia-validation/pom.xml | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 2 +- services/pom.xml | 2 +- test/pom.xml | 2 +- toolbox-maven-plugin/pom.xml | 2 +- topia-extension/pom.xml | 2 +- topia-templates-extension/pom.xml | 2 +- 88 files changed, 48 insertions(+), 63 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index 42e2d43..c289f2d 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>application-swing-configuration</artifactId> diff --git a/application-swing-decoration/pom.xml b/application-swing-decoration/pom.xml index bdcba78..01767d5 100644 --- a/application-swing-decoration/pom.xml +++ b/application-swing-decoration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>application-swing-decoration</artifactId> diff --git a/application-swing-validation/pom.xml b/application-swing-validation/pom.xml index 6562ce6..255fd4b 100644 --- a/application-swing-validation/pom.xml +++ b/application-swing-validation/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>application-swing-validation</artifactId> diff --git a/application-swing-validators/pom.xml b/application-swing-validators/pom.xml index 2e9a8e7..5403888 100644 --- a/application-swing-validators/pom.xml +++ b/application-swing-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>application-swing-validators</artifactId> diff --git a/application-swing/pom.xml b/application-swing/pom.xml index d475e1e..4b6d754 100644 --- a/application-swing/pom.xml +++ b/application-swing/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>application-swing</artifactId> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index 865653f..d1b4701 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>application-web-configuration</artifactId> diff --git a/application-web/pom.xml b/application-web/pom.xml index 1d8aead..550a328 100644 --- a/application-web/pom.xml +++ b/application-web/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>application-web</artifactId> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index f5d99f7..7b4383d 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>entities-migration</artifactId> diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java index c95a223..2308013 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java @@ -49,27 +49,27 @@ public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveM // Suppression du champ open sur les entités anciennement du type Openable // See https://forge.codelutin.com/issues/7469 - addScript(VersionBuilder.create("4.900").build(), "01", "remove_open_field", queries); + addScript("01", "remove_open_field", queries); // Ajout des champs lastUpdate // See https://forge.codelutin.com/issues/7470 - addScript(VersionBuilder.create("4.901").build(), "01", "add_lastUpdateDate_field", queries); + addScript("02", "add_lastUpdateDate_field", queries); // Ajout de la table lastUpdateDate // See https://forge.codelutin.com/issues/7470 - addScript(VersionBuilder.create("4.902").build(), "01", "add_lastUpdateDate_table", queries); + addScript("03", "add_lastUpdateDate_table", queries); // Ajout de la table lastUpdateDate // See https://forge.codelutin.com/issues/7470 - addScript(VersionBuilder.create("4.903").build(), "01", "remove_unit_field", queries); - addScript(VersionBuilder.create("4.903").build(), "02", "remove_gender_field", queries); - addScript(VersionBuilder.create("4.903").build(), "03", "remove_duplicate_rows", queries); + addScript("04", "remove_unit_field", queries); + addScript("05", "remove_gender_field", queries); + addScript("06", "remove_duplicate_rows", queries); - addScript(VersionBuilder.create("4.904").build(), "01", "drop_not_null_constraint_gearUseFeatures", queries); - - addScript(VersionBuilder.create("4.905").build(), "01", "drop_not_null_constraint_hauling_identifier", queries); + addScript("07", "drop_not_null_constraint_gearUseFeatures", queries); + addScript("08", "drop_not_null_constraint_hauling_identifier", queries); + addScript("09", "add_non_target_length_sex_fk", queries); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java similarity index 94% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java index 5162dc7..3291d6b 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java @@ -34,7 +34,6 @@ import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; -import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; import java.util.LinkedHashSet; @@ -47,14 +46,14 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ -@MigrationVersion(version = "5.1") -public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationCallBack { +@MigrationVersion(version = "6.0") +public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationCallBack { /** Logger */ - private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_5_1.class); + private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_6_0.class); - public DataSourceMigrationForVersion_5_1(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(DataSourceMigrationForVersion_5_1.class, callBack, scriptSuffix); + public DataSourceMigrationForVersion_6_0(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(DataSourceMigrationForVersion_6_0.class, callBack, scriptSuffix); } @Override @@ -218,22 +217,6 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC }); } -// if (sizeMeasureTypeId == null && finalLengthMeasureType.equals("LF")) { -// -// // For test purposes... -// sizeMeasureTypeId = topiaSqlSupport.findSingleResult(new TopiaSqlQuery<String>() { -// -// @Override -// public PreparedStatement prepareQuery(Connection connection) throws SQLException { -// return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizeMeasureType WHERE code = 'TL'"); -// } -// -// @Override -// public String prepareResult(ResultSet set) throws SQLException { -// return set.getString(1); -// } -// }); -// } if (sizeMeasureTypeId == null) { if (log.isWarnEnabled()) { @@ -300,7 +283,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC } - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_1 { + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_6_0 { public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, H2DataSourceMigration.TYPE); @@ -308,7 +291,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC } - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_1 { + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_6_0 { public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { super(callBack, PGDataSourceMigration.TYPE); diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_900_01_remove_open_field-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/01_remove_open_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_900_01_remove_open_field-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/01_remove_open_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_900_01_remove_open_field-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/01_remove_open_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_900_01_remove_open_field-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/01_remove_open_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_901_01_add_lastUpdateDate_field-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_901_01_add_lastUpdateDate_field-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_901_01_add_lastUpdateDate_field-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_901_01_add_lastUpdateDate_field-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_902_01_add_lastUpdateDate_table-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_902_01_add_lastUpdateDate_table-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_902_01_add_lastUpdateDate_table-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_902_01_add_lastUpdateDate_table-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_903_01_remove_unit_field-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/04_remove_unit_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_903_01_remove_unit_field-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/04_remove_unit_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_903_01_remove_unit_field-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/04_remove_unit_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_903_01_remove_unit_field-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/04_remove_unit_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_903_02_remove_gender_field-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/05_remove_gender_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_903_02_remove_gender_field-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/05_remove_gender_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_903_02_remove_gender_field-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/05_remove_gender_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_903_02_remove_gender_field-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/05_remove_gender_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_903_03_remove_duplicate_rows-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_903_03_remove_duplicate_rows-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_903_03_remove_duplicate_rows-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_903_03_remove_duplicate_rows-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_906_01_add_non_target_length_sex_fk-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_906_01_add_non_target_length_sex_fk-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/V4_906_01_add_non_target_length_sex_fk-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/V4_906_01_add_non_target_length_sex_fk-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_01_evol_8374_delete_sonarUsed-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_01_evol_8374_delete_sonarUsed-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_01_evol_8374_delete_sonarUsed-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_01_evol_8374_delete_sonarUsed-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_02_evol_7886_catch_add_set_idx-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_02_evol_7886_catch_add_set_idx-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_02_evol_7886_catch_add_set_idx-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_02_evol_7886_catch_add_set_idx-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_08_1_evol_8390_measure_type-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_09_evol_7877_targetLength_add_sex-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_09_evol_7877_targetLength_add_sex-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_09_evol_7877_targetLength_add_sex-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_09_evol_7877_targetLength_add_sex-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_11_evol_8571_length_add_tagNumber-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_11_evol_8571_length_add_tagNumber-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_11_evol_8571_length_add_tagNumber-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_11_evol_8571_length_add_tagNumber-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_12_evol_8475_vessel_add_fields-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_12_evol_8475_vessel_add_fields-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_12_evol_8475_vessel_add_fields-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_12_evol_8475_vessel_add_fields-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_18_evol_8404_lengthLengthParameter-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_19_ano_8554_brancheline_add_section-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_19_ano_8554_brancheline_add_section-H2.sql rename to entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.1/V5_1_19_ano_8554_brancheline_add_section-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.1/V5_1_19_ano_8554_brancheline_add_section-PG.sql rename to entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql diff --git a/entities/pom.xml b/entities/pom.xml index 14b6966..40ee092 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>entities</artifactId> diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index f5838ab..97f70b5 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -92,9 +92,10 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal String migrationScript = prefix + "-" + scriptSuffix + ".sql"; String scriptPath = "/db/migration/"; if (getClass().getName().contains(".old.")) { - scriptPath += "old/"; + scriptPath += "old/" + this.version + "/V" + version.getValidName() + "_" + rank + "_" + migrationScript; + } else { + scriptPath += this.version + "/" + rank + "_" + migrationScript; } - scriptPath += this.version + "/V" + version.getValidName() + "_" + rank + "_" + migrationScript; if (log.isInfoEnabled()) { log.info("Load migration script: " + scriptPath); @@ -103,6 +104,7 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal try (InputStream stream = getClass().getResourceAsStream(scriptPath)) { String content = IOUtils.toString(stream, Charsets.UTF_8); Set<String> result = new LinkedHashSet<>(); + //FIXME On devrait utiliser le parseur de requètes sql plutôt qu'un simple split... for (String statement : content.split("\n")) { if (statement.startsWith("--")) { diff --git a/pom.xml b/pom.xml index 94bdc44..0191e07 100644 --- a/pom.xml +++ b/pom.xml @@ -33,7 +33,7 @@ <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ObServe</name> @@ -205,7 +205,7 @@ <devMode>true</devMode> <!--Modèle version--> - <observe.model.version>5.1</observe.model.version> + <observe.model.version>6.0</observe.model.version> </properties> diff --git a/services-configuration-rest/pom.xml b/services-configuration-rest/pom.xml index aeae421..3378c53 100644 --- a/services-configuration-rest/pom.xml +++ b/services-configuration-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-configuration-rest</artifactId> diff --git a/services-configuration-topia/pom.xml b/services-configuration-topia/pom.xml index 02f45bc..d259ab8 100644 --- a/services-configuration-topia/pom.xml +++ b/services-configuration-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-configuration-topia</artifactId> diff --git a/services-configuration/pom.xml b/services-configuration/pom.xml index 61ecb83..89706f2 100644 --- a/services-configuration/pom.xml +++ b/services-configuration/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-configuration</artifactId> diff --git a/services-dto-gson/pom.xml b/services-dto-gson/pom.xml index 9082b1c..564cb7e 100644 --- a/services-dto-gson/pom.xml +++ b/services-dto-gson/pom.xml @@ -29,7 +29,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-dto-gson</artifactId> diff --git a/services-dto-reference/pom.xml b/services-dto-reference/pom.xml index 882c31f..ea928fb 100644 --- a/services-dto-reference/pom.xml +++ b/services-dto-reference/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-dto-reference</artifactId> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index 5b2baff..e3641a9 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-dto</artifactId> diff --git a/services-rest/pom.xml b/services-rest/pom.xml index 496b5c3..9240748 100644 --- a/services-rest/pom.xml +++ b/services-rest/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-rest</artifactId> diff --git a/services-runner/pom.xml b/services-runner/pom.xml index 859040e..a945bfb 100644 --- a/services-runner/pom.xml +++ b/services-runner/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-runner</artifactId> diff --git a/services-topia-binder/pom.xml b/services-topia-binder/pom.xml index 5f25805..7bdc233 100644 --- a/services-topia-binder/pom.xml +++ b/services-topia-binder/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-topia-binder</artifactId> diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index ee6361b..9935928 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-topia-validation</artifactId> diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index ee8ee0d..e666e26 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-topia-validators</artifactId> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index b39fba5..551b8a3 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services-topia</artifactId> diff --git a/services/pom.xml b/services/pom.xml index 588816b..766a335 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>services</artifactId> diff --git a/test/pom.xml b/test/pom.xml index ab4b4f9..32f499d 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -26,7 +26,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>test</artifactId> diff --git a/toolbox-maven-plugin/pom.xml b/toolbox-maven-plugin/pom.xml index 98758de..97faa69 100644 --- a/toolbox-maven-plugin/pom.xml +++ b/toolbox-maven-plugin/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>toolbox-maven-plugin</artifactId> diff --git a/topia-extension/pom.xml b/topia-extension/pom.xml index 4255bcd..41c2d0e 100644 --- a/topia-extension/pom.xml +++ b/topia-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>topia-extension</artifactId> diff --git a/topia-templates-extension/pom.xml b/topia-templates-extension/pom.xml index c18938a..680b87b 100644 --- a/topia-templates-extension/pom.xml +++ b/topia-templates-extension/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>fr.ird.observe</groupId> <artifactId>observe</artifactId> - <version>5.1-SNAPSHOT</version> + <version>6.0-SNAPSHOT</version> </parent> <artifactId>topia-templates-extension</artifactId> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 8c0dfe50a9eaf46b39b36dab99a9175e181c7cbf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Nov 26 13:40:52 2016 +0100 [persistence] correction des optimisations de recherche + fix toutes les bases de test --- .../DataSourceMigrationForVersion_6_0.java | 11 +++--- .../6.0/19_ano_8554_brancheline_add_section-H2.sql | 7 ++-- .../6.0/19_ano_8554_brancheline_add_section-PG.sql | 7 ++-- ...evol_8391_species_drop_lengthmeasuretype-H2.sql | 1 + ...evol_8391_species_drop_lengthmeasuretype-PG.sql | 1 + .../observe/ObserveTopiaApplicationContext.java | 43 ++++++++++++++------- entities/src/main/xmi/observe-longline.zargo | Bin 95950 -> 95951 bytes entities/src/main/xmi/observe.ini | 2 +- .../data/longline/BranchlineServiceTopia.java | 5 +-- .../SetLonglineDetailCompositionServiceTopia.java | 6 +-- .../topia/entity/LengthWeightParemetersTest.java | 16 ++++---- .../java/fr/ird/observe/test/ObserveFixtures.java | 2 +- .../resources/db/5.0/dataForTestLongline.sql.gz | Bin 1579241 -> 1579264 bytes .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 448110 -> 448129 bytes test/src/main/resources/db/5.0/referentiel.sql.gz | Bin 142863 -> 179173 bytes .../resources/db/6.0/dataForTestLongline.sql.gz | Bin 1593547 -> 1636168 bytes .../main/resources/db/6.0/dataForTestSeine.sql.gz | Bin 451463 -> 455791 bytes test/src/main/resources/db/6.0/empty_h2.sql.gz | Bin 6302 -> 6310 bytes test/src/main/resources/db/6.0/empty_pg.sql.gz | Bin 6293 -> 6302 bytes test/src/main/resources/db/6.0/referentiel.sql.gz | Bin 182328 -> 183215 bytes 20 files changed, 58 insertions(+), 43 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java index 3291d6b..5635693 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java @@ -57,10 +57,7 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC } @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { addScript("01", "evol_8374_delete_sonarUsed", queries); addScript("02", "evol_7886_catch_add_set_idx", queries); @@ -87,6 +84,8 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC addScript("17", "evol_8376_vesselActivitySeine_add_allowFad", queries); addScript("18", "evol_8404_lengthLengthParameter", queries); addScript("19", "ano_8554_brancheline_add_section", queries); + addScript("20", "evol_8391_species_drop_lengthmeasuretype", queries); + } private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { @@ -97,6 +96,7 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC .put("L1", "PDL") .put("LC", "DL") .put("LT", "TL") +// .put("", "TL") .build(); List<String> lengthMeasureTypes = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { @@ -126,6 +126,7 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC Set<String> missingLengthMeasureTypeCodes = new HashSet<>(); for (String lengthMeasureType : lengthMeasureTypes) { + lengthMeasureType = lengthMeasureType.trim(); String realCode = missingCodesMapping.get(lengthMeasureType); if (realCode == null) { realCode = lengthMeasureType; @@ -234,8 +235,6 @@ public class DataSourceMigrationForVersion_6_0 extends AbstractObserveMigrationC throw new IllegalStateException("Impossible de trouver la type de mesure de taille pour les codes suivants :\n\t" + Joiner.on("\n\t").join(invalidCodes)); } - queries.add("ALTER TABLE observe_common.species DROP COLUMN lengthmeasuretype CASCADE;"); - } private void evol8390(TopiaSqlSupport topiaSqlSupport, List<String> queries) { diff --git a/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql index bbe135a..0ee0010 100644 --- a/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql +++ b/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql @@ -19,6 +19,7 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -ALTER TABLE observe_longline.branchline ADD COLUMN set VARCHAR(255); -ALTER TABLE observe_longline.branchline ADD CONSTRAINT FK_BRANCHLINE_SET FOREIGN KEY(set) REFERENCES observe_longline.set(topiaid); -UPDATE observe_longline.branchline main SET set = (SELECT s.topiaid FROM observe_longline.set s INNER JOIN observe_longline.section section ON section.set = s.topiaid INNER JOIN observe_longline.basket basket ON basket.section = section.topiaid INNER JOIN observe_longline.branchline branchline ON branchline.basket = basket.topiaid WHERE branchline.topiaid = main.topiaid); +ALTER TABLE observe_longline.basket ADD COLUMN set character varying(255); +UPDATE observe_longline.basket main SET set = (SELECT section.set FROM observe_longline.section section INNER JOIN observe_longline.basket basket ON basket.section = section.topiaid WHERE basket.topiaid = main.topiaid); +ALTER TABLE observe_longline.basket ADD CONSTRAINT FK_BASKET_SET FOREIGN KEY(set) REFERENCES observe_longline.set(topiaid); +CREATE INDEX idx_observe_longline_basket_set ON OBSERVE_LONGLINE.basket(set); diff --git a/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql index 147d3fc..a588f75 100644 --- a/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql +++ b/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql @@ -19,6 +19,7 @@ -- <http://www.gnu.org/licenses/gpl-3.0.html>. -- #L% --- -ALTER TABLE observe_longline.branchline ADD COLUMN set character varying(255); -ALTER TABLE observe_longline.branchline ADD CONSTRAINT FK_BRANCHLINE_SET FOREIGN KEY(set) REFERENCES observe_longline.set(topiaid); -UPDATE observe_longline.branchline main SET set = (SELECT s.topiaid FROM observe_longline.set s INNER JOIN observe_longline.section section ON section.set = s.topiaid INNER JOIN observe_longline.basket basket ON basket.section = section.topiaid INNER JOIN observe_longline.branchline branchline ON branchline.basket = basket.topiaid WHERE branchline.topiaid = main.topiaid); +ALTER TABLE observe_longline.basket ADD COLUMN set character varying(255); +UPDATE observe_longline.basket main SET set = (SELECT section.set FROM observe_longline.section section INNER JOIN observe_longline.basket basket ON basket.section = section.topiaid WHERE basket.topiaid = main.topiaid); +ALTER TABLE observe_longline.basket ADD CONSTRAINT FK_BASKET_SET FOREIGN KEY(set) REFERENCES observe_longline.set(topiaid); +CREATE INDEX idx_observe_longline_basket_set ON OBSERVE_LONGLINE.basket(set); \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-H2.sql b/entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-H2.sql new file mode 100644 index 0000000..a94568d --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-H2.sql @@ -0,0 +1 @@ +ALTER TABLE observe_common.species DROP COLUMN lengthmeasuretype; \ No newline at end of file diff --git a/entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-PG.sql b/entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-PG.sql new file mode 100644 index 0000000..b2b0485 --- /dev/null +++ b/entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-PG.sql @@ -0,0 +1 @@ +ALTER TABLE observe_common.species DROP COLUMN lengthmeasuretype CASCADE; \ No newline at end of file diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index 4fe9930..2b038e3 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -297,21 +297,38 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat log.info("Loading tripLonglineTables."); tripLonglineTables = topiaSqlTablesFactory.newReplicateEntityTables(new TripReplicateTablesPredicate(), ObserveEntityEnum.TripLongline); - TopiaSqlTable table = tripLonglineTables.getTable("observe_longline.branchline"); - - table = new TopiaSqlTable( - table.getMetadataEntity(), - table.getAssociationMetadataEntity(), - table.getSchemaName(), - table.getTableName(), - table.getFromClause(), - table.getWhereClauseAlias(), + TopiaSqlTable basketTable = tripLonglineTables.getTable("observe_longline.basket"); + + basketTable = new TopiaSqlTable( + basketTable.getMetadataEntity(), + basketTable.getAssociationMetadataEntity(), + basketTable.getSchemaName(), + basketTable.getTableName(), + basketTable.getFromClause(), + basketTable.getWhereClauseAlias(), ImmutableSet.of(" INNER JOIN observe_longline.set set ON set.topiaId = activity.set", - " INNER JOIN observe_longline.branchline branchline ON branchline.set = set.topiaId"), - null - ); + " INNER JOIN observe_longline.basket basket ON basket.set = set.topiaId" + ), + null); - tripLonglineTables.replaceTable("observe_longline.branchline", table); + tripLonglineTables.replaceTable("observe_longline.basket", basketTable); + + TopiaSqlTable branchlineTable = tripLonglineTables.getTable("observe_longline.branchline"); + + branchlineTable = new TopiaSqlTable( + branchlineTable.getMetadataEntity(), + branchlineTable.getAssociationMetadataEntity(), + branchlineTable.getSchemaName(), + branchlineTable.getTableName(), + branchlineTable.getFromClause(), + branchlineTable.getWhereClauseAlias(), + ImmutableSet.of(" INNER JOIN observe_longline.set set ON set.topiaId = activity.set", + " INNER JOIN observe_longline.basket basket ON basket.set = set.topiaId", + " INNER JOIN observe_longline.branchline branchline ON branchline.basket = basket.topiaId" + ), + null); + + tripLonglineTables.replaceTable("observe_longline.branchline", branchlineTable); } diff --git a/entities/src/main/xmi/observe-longline.zargo b/entities/src/main/xmi/observe-longline.zargo index 6aa2afa..cdd3bd3 100644 Binary files a/entities/src/main/xmi/observe-longline.zargo and b/entities/src/main/xmi/observe-longline.zargo differ diff --git a/entities/src/main/xmi/observe.ini b/entities/src/main/xmi/observe.ini index da8daf1..65ffdcc 100644 --- a/entities/src/main/xmi/observe.ini +++ b/entities/src/main/xmi/observe.ini @@ -48,13 +48,13 @@ vesselActivityLongline.lazy = false branchline.orderBy = settingIdentifier branchline.unique = true settingIdentifier.notNull = true +setLongline.dbName = set [class fr.ird.observe.entities.longline.Branchline] branchlineLength.sqlType = numeric catchLongline.dbName = catch hookSize.sqlType = numeric settingIdentifier.notNull = true -setLongline.dbName = set snapWeight.sqlType = numeric swivelWeight.sqlType = numeric tracelineLength.sqlType = numeric diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java index 6305519..48eeb81 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/BranchlineServiceTopia.java @@ -24,13 +24,13 @@ package fr.ird.observe.services.topia.service.data.longline; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.service.data.longline.BranchlineService; -import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.longline.BranchlineDto; import fr.ird.observe.services.dto.longline.SetLonglineDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.service.data.longline.BranchlineService; +import fr.ird.observe.services.topia.ObserveServiceTopia; /** * @author Sylvain Bavencoff - bavencoff@codelutin.com @@ -58,7 +58,6 @@ public class BranchlineServiceTopia extends ObserveServiceTopia implements Branc checkLastUpdateDate(setLongline, dto); Branchline entity = loadOrCreateEntityFromDataDto(dto); - entity.setSetLongline(setLongline); copyDataDtoToEntity(dto, entity); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java index 84ba0fd..adc1c6e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/SetLonglineDetailCompositionServiceTopia.java @@ -123,11 +123,7 @@ public class SetLonglineDetailCompositionServiceTopia extends ObserveServiceTopi section.setSetLongline(entity); if (section.isBasketNotEmpty()) { for (Basket basket : section.getBasket()) { - if (basket.isBranchlineNotEmpty()) { - for (Branchline branchline : basket.getBranchline()) { - branchline.setSetLongline(entity); - } - } + basket.setSetLongline(entity); } } } diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java index d705846..bcb6b6a 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java @@ -198,18 +198,18 @@ public class LengthWeightParemetersTest extends AbstractServiceTopiaTest { assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, maleSex, maleSex, date2011, date2011); assertFoundLengthWeightParameter(persistenceContext, species, atlanticOcean, femaleSex, undeterminedSex, date2011, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, undeterminedSex, date2009, date1970); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2009, date1970); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2009); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2009); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, date2009); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, date2009); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2010, date2010); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2010); assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2010, date2010); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2010, date2010); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, date2010); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, null, undeterminedSex, date2011, date2011); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, undeterminedSex, date2011); assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, maleSex, maleSex, date2011, date2011); - assertFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, undeterminedSex, date2011, date2011); + assertNotFoundLengthWeightParameter(persistenceContext, species, indianOcean, femaleSex, date2011); assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, undeterminedSex, date2010); assertNotFoundLengthWeightParameter(persistenceContext, species, pacificOcean, maleSex, date2010); diff --git a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java index feb894d..a4c31ba 100644 --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -72,7 +72,7 @@ public class ObserveFixtures { .put("observe_common.gearcaracteristictype", 6L) .put("observe_common.harbour", 74L) .put("observe_common.lastupdatedate", 97L) - .put("observe_common.lengthlengthparameter", 3L) + .put("observe_common.lengthlengthparameter", 0L) .put("observe_common.lengthweightparameter", 365L) .put("observe_common.ocean", 3L) .put("observe_common.ocean_species", 500L) diff --git a/test/src/main/resources/db/5.0/dataForTestLongline.sql.gz b/test/src/main/resources/db/5.0/dataForTestLongline.sql.gz index 3132d7b..97805e9 100644 Binary files a/test/src/main/resources/db/5.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/5.0/dataForTestLongline.sql.gz differ diff --git a/test/src/main/resources/db/5.0/dataForTestSeine.sql.gz b/test/src/main/resources/db/5.0/dataForTestSeine.sql.gz index c776ee2..9036725 100644 Binary files a/test/src/main/resources/db/5.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/5.0/dataForTestSeine.sql.gz differ diff --git a/test/src/main/resources/db/5.0/referentiel.sql.gz b/test/src/main/resources/db/5.0/referentiel.sql.gz index 42202b8..954d611 100644 Binary files a/test/src/main/resources/db/5.0/referentiel.sql.gz and b/test/src/main/resources/db/5.0/referentiel.sql.gz differ diff --git a/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz b/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz index ed54e9a..c2b1508 100644 Binary files a/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz and b/test/src/main/resources/db/6.0/dataForTestLongline.sql.gz differ diff --git a/test/src/main/resources/db/6.0/dataForTestSeine.sql.gz b/test/src/main/resources/db/6.0/dataForTestSeine.sql.gz index 9510a01..e9f365d 100644 Binary files a/test/src/main/resources/db/6.0/dataForTestSeine.sql.gz and b/test/src/main/resources/db/6.0/dataForTestSeine.sql.gz differ diff --git a/test/src/main/resources/db/6.0/empty_h2.sql.gz b/test/src/main/resources/db/6.0/empty_h2.sql.gz index 54ee2ef..47757ff 100644 Binary files a/test/src/main/resources/db/6.0/empty_h2.sql.gz and b/test/src/main/resources/db/6.0/empty_h2.sql.gz differ diff --git a/test/src/main/resources/db/6.0/empty_pg.sql.gz b/test/src/main/resources/db/6.0/empty_pg.sql.gz index d1579c9..ebcee3f 100644 Binary files a/test/src/main/resources/db/6.0/empty_pg.sql.gz and b/test/src/main/resources/db/6.0/empty_pg.sql.gz differ diff --git a/test/src/main/resources/db/6.0/referentiel.sql.gz b/test/src/main/resources/db/6.0/referentiel.sql.gz index c2a7842..7a5875d 100644 Binary files a/test/src/main/resources/db/6.0/referentiel.sql.gz and b/test/src/main/resources/db/6.0/referentiel.sql.gz differ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.