branch develop updated (10d3542 -> 9529836)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 10d3542 fix jaxx binding new 79b7f97 Déplacement des scripts de migration new 45bed33 Déplacement des call backs de version et utilisation de l'annotation MigrationVersion new 8708aaf Déplacements du moteur de migration dans le module entities new 1210aff optimize dependencies new 4e70d90 fix binding new 5bd34d7 fix migrations new 66c4f0f Ajout des bases de tests pour la version 5.1 new 60aa11f Mise à jour de la liste bien ordonnée des entités new c980112 Mise à jour de tests suite aux modifications de référentiel new a7e75eb Ajout de binder new 3746aed ignore a test, il faut le reecrire new f134c8d skip empty code new 5f38a08 On passe sur une snpashot de topia qui corrige un probleme sur les migrations new 9529836 Merge branch 'feature/migration' into develop The 14 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9529836c4cfbd6ad1034093a92c935d8d7747d10 Merge: 10d3542 5f38a08 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:29:30 2016 +0100 Merge branch 'feature/migration' into develop commit 5f38a08cd6db7e814d08efc10c53bc30b23bb0af Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:29:26 2016 +0100 On passe sur une snpashot de topia qui corrige un probleme sur les migrations commit f134c8df6abcf024b862e50d4a91e22e35af5762 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:28:36 2016 +0100 skip empty code commit 3746aed85675ddefd8b42e155267687685137a5d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:28:13 2016 +0100 ignore a test, il faut le reecrire commit a7e75ebee5f1709ff297f8f52d357839674a8266 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:27:51 2016 +0100 Ajout de binder commit c9801121259df0df95b75856dd5b4b76b49d705d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:27:25 2016 +0100 Mise à jour de tests suite aux modifications de référentiel commit 60aa11f9d397116ef396b35d182a55c478af2c4a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:26:53 2016 +0100 Mise à jour de la liste bien ordonnée des entités commit 66c4f0f83d4c5a1a6a0912e07b7a2d9bd9b6b20c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:26:30 2016 +0100 Ajout des bases de tests pour la version 5.1 commit 5bd34d74a329c5844166c7338b0d45c3edfc917e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 11:55:31 2016 +0100 fix migrations commit 4e70d9004e0fd1c9777ff14ec207262ac6fdf3a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 11:38:56 2016 +0100 fix binding commit 1210affcadfd69b1d014c5cdd13ba5d79feacc2d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 10:52:51 2016 +0100 optimize dependencies commit 8708aaf9de6af6894ef8525332caa0cee8445acc Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 10:52:16 2016 +0100 Déplacements du moteur de migration dans le module entities commit 45bed333dfa309aa6615b62f2311475893c45d8c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 10:51:08 2016 +0100 Déplacement des call backs de version et utilisation de l'annotation MigrationVersion commit 79b7f977e2b5501d9900c1b62c10d0da49ffef56 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 10:49:05 2016 +0100 Déplacement des scripts de migration Summary of changes: application-swing-configuration/pom.xml | 2 + .../application/swing/ui/ObserveMainUIHandler.java | 3 + application-web-configuration/pom.xml | 2 + entities-migration/pom.xml | 4 - .../DataSourceMigrationForVersion_5_0.java | 116 +++++++++++++++++ .../DataSourceMigrationForVersion_5_1.java | 57 ++++---- ...ObserveMigrationCallBackForVersionResolver.java | 94 -------------- .../ObserveMigrationConfigurationProviderImpl.java | 144 --------------------- .../DataSourceMigrationForVersion_3_1.java | 15 ++- .../DataSourceMigrationForVersion_3_10.java | 7 +- .../DataSourceMigrationForVersion_3_11.java | 7 +- .../DataSourceMigrationForVersion_3_12.java | 7 +- .../DataSourceMigrationForVersion_3_14.java | 7 +- .../DataSourceMigrationForVersion_3_15.java | 7 +- .../DataSourceMigrationForVersion_3_16.java | 11 +- .../DataSourceMigrationForVersion_3_5.java | 7 +- .../DataSourceMigrationForVersion_3_7.java | 7 +- .../DataSourceMigrationForVersion_3_8.java | 7 +- .../DataSourceMigrationForVersion_3_9.java | 7 +- .../DataSourceMigrationForVersion_4_0.java | 7 +- .../DataSourceMigrationForVersion_4_0_1.java | 7 +- .../DataSourceMigrationForVersion_4_0_2.java | 7 +- .../DataSourceMigrationForVersion_4_0_4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 11 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 7 +- .../DataSourceMigrationForVersion_4_900.java | 73 ----------- .../DataSourceMigrationForVersion_4_901.java | 73 ----------- .../DataSourceMigrationForVersion_4_902.java | 73 ----------- .../DataSourceMigrationForVersion_4_903.java | 74 ----------- .../DataSourceMigrationForVersion_4_904.java | 70 ---------- .../DataSourceMigrationForVersion_4_905.java | 71 ---------- .../DataSourceMigrationForVersion_4_906.java | 81 ------------ .../DataSourceMigrationForVersion_5_0.java | 72 ----------- .../{ => 3.10}/V3_10_01_remove-person-H2.sql | 0 .../{ => 3.10}/V3_10_01_remove-person-PG.sql | 0 .../{ => 3.10}/V3_10_02_add-missing-fk-H2.sql | 0 .../{ => 3.10}/V3_10_02_add-missing-fk-PG.sql | 0 .../V3_10_03_increase-comment-field-H2.sql | 0 .../V3_10_03_increase-comment-field-PG.sql | 0 .../V3_10_04_fix-sensorDataFormat-H2.sql | 0 .../V3_10_04_fix-sensorDataFormat-PG.sql | 0 .../{ => 3.10}/V3_10_05_normalize-sections-H2.sql | 0 .../{ => 3.10}/V3_10_05_normalize-sections-PG.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 0 .../{ => 3.11}/V3_11_03_add-fpaZones-H2.sql | 0 .../{ => 3.11}/V3_11_03_add-fpaZones-PG.sql | 0 .../{ => 3.11}/V3_11_04_add-activity-ersId-H2.sql | 0 .../{ => 3.11}/V3_11_04_add-activity-ersId-PG.sql | 0 .../{ => 3.11}/V3_11_05_add-person-country-H2.sql | 0 .../{ => 3.11}/V3_11_05_add-person-country-PG.sql | 0 .../{ => 3.11}/V3_11_06_add-harbours-H2.sql | 0 .../{ => 3.11}/V3_11_06_add-harbours-PG.sql | 0 .../{ => 3.12}/V3_12_01_add-missing-boat-H2.sql | 0 .../{ => 3.12}/V3_12_01_add-missing-boat-PG.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 0 ...3_14_02_fix-targetsample-discarded-value-H2.sql | 0 ...3_14_02_fix-targetsample-discarded-value-PG.sql | 0 .../V3_14_03_remove-orphan-seine-sample-H2.sql | 0 .../V3_14_03_remove-orphan-seine-sample-PG.sql | 0 ...4_04_remove-targetlength-discarded-field-H2.sql | 0 ...4_04_remove-targetlength-discarded-field-PG.sql | 0 ..._15_01_change-tdr-integer-field-to-float-H2.sql | 0 ..._15_01_change-tdr-integer-field-to-float-PG.sql | 0 ..._15_02_remove-set-longline-length-fields-H2.sql | 0 ..._15_02_remove-set-longline-length-fields-PG.sql | 0 .../V3_15_03_remove-brancheline-fields-H2.sql | 0 .../V3_15_03_remove-brancheline-fields-PG.sql | 0 .../V3_16_01_add-gear-referential-H2.sql | 0 .../V3_16_01_add-gear-referential-PG.sql | 0 .../{ => 3.16}/V3_16_02_add-gear-data-H2.sql | 0 .../{ => 3.16}/V3_16_02_add-gear-data-PG.sql | 0 .../V3_16_03_remove-tripSeine-seine-H2.sql | 0 .../V3_16_03_remove-tripSeine-seine-PG.sql | 0 .../migration/{ => 3.5}/V3_5_01_migration-H2.sql | 0 .../migration/{ => 3.5}/V3_5_01_migration-PG.sql | 0 .../{ => 3.5}/V3_5_02_add-longline-schema-H2.sql | 0 .../{ => 3.5}/V3_5_02_add-longline-schema-PG.sql | 0 .../V3_5_03_update-common-references-H2.sql | 0 .../V3_5_03_update-common-references-PG.sql | 0 .../V3_5_04_add-longline-references-H2.sql | 0 .../V3_5_04_add-longline-references-PG.sql | 0 .../{ => 3.7}/V3_7_01_rename-seine-model-H2.sql | 0 .../{ => 3.7}/V3_7_01_rename-seine-model-PG.sql | 0 .../{ => 3.7}/V3_7_02_remove-trip-organism-H2.sql | 0 .../{ => 3.7}/V3_7_02_remove-trip-organism-PG.sql | 0 .../V3_7_03_add-referential-needComment-H2.sql | 0 .../V3_7_03_add-referential-needComment-PG.sql | 0 .../V3_7_04_normalize-triplongline-H2.sql | 0 .../V3_7_04_normalize-triplongline-PG.sql | 0 .../V3_7_05_normalize-activitylongline-H2.sql | 0 .../V3_7_05_normalize-activitylongline-PG.sql | 0 .../{ => 3.7}/V3_7_06_normalize-setlongline-H2.sql | 0 .../{ => 3.7}/V3_7_06_normalize-setlongline-PG.sql | 0 .../V3_7_07_normalize-catchlongline-H2.sql | 0 .../V3_7_07_normalize-catchlongline-PG.sql | 0 .../{ => 3.7}/V3_7_08_normalize-tdr-H2.sql | 0 .../{ => 3.7}/V3_7_08_normalize-tdr-PG.sql | 0 .../{ => 3.7}/V3_7_09_add-species-list-H2.sql | 0 .../{ => 3.7}/V3_7_09_add-species-list-PG.sql | 0 .../V3_7_10_increase-comment-field-H2.sql | 0 .../V3_7_10_increase-comment-field-PG.sql | 0 .../migration/{ => 3.8}/V3_8_01_fix-person-H2.sql | 0 .../migration/{ => 3.8}/V3_8_01_fix-person-PG.sql | 0 .../V3_8_02_fix-branchelinecomposition-H2.sql | 0 .../V3_8_02_fix-branchelinecomposition-PG.sql | 0 .../{ => 3.8}/V3_8_03_normalize-sensorused-H2.sql | 0 .../{ => 3.8}/V3_8_03_normalize-sensorused-PG.sql | 0 .../{ => 3.8}/V3_8_04_normalize-tdr-H2.sql | 0 .../{ => 3.8}/V3_8_04_normalize-tdr-PG.sql | 0 .../V3_9_01_add-dataFilename-attribute-H2.sql | 0 .../V3_9_01_add-dataFilename-attribute-PG.sql | 0 .../{ => 3.9}/V3_9_02_fill-sensorDataFormat-H2.sql | 0 .../{ => 3.9}/V3_9_02_fill-sensorDataFormat-PG.sql | 0 .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 0 .../V4_0_RC_4_01_add-gear-data-H2.sql | 0 .../V4_0_RC_4_01_add-gear-data-PG.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 0 .../V4_0_1_01_remove-gender-column-H2.sql | 0 .../{ => 4.0.1}/V4_0_1_02_add-missing-fk-H2.sql | 0 .../{ => 4.0.1}/V4_0_1_02_add-missing-fk-PG.sql | 0 .../V4_0_2_01_remove-gender-column-PG.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 0 .../db/migration/{ => 4.0}/V4_0_01_empty-H2.sql | 0 .../db/migration/{ => 4.0}/V4_0_01_empty-PG.sql | 0 .../{ => 5.0}/V4_900_01_remove_open_field-H2.sql | 0 .../{ => 5.0}/V4_900_01_remove_open_field-PG.sql | 0 .../V4_901_01_add_lastUpdateDate_field-H2.sql | 0 .../V4_901_01_add_lastUpdateDate_field-PG.sql | 0 .../V4_902_01_add_lastUpdateDate_table-H2.sql | 0 .../V4_902_01_add_lastUpdateDate_table-PG.sql | 0 .../{ => 5.0}/V4_903_01_remove_unit_field-H2.sql | 0 .../{ => 5.0}/V4_903_01_remove_unit_field-PG.sql | 0 .../{ => 5.0}/V4_903_02_remove_gender_field-H2.sql | 0 .../{ => 5.0}/V4_903_02_remove_gender_field-PG.sql | 0 .../V4_903_03_remove_duplicate_rows-H2.sql | 0 .../V4_903_03_remove_duplicate_rows-PG.sql | 0 ...drop_not_null_constraint_gearUseFeatures-H2.sql | 0 ...drop_not_null_constraint_gearUseFeatures-PG.sql | 0 ...p_not_null_constraint_hauling_identifier-H2.sql | 0 ...p_not_null_constraint_hauling_identifier-PG.sql | 0 .../V4_906_01_add_non_target_length_sex_fk-H2.sql | 0 .../V4_906_01_add_non_target_length_sex_fk-PG.sql | 0 .../V5_1_01_evol_8374_delete_sonarUsed-H2.sql | 0 .../V5_1_01_evol_8374_delete_sonarUsed-PG.sql | 0 .../V5_1_02_evol_7886_catch_add_set_idx-H2.sql | 0 .../V5_1_02_evol_7886_catch_add_set_idx-PG.sql | 0 ..._1_03_evol_6997_delete_supportVesselName-H2.sql | 0 ..._1_03_evol_6997_delete_supportVesselName-PG.sql | 0 ...ranchlineComposition_add_tracelineLength-H2.sql | 0 ...ranchlineComposition_add_tracelineLength-PG.sql | 0 ...5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql | 0 ...5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql | 0 .../V5_1_06_evol_8375_setSeine_add_booleans-H2.sql | 0 .../V5_1_06_evol_8375_setSeine_add_booleans-PG.sql | 0 .../V5_1_07_evol_8389_rename_source_columns-H2.sql | 0 .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 0 .../V5_1_08_evol_8390_measure_type-H2.sql | 0 .../V5_1_08_evol_8390_measure_type-PG.sql | 0 .../V5_1_09_evol_7877_targetLength_add_sex-H2.sql | 0 .../V5_1_09_evol_7877_targetLength_add_sex-PG.sql | 0 ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 0 ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 0 .../V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 0 .../V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 0 .../V5_1_12_evol_8475_vessel_add_fields-H2.sql | 0 .../V5_1_12_evol_8475_vessel_add_fields-PG.sql | 0 .../V5_1_13_evol_7901_add_armateur_table-H2.sql | 0 .../V5_1_13_evol_7901_add_armateur_table-PG.sql | 0 ...ol_8196_lengthWeightParameter_add_source-H2.sql | 0 ...ol_8196_lengthWeightParameter_add_source-PG.sql | 0 ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 0 ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 0 ...5_1_16_evol_8377_speciesFate_add_discard-H2.sql | 0 ...5_1_16_evol_8377_speciesFate_add_discard-PG.sql | 0 entities/pom.xml | 4 + .../java/fr/ird/observe/entities/Entities.java | 6 +- .../migration/AbstractDataSourceMigration.java | 5 - .../AbstractObserveMigrationCallBack.java | 20 +-- .../entities/migration/H2DataSourceMigration.java | 0 .../entities/migration/MigrationVersion.java | 20 +++ ...ObserveMigrationCallBackForVersionResolver.java | 87 +++++++++++++ .../ObserveMigrationConfigurationProvider.java | 105 ++++++++++++--- .../entities/migration/PGDataSourceMigration.java | 0 pom.xml | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 12 +- .../topia/binder/data/DataBinderSupport.java | 2 +- .../topia/binder/data/NonTargetLengthBinder.java | 8 +- .../topia/binder/data/TargetCatchBinder.java | 6 + .../topia/binder/BinderEngineMetadataTest.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../topia/service/MigrateTestsDatabases.java | 11 ++ .../UnidirectionalSynchronizeReferentialTest.java | 4 + .../actions/validate/ValidateServiceTopiaTest.java | 42 +++--- .../java/fr/ird/observe/test/ObserveFixtures.java | 7 +- .../resources/db/5.1/dataForTestLongline.sql.gz | Bin 0 -> 1626691 bytes .../main/resources/db/5.1/dataForTestSeine.sql.gz | Bin 0 -> 455040 bytes test/src/main/resources/db/5.1/empty_h2.sql.gz | Bin 0 -> 6193 bytes test/src/main/resources/db/5.1/empty_pg.sql.gz | Bin 0 -> 6188 bytes test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 0 -> 143865 bytes test/src/main/resources/observetest.properties | 2 +- 219 files changed, 530 insertions(+), 984 deletions(-) create mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => }/DataSourceMigrationForVersion_5_1.java (83%) delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_1.java (89%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_10.java (90%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_11.java (90%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_12.java (89%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_14.java (90%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_15.java (90%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_16.java (94%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_5.java (97%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_7.java (91%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_8.java (90%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_3_9.java (90%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_4_0.java (90%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_4_0_1.java (97%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_4_0_2.java (90%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_4_0_4.java (90%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_4_0_RC2.java (92%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_4_0_RC3.java (97%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_4_0_RC4.java (89%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_4_0_RC6.java (89%) rename entities-migration/src/main/java/fr/ird/observe/entities/migration/{versions => old}/DataSourceMigrationForVersion_4_0_RC7.java (90%) delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java delete mode 100644 entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_01_remove-person-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_01_remove-person-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_02_add-missing-fk-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_02_add-missing-fk-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_03_increase-comment-field-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_03_increase-comment-field-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_04_fix-sensorDataFormat-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_04_fix-sensorDataFormat-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_05_normalize-sections-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.10}/V3_10_05_normalize-sections-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_02_add-country-on-transmitting-buoy-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_02_add-country-on-transmitting-buoy-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_03_add-fpaZones-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_03_add-fpaZones-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_04_add-activity-ersId-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_04_add-activity-ersId-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_05_add-person-country-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_05_add-person-country-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_06_add-harbours-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.11}/V3_11_06_add-harbours-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.12}/V3_12_01_add-missing-boat-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.12}/V3_12_01_add-missing-boat-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.14}/V3_14_01_remove-hooksPerBasketCount-field-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.14}/V3_14_01_remove-hooksPerBasketCount-field-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.14}/V3_14_02_fix-targetsample-discarded-value-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.14}/V3_14_02_fix-targetsample-discarded-value-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.14}/V3_14_03_remove-orphan-seine-sample-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.14}/V3_14_03_remove-orphan-seine-sample-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.14}/V3_14_04_remove-targetlength-discarded-field-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.14}/V3_14_04_remove-targetlength-discarded-field-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.15}/V3_15_01_change-tdr-integer-field-to-float-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.15}/V3_15_01_change-tdr-integer-field-to-float-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.15}/V3_15_02_remove-set-longline-length-fields-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.15}/V3_15_02_remove-set-longline-length-fields-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.15}/V3_15_03_remove-brancheline-fields-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.15}/V3_15_03_remove-brancheline-fields-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.16}/V3_16_01_add-gear-referential-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.16}/V3_16_01_add-gear-referential-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.16}/V3_16_02_add-gear-data-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.16}/V3_16_02_add-gear-data-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.16}/V3_16_03_remove-tripSeine-seine-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.16}/V3_16_03_remove-tripSeine-seine-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.5}/V3_5_01_migration-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.5}/V3_5_01_migration-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.5}/V3_5_02_add-longline-schema-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.5}/V3_5_02_add-longline-schema-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.5}/V3_5_03_update-common-references-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.5}/V3_5_03_update-common-references-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.5}/V3_5_04_add-longline-references-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.5}/V3_5_04_add-longline-references-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_01_rename-seine-model-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_01_rename-seine-model-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_02_remove-trip-organism-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_02_remove-trip-organism-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_03_add-referential-needComment-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_03_add-referential-needComment-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_04_normalize-triplongline-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_04_normalize-triplongline-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_05_normalize-activitylongline-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_05_normalize-activitylongline-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_06_normalize-setlongline-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_06_normalize-setlongline-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_07_normalize-catchlongline-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_07_normalize-catchlongline-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_08_normalize-tdr-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_08_normalize-tdr-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_09_add-species-list-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_09_add-species-list-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_10_increase-comment-field-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.7}/V3_7_10_increase-comment-field-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.8}/V3_8_01_fix-person-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.8}/V3_8_01_fix-person-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.8}/V3_8_02_fix-branchelinecomposition-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.8}/V3_8_02_fix-branchelinecomposition-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.8}/V3_8_03_normalize-sensorused-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.8}/V3_8_03_normalize-sensorused-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.8}/V3_8_04_normalize-tdr-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.8}/V3_8_04_normalize-tdr-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.9}/V3_9_01_add-dataFilename-attribute-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.9}/V3_9_01_add-dataFilename-attribute-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.9}/V3_9_02_fill-sensorDataFormat-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 3.9}/V3_9_02_fill-sensorDataFormat-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-2}/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-2}/V4_0_RC_2_01_clean-program-gear-type-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-2}/V4_0_RC_2_01_clean-program-gear-type-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-2}/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-2}/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-2}/V4_0_RC_2_03_rename-unknown-longliner-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-2}/V4_0_RC_2_03_rename-unknown-longliner-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-4}/V4_0_RC_4_01_add-gear-data-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-4}/V4_0_RC_4_01_add-gear-data-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-6}/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-6}/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-7}/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-7}/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-7}/V4_0_RC_7_02_rename-unknown-longliner-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0-RC-7}/V4_0_RC_7_02_rename-unknown-longliner-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0.1}/V4_0_1_01_remove-gender-column-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0.1}/V4_0_1_02_add-missing-fk-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0.1}/V4_0_1_02_add-missing-fk-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0.2}/V4_0_2_01_remove-gender-column-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0.4}/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0.4}/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0}/V4_0_01_empty-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 4.0}/V4_0_01_empty-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_900_01_remove_open_field-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_900_01_remove_open_field-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_901_01_add_lastUpdateDate_field-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_901_01_add_lastUpdateDate_field-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_902_01_add_lastUpdateDate_table-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_902_01_add_lastUpdateDate_table-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_903_01_remove_unit_field-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_903_01_remove_unit_field-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_903_02_remove_gender_field-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_903_02_remove_gender_field-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_903_03_remove_duplicate_rows-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_903_03_remove_duplicate_rows-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_906_01_add_non_target_length_sex_fk-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.0}/V4_906_01_add_non_target_length_sex_fk-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_01_evol_8374_delete_sonarUsed-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_01_evol_8374_delete_sonarUsed-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_02_evol_7886_catch_add_set_idx-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_02_evol_7886_catch_add_set_idx-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_03_evol_6997_delete_supportVesselName-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_03_evol_6997_delete_supportVesselName-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_07_evol_8389_rename_source_columns-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_07_evol_8389_rename_source_columns-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_08_evol_8390_measure_type-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_08_evol_8390_measure_type-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_09_evol_7877_targetLength_add_sex-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_09_evol_7877_targetLength_add_sex-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_11_evol_8571_length_add_tagNumber-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_11_evol_8571_length_add_tagNumber-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_12_evol_8475_vessel_add_fields-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_12_evol_8475_vessel_add_fields-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_13_evol_7901_add_armateur_table-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_13_evol_7901_add_armateur_table-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql (100%) rename entities-migration/src/main/resources/db/migration/{ => 5.1}/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql (100%) rename {entities-migration => entities}/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java (90%) rename {entities-migration => entities}/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java (82%) rename {entities-migration => entities}/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java (100%) create mode 100644 entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersion.java create mode 100644 entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java rename {entities-migration => entities}/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java (100%) create mode 100644 test/src/main/resources/db/5.1/dataForTestLongline.sql.gz create mode 100644 test/src/main/resources/db/5.1/dataForTestSeine.sql.gz create mode 100644 test/src/main/resources/db/5.1/empty_h2.sql.gz create mode 100644 test/src/main/resources/db/5.1/empty_pg.sql.gz create mode 100644 test/src/main/resources/db/5.1/referentiel.sql.gz -- 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 79b7f977e2b5501d9900c1b62c10d0da49ffef56 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 10:49:05 2016 +0100 Déplacement des scripts de migration --- .../main/resources/db/migration/{ => 3.10}/V3_10_01_remove-person-H2.sql | 0 .../main/resources/db/migration/{ => 3.10}/V3_10_01_remove-person-PG.sql | 0 .../main/resources/db/migration/{ => 3.10}/V3_10_02_add-missing-fk-H2.sql | 0 .../main/resources/db/migration/{ => 3.10}/V3_10_02_add-missing-fk-PG.sql | 0 .../db/migration/{ => 3.10}/V3_10_03_increase-comment-field-H2.sql | 0 .../db/migration/{ => 3.10}/V3_10_03_increase-comment-field-PG.sql | 0 .../db/migration/{ => 3.10}/V3_10_04_fix-sensorDataFormat-H2.sql | 0 .../db/migration/{ => 3.10}/V3_10_04_fix-sensorDataFormat-PG.sql | 0 .../resources/db/migration/{ => 3.10}/V3_10_05_normalize-sections-H2.sql | 0 .../resources/db/migration/{ => 3.10}/V3_10_05_normalize-sections-PG.sql | 0 .../{ => 3.11}/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql | 0 .../{ => 3.11}/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql | 0 .../migration/{ => 3.11}/V3_11_02_add-country-on-transmitting-buoy-H2.sql | 0 .../migration/{ => 3.11}/V3_11_02_add-country-on-transmitting-buoy-PG.sql | 0 .../main/resources/db/migration/{ => 3.11}/V3_11_03_add-fpaZones-H2.sql | 0 .../main/resources/db/migration/{ => 3.11}/V3_11_03_add-fpaZones-PG.sql | 0 .../resources/db/migration/{ => 3.11}/V3_11_04_add-activity-ersId-H2.sql | 0 .../resources/db/migration/{ => 3.11}/V3_11_04_add-activity-ersId-PG.sql | 0 .../resources/db/migration/{ => 3.11}/V3_11_05_add-person-country-H2.sql | 0 .../resources/db/migration/{ => 3.11}/V3_11_05_add-person-country-PG.sql | 0 .../main/resources/db/migration/{ => 3.11}/V3_11_06_add-harbours-H2.sql | 0 .../main/resources/db/migration/{ => 3.11}/V3_11_06_add-harbours-PG.sql | 0 .../resources/db/migration/{ => 3.12}/V3_12_01_add-missing-boat-H2.sql | 0 .../resources/db/migration/{ => 3.12}/V3_12_01_add-missing-boat-PG.sql | 0 .../migration/{ => 3.14}/V3_14_01_remove-hooksPerBasketCount-field-H2.sql | 0 .../migration/{ => 3.14}/V3_14_01_remove-hooksPerBasketCount-field-PG.sql | 0 .../migration/{ => 3.14}/V3_14_02_fix-targetsample-discarded-value-H2.sql | 0 .../migration/{ => 3.14}/V3_14_02_fix-targetsample-discarded-value-PG.sql | 0 .../db/migration/{ => 3.14}/V3_14_03_remove-orphan-seine-sample-H2.sql | 0 .../db/migration/{ => 3.14}/V3_14_03_remove-orphan-seine-sample-PG.sql | 0 .../{ => 3.14}/V3_14_04_remove-targetlength-discarded-field-H2.sql | 0 .../{ => 3.14}/V3_14_04_remove-targetlength-discarded-field-PG.sql | 0 .../{ => 3.15}/V3_15_01_change-tdr-integer-field-to-float-H2.sql | 0 .../{ => 3.15}/V3_15_01_change-tdr-integer-field-to-float-PG.sql | 0 .../{ => 3.15}/V3_15_02_remove-set-longline-length-fields-H2.sql | 0 .../{ => 3.15}/V3_15_02_remove-set-longline-length-fields-PG.sql | 0 .../db/migration/{ => 3.15}/V3_15_03_remove-brancheline-fields-H2.sql | 0 .../db/migration/{ => 3.15}/V3_15_03_remove-brancheline-fields-PG.sql | 0 .../db/migration/{ => 3.16}/V3_16_01_add-gear-referential-H2.sql | 0 .../db/migration/{ => 3.16}/V3_16_01_add-gear-referential-PG.sql | 0 .../main/resources/db/migration/{ => 3.16}/V3_16_02_add-gear-data-H2.sql | 0 .../main/resources/db/migration/{ => 3.16}/V3_16_02_add-gear-data-PG.sql | 0 .../db/migration/{ => 3.16}/V3_16_03_remove-tripSeine-seine-H2.sql | 0 .../db/migration/{ => 3.16}/V3_16_03_remove-tripSeine-seine-PG.sql | 0 .../src/main/resources/db/migration/{ => 3.5}/V3_5_01_migration-H2.sql | 0 .../src/main/resources/db/migration/{ => 3.5}/V3_5_01_migration-PG.sql | 0 .../resources/db/migration/{ => 3.5}/V3_5_02_add-longline-schema-H2.sql | 0 .../resources/db/migration/{ => 3.5}/V3_5_02_add-longline-schema-PG.sql | 0 .../db/migration/{ => 3.5}/V3_5_03_update-common-references-H2.sql | 0 .../db/migration/{ => 3.5}/V3_5_03_update-common-references-PG.sql | 0 .../db/migration/{ => 3.5}/V3_5_04_add-longline-references-H2.sql | 0 .../db/migration/{ => 3.5}/V3_5_04_add-longline-references-PG.sql | 0 .../resources/db/migration/{ => 3.7}/V3_7_01_rename-seine-model-H2.sql | 0 .../resources/db/migration/{ => 3.7}/V3_7_01_rename-seine-model-PG.sql | 0 .../resources/db/migration/{ => 3.7}/V3_7_02_remove-trip-organism-H2.sql | 0 .../resources/db/migration/{ => 3.7}/V3_7_02_remove-trip-organism-PG.sql | 0 .../db/migration/{ => 3.7}/V3_7_03_add-referential-needComment-H2.sql | 0 .../db/migration/{ => 3.7}/V3_7_03_add-referential-needComment-PG.sql | 0 .../db/migration/{ => 3.7}/V3_7_04_normalize-triplongline-H2.sql | 0 .../db/migration/{ => 3.7}/V3_7_04_normalize-triplongline-PG.sql | 0 .../db/migration/{ => 3.7}/V3_7_05_normalize-activitylongline-H2.sql | 0 .../db/migration/{ => 3.7}/V3_7_05_normalize-activitylongline-PG.sql | 0 .../resources/db/migration/{ => 3.7}/V3_7_06_normalize-setlongline-H2.sql | 0 .../resources/db/migration/{ => 3.7}/V3_7_06_normalize-setlongline-PG.sql | 0 .../db/migration/{ => 3.7}/V3_7_07_normalize-catchlongline-H2.sql | 0 .../db/migration/{ => 3.7}/V3_7_07_normalize-catchlongline-PG.sql | 0 .../main/resources/db/migration/{ => 3.7}/V3_7_08_normalize-tdr-H2.sql | 0 .../main/resources/db/migration/{ => 3.7}/V3_7_08_normalize-tdr-PG.sql | 0 .../main/resources/db/migration/{ => 3.7}/V3_7_09_add-species-list-H2.sql | 0 .../main/resources/db/migration/{ => 3.7}/V3_7_09_add-species-list-PG.sql | 0 .../db/migration/{ => 3.7}/V3_7_10_increase-comment-field-H2.sql | 0 .../db/migration/{ => 3.7}/V3_7_10_increase-comment-field-PG.sql | 0 .../src/main/resources/db/migration/{ => 3.8}/V3_8_01_fix-person-H2.sql | 0 .../src/main/resources/db/migration/{ => 3.8}/V3_8_01_fix-person-PG.sql | 0 .../db/migration/{ => 3.8}/V3_8_02_fix-branchelinecomposition-H2.sql | 0 .../db/migration/{ => 3.8}/V3_8_02_fix-branchelinecomposition-PG.sql | 0 .../resources/db/migration/{ => 3.8}/V3_8_03_normalize-sensorused-H2.sql | 0 .../resources/db/migration/{ => 3.8}/V3_8_03_normalize-sensorused-PG.sql | 0 .../main/resources/db/migration/{ => 3.8}/V3_8_04_normalize-tdr-H2.sql | 0 .../main/resources/db/migration/{ => 3.8}/V3_8_04_normalize-tdr-PG.sql | 0 .../db/migration/{ => 3.9}/V3_9_01_add-dataFilename-attribute-H2.sql | 0 .../db/migration/{ => 3.9}/V3_9_01_add-dataFilename-attribute-PG.sql | 0 .../resources/db/migration/{ => 3.9}/V3_9_02_fill-sensorDataFormat-H2.sql | 0 .../resources/db/migration/{ => 3.9}/V3_9_02_fill-sensorDataFormat-PG.sql | 0 .../migration/{ => 4.0-RC-2}/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 0 .../migration/{ => 4.0-RC-2}/V4_0_RC_2_01_clean-program-gear-type-H2.sql | 0 .../migration/{ => 4.0-RC-2}/V4_0_RC_2_01_clean-program-gear-type-PG.sql | 0 .../{ => 4.0-RC-2}/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 0 .../{ => 4.0-RC-2}/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 0 .../migration/{ => 4.0-RC-2}/V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 0 .../migration/{ => 4.0-RC-2}/V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 0 .../db/migration/{ => 4.0-RC-4}/V4_0_RC_4_01_add-gear-data-H2.sql | 0 .../db/migration/{ => 4.0-RC-4}/V4_0_RC_4_01_add-gear-data-PG.sql | 0 .../{ => 4.0-RC-6}/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 0 .../{ => 4.0-RC-6}/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 0 .../{ => 4.0-RC-7}/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 0 .../{ => 4.0-RC-7}/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 0 .../migration/{ => 4.0-RC-7}/V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 0 .../migration/{ => 4.0-RC-7}/V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 0 .../db/migration/{ => 4.0.1}/V4_0_1_01_remove-gender-column-H2.sql | 0 .../resources/db/migration/{ => 4.0.1}/V4_0_1_02_add-missing-fk-H2.sql | 0 .../resources/db/migration/{ => 4.0.1}/V4_0_1_02_add-missing-fk-PG.sql | 0 .../db/migration/{ => 4.0.2}/V4_0_2_01_remove-gender-column-PG.sql | 0 .../{ => 4.0.4}/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql | 0 .../{ => 4.0.4}/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql | 0 .../src/main/resources/db/migration/{ => 4.0}/V4_0_01_empty-H2.sql | 0 .../src/main/resources/db/migration/{ => 4.0}/V4_0_01_empty-PG.sql | 0 .../resources/db/migration/{ => 5.0}/V4_900_01_remove_open_field-H2.sql | 0 .../resources/db/migration/{ => 5.0}/V4_900_01_remove_open_field-PG.sql | 0 .../db/migration/{ => 5.0}/V4_901_01_add_lastUpdateDate_field-H2.sql | 0 .../db/migration/{ => 5.0}/V4_901_01_add_lastUpdateDate_field-PG.sql | 0 .../db/migration/{ => 5.0}/V4_902_01_add_lastUpdateDate_table-H2.sql | 0 .../db/migration/{ => 5.0}/V4_902_01_add_lastUpdateDate_table-PG.sql | 0 .../resources/db/migration/{ => 5.0}/V4_903_01_remove_unit_field-H2.sql | 0 .../resources/db/migration/{ => 5.0}/V4_903_01_remove_unit_field-PG.sql | 0 .../resources/db/migration/{ => 5.0}/V4_903_02_remove_gender_field-H2.sql | 0 .../resources/db/migration/{ => 5.0}/V4_903_02_remove_gender_field-PG.sql | 0 .../db/migration/{ => 5.0}/V4_903_03_remove_duplicate_rows-H2.sql | 0 .../db/migration/{ => 5.0}/V4_903_03_remove_duplicate_rows-PG.sql | 0 .../{ => 5.0}/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql | 0 .../{ => 5.0}/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql | 0 .../V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql | 0 .../V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql | 0 .../db/migration/{ => 5.0}/V4_906_01_add_non_target_length_sex_fk-H2.sql | 0 .../db/migration/{ => 5.0}/V4_906_01_add_non_target_length_sex_fk-PG.sql | 0 .../db/migration/{ => 5.1}/V5_1_01_evol_8374_delete_sonarUsed-H2.sql | 0 .../db/migration/{ => 5.1}/V5_1_01_evol_8374_delete_sonarUsed-PG.sql | 0 .../db/migration/{ => 5.1}/V5_1_02_evol_7886_catch_add_set_idx-H2.sql | 0 .../db/migration/{ => 5.1}/V5_1_02_evol_7886_catch_add_set_idx-PG.sql | 0 .../migration/{ => 5.1}/V5_1_03_evol_6997_delete_supportVesselName-H2.sql | 0 .../migration/{ => 5.1}/V5_1_03_evol_6997_delete_supportVesselName-PG.sql | 0 .../V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql | 0 .../V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql | 0 .../migration/{ => 5.1}/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql | 0 .../migration/{ => 5.1}/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql | 0 .../db/migration/{ => 5.1}/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql | 0 .../db/migration/{ => 5.1}/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql | 0 .../db/migration/{ => 5.1}/V5_1_07_evol_8389_rename_source_columns-H2.sql | 0 .../db/migration/{ => 5.1}/V5_1_07_evol_8389_rename_source_columns-PG.sql | 0 .../db/migration/{ => 5.1}/V5_1_08_evol_8390_measure_type-H2.sql | 0 .../db/migration/{ => 5.1}/V5_1_08_evol_8390_measure_type-PG.sql | 0 .../db/migration/{ => 5.1}/V5_1_09_evol_7877_targetLength_add_sex-H2.sql | 0 .../db/migration/{ => 5.1}/V5_1_09_evol_7877_targetLength_add_sex-PG.sql | 0 .../{ => 5.1}/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql | 0 .../{ => 5.1}/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql | 0 .../db/migration/{ => 5.1}/V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 0 .../db/migration/{ => 5.1}/V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 0 .../db/migration/{ => 5.1}/V5_1_12_evol_8475_vessel_add_fields-H2.sql | 0 .../db/migration/{ => 5.1}/V5_1_12_evol_8475_vessel_add_fields-PG.sql | 0 .../db/migration/{ => 5.1}/V5_1_13_evol_7901_add_armateur_table-H2.sql | 0 .../db/migration/{ => 5.1}/V5_1_13_evol_7901_add_armateur_table-PG.sql | 0 .../{ => 5.1}/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql | 0 .../{ => 5.1}/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql | 0 .../{ => 5.1}/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql | 0 .../{ => 5.1}/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql | 0 .../migration/{ => 5.1}/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql | 0 .../migration/{ => 5.1}/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql | 0 157 files changed, 0 insertions(+), 0 deletions(-) diff --git a/entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_01_remove-person-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-H2.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_01_remove-person-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_01_remove-person-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_01_remove-person-PG.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_01_remove-person-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_02_add-missing-fk-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-H2.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_02_add-missing-fk-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_02_add-missing-fk-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_02_add-missing-fk-PG.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_02_add-missing-fk-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_03_increase-comment-field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-H2.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_03_increase-comment-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_03_increase-comment-field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_03_increase-comment-field-PG.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_03_increase-comment-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_04_fix-sensorDataFormat-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-H2.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_04_fix-sensorDataFormat-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_04_fix-sensorDataFormat-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_04_fix-sensorDataFormat-PG.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_04_fix-sensorDataFormat-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_05_normalize-sections-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-H2.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_05_normalize-sections-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql b/entities-migration/src/main/resources/db/migration/3.10/V3_10_05_normalize-sections-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_10_05_normalize-sections-PG.sql rename to entities-migration/src/main/resources/db/migration/3.10/V3_10_05_normalize-sections-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_02_add-country-on-transmitting-buoy-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_02_add-country-on-transmitting-buoy-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_02_add-country-on-transmitting-buoy-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_02_add-country-on-transmitting-buoy-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_03_add-fpaZones-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-H2.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_03_add-fpaZones-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_03_add-fpaZones-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_03_add-fpaZones-PG.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_03_add-fpaZones-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_04_add-activity-ersId-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-H2.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_04_add-activity-ersId-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_04_add-activity-ersId-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_04_add-activity-ersId-PG.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_04_add-activity-ersId-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_05_add-person-country-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-H2.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_05_add-person-country-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_05_add-person-country-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_05_add-person-country-PG.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_05_add-person-country-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_06_add-harbours-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-H2.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_06_add-harbours-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql b/entities-migration/src/main/resources/db/migration/3.11/V3_11_06_add-harbours-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_11_06_add-harbours-PG.sql rename to entities-migration/src/main/resources/db/migration/3.11/V3_11_06_add-harbours-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql b/entities-migration/src/main/resources/db/migration/3.12/V3_12_01_add-missing-boat-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-H2.sql rename to entities-migration/src/main/resources/db/migration/3.12/V3_12_01_add-missing-boat-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql b/entities-migration/src/main/resources/db/migration/3.12/V3_12_01_add-missing-boat-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_12_01_add-missing-boat-PG.sql rename to entities-migration/src/main/resources/db/migration/3.12/V3_12_01_add-missing-boat-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql b/entities-migration/src/main/resources/db/migration/3.14/V3_14_01_remove-hooksPerBasketCount-field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql rename to entities-migration/src/main/resources/db/migration/3.14/V3_14_01_remove-hooksPerBasketCount-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql b/entities-migration/src/main/resources/db/migration/3.14/V3_14_01_remove-hooksPerBasketCount-field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql rename to entities-migration/src/main/resources/db/migration/3.14/V3_14_01_remove-hooksPerBasketCount-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql b/entities-migration/src/main/resources/db/migration/3.14/V3_14_02_fix-targetsample-discarded-value-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-H2.sql rename to entities-migration/src/main/resources/db/migration/3.14/V3_14_02_fix-targetsample-discarded-value-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql b/entities-migration/src/main/resources/db/migration/3.14/V3_14_02_fix-targetsample-discarded-value-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_14_02_fix-targetsample-discarded-value-PG.sql rename to entities-migration/src/main/resources/db/migration/3.14/V3_14_02_fix-targetsample-discarded-value-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql b/entities-migration/src/main/resources/db/migration/3.14/V3_14_03_remove-orphan-seine-sample-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-H2.sql rename to entities-migration/src/main/resources/db/migration/3.14/V3_14_03_remove-orphan-seine-sample-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql b/entities-migration/src/main/resources/db/migration/3.14/V3_14_03_remove-orphan-seine-sample-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_14_03_remove-orphan-seine-sample-PG.sql rename to entities-migration/src/main/resources/db/migration/3.14/V3_14_03_remove-orphan-seine-sample-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql b/entities-migration/src/main/resources/db/migration/3.14/V3_14_04_remove-targetlength-discarded-field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-H2.sql rename to entities-migration/src/main/resources/db/migration/3.14/V3_14_04_remove-targetlength-discarded-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql b/entities-migration/src/main/resources/db/migration/3.14/V3_14_04_remove-targetlength-discarded-field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_14_04_remove-targetlength-discarded-field-PG.sql rename to entities-migration/src/main/resources/db/migration/3.14/V3_14_04_remove-targetlength-discarded-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql b/entities-migration/src/main/resources/db/migration/3.15/V3_15_01_change-tdr-integer-field-to-float-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql rename to entities-migration/src/main/resources/db/migration/3.15/V3_15_01_change-tdr-integer-field-to-float-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql b/entities-migration/src/main/resources/db/migration/3.15/V3_15_01_change-tdr-integer-field-to-float-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql rename to entities-migration/src/main/resources/db/migration/3.15/V3_15_01_change-tdr-integer-field-to-float-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql b/entities-migration/src/main/resources/db/migration/3.15/V3_15_02_remove-set-longline-length-fields-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-H2.sql rename to entities-migration/src/main/resources/db/migration/3.15/V3_15_02_remove-set-longline-length-fields-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql b/entities-migration/src/main/resources/db/migration/3.15/V3_15_02_remove-set-longline-length-fields-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_15_02_remove-set-longline-length-fields-PG.sql rename to entities-migration/src/main/resources/db/migration/3.15/V3_15_02_remove-set-longline-length-fields-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql b/entities-migration/src/main/resources/db/migration/3.15/V3_15_03_remove-brancheline-fields-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-H2.sql rename to entities-migration/src/main/resources/db/migration/3.15/V3_15_03_remove-brancheline-fields-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql b/entities-migration/src/main/resources/db/migration/3.15/V3_15_03_remove-brancheline-fields-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_15_03_remove-brancheline-fields-PG.sql rename to entities-migration/src/main/resources/db/migration/3.15/V3_15_03_remove-brancheline-fields-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql b/entities-migration/src/main/resources/db/migration/3.16/V3_16_01_add-gear-referential-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-H2.sql rename to entities-migration/src/main/resources/db/migration/3.16/V3_16_01_add-gear-referential-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql b/entities-migration/src/main/resources/db/migration/3.16/V3_16_01_add-gear-referential-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_16_01_add-gear-referential-PG.sql rename to entities-migration/src/main/resources/db/migration/3.16/V3_16_01_add-gear-referential-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql b/entities-migration/src/main/resources/db/migration/3.16/V3_16_02_add-gear-data-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-H2.sql rename to entities-migration/src/main/resources/db/migration/3.16/V3_16_02_add-gear-data-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql b/entities-migration/src/main/resources/db/migration/3.16/V3_16_02_add-gear-data-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_16_02_add-gear-data-PG.sql rename to entities-migration/src/main/resources/db/migration/3.16/V3_16_02_add-gear-data-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql b/entities-migration/src/main/resources/db/migration/3.16/V3_16_03_remove-tripSeine-seine-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-H2.sql rename to entities-migration/src/main/resources/db/migration/3.16/V3_16_03_remove-tripSeine-seine-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql b/entities-migration/src/main/resources/db/migration/3.16/V3_16_03_remove-tripSeine-seine-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_16_03_remove-tripSeine-seine-PG.sql rename to entities-migration/src/main/resources/db/migration/3.16/V3_16_03_remove-tripSeine-seine-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_5_01_migration-H2.sql b/entities-migration/src/main/resources/db/migration/3.5/V3_5_01_migration-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_5_01_migration-H2.sql rename to entities-migration/src/main/resources/db/migration/3.5/V3_5_01_migration-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_5_01_migration-PG.sql b/entities-migration/src/main/resources/db/migration/3.5/V3_5_01_migration-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_5_01_migration-PG.sql rename to entities-migration/src/main/resources/db/migration/3.5/V3_5_01_migration-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql b/entities-migration/src/main/resources/db/migration/3.5/V3_5_02_add-longline-schema-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-H2.sql rename to entities-migration/src/main/resources/db/migration/3.5/V3_5_02_add-longline-schema-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql b/entities-migration/src/main/resources/db/migration/3.5/V3_5_02_add-longline-schema-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_5_02_add-longline-schema-PG.sql rename to entities-migration/src/main/resources/db/migration/3.5/V3_5_02_add-longline-schema-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql b/entities-migration/src/main/resources/db/migration/3.5/V3_5_03_update-common-references-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-H2.sql rename to entities-migration/src/main/resources/db/migration/3.5/V3_5_03_update-common-references-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql b/entities-migration/src/main/resources/db/migration/3.5/V3_5_03_update-common-references-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_5_03_update-common-references-PG.sql rename to entities-migration/src/main/resources/db/migration/3.5/V3_5_03_update-common-references-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql b/entities-migration/src/main/resources/db/migration/3.5/V3_5_04_add-longline-references-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-H2.sql rename to entities-migration/src/main/resources/db/migration/3.5/V3_5_04_add-longline-references-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql b/entities-migration/src/main/resources/db/migration/3.5/V3_5_04_add-longline-references-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_5_04_add-longline-references-PG.sql rename to entities-migration/src/main/resources/db/migration/3.5/V3_5_04_add-longline-references-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_01_rename-seine-model-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_01_rename-seine-model-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_01_rename-seine-model-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_01_rename-seine-model-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_01_rename-seine-model-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_02_remove-trip-organism-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_02_remove-trip-organism-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_02_remove-trip-organism-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_02_remove-trip-organism-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_02_remove-trip-organism-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_03_add-referential-needComment-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_03_add-referential-needComment-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_03_add-referential-needComment-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_03_add-referential-needComment-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_03_add-referential-needComment-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_04_normalize-triplongline-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_04_normalize-triplongline-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_04_normalize-triplongline-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_04_normalize-triplongline-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_04_normalize-triplongline-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_05_normalize-activitylongline-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_05_normalize-activitylongline-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_05_normalize-activitylongline-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_05_normalize-activitylongline-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_05_normalize-activitylongline-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_06_normalize-setlongline-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_06_normalize-setlongline-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_06_normalize-setlongline-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_06_normalize-setlongline-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_06_normalize-setlongline-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_07_normalize-catchlongline-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_07_normalize-catchlongline-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_07_normalize-catchlongline-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_07_normalize-catchlongline-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_07_normalize-catchlongline-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_08_normalize-tdr-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_08_normalize-tdr-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_08_normalize-tdr-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_08_normalize-tdr-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_08_normalize-tdr-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_09_add-species-list-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_09_add-species-list-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_09_add-species-list-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_09_add-species-list-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_09_add-species-list-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_10_increase-comment-field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-H2.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_10_increase-comment-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql b/entities-migration/src/main/resources/db/migration/3.7/V3_7_10_increase-comment-field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_7_10_increase-comment-field-PG.sql rename to entities-migration/src/main/resources/db/migration/3.7/V3_7_10_increase-comment-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql b/entities-migration/src/main/resources/db/migration/3.8/V3_8_01_fix-person-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-H2.sql rename to entities-migration/src/main/resources/db/migration/3.8/V3_8_01_fix-person-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql b/entities-migration/src/main/resources/db/migration/3.8/V3_8_01_fix-person-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_8_01_fix-person-PG.sql rename to entities-migration/src/main/resources/db/migration/3.8/V3_8_01_fix-person-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql b/entities-migration/src/main/resources/db/migration/3.8/V3_8_02_fix-branchelinecomposition-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-H2.sql rename to entities-migration/src/main/resources/db/migration/3.8/V3_8_02_fix-branchelinecomposition-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql b/entities-migration/src/main/resources/db/migration/3.8/V3_8_02_fix-branchelinecomposition-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_8_02_fix-branchelinecomposition-PG.sql rename to entities-migration/src/main/resources/db/migration/3.8/V3_8_02_fix-branchelinecomposition-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql b/entities-migration/src/main/resources/db/migration/3.8/V3_8_03_normalize-sensorused-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-H2.sql rename to entities-migration/src/main/resources/db/migration/3.8/V3_8_03_normalize-sensorused-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql b/entities-migration/src/main/resources/db/migration/3.8/V3_8_03_normalize-sensorused-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_8_03_normalize-sensorused-PG.sql rename to entities-migration/src/main/resources/db/migration/3.8/V3_8_03_normalize-sensorused-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql b/entities-migration/src/main/resources/db/migration/3.8/V3_8_04_normalize-tdr-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-H2.sql rename to entities-migration/src/main/resources/db/migration/3.8/V3_8_04_normalize-tdr-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql b/entities-migration/src/main/resources/db/migration/3.8/V3_8_04_normalize-tdr-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_8_04_normalize-tdr-PG.sql rename to entities-migration/src/main/resources/db/migration/3.8/V3_8_04_normalize-tdr-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql b/entities-migration/src/main/resources/db/migration/3.9/V3_9_01_add-dataFilename-attribute-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-H2.sql rename to entities-migration/src/main/resources/db/migration/3.9/V3_9_01_add-dataFilename-attribute-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql b/entities-migration/src/main/resources/db/migration/3.9/V3_9_01_add-dataFilename-attribute-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_9_01_add-dataFilename-attribute-PG.sql rename to entities-migration/src/main/resources/db/migration/3.9/V3_9_01_add-dataFilename-attribute-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql b/entities-migration/src/main/resources/db/migration/3.9/V3_9_02_fill-sensorDataFormat-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-H2.sql rename to entities-migration/src/main/resources/db/migration/3.9/V3_9_02_fill-sensorDataFormat-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql b/entities-migration/src/main/resources/db/migration/3.9/V3_9_02_fill-sensorDataFormat-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V3_9_02_fill-sensorDataFormat-PG.sql rename to entities-migration/src/main/resources/db/migration/3.9/V3_9_02_fill-sensorDataFormat-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_4_01_add-gear-data-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql b/entities-migration/src/main/resources/db/migration/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql b/entities-migration/src/main/resources/db/migration/4.0.1/V4_0_1_01_remove-gender-column-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_1_01_remove-gender-column-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0.1/V4_0_1_01_remove-gender-column-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql b/entities-migration/src/main/resources/db/migration/4.0.1/V4_0_1_02_add-missing-fk-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0.1/V4_0_1_02_add-missing-fk-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql b/entities-migration/src/main/resources/db/migration/4.0.1/V4_0_1_02_add-missing-fk-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_1_02_add-missing-fk-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0.1/V4_0_1_02_add-missing-fk-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql b/entities-migration/src/main/resources/db/migration/4.0.2/V4_0_2_01_remove-gender-column-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_2_01_remove-gender-column-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0.2/V4_0_2_01_remove-gender-column-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql b/entities-migration/src/main/resources/db/migration/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql b/entities-migration/src/main/resources/db/migration/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_01_empty-H2.sql b/entities-migration/src/main/resources/db/migration/4.0/V4_0_01_empty-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_01_empty-H2.sql rename to entities-migration/src/main/resources/db/migration/4.0/V4_0_01_empty-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_0_01_empty-PG.sql b/entities-migration/src/main/resources/db/migration/4.0/V4_0_01_empty-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_0_01_empty-PG.sql rename to entities-migration/src/main/resources/db/migration/4.0/V4_0_01_empty-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_900_01_remove_open_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_900_01_remove_open_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_900_01_remove_open_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_900_01_remove_open_field-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_900_01_remove_open_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_901_01_add_lastUpdateDate_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_901_01_add_lastUpdateDate_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_901_01_add_lastUpdateDate_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_901_01_add_lastUpdateDate_field-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_901_01_add_lastUpdateDate_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_902_01_add_lastUpdateDate_table-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_902_01_add_lastUpdateDate_table-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_902_01_add_lastUpdateDate_table-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_902_01_add_lastUpdateDate_table-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_902_01_add_lastUpdateDate_table-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_903_01_remove_unit_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_903_01_remove_unit_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_903_01_remove_unit_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_903_01_remove_unit_field-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_903_01_remove_unit_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_903_02_remove_gender_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_903_02_remove_gender_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_903_02_remove_gender_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_903_02_remove_gender_field-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_903_02_remove_gender_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_903_03_remove_duplicate_rows-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_903_03_remove_duplicate_rows-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_903_03_remove_duplicate_rows-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_903_03_remove_duplicate_rows-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_903_03_remove_duplicate_rows-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_904_01_drop_not_null_constraint_gearUseFeatures-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_904_01_drop_not_null_constraint_gearUseFeatures-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_905_01_drop_not_null_constraint_hauling_identifier-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_905_01_drop_not_null_constraint_hauling_identifier-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-H2.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_906_01_add_non_target_length_sex_fk-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-H2.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_906_01_add_non_target_length_sex_fk-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-PG.sql b/entities-migration/src/main/resources/db/migration/5.0/V4_906_01_add_non_target_length_sex_fk-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V4_906_01_add_non_target_length_sex_fk-PG.sql rename to entities-migration/src/main/resources/db/migration/5.0/V4_906_01_add_non_target_length_sex_fk-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_01_evol_8374_delete_sonarUsed-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_01_evol_8374_delete_sonarUsed-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_01_evol_8374_delete_sonarUsed-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_01_evol_8374_delete_sonarUsed-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_01_evol_8374_delete_sonarUsed-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_01_evol_8374_delete_sonarUsed-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_01_evol_8374_delete_sonarUsed-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_01_evol_8374_delete_sonarUsed-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_02_evol_7886_catch_add_set_idx-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_02_evol_7886_catch_add_set_idx-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_02_evol_7886_catch_add_set_idx-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_02_evol_7886_catch_add_set_idx-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_02_evol_7886_catch_add_set_idx-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_02_evol_7886_catch_add_set_idx-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_02_evol_7886_catch_add_set_idx-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_02_evol_7886_catch_add_set_idx-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_03_evol_6997_delete_supportVesselName-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_03_evol_6997_delete_supportVesselName-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_03_evol_6997_delete_supportVesselName-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_03_evol_6997_delete_supportVesselName-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_03_evol_6997_delete_supportVesselName-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_06_evol_8375_setSeine_add_booleans-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_06_evol_8375_setSeine_add_booleans-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_07_evol_8389_rename_source_columns-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_07_evol_8389_rename_source_columns-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_08_evol_8390_measure_type-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_08_evol_8390_measure_type-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_09_evol_7877_targetLength_add_sex-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_09_evol_7877_targetLength_add_sex-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_09_evol_7877_targetLength_add_sex-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_09_evol_7877_targetLength_add_sex-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_09_evol_7877_targetLength_add_sex-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_09_evol_7877_targetLength_add_sex-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_09_evol_7877_targetLength_add_sex-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_09_evol_7877_targetLength_add_sex-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_10_evol_8391_species_add_sizeMeasureType-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_11_evol_8571_length_add_tagNumber-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_11_evol_8571_length_add_tagNumber-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_11_evol_8571_length_add_tagNumber-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_11_evol_8571_length_add_tagNumber-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_11_evol_8571_length_add_tagNumber-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_12_evol_8475_vessel_add_fields-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_12_evol_8475_vessel_add_fields-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_12_evol_8475_vessel_add_fields-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_12_evol_8475_vessel_add_fields-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_12_evol_8475_vessel_add_fields-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_13_evol_7901_add_armateur_table-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_13_evol_7901_add_armateur_table-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_13_evol_7901_add_armateur_table-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_13_evol_7901_add_armateur_table-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_13_evol_7901_add_armateur_table-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_14_evol_8196_lengthWeightParameter_add_source-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_15_evol_8578_nonTargetLength_add_speciesFate-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_16_evol_8377_speciesFate_add_discard-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql b/entities-migration/src/main/resources/db/migration/5.1/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql rename to entities-migration/src/main/resources/db/migration/5.1/V5_1_16_evol_8377_speciesFate_add_discard-PG.sql -- 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 45bed333dfa309aa6615b62f2311475893c45d8c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 10:51:08 2016 +0100 Déplacement des call backs de version et utilisation de l'annotation MigrationVersion --- .../DataSourceMigrationForVersion_5_0.java | 116 +++++++++++++++++++++ .../DataSourceMigrationForVersion_5_1.java | 25 ++--- .../DataSourceMigrationForVersion_3_1.java | 15 +-- .../DataSourceMigrationForVersion_3_10.java | 7 +- .../DataSourceMigrationForVersion_3_11.java | 7 +- .../DataSourceMigrationForVersion_3_12.java | 7 +- .../DataSourceMigrationForVersion_3_14.java | 7 +- .../DataSourceMigrationForVersion_3_15.java | 7 +- .../DataSourceMigrationForVersion_3_16.java | 11 +- .../DataSourceMigrationForVersion_3_5.java | 7 +- .../DataSourceMigrationForVersion_3_7.java | 7 +- .../DataSourceMigrationForVersion_3_8.java | 7 +- .../DataSourceMigrationForVersion_3_9.java | 7 +- .../DataSourceMigrationForVersion_4_0.java | 7 +- .../DataSourceMigrationForVersion_4_0_1.java | 7 +- .../DataSourceMigrationForVersion_4_0_2.java | 7 +- .../DataSourceMigrationForVersion_4_0_4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 11 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 7 +- .../DataSourceMigrationForVersion_4_900.java | 73 ------------- .../DataSourceMigrationForVersion_4_901.java | 73 ------------- .../DataSourceMigrationForVersion_4_902.java | 73 ------------- .../DataSourceMigrationForVersion_4_903.java | 74 ------------- .../DataSourceMigrationForVersion_4_904.java | 70 ------------- .../DataSourceMigrationForVersion_4_905.java | 71 ------------- .../DataSourceMigrationForVersion_4_906.java | 81 -------------- .../DataSourceMigrationForVersion_5_0.java | 72 ------------- 30 files changed, 214 insertions(+), 670 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java new file mode 100644 index 0000000..997c7a4 --- /dev/null +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java @@ -0,0 +1,116 @@ +package fr.ird.observe.entities.migration; + +/* + * #%L + * ObServe :: Entities Migration + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.nuiton.topia.persistence.support.TopiaSqlSupport; +import org.nuiton.version.VersionBuilder; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * Created on 25/08/15. + * + * @author Tony Chemit - chemit@codelutin.com + */ +@MigrationVersion(version = "5.0") +public abstract class DataSourceMigrationForVersion_5_0 extends AbstractObserveMigrationCallBack { + + public DataSourceMigrationForVersion_5_0(AbstractDataSourceMigration callBack, String scriptSuffix) { + super(DataSourceMigrationForVersion_5_0.class, callBack, scriptSuffix); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, + List<String> queries, + boolean showSql, + boolean showProgression) { + + // Suppression du champ open sur les entités anciennement du type Openable + // See https://forge.codelutin.com/issues/7469 + addScript(VersionBuilder.create("4.900").build(), "01", "remove_open_field", queries); + + // Ajout des champs lastUpdate + // See https://forge.codelutin.com/issues/7470 + addScript(VersionBuilder.create("4.901").build(), "01", "add_lastUpdateDate_field", queries); + + // Ajout de la table lastUpdateDate + // See https://forge.codelutin.com/issues/7470 + addScript(VersionBuilder.create("4.902").build(), "01", "add_lastUpdateDate_table", queries); + + + // Ajout de la table lastUpdateDate + // See https://forge.codelutin.com/issues/7470 + addScript(VersionBuilder.create("4.903").build(), "01", "remove_unit_field", queries); + addScript(VersionBuilder.create("4.903").build(), "02", "remove_gender_field", queries); + addScript(VersionBuilder.create("4.903").build(), "03", "remove_duplicate_rows", queries); + + + addScript(VersionBuilder.create("4.904").build(), "01", "drop_not_null_constraint_gearUseFeatures", queries); + + addScript(VersionBuilder.create("4.905").build(), "01", "drop_not_null_constraint_hauling_identifier", queries); + } + + public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { + + public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, H2DataSourceMigration.TYPE); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + + super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); + + Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); + Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); + if (!collect.contains("fk_nontargetlength_sex")) { + addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + } + } + + } + + public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { + + public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { + super(callBack, PGDataSourceMigration.TYPE); + } + + @Override + protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { + + super.prepareMigrationScript(topiaSqlSupport, queries, showSql, showProgression); + + Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); + Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); + if (!collect.contains("fk_nontargetlength_sex")) { + addScript(VersionBuilder.create("4.906").build(), "01", "add_non_target_length_sex_fk", queries); + } + } + + + } + +} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java index 060953d..fd17c4b 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_1.java @@ -1,13 +1,7 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; -import com.google.common.collect.ImmutableMultimap; -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -27,13 +21,14 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 5.1 */ +@MigrationVersion(version = "5.1") public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationCallBack { /** Logger */ private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_5_1.class); public DataSourceMigrationForVersion_5_1(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_5_1.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_5_1.class, callBack, scriptSuffix); } @Override @@ -64,12 +59,12 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC private void evol8391(TopiaSqlSupport topiaSqlSupport, List<String> queries) { - ImmutableMap<String,String> missingCodesMapping = ImmutableMap.<String,String>builder() - .put("LT ?","TL") - .put("FL","LF") - .put("L1","PDL") - .put("LC","DL") - .put("LT","TL") + ImmutableMap<String, String> missingCodesMapping = ImmutableMap.<String, String>builder() + .put("LT ?", "TL") + .put("FL", "LF") + .put("L1", "PDL") + .put("LC", "DL") + .put("LT", "TL") .build(); List<String> lengthMeasureTypes = topiaSqlSupport.findMultipleResult(new TopiaSqlQuery<String>() { @@ -97,7 +92,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement preparedStatement = connection.prepareStatement("SELECT topiaId FROM observe_common.sizeMeasureType WHERE code = '"+ finalLengthMeasureType +"'"); + PreparedStatement preparedStatement = connection.prepareStatement("SELECT topiaId FROM observe_common.sizeMeasureType WHERE code = '" + finalLengthMeasureType + "'"); return preparedStatement; } diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java similarity index 89% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java index 3576ed1..21ee5cb 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -24,7 +24,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -43,10 +43,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.1 */ +@MigrationVersion(version = "3.1") public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_1(AbstractDataSourceMigration callBack) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_1.getVersion(), callBack, ""); + super(DataSourceMigrationForVersion_3_1.class, callBack, ""); } @Override @@ -94,10 +95,10 @@ public class DataSourceMigrationForVersion_3_1 extends AbstractObserveMigrationC @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { String sql = "SELECT e.espece%1$s, e.ocean, count(e.*) " + - "FROM espece%1$s_ocean e \n" + - "GROUP BY e.espece%1$s, e.ocean\n" + - "HAVING count(e.*) > 1\n" + - "ORDER BY e.espece%1$s, e.ocean;"; + "FROM espece%1$s_ocean e \n" + + "GROUP BY e.espece%1$s, e.ocean\n" + + "HAVING count(e.*) > 1\n" + + "ORDER BY e.espece%1$s, e.ocean;"; return connection.prepareStatement(String.format(sql, tableName)); } diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java index 87260c1..c4792b3 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_10.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.10 */ +@MigrationVersion(version = "3.10") public class DataSourceMigrationForVersion_3_10 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_10(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_10.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_10.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java index a042f45..5eef90c 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_11.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.11 */ +@MigrationVersion(version = "3.11") public class DataSourceMigrationForVersion_3_11 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_11(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_11.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_11.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java similarity index 89% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java index 3679bb3..9f978c5 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_12.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.12 */ +@MigrationVersion(version = "3.12") public class DataSourceMigrationForVersion_3_12 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_12(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_12.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_12.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java index 1e4c49e..50a28bd 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_14.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.14 */ +@MigrationVersion(version = "3.14") public class DataSourceMigrationForVersion_3_14 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_14(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_14.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_14.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java index eb3cda8..f6e408e 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_15.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.15 */ +@MigrationVersion(version = "3.15") public class DataSourceMigrationForVersion_3_15 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_15(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_15.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_15.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java similarity index 94% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java index 234a99b..179b307 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_16.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -44,13 +44,14 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 3.16 */ +@MigrationVersion(version = "3.16") public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigrationCallBack { /** Logger. */ private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_3_16.class); public DataSourceMigrationForVersion_3_16(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_16.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_16.class, callBack, scriptSuffix); } @Override @@ -66,7 +67,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration } - private void migrateTripSenneData(TopiaSqlSupport tx, List<String> queries) { + private void migrateTripSenneData(TopiaSqlSupport tx, List<String> queries) { String gearUseFeaturesIdPrefix = "fr.ird.observe.entities.seine.GearUseFeatures#1427183650941#"; @@ -98,7 +99,7 @@ public class DataSourceMigrationForVersion_3_16 extends AbstractObserveMigration } } - protected Set<SenneData> getSenneData(TopiaSqlSupport tx) { + protected Set<SenneData> getSenneData(TopiaSqlSupport tx) { final Set<SenneData> result = new HashSet<>(); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java similarity index 97% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java index 61e1a0c..7e97871 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_5.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -39,6 +39,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ +@MigrationVersion(version = "3.5") public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveMigrationCallBack { protected static final String[] TABLES = new String[]{ @@ -92,7 +93,7 @@ public abstract class DataSourceMigrationForVersion_3_5 extends AbstractObserveM }; public DataSourceMigrationForVersion_3_5(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_5.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_5.class, callBack, scriptSuffix); } protected abstract void removeFK(TopiaSqlSupport tx, String tableName, List<String> queries) throws TopiaException; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java similarity index 91% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java index c6061c0..51cf18b 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_7.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.7 */ +@MigrationVersion(version = "3.7") public abstract class DataSourceMigrationForVersion_3_7 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_7(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_7.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_7.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java index f92ada7..1ad80aa 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_8.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.8 */ +@MigrationVersion(version = "3.8") public class DataSourceMigrationForVersion_3_8 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_8(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_8.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_8.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java index e767dd9..4e5016a 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_3_9.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 3.9 */ +@MigrationVersion(version = "3.9") public class DataSourceMigrationForVersion_3_9 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_3_9(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_3_9.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_3_9.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java index b9523b4..4740549 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0 */ +@MigrationVersion(version = "4.0") public class DataSourceMigrationForVersion_4_0 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java similarity index 97% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java index 965932e..d489dbb 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_1.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -28,7 +28,7 @@ import fr.ird.observe.ObserveTopiaIdFactory; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; @@ -49,10 +49,11 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 4.0.1 */ +@MigrationVersion(version = "4.0.1") public abstract class DataSourceMigrationForVersion_4_0_1 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_1(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_1.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_1.class, callBack, scriptSuffix); } protected abstract void removeForeignKeys(TopiaSqlSupport tx, List<String> queries); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java index 3ce0e28..ce42d7f 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_2.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0.1 */ +@MigrationVersion(version = "4.0.2") public abstract class DataSourceMigrationForVersion_4_0_2 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_2(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_2.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_2.class, callBack, scriptSuffix); } public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_0_2 { diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java index b4015c7..f8876fb 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_4.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -38,10 +38,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0.1 */ +@MigrationVersion(version = "4.0.4") public abstract class DataSourceMigrationForVersion_4_0_4 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_4(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_4.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_4.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java similarity index 92% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java index e680989..23b7937 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC2.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -42,10 +42,11 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC2 */ +@MigrationVersion(version = "4.0-RC2") public class DataSourceMigrationForVersion_4_0_RC2 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC2(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC2.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC2.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java similarity index 97% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java index 07ad461..44172ad 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC3.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -46,6 +46,7 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC3 */ +@MigrationVersion(version = "4.0-RC3") public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObserveMigrationCallBack { /** @@ -54,7 +55,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC3 extends AbstractObse private static final Log log = LogFactory.getLog(DataSourceMigrationForVersion_4_0_RC3.class); public DataSourceMigrationForVersion_4_0_RC3(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC3.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC3.class, callBack, scriptSuffix); } protected abstract void addMissingForeignKeys(TopiaSqlSupport tx, List<String> queries) throws TopiaException; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java similarity index 89% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java index ca40f59..e457ae2 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC4.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC4 */ +@MigrationVersion(version = "4.0-RC4") public class DataSourceMigrationForVersion_4_0_RC4 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC4(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC4.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC4.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java similarity index 89% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java index 71b9cef..acfaa12 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC6.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC6 */ +@MigrationVersion(version = "4.0-RC6") public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC6(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC6.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC6.class, callBack, scriptSuffix); } protected abstract void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries); @@ -67,7 +68,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObse } @Override - protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { + protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { H2DataSourceMigration.removeFK(tx, "observe_seine", "GEARUSEFEATURESMEASUREMENT", "GEARUSEFEATURES", queries); @@ -82,7 +83,7 @@ public abstract class DataSourceMigrationForVersion_4_0_RC6 extends AbstractObse } @Override - protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { + protected void removeForeignKeyOnGearFseFeaturesMeasurementSeine(TopiaSqlSupport tx, List<String> queries) { PGDataSourceMigration.removeFK(tx, "observe_seine", "GEARUSEFEATURESMEASUREMENT", "GEARUSEFEATURES", queries); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java rename to entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java index 24d030a..5dfe805 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_0_RC7.java +++ b/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.versions; +package fr.ird.observe.entities.migration.old; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities.migration.versions; import fr.ird.observe.entities.migration.AbstractDataSourceMigration; import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; +import fr.ird.observe.entities.migration.MigrationVersion; import fr.ird.observe.entities.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; @@ -37,10 +37,11 @@ import java.util.List; * @author Tony Chemit - chemit@codelutin.com * @since 4.0-RC7 */ +@MigrationVersion(version = "4.0-RC7") public abstract class DataSourceMigrationForVersion_4_0_RC7 extends AbstractObserveMigrationCallBack { public DataSourceMigrationForVersion_4_0_RC7(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_0_RC7.getVersion(), callBack, scriptSuffix); + super(DataSourceMigrationForVersion_4_0_RC7.class, callBack, scriptSuffix); } @Override diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java deleted file mode 100644 index cd49728..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_900.java +++ /dev/null @@ -1,73 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_4_900 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_900(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_900.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Suppression du champ open sur les entités anciennement du type Openable - // See https://forge.codelutin.com/issues/7469 - addScript("01", "remove_open_field", queries); - - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_900 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_900 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java deleted file mode 100644 index 38c0b0a..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_901.java +++ /dev/null @@ -1,73 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_4_901 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_901(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_901.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Ajout des champs lastUpdate - // See https://forge.codelutin.com/issues/7470 - addScript("01", "add_lastUpdateDate_field", queries); - - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_901 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_901 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java deleted file mode 100644 index db0ee11..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_902.java +++ /dev/null @@ -1,73 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_4_902 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_902(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_902.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Ajout de la table lastUpdateDate - // See https://forge.codelutin.com/issues/7470 - addScript("01", "add_lastUpdateDate_table", queries); - - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_902 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_902 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java deleted file mode 100644 index 822a75f..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_903.java +++ /dev/null @@ -1,74 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_4_903 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_903(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_903.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Ajout de la table lastUpdateDate - // See https://forge.codelutin.com/issues/7470 - addScript("01", "remove_unit_field", queries); - addScript("02", "remove_gender_field", queries); - addScript("03", "remove_duplicate_rows", queries); - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_903 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_903 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java deleted file mode 100644 index 48b0048..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_904.java +++ /dev/null @@ -1,70 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 20/07/16. - * - * @author Samuel Maisonneuve - maisonneuve@codelutin.com - */ -public class DataSourceMigrationForVersion_4_904 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_904(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_904.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - addScript("01", "drop_not_null_constraint_gearUseFeatures", queries); - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_904 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_904 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java deleted file mode 100644 index a8bf82a..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_905.java +++ /dev/null @@ -1,71 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/*- - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * Created on 02/09/16. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 5.0 - */ -public class DataSourceMigrationForVersion_4_905 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_905(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_905.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - addScript("01", "drop_not_null_constraint_hauling_identifier", queries); - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_905 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_905 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java deleted file mode 100644 index 4e01ab8..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_4_906.java +++ /dev/null @@ -1,81 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/*- - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -/** - * Created on 02/09/16. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 5.0 - */ -public abstract class DataSourceMigrationForVersion_4_906 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_4_906(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_4_906.getVersion(), callBack, scriptSuffix); - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_906 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { - Set<String> forkeignKeys = H2DataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); - Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); - if (!collect.contains("fk_nontargetlength_sex")) { - addScript("01", "add_non_target_length_sex_fk", queries); - } - } - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_4_906 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, List<String> queries, boolean showSql, boolean showProgression) { - Set<String> forkeignKeys = PGDataSourceMigration.getForeignKeyConstraintNames(topiaSqlSupport, "nontargetlength"); - Set<String> collect = forkeignKeys.stream().map(String::toLowerCase).collect(Collectors.toSet()); - if (!collect.contains("fk_nontargetlength_sex")) { - addScript("01", "add_non_target_length_sex_fk", queries); - } - } - - } - -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java deleted file mode 100644 index 6e3ab82..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/versions/DataSourceMigrationForVersion_5_0.java +++ /dev/null @@ -1,72 +0,0 @@ -package fr.ird.observe.entities.migration.versions; - -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.H2DataSourceMigration; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProviderImpl; -import fr.ird.observe.entities.migration.PGDataSourceMigration; -import org.nuiton.topia.persistence.support.TopiaSqlSupport; - -import java.util.List; - -/** - * FIXME A utiliser en version final 5.0 - * Created on 25/08/15. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public class DataSourceMigrationForVersion_5_0 extends AbstractObserveMigrationCallBack { - - public DataSourceMigrationForVersion_5_0(AbstractDataSourceMigration callBack, String scriptSuffix) { - super(ObserveMigrationConfigurationProviderImpl.ObserveMigrationVersions.V_5_0.getVersion(), callBack, scriptSuffix); - } - - @Override - protected void prepareMigrationScript(TopiaSqlSupport topiaSqlSupport, - List<String> queries, - boolean showSql, - boolean showProgression) { - - // Rien à faire - - } - - public static class H2DataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { - - public H2DataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, H2DataSourceMigration.TYPE); - } - - } - - public static class PGDataSourceMigrationForVersion extends DataSourceMigrationForVersion_5_0 { - - public PGDataSourceMigrationForVersion(AbstractDataSourceMigration callBack) { - super(callBack, PGDataSourceMigration.TYPE); - } - - } - -} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 8708aaf9de6af6894ef8525332caa0cee8445acc Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 10:52:16 2016 +0100 Déplacements du moteur de migration dans le module entities --- ...ObserveMigrationCallBackForVersionResolver.java | 94 -------------- .../ObserveMigrationConfigurationProviderImpl.java | 144 --------------------- entities/pom.xml | 4 + .../migration/AbstractDataSourceMigration.java | 5 - .../AbstractObserveMigrationCallBack.java | 20 +-- .../entities/migration/H2DataSourceMigration.java | 0 .../entities/migration/MigrationVersion.java | 20 +++ ...ObserveMigrationCallBackForVersionResolver.java | 87 +++++++++++++ .../ObserveMigrationConfigurationProvider.java | 105 ++++++++++++--- .../entities/migration/PGDataSourceMigration.java | 0 10 files changed, 210 insertions(+), 269 deletions(-) diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java deleted file mode 100644 index ec0a59b..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java +++ /dev/null @@ -1,94 +0,0 @@ -/* - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.entities.migration; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaException; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; -import org.nuiton.version.Version; - -import java.lang.reflect.Modifier; - -/** - * Le resolveur de classe de migration par version. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 2.0 - */ -class ObserveMigrationCallBackForVersionResolver implements TopiaMigrationCallbackByClass.MigrationCallBackForVersionResolver { - - /** Logger */ - private static final Log log = - LogFactory.getLog(ObserveMigrationCallBackForVersionResolver.class); - - protected final String prefix; - - public ObserveMigrationCallBackForVersionResolver(String prefix) { - this.prefix = prefix; - } - - @SuppressWarnings({"unchecked"}) - @Override - public Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion> getCallBack(Version version) { - - String mainclassName = getClass().getPackage().getName() + ".versions.DataSourceMigrationForVersion_" + version.getValidName(); - Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion> result = null; - try { - Class<?> mainClass = Class.forName(mainclassName); - Class<?>[] declaredClasses = mainClass.getClasses(); - if (declaredClasses.length == 0) { - - // no specified class for the version, use the main one - result = (Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion>) mainClass; - - // must check that the main class is not abstract - if (Modifier.isAbstract(mainClass.getModifiers())) { - throw new IllegalStateException("Could not find specialized migration class for version [" + version + "] in [" + mainclassName + "]"); - } - } else { - - // some specialized class exists, find the correct (with good prefix) - for (Class<?> declaredClass : declaredClasses) { - if (declaredClass.getSimpleName().startsWith(prefix)) { - - // found the good class - result = (Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion>) declaredClass; - break; - } - } - - if (result == null) { - throw new IllegalStateException("Could not find specialized migration class for version [" + version + "] in [" + mainclassName + "]"); - } - } - - } catch (ClassNotFoundException e) { - throw new TopiaException("Could not find migration class [" + mainclassName + "] for version " + version); - } - - if (log.isDebugEnabled()) { - log.debug("[" + prefix + "] Resolved callback for version [" + version + "] : " + result.getName()); - } - return result; - } -} diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java b/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java deleted file mode 100644 index 7a993f8..0000000 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProviderImpl.java +++ /dev/null @@ -1,144 +0,0 @@ -package fr.ird.observe.entities.migration; - -/*- - * #%L - * ObServe :: Entities Migration - * %% - * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.ImmutableList; -import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; -import org.nuiton.version.Version; -import org.nuiton.version.Versions; - -import java.util.LinkedHashSet; -import java.util.Set; - -/** - * Created on 01/08/16. - * - * @author Tony Chemit - chemit@codelutin.com - */ -public final class ObserveMigrationConfigurationProviderImpl extends ObserveMigrationConfigurationProvider { - - public enum ObserveMigrationVersions { - - V_3_0("3.0", false), - V_3_1("3.1"), - V_3_5("3.5"), - V_3_7("3.7"), - V_3_8("3.8"), - V_3_9("3.9"), - V_3_10("3.10"), - V_3_11("3.11"), - V_3_12("3.12"), - V_3_14("3.14"), - V_3_15("3.15"), - V_3_16("3.16"), - V_4_0_RC2("4.0-RC2"), - V_4_0_RC3("4.0-RC3"), - V_4_0_RC4("4.0-RC4"), - V_4_0_RC6("4.0-RC6"), - V_4_0_RC7("4.0-RC7"), - V_4_0("4.0"), - V_4_0_1("4.0.1"), - V_4_0_2("4.0.2"), - V_4_0_4("4.0.4"), - V_4_900("4.900"), - V_4_901("4.901"), - V_4_902("4.902"), - V_4_903("4.903"), - V_4_904("4.904"), - V_4_905("4.905"), - V_4_906("4.906"), - V_5_0("5.0"), - V_5_1("5.1"); - - - private final Version version; - private final boolean canApply; - - ObserveMigrationVersions(String versionAsString, boolean canApply) { - this.version = Versions.valueOf(versionAsString); - this.canApply = canApply; - } - - ObserveMigrationVersions(String versionAsString) { - this(versionAsString, true); - } - - public Version getVersion() { - return version; - } - - } - - private final Version[] availableVersions; - - public ObserveMigrationConfigurationProviderImpl() { - - Set<Version> result = new LinkedHashSet<>(); - for (ObserveMigrationVersions version : ObserveMigrationVersions.values()) { - if (version.canApply) { - result.add(version.getVersion()); - } - } - this.availableVersions = result.toArray(new Version[result.size()]); - } - - @Override - public Version[] getAvailableVersions() { - return availableVersions; - } - - @Override - public Version getLastVersion() { - Version[] values = getAvailableVersions(); - int lastIndex = values.length - 1; - return values[lastIndex]; - } - - @Override - public Version getMinimumVersion() { - return ObserveMigrationVersions.V_3_0.getVersion(); - } - - @Override - public ImmutableList<Version> getVersionsAfter(Version current) { - - ImmutableList.Builder<Version> builder = ImmutableList.builder(); - - for (Version version : getAvailableVersions()) { - - if (version.after(current)) { - builder.add(version); - } - - } - - return builder.build(); - - } - - @Override - public Class<? extends TopiaMigrationCallbackByClass> getMigrationClassBack(boolean h2) { - return h2 ? H2DataSourceMigration.class : PGDataSourceMigration.class; - } - -} diff --git a/entities/pom.xml b/entities/pom.xml index ec5f34c..14b6966 100644 --- a/entities/pom.xml +++ b/entities/pom.xml @@ -69,6 +69,10 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java similarity index 90% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java rename to entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java index 22806b8..9cf7e7a 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java @@ -21,8 +21,6 @@ */ package fr.ird.observe.entities.migration; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.version.Version; @@ -36,9 +34,6 @@ import java.util.List; */ public abstract class AbstractDataSourceMigration extends TopiaMigrationCallbackByClass { - /** Logger. */ - private static final Log log = LogFactory.getLog(AbstractDataSourceMigration.class); - protected AbstractDataSourceMigration(MigrationCallBackForVersionResolver callBackResolver) { super(callBackResolver); } diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java similarity index 82% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java rename to entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java index ce37a4c..55be2c1 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java @@ -23,7 +23,6 @@ package fr.ird.observe.entities.migration; */ import com.google.common.base.Charsets; -import com.google.common.collect.Lists; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -36,6 +35,7 @@ import java.io.IOException; import java.io.InputStream; import java.sql.PreparedStatement; import java.sql.ResultSet; +import java.util.Arrays; import java.util.HashSet; import java.util.LinkedHashSet; import java.util.List; @@ -54,8 +54,8 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal private final String scriptSuffix; - public AbstractObserveMigrationCallBack(Version version, TopiaMigrationCallbackByClass callBack, String scriptSuffix) { - super(version, callBack); + public AbstractObserveMigrationCallBack(Class type, TopiaMigrationCallbackByClass callBack, String scriptSuffix) { + super(ObserveMigrationConfigurationProvider.getVersion(type), callBack); this.scriptSuffix = scriptSuffix; } @@ -78,17 +78,19 @@ public abstract class AbstractObserveMigrationCallBack extends TopiaMigrationCal } - protected void addScript(String rank, String prefix, List<String> queries) { - - String[] migrationQueries = loadScript(rank, prefix); - queries.addAll(Lists.newArrayList(migrationQueries)); + protected void addScript(Version version, String rank, String prefix, List<String> queries) { + String[] migrationQueries = loadScript(version, rank, prefix); + queries.addAll(Arrays.asList(migrationQueries)); + } + protected void addScript(String rank, String prefix, List<String> queries) { + addScript(version, rank, prefix, queries); } - private String[] loadScript(String rank, String prefix) { + private String[] loadScript(Version version, String rank, String prefix) { String migrationScript = prefix + "-" + scriptSuffix + ".sql"; - String scriptPath = "/db/migration/V" + version.getValidName() + "_" + rank + "_" + migrationScript; + String scriptPath = "/db/migration/" + this.version + "/V" + version.getValidName() + "_" + rank + "_" + migrationScript; if (log.isInfoEnabled()) { log.info("Load migration script: " + scriptPath); diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java b/entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java similarity index 100% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java rename to entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersion.java b/entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersion.java new file mode 100644 index 0000000..e9c0c33 --- /dev/null +++ b/entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersion.java @@ -0,0 +1,20 @@ +package fr.ird.observe.entities.migration; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Created on 04/11/16. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 5.1 + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface MigrationVersion { + + String version(); + +} diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java new file mode 100644 index 0000000..da50f9a --- /dev/null +++ b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java @@ -0,0 +1,87 @@ +/* + * #%L + * ObServe :: Entities Migration + * %% + * Copyright (C) 2008 - 2016 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ +package fr.ird.observe.entities.migration; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; +import org.nuiton.version.Version; + +import java.lang.reflect.Modifier; + +/** + * Le resolveur de classe de migration par version. + * + * @author Tony Chemit - chemit@codelutin.com + * @since 2.0 + */ +class ObserveMigrationCallBackForVersionResolver implements TopiaMigrationCallbackByClass.MigrationCallBackForVersionResolver { + + /** Logger */ + private static final Log log = LogFactory.getLog(ObserveMigrationCallBackForVersionResolver.class); + + protected final String prefix; + + public ObserveMigrationCallBackForVersionResolver(String prefix) { + this.prefix = prefix; + } + + @Override + public Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion> getCallBack(Version version) { + + Class<?> result = null; + + Class<?> mainClass = ObserveMigrationConfigurationProvider.getMigrationForVersionTypes().get(version); + Class<?>[] declaredClasses = mainClass.getClasses(); + if (declaredClasses.length == 0) { + + // no specified class for the version, use the main one + result = mainClass; + + // must check that the main class is not abstract + if (Modifier.isAbstract(mainClass.getModifiers())) { + throw new IllegalStateException("Could not find specialized migration class for version [" + version + "] in [" + mainClass.getName() + "]"); + } + } else { + + // some specialized class exists, find the correct (with good prefix) + for (Class<?> declaredClass : declaredClasses) { + if (declaredClass.getSimpleName().startsWith(prefix)) { + + // found the good class + result = declaredClass; + break; + } + } + + if (result == null) { + throw new IllegalStateException("Could not find specialized migration class for version [" + version + "] in [" + mainClass.getName() + "]"); + } + } + + + if (log.isDebugEnabled()) { + log.debug("[" + prefix + "] Resolved callback for version [" + version + "] : " + result.getName()); + } + return (Class<? extends TopiaMigrationCallbackByClass.MigrationCallBackForVersion>) result; + } +} diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java index b09f94a..47de7f6 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java +++ b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java @@ -23,11 +23,21 @@ package fr.ird.observe.entities.migration; */ import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.version.Version; +import org.nuiton.version.VersionBuilder; import org.reflections.Reflections; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.Map; +import java.util.Objects; import java.util.Set; +import java.util.TreeMap; /** * Created on 01/08/16. @@ -35,33 +45,94 @@ import java.util.Set; * @author Tony Chemit - chemit@codelutin.com * @since 5.0 */ -public abstract class ObserveMigrationConfigurationProvider { +public final class ObserveMigrationConfigurationProvider { + + /** Logger */ + private static final Log log = LogFactory.getLog(ObserveMigrationConfigurationProvider.class); private static ObserveMigrationConfigurationProvider INSTANCE; - public abstract Version[] getAvailableVersions(); + private static Map<Version, Class<?>> migrationForVersionTypes; - public abstract Version getLastVersion(); + private final Version[] availableVersions; - public abstract Version getMinimumVersion(); + public static Map<Version, Class<?>> getMigrationForVersionTypes() { + if (migrationForVersionTypes == null) { - public abstract ImmutableList<Version> getVersionsAfter(Version current); + TreeMap<Version, Class<?>> builder = new TreeMap<>(); - public abstract Class<? extends TopiaMigrationCallbackByClass> getMigrationClassBack(boolean h2); + Set<Class<?>> types = new Reflections("fr.ird.observe.entities.migration.versions").getTypesAnnotatedWith(MigrationVersion.class); + for (Class<?> type : types) { + Version version = getVersion(type); + builder.put(version, type); + if (log.isInfoEnabled()) { + log.info("Found migration version: " + version + " -> " + type.getName()); + } + } + migrationForVersionTypes = ImmutableMap.copyOf(builder); - public static ObserveMigrationConfigurationProvider get() { - if (INSTANCE == null) { + } + return migrationForVersionTypes; + } - Set<Class<? extends ObserveMigrationConfigurationProvider>> impls = new Reflections("fr.ird.observe.entities.migration").getSubTypesOf(ObserveMigrationConfigurationProvider.class); - if (impls.isEmpty()) { - throw new ExceptionInInitializerError("No migration configuration provider found."); - } - Class<? extends ObserveMigrationConfigurationProvider> impl = impls.iterator().next(); - try { - INSTANCE = impl.newInstance(); - } catch (InstantiationException | IllegalAccessException e) { - throw new ExceptionInInitializerError(e); + public static Version getVersion(Class type) { + + Objects.requireNonNull(type); + if (type.isMemberClass()) { + type = type.getEnclosingClass(); + } + MigrationVersion annotation = (MigrationVersion) type.getDeclaredAnnotation(MigrationVersion.class); + Objects.requireNonNull(annotation); + String version = annotation.version(); + return VersionBuilder.create(version).build(); + + } + + public ObserveMigrationConfigurationProvider() { + Set<Version> versionsSet = getMigrationForVersionTypes().keySet(); + List<Version> versions = new ArrayList<>(versionsSet); + Collections.sort(versions); + this.availableVersions = versions.toArray(new Version[versions.size()]); + } + + public Version[] getAvailableVersions() { + return availableVersions; + } + + public Version getLastVersion() { + Version[] values = getAvailableVersions(); + int lastIndex = values.length - 1; + return values[lastIndex]; + } + + + public ImmutableList<Version> getVersionsAfter(Version current) { + + ImmutableList.Builder<Version> builder = ImmutableList.builder(); + + for (Version version : getAvailableVersions()) { + + if (version.after(current)) { + builder.add(version); } + + } + + return builder.build(); + + } + + public Version getMinimumVersion() { + return VersionBuilder.create("3.0").build(); + } + + public Class<? extends TopiaMigrationCallbackByClass> getMigrationClassBack(boolean h2) { + return h2 ? H2DataSourceMigration.class : PGDataSourceMigration.class; + } + + public static ObserveMigrationConfigurationProvider get() { + if (INSTANCE == null) { + INSTANCE = new ObserveMigrationConfigurationProvider(); } return INSTANCE; } diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java b/entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java similarity index 100% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java rename to entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java -- 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 1210affcadfd69b1d014c5cdd13ba5d79feacc2d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 10:52:51 2016 +0100 optimize dependencies --- application-swing-configuration/pom.xml | 2 ++ application-web-configuration/pom.xml | 2 ++ entities-migration/pom.xml | 4 ---- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index e33e074..42e2d43 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -50,11 +50,13 @@ <groupId>${project.groupId}</groupId> <artifactId>services-topia-validators</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>application-swing-validators</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <!-- commons dependencies --> diff --git a/application-web-configuration/pom.xml b/application-web-configuration/pom.xml index ba5c2f4..865653f 100644 --- a/application-web-configuration/pom.xml +++ b/application-web-configuration/pom.xml @@ -46,11 +46,13 @@ <groupId>${project.groupId}</groupId> <artifactId>services-topia-validators</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> <artifactId>application-swing-validators</artifactId> <version>${project.version}</version> + <scope>provided</scope> </dependency> <!-- commons dependencies --> diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml index a11a8ed..f5d99f7 100644 --- a/entities-migration/pom.xml +++ b/entities-migration/pom.xml @@ -61,10 +61,6 @@ <artifactId>commons-logging</artifactId> </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> -- 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 4e70d9004e0fd1c9777ff14ec207262ac6fdf3a2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 11:38:56 2016 +0100 fix binding --- .../java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java index c0fcea6..35eb83a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/ObserveMainUIHandler.java @@ -440,6 +440,9 @@ public class ObserveMainUIHandler { protected void $afterCompleteSetup(final ObserveMainUI ui) { + // bad binding, force value + ui.getStopH2WebServer().setEnabled(false); + ui.getStatus().init(); // ajout d'un ecouteur sur la navigation pour toujours mettre la scrollbar -- 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 5bd34d74a329c5844166c7338b0d45c3edfc917e Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 11:55:31 2016 +0100 fix migrations --- .../entities/migration/DataSourceMigrationForVersion_5_1.java | 5 +++-- .../entities/migration/ObserveMigrationConfigurationProvider.java | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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_5_1.java index fd17c4b..a58fbbd 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_5_1.java @@ -2,6 +2,7 @@ package fr.ird.observe.entities.migration; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableMap; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.support.TopiaSqlQuery; @@ -92,8 +93,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC @Override public PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement preparedStatement = connection.prepareStatement("SELECT topiaId FROM observe_common.sizeMeasureType WHERE code = '" + finalLengthMeasureType + "'"); - return preparedStatement; + return connection.prepareStatement("SELECT topiaId FROM observe_longline.sizeMeasureType WHERE label1 = '" + finalLengthMeasureType + "'"); } @Override @@ -108,6 +108,7 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC } invalidCodes.add(lengthMeasureType); } else { + sizeMeasureTypeId = StringUtils.replace(sizeMeasureTypeId, ".longline", ""); queries.add(String.format("UPDATE observe_common.species SET sizeMeasureType = '%s' WHERE lengthMeasureType = '%s'", sizeMeasureTypeId, lengthMeasureType)); } } diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java index 47de7f6..3a5a63d 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java +++ b/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java @@ -61,7 +61,7 @@ public final class ObserveMigrationConfigurationProvider { TreeMap<Version, Class<?>> builder = new TreeMap<>(); - Set<Class<?>> types = new Reflections("fr.ird.observe.entities.migration.versions").getTypesAnnotatedWith(MigrationVersion.class); + Set<Class<?>> types = new Reflections("fr.ird.observe.entities.migration").getTypesAnnotatedWith(MigrationVersion.class); for (Class<?> type : types) { Version version = getVersion(type); builder.put(version, type); -- 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 66c4f0f83d4c5a1a6a0912e07b7a2d9bd9b6b20c Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:26:30 2016 +0100 Ajout des bases de tests pour la version 5.1 --- .../java/fr/ird/observe/test/ObserveFixtures.java | 7 ++++--- .../main/resources/db/5.1/dataForTestLongline.sql.gz | Bin 0 -> 1626691 bytes .../src/main/resources/db/5.1/dataForTestSeine.sql.gz | Bin 0 -> 455040 bytes test/src/main/resources/db/5.1/empty_h2.sql.gz | Bin 0 -> 6193 bytes test/src/main/resources/db/5.1/empty_pg.sql.gz | Bin 0 -> 6188 bytes test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 0 -> 143865 bytes test/src/main/resources/observetest.properties | 2 +- 7 files changed, 5 insertions(+), 4 deletions(-) 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 6ef7d70..3e337b4 100644 --- a/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java +++ b/test/src/main/java/fr/ird/observe/test/ObserveFixtures.java @@ -71,14 +71,16 @@ public class ObserveFixtures { .put("observe_common.gearcaracteristic", 22L) .put("observe_common.gearcaracteristictype", 6L) .put("observe_common.harbour", 72L) - .put("observe_common.lastupdatedate", 95L) + .put("observe_common.lastupdatedate", 96L) .put("observe_common.lengthweightparameter", 352L) .put("observe_common.ocean", 3L) .put("observe_common.ocean_species", 359L) .put("observe_common.organism", 6L) .put("observe_common.person", 344L) .put("observe_common.program", 23L) + .put("observe_common.shipOwner", 27L) .put("observe_common.sex", 5L) + .put("observe_common.sizemeasuretype", 18L) .put("observe_common.species", 211L) .put("observe_common.species_specieslist", 255L) .put("observe_common.speciesgroup", 8L) @@ -86,6 +88,7 @@ public class ObserveFixtures { .put("observe_common.vessel", 906L) .put("observe_common.vesselsizecategory", 13L) .put("observe_common.vesseltype", 14L) + .put("observe_common.weightmeasuretype", 3L) .build(); public static final ImmutableMap<String, Long> REFERENTIAL_SEINE_TABLES_COUNT = ImmutableMap @@ -130,11 +133,9 @@ public class ObserveFixtures { .put("observe_longline.sensordataformat", 2L) .put("observe_longline.sensortype", 4L) .put("observe_longline.settingshape", 5L) - .put("observe_longline.sizemeasuretype", 18L) .put("observe_longline.stomacfullness", 6L) .put("observe_longline.triptype", 3L) .put("observe_longline.vesselactivity", 5L) - .put("observe_longline.weightmeasuretype", 3L) .build(); public static final ImmutableMap<String, Long> REFERENTIAL_TABLES_COUNT = mergeResults( diff --git a/test/src/main/resources/db/5.1/dataForTestLongline.sql.gz b/test/src/main/resources/db/5.1/dataForTestLongline.sql.gz new file mode 100644 index 0000000..98ee166 Binary files /dev/null and b/test/src/main/resources/db/5.1/dataForTestLongline.sql.gz differ diff --git a/test/src/main/resources/db/5.1/dataForTestSeine.sql.gz b/test/src/main/resources/db/5.1/dataForTestSeine.sql.gz new file mode 100644 index 0000000..8d0247c Binary files /dev/null and b/test/src/main/resources/db/5.1/dataForTestSeine.sql.gz differ diff --git a/test/src/main/resources/db/5.1/empty_h2.sql.gz b/test/src/main/resources/db/5.1/empty_h2.sql.gz new file mode 100644 index 0000000..a97a1d4 Binary files /dev/null and b/test/src/main/resources/db/5.1/empty_h2.sql.gz differ diff --git a/test/src/main/resources/db/5.1/empty_pg.sql.gz b/test/src/main/resources/db/5.1/empty_pg.sql.gz new file mode 100644 index 0000000..e7126b2 Binary files /dev/null and b/test/src/main/resources/db/5.1/empty_pg.sql.gz differ diff --git a/test/src/main/resources/db/5.1/referentiel.sql.gz b/test/src/main/resources/db/5.1/referentiel.sql.gz new file mode 100644 index 0000000..72a4111 Binary files /dev/null and b/test/src/main/resources/db/5.1/referentiel.sql.gz differ diff --git a/test/src/main/resources/observetest.properties b/test/src/main/resources/observetest.properties index 0da7256..f6ebb34 100644 --- a/test/src/main/resources/observetest.properties +++ b/test/src/main/resources/observetest.properties @@ -24,7 +24,7 @@ observetest.build.version=${project.version} observetest.model.version=${observe.model.version} observetest.previous.model.version=4.0.1 observetest.first.model.version=4.0.1 -observetest.first.model.for.ref.synchro.version=4.903 +observetest.first.model.for.ref.synchro.version=5.0 observetest.h2.login=sa observetest.h2.password=sa observetest.web.url=http://localhost:8080/observeweb/api/v1 -- 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 60aa11f9d397116ef396b35d182a55c478af2c4a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:26:53 2016 +0100 Mise à jour de la liste bien ordonnée des entités --- entities/src/main/java/fr/ird/observe/entities/Entities.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/entities/src/main/java/fr/ird/observe/entities/Entities.java b/entities/src/main/java/fr/ird/observe/entities/Entities.java index ef3b981..219ea2b 100644 --- a/entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -57,6 +57,8 @@ public class Entities { ObserveEntityEnum.Vessel, ObserveEntityEnum.SpeciesGroup, ObserveEntityEnum.Ocean, + ObserveEntityEnum.SizeMeasureType, + ObserveEntityEnum.WeightMeasureType, ObserveEntityEnum.Species, ObserveEntityEnum.Sex, ObserveEntityEnum.FpaZone, @@ -107,11 +109,9 @@ public class Entities { ObserveEntityEnum.SensorDataFormat, ObserveEntityEnum.SensorType, ObserveEntityEnum.SettingShape, - ObserveEntityEnum.SizeMeasureType, ObserveEntityEnum.StomacFullness, ObserveEntityEnum.TripType, - ObserveEntityEnum.VesselActivityLongline, - ObserveEntityEnum.WeightMeasureType + ObserveEntityEnum.VesselActivityLongline }; public static final List<ObserveEntityEnum> REFERENCE_ENTITIES_LIST = -- 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 c9801121259df0df95b75856dd5b4b76b49d705d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:27:25 2016 +0100 Mise à jour de tests suite aux modifications de référentiel --- .../topia/binder/BinderEngineMetadataTest.java | 4 +-- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../actions/validate/ValidateServiceTopiaTest.java | 42 +++++++++++++--------- 3 files changed, 28 insertions(+), 20 deletions(-) diff --git a/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java b/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java index 2251851..9f5ee71 100644 --- a/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java +++ b/services-topia-binder/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineMetadataTest.java @@ -83,7 +83,7 @@ public class BinderEngineMetadataTest { ImmutableMap<Class<? extends ReferentialDto>, Class<? extends ObserveReferentialEntity>> referentialDtoToEntityTypes = binderEngine.getReferentialDtoToEntityTypes(); Assert.assertNotNull(referentialDtoToEntityTypes); - Assert.assertEquals(59, referentialDtoToEntityTypes.size()); + Assert.assertEquals(60, referentialDtoToEntityTypes.size()); Set<Class<? extends ObserveReferentialEntity>> entityTypesFromEngine = Sets.newHashSet(referentialDtoToEntityTypes.values()); Set<Class<? extends ObserveReferentialEntity>> referentialEntityTypesFromTopia = getReferentialEntityTypes(); @@ -124,7 +124,7 @@ public class BinderEngineMetadataTest { ImmutableMap<Class<? extends ObserveReferentialEntity>, Class<? extends ReferentialDto>> referentialDtoToEntityTypes = binderEngine.getReferentialEntityToDtoTypes(); Assert.assertNotNull(referentialDtoToEntityTypes); - Assert.assertEquals(2 * 59, referentialDtoToEntityTypes.size()); + Assert.assertEquals(2 * 60, referentialDtoToEntityTypes.size()); for (Class<? extends ObserveReferentialEntity> entityType : referentialDtoToEntityTypes.keySet()) { diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java index a0d75d3..810858a 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopia.java @@ -291,7 +291,7 @@ public class ConsolidateDataServiceTopia extends ObserveServiceTopia implements // on recherche sur le couple species/speciesFate Collection<NonTargetLength> nonTargetLengths = SetSeines.getNonTargetLengths(activityContext.getSetSeine(), species, nonTargetCatch.getSpeciesFate()); - if (nonTargetLengths.isEmpty()) { + if (CollectionUtils.isEmpty(nonTargetLengths)) { // on recherche sur le couple species/null nonTargetLengths = SetSeines.getNonTargetLengths(activityContext.getSetSeine(), species, null); } diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java index f805b5b..2168911 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopiaTest.java @@ -24,14 +24,6 @@ package fr.ird.observe.services.topia.service.actions.validate; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; -import fr.ird.observe.services.service.actions.validate.ValidateDataResult; -import fr.ird.observe.services.service.actions.validate.ValidateReferentialsRequest; -import fr.ird.observe.services.service.actions.validate.ValidateReferentialsResult; -import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; -import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType; -import fr.ird.observe.services.service.actions.validate.ValidateService; -import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.dto.IdDto; import fr.ird.observe.services.dto.referential.CountryDto; import fr.ird.observe.services.dto.referential.FpaZoneDto; @@ -46,12 +38,15 @@ import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SexDto; +import fr.ird.observe.services.dto.referential.ShipOwnerDto; +import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.SpeciesGroupDto; import fr.ird.observe.services.dto.referential.SpeciesListDto; import fr.ird.observe.services.dto.referential.VesselDto; import fr.ird.observe.services.dto.referential.VesselSizeCategoryDto; import fr.ird.observe.services.dto.referential.VesselTypeDto; +import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.BaitHaulingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitSettingStatusDto; import fr.ird.observe.services.dto.referential.longline.BaitTypeDto; @@ -72,11 +67,9 @@ import fr.ird.observe.services.dto.referential.longline.SensorBrandDto; import fr.ird.observe.services.dto.referential.longline.SensorDataFormatDto; import fr.ird.observe.services.dto.referential.longline.SensorTypeDto; import fr.ird.observe.services.dto.referential.longline.SettingShapeDto; -import fr.ird.observe.services.dto.referential.SizeMeasureTypeDto; import fr.ird.observe.services.dto.referential.longline.StomacFullnessDto; import fr.ird.observe.services.dto.referential.longline.TripTypeDto; import fr.ird.observe.services.dto.referential.longline.VesselActivityLonglineDto; -import fr.ird.observe.services.dto.referential.WeightMeasureTypeDto; import fr.ird.observe.services.dto.referential.seine.DetectionModeDto; import fr.ird.observe.services.dto.referential.seine.ObjectFateDto; import fr.ird.observe.services.dto.referential.seine.ObjectOperationDto; @@ -96,10 +89,20 @@ import fr.ird.observe.services.dto.referential.seine.WindDto; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.service.actions.validate.ValidateDataRequest; +import fr.ird.observe.services.service.actions.validate.ValidateDataResult; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsRequest; +import fr.ird.observe.services.service.actions.validate.ValidateReferentialsResult; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDto; +import fr.ird.observe.services.service.actions.validate.ValidateResultForDtoType; +import fr.ird.observe.services.service.actions.validate.ValidateService; +import fr.ird.observe.services.topia.ObserveServiceTopia; import fr.ird.observe.services.topia.service.AbstractServiceTopiaTest; import fr.ird.observe.test.DatabaseName; import fr.ird.observe.test.ObserveFixtures; @@ -109,6 +112,8 @@ import org.junit.Before; import org.junit.Test; import org.nuiton.validator.NuitonValidatorScope; +import java.util.Map; + /** * @author Sylvain Bavencoff - bavencoff@codelutin.com */ @@ -135,7 +140,7 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { Assert.assertNotNull(result); ImmutableMap<Class<? extends ReferentialDto>, ValidateResultForDtoType> resultByType = result.getResultByType(); Assert.assertNotNull(resultByType); - Assert.assertEquals(59, resultByType.size()); + Assert.assertEquals(60, resultByType.size()); // for (Map.Entry<Class<? extends ReferentialDto>, ValidateResultForDtoType> entry : resultByType.entrySet()) { // System.out.println("assertValidateResultForReferentialDtoType(resultByType, " + entry.getKey().getName() + ".class, " + entry.getValue().getValidationResultForDto().size() + ");"); @@ -153,12 +158,15 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { assertValidateResultForReferentialDtoType(resultByType, PersonDto.class, 390); assertValidateResultForReferentialDtoType(resultByType, ProgramDto.class, 27); assertValidateResultForReferentialDtoType(resultByType, SexDto.class, 5); + assertValidateResultForReferentialDtoType(resultByType, ShipOwnerDto.class, 27); + assertValidateResultForReferentialDtoType(resultByType, SizeMeasureTypeDto.class, 17); assertValidateResultForReferentialDtoType(resultByType, SpeciesDto.class, 275); assertValidateResultForReferentialDtoType(resultByType, SpeciesGroupDto.class, 8); assertValidateResultForReferentialDtoType(resultByType, SpeciesListDto.class, 5); assertValidateResultForReferentialDtoType(resultByType, VesselDto.class, 977); assertValidateResultForReferentialDtoType(resultByType, VesselSizeCategoryDto.class, 13); assertValidateResultForReferentialDtoType(resultByType, VesselTypeDto.class, 14); + assertValidateResultForReferentialDtoType(resultByType, WeightMeasureTypeDto.class, 3); assertValidateResultForReferentialDtoType(resultByType, BaitHaulingStatusDto.class, 5); assertValidateResultForReferentialDtoType(resultByType, BaitSettingStatusDto.class, 5); @@ -180,11 +188,9 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { assertValidateResultForReferentialDtoType(resultByType, SensorDataFormatDto.class, 2); assertValidateResultForReferentialDtoType(resultByType, SensorTypeDto.class, 4); assertValidateResultForReferentialDtoType(resultByType, SettingShapeDto.class, 6); - assertValidateResultForReferentialDtoType(resultByType, SizeMeasureTypeDto.class, 17); assertValidateResultForReferentialDtoType(resultByType, StomacFullnessDto.class, 7); assertValidateResultForReferentialDtoType(resultByType, TripTypeDto.class, 3); assertValidateResultForReferentialDtoType(resultByType, VesselActivityLonglineDto.class, 5); - assertValidateResultForReferentialDtoType(resultByType, WeightMeasureTypeDto.class, 3); assertValidateResultForReferentialDtoType(resultByType, DetectionModeDto.class, 10); assertValidateResultForReferentialDtoType(resultByType, ObjectFateDto.class, 9); @@ -219,11 +225,11 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { ImmutableMap<Class<? extends IdDto>, ValidateResultForDtoType> resultByType = result.getResultByType(); Assert.assertNotNull(resultByType); - Assert.assertEquals(7, resultByType.size()); + Assert.assertEquals(9, resultByType.size()); -// for (Map.Entry<Class<? extends IdDto>, ValidateResultForDtoType> entry : resultByType.entrySet()) { -// System.out.println("assertValidateResultForDtoType(resultByType, " + entry.getKey().getName() + ".class, " + entry.getValue().getValidationResultForDto().size() + ");"); -// } + for (Map.Entry<Class<? extends IdDto>, ValidateResultForDtoType> entry : resultByType.entrySet()) { + System.out.println("assertValidateResultForDtoType(resultByType, " + entry.getKey().getName() + ".class, " + entry.getValue().getValidateResultForDto().size() + ");"); + } assertValidateResultForDtoType(resultByType, TripSeineDto.class, 2); assertValidateResultForDtoType(resultByType, RouteDto.class, 55); @@ -232,6 +238,8 @@ public class ValidateServiceTopiaTest extends AbstractServiceTopiaTest { assertValidateResultForDtoType(resultByType, TransmittingBuoyDto.class, 42); assertValidateResultForDtoType(resultByType, SetSeineDto.class, 35); assertValidateResultForDtoType(resultByType, NonTargetCatchDto.class, 3); + assertValidateResultForDtoType(resultByType, NonTargetLengthDto.class, 1009); + assertValidateResultForDtoType(resultByType, TargetLengthDto.class, 85); } -- 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 a7e75ebee5f1709ff297f8f52d357839674a8266 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:27:51 2016 +0100 Ajout de binder --- .../services/dto/reference/DataReferenceSetDefinitions.java | 12 +++++++++--- .../services/topia/binder/data/DataBinderSupport.java | 2 +- .../services/topia/binder/data/NonTargetLengthBinder.java | 8 +++++++- .../services/topia/binder/data/TargetCatchBinder.java | 6 ++++++ 4 files changed, 23 insertions(+), 5 deletions(-) diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java index 6bd788d..ca9a7bf 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/reference/DataReferenceSetDefinitions.java @@ -41,9 +41,11 @@ import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.seine.ActivitySeineDto; import fr.ird.observe.services.dto.seine.FloatingObjectDto; import fr.ird.observe.services.dto.seine.NonTargetCatchDto; +import fr.ird.observe.services.dto.seine.NonTargetLengthDto; import fr.ird.observe.services.dto.seine.RouteDto; import fr.ird.observe.services.dto.seine.SchoolEstimateDto; import fr.ird.observe.services.dto.seine.SetSeineDto; +import fr.ird.observe.services.dto.seine.TargetCatchDto; import fr.ird.observe.services.dto.seine.TargetLengthDto; import fr.ird.observe.services.dto.seine.TransmittingBuoyDto; import fr.ird.observe.services.dto.seine.TripSeineDto; @@ -85,18 +87,22 @@ public enum DataReferenceSetDefinitions { .addProperty(String.class, NonTargetCatchDto.PROPERTY_SPECIES) .addProperty(String.class, NonTargetCatchDto.PROPERTY_SPECIES_FATE)), + NON_TARGET_LENGTH(newDefinitionBuilder(NonTargetLengthDto.class) + .addProperty(String.class, NonTargetLengthDto.PROPERTY_SPECIES)), + SCHOOL_ESTIMATE(newDefinitionBuilder(SchoolEstimateDto.class) .addProperty(String.class, SchoolEstimateDto.PROPERTY_SPECIES) .addProperty(String.class, SchoolEstimateDto.PROPERTY_MEAN_WEIGHT) - .addProperty(String.class, SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT) - ), + .addProperty(String.class, SchoolEstimateDto.PROPERTY_TOTAL_WEIGHT)), + + TARGET_CATCH(newDefinitionBuilder(TargetCatchDto.class) + .addProperty(String.class, TargetCatchDto.PROPERTY_SPECIES)), TARGET_LENGTH(newDefinitionBuilder(TargetLengthDto.class) .addProperty(String.class, TargetLengthDto.PROPERTY_SPECIES) .addProperty(String.class, TargetLengthDto.PROPERTY_LENGTH) .addProperty(String.class, TargetLengthDto.PROPERTY_COUNT) ), - ACTIVITY_SEINE(newDefinitionBuilder(ActivitySeineDto.class) .addProperty(Date.class, ActivitySeineDto.PROPERTY_TIME) .addProperty(String.class, ActivitySeineDto.PROPERTY_VESSEL_ACTIVITY_SEINE + "Id") diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java index b10fbf2..78467f5 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/DataBinderSupport.java @@ -112,7 +112,7 @@ public abstract class DataBinderSupport<E extends ObserveDataEntity, D extends D // -------------------------------------------------------------------------------------------------------------- // public DataReference<D> toDataReference(ReferentialLocale referentialLocale, E entity) { - throw new IllegalStateException("Not implemented"); + throw new IllegalStateException("Not implemented for " + this); } protected DataReference<D> toDataReference(E entity, Serializable... values) { diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java index c18df64..1493be4 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/NonTargetLengthBinder.java @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.Sex; import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.SpeciesFate; import fr.ird.observe.entities.seine.NonTargetLength; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SexDto; import fr.ird.observe.services.dto.referential.SpeciesDto; @@ -40,7 +41,7 @@ import fr.ird.observe.services.dto.seine.NonTargetLengthDto; public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, NonTargetLengthDto> { public NonTargetLengthBinder() { - super(NonTargetLength.class, NonTargetLengthDto.class, false); + super(NonTargetLength.class, NonTargetLengthDto.class, true); } @Override @@ -82,4 +83,9 @@ public class NonTargetLengthBinder extends DataBinderSupport<NonTargetLength, No dto.setTagNumber(entity.getTagNumber()); } + + @Override + public DataReference<NonTargetLengthDto> toDataReference(ReferentialLocale referentialLocale, NonTargetLength entity) { + return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies())); + } } diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java index c66ee85..f3fcc84 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/data/TargetCatchBinder.java @@ -26,6 +26,7 @@ import fr.ird.observe.entities.referentiel.Species; import fr.ird.observe.entities.referentiel.seine.ReasonForDiscard; import fr.ird.observe.entities.referentiel.seine.WeightCategory; import fr.ird.observe.entities.seine.TargetCatch; +import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.referential.SpeciesDto; import fr.ird.observe.services.dto.referential.seine.ReasonForDiscardDto; @@ -72,4 +73,9 @@ public class TargetCatchBinder extends DataBinderSupport<TargetCatch, TargetCatc dto.setWeightCategory(toReferentialReference(referentialLocale, entity.getWeightCategory(), WeightCategoryDto.class)); } + + @Override + public DataReference<TargetCatchDto> toDataReference(ReferentialLocale referentialLocale, TargetCatch entity) { + return toDataReference(entity, getLabel(referentialLocale, entity.getSpecies())); + } } -- 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 3746aed85675ddefd8b42e155267687685137a5d Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:28:13 2016 +0100 ignore a test, il faut le reecrire --- .../observe/services/topia/service/MigrateTestsDatabases.java | 11 +++++++++++ .../synchro/UnidirectionalSynchronizeReferentialTest.java | 4 ++++ 2 files changed, 15 insertions(+) diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java index b073a0c..23408a1 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/MigrateTestsDatabases.java @@ -27,6 +27,7 @@ import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationExce import fr.ird.observe.services.service.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.AddSqlScriptProducerResult; import fr.ird.observe.services.service.BabModelVersionException; +import fr.ird.observe.services.service.DataSourceService; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; import fr.ird.observe.services.service.SqlScriptProducerService; @@ -60,16 +61,19 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { private static final Log log = LogFactory.getLog(MigrateTestsDatabases.class); protected SqlScriptProducerService service; + protected DataSourceService dataSourceService; @Before public void setUp() throws Exception { service = topiaTestMethodResource.newService(SqlScriptProducerService.class); + dataSourceService = topiaTestMethodResource.newService(DataSourceService.class); } @DatabaseNameConfiguration(DatabaseName.referentiel) @Test public void migrateReferentielDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + dataSourceService.migrateData(topiaTestMethodResource.getDataSourceConfiguration()); migrate(service.produceAddSqlScript(request)); } @@ -77,6 +81,7 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @Test public void migrateDataForTestSeineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + dataSourceService.migrateData(topiaTestMethodResource.getDataSourceConfiguration()); migrate(service.produceAddSqlScript(request)); } @@ -84,6 +89,7 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @Test public void migrateDataForTestLonglineDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + dataSourceService.migrateData(topiaTestMethodResource.getDataSourceConfiguration()); migrate(service.produceAddSqlScript(request)); } @@ -91,14 +97,18 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @Test public void migrateEmptyH2Db() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema(); + dataSourceService.migrateData(topiaTestMethodResource.getDataSourceConfiguration()); migrate(service.produceAddSqlScript(request)); } + // On n'utilise plus cette base de test @DatabaseVersionConfiguration(ObserveTestConfiguration.FIRST_VERSION_FOR_REF_SYNCHRO) @DatabaseNameConfiguration(DatabaseName.dataForTestUnidirectionalReferentialSynchro) @Test + @Ignore public void migrateDataForTestUnidirectionalReferentialSynchroDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forH2().addSchema().addReferential().addAllData(); + dataSourceService.migrateData(topiaTestMethodResource.getDataSourceConfiguration()); migrate(service.produceAddSqlScript(request)); } @@ -106,6 +116,7 @@ public class MigrateTestsDatabases extends AbstractServiceTopiaTest { @Test public void migrateEmptyPgDb() throws IOException, IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException { AddSqlScriptProducerRequest request = AddSqlScriptProducerRequest.forPostgres().addSchema(); + dataSourceService.migrateData(topiaTestMethodResource.getDataSourceConfiguration()); migrate(DatabaseName.empty_pg.name(), service.produceAddSqlScript(request)); } diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java index 065d672..45b675c 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/synchro/UnidirectionalSynchronizeReferentialTest.java @@ -50,6 +50,7 @@ import org.apache.commons.lang3.tuple.Pair; import org.junit.Assert; import org.junit.Before; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; @@ -142,11 +143,14 @@ public class UnidirectionalSynchronizeReferentialTest extends AbstractServiceTop } + // Il faut reecrire ce test en clonant une base, y fiasant des modif puis test + // et plus en utilisant deux bases différentes (lourd à maintenir). @DatabaseNameConfiguration(DatabaseName.dataForTestSeine) @CopyDatabaseConfiguration @DatabaseNameConfiguration(value = DatabaseName.dataForTestUnidirectionalReferentialSynchro, classifier = DatabaseClassifier.CENTRAL) @DatabaseVersionConfiguration(value = ObserveTestConfiguration.MODEL_VERSION, classifier = DatabaseClassifier.CENTRAL) @Test + @Ignore public void testSynchronizeWithAllChanges() { -- 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 f134c8df6abcf024b862e50d4a91e22e35af5762 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:28:36 2016 +0100 skip empty code --- .../DataSourceMigrationForVersion_5_1.java | 29 ++++++++++++++++------ 1 file changed, 22 insertions(+), 7 deletions(-) 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_5_1.java index a58fbbd..f55cba7 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_5_1.java @@ -84,6 +84,9 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC for (String lengthMeasureType : lengthMeasureTypes) { lengthMeasureType = lengthMeasureType.trim(); + if (lengthMeasureType.isEmpty()) { + continue; + } if (missingCodesMapping.containsKey(lengthMeasureType)) { lengthMeasureType = missingCodesMapping.get(lengthMeasureType); } @@ -102,7 +105,24 @@ 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 label1 = 'TL'"); + } + + @Override + public String prepareResult(ResultSet set) throws SQLException { + return set.getString(1); + } + }); + } if (sizeMeasureTypeId == null) { + if (log.isWarnEnabled()) { log.warn("Impossible de trouver la type de mesure de taille pour le code: " + lengthMeasureType); } @@ -137,10 +157,8 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC } }); - String newIdPrefix = "fr.ird.observe.entities.referentiel.SizeMeasureType#1#"; - int count = 0; for (String oldId : oldIds) { - String newId = newIdPrefix + (count++); + String newId = StringUtils.replace(oldId, ".longline", ""); queries.add(String.format("UPDATE observe_common.sizeMeasureType SET topiaId = '%s' WHERE topiaId = '%s'", newId, oldId)); queries.add(String.format("UPDATE observe_longline.sizeMeasure SET sizeMeasureType2 = '%s' WHERE sizeMeasureType = '%s'", newId, oldId)); queries.add(String.format("UPDATE observe_seine.targetLength SET sizeMeasureType = '%s' WHERE sizeMeasureType = '%s'", newId, oldId)); @@ -160,11 +178,8 @@ public class DataSourceMigrationForVersion_5_1 extends AbstractObserveMigrationC } }); - String newIdPrefix = "fr.ird.observe.entities.referentiel.WeightMeasureType#1#"; - - int count = 0; for (String oldId : oldIds) { - String newId = newIdPrefix + (count++); + String newId = StringUtils.replace(oldId, ".longline", ""); queries.add(String.format("UPDATE observe_common.weightMeasureType SET topiaId = '%s' WHERE topiaId = '%s'", newId, oldId)); queries.add(String.format("UPDATE observe_longline.weightMeasure SET weightMeasureType2 = '%s' WHERE weightMeasureType = '%s'", newId, oldId)); } -- 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 5f38a08cd6db7e814d08efc10c53bc30b23bb0af Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:29:26 2016 +0100 On passe sur une snpashot de topia qui corrige un probleme sur les migrations --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 4c073d8..d786b66 100644 --- a/pom.xml +++ b/pom.xml @@ -162,7 +162,7 @@ <eugenePluginVersion>3.0-alpha-10</eugenePluginVersion> <processorPluginVersion>1.3</processorPluginVersion> - <topiaVersion>3.1.3.2</topiaVersion> + <topiaVersion>3.2-SNAPSHOT</topiaVersion> <jaxxVersion>2.34</jaxxVersion> <nuitonI18nVersion>3.6.2</nuitonI18nVersion> <nuitonValidatorVersion>3.0.1</nuitonValidatorVersion> -- 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 9529836c4cfbd6ad1034093a92c935d8d7747d10 Merge: 10d3542 5f38a08 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Nov 4 13:29:30 2016 +0100 Merge branch 'feature/migration' into develop application-swing-configuration/pom.xml | 2 + .../application/swing/ui/ObserveMainUIHandler.java | 3 + application-web-configuration/pom.xml | 2 + entities-migration/pom.xml | 4 - .../DataSourceMigrationForVersion_5_0.java | 116 +++++++++++++++++ .../DataSourceMigrationForVersion_5_1.java | 57 ++++---- ...ObserveMigrationCallBackForVersionResolver.java | 94 -------------- .../ObserveMigrationConfigurationProviderImpl.java | 144 --------------------- .../DataSourceMigrationForVersion_3_1.java | 15 ++- .../DataSourceMigrationForVersion_3_10.java | 7 +- .../DataSourceMigrationForVersion_3_11.java | 7 +- .../DataSourceMigrationForVersion_3_12.java | 7 +- .../DataSourceMigrationForVersion_3_14.java | 7 +- .../DataSourceMigrationForVersion_3_15.java | 7 +- .../DataSourceMigrationForVersion_3_16.java | 11 +- .../DataSourceMigrationForVersion_3_5.java | 7 +- .../DataSourceMigrationForVersion_3_7.java | 7 +- .../DataSourceMigrationForVersion_3_8.java | 7 +- .../DataSourceMigrationForVersion_3_9.java | 7 +- .../DataSourceMigrationForVersion_4_0.java | 7 +- .../DataSourceMigrationForVersion_4_0_1.java | 7 +- .../DataSourceMigrationForVersion_4_0_2.java | 7 +- .../DataSourceMigrationForVersion_4_0_4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 7 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 11 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 7 +- .../DataSourceMigrationForVersion_4_900.java | 73 ----------- .../DataSourceMigrationForVersion_4_901.java | 73 ----------- .../DataSourceMigrationForVersion_4_902.java | 73 ----------- .../DataSourceMigrationForVersion_4_903.java | 74 ----------- .../DataSourceMigrationForVersion_4_904.java | 70 ---------- .../DataSourceMigrationForVersion_4_905.java | 71 ---------- .../DataSourceMigrationForVersion_4_906.java | 81 ------------ .../DataSourceMigrationForVersion_5_0.java | 72 ----------- .../{ => 3.10}/V3_10_01_remove-person-H2.sql | 0 .../{ => 3.10}/V3_10_01_remove-person-PG.sql | 0 .../{ => 3.10}/V3_10_02_add-missing-fk-H2.sql | 0 .../{ => 3.10}/V3_10_02_add-missing-fk-PG.sql | 0 .../V3_10_03_increase-comment-field-H2.sql | 0 .../V3_10_03_increase-comment-field-PG.sql | 0 .../V3_10_04_fix-sensorDataFormat-H2.sql | 0 .../V3_10_04_fix-sensorDataFormat-PG.sql | 0 .../{ => 3.10}/V3_10_05_normalize-sections-H2.sql | 0 .../{ => 3.10}/V3_10_05_normalize-sections-PG.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-H2.sql | 0 ...1_01_remove-speciesGroup-obsolete-fields-PG.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-H2.sql | 0 ...3_11_02_add-country-on-transmitting-buoy-PG.sql | 0 .../{ => 3.11}/V3_11_03_add-fpaZones-H2.sql | 0 .../{ => 3.11}/V3_11_03_add-fpaZones-PG.sql | 0 .../{ => 3.11}/V3_11_04_add-activity-ersId-H2.sql | 0 .../{ => 3.11}/V3_11_04_add-activity-ersId-PG.sql | 0 .../{ => 3.11}/V3_11_05_add-person-country-H2.sql | 0 .../{ => 3.11}/V3_11_05_add-person-country-PG.sql | 0 .../{ => 3.11}/V3_11_06_add-harbours-H2.sql | 0 .../{ => 3.11}/V3_11_06_add-harbours-PG.sql | 0 .../{ => 3.12}/V3_12_01_add-missing-boat-H2.sql | 0 .../{ => 3.12}/V3_12_01_add-missing-boat-PG.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-H2.sql | 0 ...3_14_01_remove-hooksPerBasketCount-field-PG.sql | 0 ...3_14_02_fix-targetsample-discarded-value-H2.sql | 0 ...3_14_02_fix-targetsample-discarded-value-PG.sql | 0 .../V3_14_03_remove-orphan-seine-sample-H2.sql | 0 .../V3_14_03_remove-orphan-seine-sample-PG.sql | 0 ...4_04_remove-targetlength-discarded-field-H2.sql | 0 ...4_04_remove-targetlength-discarded-field-PG.sql | 0 ..._15_01_change-tdr-integer-field-to-float-H2.sql | 0 ..._15_01_change-tdr-integer-field-to-float-PG.sql | 0 ..._15_02_remove-set-longline-length-fields-H2.sql | 0 ..._15_02_remove-set-longline-length-fields-PG.sql | 0 .../V3_15_03_remove-brancheline-fields-H2.sql | 0 .../V3_15_03_remove-brancheline-fields-PG.sql | 0 .../V3_16_01_add-gear-referential-H2.sql | 0 .../V3_16_01_add-gear-referential-PG.sql | 0 .../{ => 3.16}/V3_16_02_add-gear-data-H2.sql | 0 .../{ => 3.16}/V3_16_02_add-gear-data-PG.sql | 0 .../V3_16_03_remove-tripSeine-seine-H2.sql | 0 .../V3_16_03_remove-tripSeine-seine-PG.sql | 0 .../migration/{ => 3.5}/V3_5_01_migration-H2.sql | 0 .../migration/{ => 3.5}/V3_5_01_migration-PG.sql | 0 .../{ => 3.5}/V3_5_02_add-longline-schema-H2.sql | 0 .../{ => 3.5}/V3_5_02_add-longline-schema-PG.sql | 0 .../V3_5_03_update-common-references-H2.sql | 0 .../V3_5_03_update-common-references-PG.sql | 0 .../V3_5_04_add-longline-references-H2.sql | 0 .../V3_5_04_add-longline-references-PG.sql | 0 .../{ => 3.7}/V3_7_01_rename-seine-model-H2.sql | 0 .../{ => 3.7}/V3_7_01_rename-seine-model-PG.sql | 0 .../{ => 3.7}/V3_7_02_remove-trip-organism-H2.sql | 0 .../{ => 3.7}/V3_7_02_remove-trip-organism-PG.sql | 0 .../V3_7_03_add-referential-needComment-H2.sql | 0 .../V3_7_03_add-referential-needComment-PG.sql | 0 .../V3_7_04_normalize-triplongline-H2.sql | 0 .../V3_7_04_normalize-triplongline-PG.sql | 0 .../V3_7_05_normalize-activitylongline-H2.sql | 0 .../V3_7_05_normalize-activitylongline-PG.sql | 0 .../{ => 3.7}/V3_7_06_normalize-setlongline-H2.sql | 0 .../{ => 3.7}/V3_7_06_normalize-setlongline-PG.sql | 0 .../V3_7_07_normalize-catchlongline-H2.sql | 0 .../V3_7_07_normalize-catchlongline-PG.sql | 0 .../{ => 3.7}/V3_7_08_normalize-tdr-H2.sql | 0 .../{ => 3.7}/V3_7_08_normalize-tdr-PG.sql | 0 .../{ => 3.7}/V3_7_09_add-species-list-H2.sql | 0 .../{ => 3.7}/V3_7_09_add-species-list-PG.sql | 0 .../V3_7_10_increase-comment-field-H2.sql | 0 .../V3_7_10_increase-comment-field-PG.sql | 0 .../migration/{ => 3.8}/V3_8_01_fix-person-H2.sql | 0 .../migration/{ => 3.8}/V3_8_01_fix-person-PG.sql | 0 .../V3_8_02_fix-branchelinecomposition-H2.sql | 0 .../V3_8_02_fix-branchelinecomposition-PG.sql | 0 .../{ => 3.8}/V3_8_03_normalize-sensorused-H2.sql | 0 .../{ => 3.8}/V3_8_03_normalize-sensorused-PG.sql | 0 .../{ => 3.8}/V3_8_04_normalize-tdr-H2.sql | 0 .../{ => 3.8}/V3_8_04_normalize-tdr-PG.sql | 0 .../V3_9_01_add-dataFilename-attribute-H2.sql | 0 .../V3_9_01_add-dataFilename-attribute-PG.sql | 0 .../{ => 3.9}/V3_9_02_fill-sensorDataFormat-H2.sql | 0 .../{ => 3.9}/V3_9_02_fill-sensorDataFormat-PG.sql | 0 .../V4_0_RC_2_01_add-foreign-key-indexes-PG.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-H2.sql | 0 .../V4_0_RC_2_01_clean-program-gear-type-PG.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql | 0 .../V4_0_RC_4_01_add-gear-data-H2.sql | 0 .../V4_0_RC_4_01_add-gear-data-PG.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql | 0 ...4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql | 0 ...4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql | 0 .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql | 0 .../V4_0_1_01_remove-gender-column-H2.sql | 0 .../{ => 4.0.1}/V4_0_1_02_add-missing-fk-H2.sql | 0 .../{ => 4.0.1}/V4_0_1_02_add-missing-fk-PG.sql | 0 .../V4_0_2_01_remove-gender-column-PG.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-H2.sql | 0 ...0_4_01_remove-trip-datearriveeport-field-PG.sql | 0 .../db/migration/{ => 4.0}/V4_0_01_empty-H2.sql | 0 .../db/migration/{ => 4.0}/V4_0_01_empty-PG.sql | 0 .../{ => 5.0}/V4_900_01_remove_open_field-H2.sql | 0 .../{ => 5.0}/V4_900_01_remove_open_field-PG.sql | 0 .../V4_901_01_add_lastUpdateDate_field-H2.sql | 0 .../V4_901_01_add_lastUpdateDate_field-PG.sql | 0 .../V4_902_01_add_lastUpdateDate_table-H2.sql | 0 .../V4_902_01_add_lastUpdateDate_table-PG.sql | 0 .../{ => 5.0}/V4_903_01_remove_unit_field-H2.sql | 0 .../{ => 5.0}/V4_903_01_remove_unit_field-PG.sql | 0 .../{ => 5.0}/V4_903_02_remove_gender_field-H2.sql | 0 .../{ => 5.0}/V4_903_02_remove_gender_field-PG.sql | 0 .../V4_903_03_remove_duplicate_rows-H2.sql | 0 .../V4_903_03_remove_duplicate_rows-PG.sql | 0 ...drop_not_null_constraint_gearUseFeatures-H2.sql | 0 ...drop_not_null_constraint_gearUseFeatures-PG.sql | 0 ...p_not_null_constraint_hauling_identifier-H2.sql | 0 ...p_not_null_constraint_hauling_identifier-PG.sql | 0 .../V4_906_01_add_non_target_length_sex_fk-H2.sql | 0 .../V4_906_01_add_non_target_length_sex_fk-PG.sql | 0 .../V5_1_01_evol_8374_delete_sonarUsed-H2.sql | 0 .../V5_1_01_evol_8374_delete_sonarUsed-PG.sql | 0 .../V5_1_02_evol_7886_catch_add_set_idx-H2.sql | 0 .../V5_1_02_evol_7886_catch_add_set_idx-PG.sql | 0 ..._1_03_evol_6997_delete_supportVesselName-H2.sql | 0 ..._1_03_evol_6997_delete_supportVesselName-PG.sql | 0 ...ranchlineComposition_add_tracelineLength-H2.sql | 0 ...ranchlineComposition_add_tracelineLength-PG.sql | 0 ...5_1_05_evol_6999_nonTargetCatch_add_well-H2.sql | 0 ...5_1_05_evol_6999_nonTargetCatch_add_well-PG.sql | 0 .../V5_1_06_evol_8375_setSeine_add_booleans-H2.sql | 0 .../V5_1_06_evol_8375_setSeine_add_booleans-PG.sql | 0 .../V5_1_07_evol_8389_rename_source_columns-H2.sql | 0 .../V5_1_07_evol_8389_rename_source_columns-PG.sql | 0 .../V5_1_08_evol_8390_measure_type-H2.sql | 0 .../V5_1_08_evol_8390_measure_type-PG.sql | 0 .../V5_1_09_evol_7877_targetLength_add_sex-H2.sql | 0 .../V5_1_09_evol_7877_targetLength_add_sex-PG.sql | 0 ...10_evol_8391_species_add_sizeMeasureType-H2.sql | 0 ...10_evol_8391_species_add_sizeMeasureType-PG.sql | 0 .../V5_1_11_evol_8571_length_add_tagNumber-H2.sql | 0 .../V5_1_11_evol_8571_length_add_tagNumber-PG.sql | 0 .../V5_1_12_evol_8475_vessel_add_fields-H2.sql | 0 .../V5_1_12_evol_8475_vessel_add_fields-PG.sql | 0 .../V5_1_13_evol_7901_add_armateur_table-H2.sql | 0 .../V5_1_13_evol_7901_add_armateur_table-PG.sql | 0 ...ol_8196_lengthWeightParameter_add_source-H2.sql | 0 ...ol_8196_lengthWeightParameter_add_source-PG.sql | 0 ...vol_8578_nonTargetLength_add_speciesFate-H2.sql | 0 ...vol_8578_nonTargetLength_add_speciesFate-PG.sql | 0 ...5_1_16_evol_8377_speciesFate_add_discard-H2.sql | 0 ...5_1_16_evol_8377_speciesFate_add_discard-PG.sql | 0 entities/pom.xml | 4 + .../java/fr/ird/observe/entities/Entities.java | 6 +- .../migration/AbstractDataSourceMigration.java | 5 - .../AbstractObserveMigrationCallBack.java | 20 +-- .../entities/migration/H2DataSourceMigration.java | 0 .../entities/migration/MigrationVersion.java | 20 +++ ...ObserveMigrationCallBackForVersionResolver.java | 87 +++++++++++++ .../ObserveMigrationConfigurationProvider.java | 105 ++++++++++++--- .../entities/migration/PGDataSourceMigration.java | 0 pom.xml | 2 +- .../dto/reference/DataReferenceSetDefinitions.java | 12 +- .../topia/binder/data/DataBinderSupport.java | 2 +- .../topia/binder/data/NonTargetLengthBinder.java | 8 +- .../topia/binder/data/TargetCatchBinder.java | 6 + .../topia/binder/BinderEngineMetadataTest.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 2 +- .../topia/service/MigrateTestsDatabases.java | 11 ++ .../UnidirectionalSynchronizeReferentialTest.java | 4 + .../actions/validate/ValidateServiceTopiaTest.java | 42 +++--- .../java/fr/ird/observe/test/ObserveFixtures.java | 7 +- .../resources/db/5.1/dataForTestLongline.sql.gz | Bin 0 -> 1626691 bytes .../main/resources/db/5.1/dataForTestSeine.sql.gz | Bin 0 -> 455040 bytes test/src/main/resources/db/5.1/empty_h2.sql.gz | Bin 0 -> 6193 bytes test/src/main/resources/db/5.1/empty_pg.sql.gz | Bin 0 -> 6188 bytes test/src/main/resources/db/5.1/referentiel.sql.gz | Bin 0 -> 143865 bytes test/src/main/resources/observetest.properties | 2 +- 219 files changed, 530 insertions(+), 984 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm