[Observe-commits] 01/04: Simplification des modules : un seul module persistence + nettoyage de code dans ce module (il y a beaucoup de code mort)

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 9c0762ba03a006891e791b8d3d139f6da46afd86 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 22 14:52:49 2016 +0100 Simplification des modules : un seul module persistence + nettoyage de code dans ce module (il y a beaucoup de code mort) --- application-swing-configuration/pom.xml | 4 + .../ReferentialSynchronizeTreeModelsBuilder.java | 4 +- .../swing/ui/storage/tabs/RolesTableModel.java | 2 +- .../longline/TripLonglineServiceController.java | 5 - .../v1/data/seine/TripSeineServiceController.java | 5 - application-web/src/main/resources/mapping | 2 - {entities => common}/LICENSE.txt | 0 {entities => common}/README.md | 0 common/pom.xml | 53 ++++++++ .../src/license/THIRD-PARTY.properties | 16 +-- entities-migration/pom.xml | 115 ----------------- .../src/test/resources/log4j.properties | 33 ----- .../fr/ird/observe/entities/longline/Baskets.java | 50 -------- .../ird/observe/entities/longline/Branchlines.java | 49 -------- .../fr/ird/observe/entities/longline/Sections.java | 47 ------- .../ird/observe/entities/longline/TdrTopiaDao.java | 103 ---------------- .../referentiel/GearCaracteristicTypes.java | 83 ------------- .../ird/observe/entities/referentiel/Persons.java | 39 ------ .../ird/observe/entities/referentiel/Programs.java | 62 ---------- .../ird/observe/entities/referentiel/Vessels.java | 79 ------------ .../java/fr/ird/observe/entities/seine/Routes.java | 93 -------------- {entities-migration => persistence}/LICENSE.txt | 0 {entities-migration => persistence}/README.md | 0 {entities => persistence}/pom.xml | 17 +-- .../src/license/THIRD-PARTY.properties | 0 .../java/fr/ird/observe/entities/Activity.java | 0 .../java/fr/ird/observe/entities/EntityMap.java | 0 .../observe/entities/LastUpdateDateTopiaDao.java | 0 .../observe/entities/LengthWeightComputable.java | 0 .../java/fr/ird/observe/entities/ObserveSet.java | 0 .../main/java/fr/ird/observe/entities/Trip.java | 0 .../java/fr/ird/observe/entities/TripMapPoint.java | 0 .../entities/constants/GearTypePersist.java | 0 .../entities/constants/ReferenceStatusPersist.java | 0 .../constants/TripMapPointTypePersist.java | 0 .../NonTargetCatchComputedValueSourcePersist.java | 0 .../entities/constants/seine/OwnershipPersist.java | 0 .../constants/seine/SchoolTypePersist.java | 0 .../TypeTransmittingBuoyOperationPersist.java | 0 .../ird/observe/entities/gps/CoordinateHelper.java | 0 .../entities/longline/ActivityLonglineImpl.java | 2 +- .../longline/ActivityLonglineTopiaDao.java | 51 ++++---- .../entities/longline/ActivityLonglines.java | 4 +- .../observe/entities/longline/BasketTopiaDao.java | 0 .../observe/entities/longline/BranchlineImpl.java | 0 .../entities/longline/BranchlineTopiaDao.java | 0 .../longline/GearUseFeaturesLonglineImpl.java | 0 .../longline/LonglineCompositionEntity.java | 0 .../entities/longline/LonglinePositionAware.java | 0 .../observe/entities/longline/SectionTemplate.java | 0 .../observe/entities/longline/SectionTopiaDao.java | 0 .../entities/longline/SectionWithTemplate.java | 0 .../entities/longline/SectionWithTemplateImpl.java | 0 .../entities/longline/SectionWithTemplates.java | 0 .../observe/entities/longline/SetLonglineImpl.java | 2 +- .../fr/ird/observe/entities/longline/TdrImpl.java | 0 .../entities/longline/TripLonglineImpl.java | 0 .../entities/longline/TripLonglineTopiaDao.java | 136 +-------------------- .../observe/entities/longline/TripLonglines.java | 0 .../DuplicateLengthWeightParameterException.java | 0 .../entities/referentiel/FormulaHelper.java | 0 .../entities/referentiel/FormulaSupportImpl.java | 0 .../observe/entities/referentiel/HarbourImpl.java | 0 .../referentiel/I18nReferenceEntities.java | 14 --- .../referentiel/LengthLengthParameterImpl.java | 0 .../referentiel/LengthLengthParameterTopiaDao.java | 0 .../referentiel/LengthLengthParameters.java | 2 +- .../referentiel/LengthWeightParameterImpl.java | 0 .../LengthWeightParameterNotFoundException.java | 0 .../referentiel/LengthWeightParameters.java | 2 +- .../referentiel/ObserveReferentialEntities.java | 4 +- .../referentiel/ObserveReferentialEntityImpl.java | 0 .../observe/entities/referentiel/ProgramImpl.java | 0 .../ird/observe/entities/referentiel/Species2.java | 34 +----- .../observe/entities/referentiel/SpeciesImpl.java | 0 .../observe/entities/referentiel/VesselImpl.java | 0 .../observe/entities/seine/ActivitySeineImpl.java | 2 +- .../entities/seine/ActivitySeineTopiaDao.java | 45 ++----- .../ird/observe/entities/seine/ActivitySeines.java | 23 ++-- .../observe/entities/seine/FloatingObjectImpl.java | 0 .../entities/seine/FloatingObjectTopiaDao.java | 22 ---- .../entities/seine/GearUseFeaturesSeineImpl.java | 0 .../observe/entities/seine/NonTargetCatchImpl.java | 0 .../observe/entities/seine/NonTargetCatches.java | 0 .../entities/seine/NonTargetLengthImpl.java | 0 .../fr/ird/observe/entities/seine/RouteImpl.java | 0 .../ird/observe/entities/seine/RouteTopiaDao.java | 49 +++----- .../java/fr/ird/observe/entities/seine/Routes.java | 19 ++- .../ird/observe/entities/seine/SetSeineImpl.java | 0 .../fr/ird/observe/entities/seine/SetSeines.java | 0 .../observe/entities/seine/TargetCatchImpl.java | 0 .../ird/observe/entities/seine/TargetCatchs.java | 0 .../observe/entities/seine/TargetLengthImpl.java | 0 .../ird/observe/entities/seine/TripSeineImpl.java | 0 .../observe/entities/seine/TripSeineTopiaDao.java | 129 +------------------ .../fr/ird/observe/entities/seine/TripSeines.java | 0 .../persistence}/AbstractObserveTopiaDao.java | 2 +- .../java/fr/ird/observe/persistence}/Entities.java | 4 +- .../ObserveTopiaApplicationContext.java | 9 +- .../persistence}/ObserveTopiaConfiguration.java | 2 +- .../ObserveTopiaConfigurationFactory.java | 6 +- .../persistence}/ObserveTopiaIdFactory.java | 2 +- .../ObserveTopiaPersistenceContext.java | 2 +- .../persistence}/RunScriptTopiaSqlWork.java | 2 +- .../persistence}/RunScriptsTopiaSqlWork.java | 2 +- .../migration/AbstractDataSourceMigration.java | 2 +- .../AbstractObserveMigrationCallBack.java | 2 +- .../DataSourceMigrationForVersion_5_0.java | 2 +- .../DataSourceMigrationForVersion_6_0.java | 2 +- .../migration/H2DataSourceMigration.java | 2 +- .../persistence}/migration/MigrationVersion.java | 2 +- ...ObserveMigrationCallBackForVersionResolver.java | 2 +- .../ObserveMigrationConfigurationProvider.java | 4 +- .../migration/ObserveMigrationEngine.java | 2 +- .../migration/PGDataSourceMigration.java | 2 +- .../old/DataSourceMigrationForVersion_3_1.java | 8 +- .../old/DataSourceMigrationForVersion_3_10.java | 12 +- .../old/DataSourceMigrationForVersion_3_11.java | 12 +- .../old/DataSourceMigrationForVersion_3_12.java | 12 +- .../old/DataSourceMigrationForVersion_3_14.java | 12 +- .../old/DataSourceMigrationForVersion_3_15.java | 12 +- .../old/DataSourceMigrationForVersion_3_16.java | 12 +- .../old/DataSourceMigrationForVersion_3_5.java | 12 +- .../old/DataSourceMigrationForVersion_3_7.java | 12 +- .../old/DataSourceMigrationForVersion_3_8.java | 12 +- .../old/DataSourceMigrationForVersion_3_9.java | 12 +- .../old/DataSourceMigrationForVersion_4_0.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_1.java | 14 +-- .../old/DataSourceMigrationForVersion_4_0_2.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_4.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC2.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC3.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC4.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC6.java | 12 +- .../old/DataSourceMigrationForVersion_4_0_RC7.java | 12 +- .../src/main/resources/db/3.5/constrainsts.csv | 0 .../resources/db/3.5/traduction_attributes.csv | 0 .../main/resources/db/3.5/traduction_tables.csv | 0 .../main/resources/db/3.5/traduction_tables2.csv | 0 .../db/migration/5.0/01_remove_open_field-H2.sql | 0 .../db/migration/5.0/01_remove_open_field-PG.sql | 0 .../5.0/02_add_lastUpdateDate_field-H2.sql | 0 .../5.0/02_add_lastUpdateDate_field-PG.sql | 0 .../5.0/03_add_lastUpdateDate_table-H2.sql | 0 .../5.0/03_add_lastUpdateDate_table-PG.sql | 0 .../db/migration/5.0/04_remove_unit_field-H2.sql | 0 .../db/migration/5.0/04_remove_unit_field-PG.sql | 0 .../db/migration/5.0/05_remove_gender_field-H2.sql | 0 .../db/migration/5.0/05_remove_gender_field-PG.sql | 0 .../migration/5.0/06_remove_duplicate_rows-H2.sql | 0 .../migration/5.0/06_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 .../5.0/09_add_non_target_length_sex_fk-H2.sql | 0 .../5.0/09_add_non_target_length_sex_fk-PG.sql | 0 .../6.0/01_evol_8374_delete_sonarUsed-H2.sql | 0 .../6.0/01_evol_8374_delete_sonarUsed-PG.sql | 0 .../6.0/02_evol_7886_catch_add_set_idx-H2.sql | 0 .../6.0/02_evol_7886_catch_add_set_idx-PG.sql | 0 .../03_evol_6997_delete_supportVesselName-H2.sql | 0 .../03_evol_6997_delete_supportVesselName-PG.sql | 0 ...ranchlineComposition_add_tracelineLength-H2.sql | 0 ...ranchlineComposition_add_tracelineLength-PG.sql | 0 .../05_evol_6999_nonTargetCatch_add_well-H2.sql | 0 .../05_evol_6999_nonTargetCatch_add_well-PG.sql | 0 .../6.0/06_evol_8375_setSeine_add_booleans-H2.sql | 0 .../6.0/06_evol_8375_setSeine_add_booleans-PG.sql | 0 .../6.0/07_evol_8389_rename_source_columns-H2.sql | 0 .../6.0/07_evol_8389_rename_source_columns-PG.sql | 0 .../6.0/08_1_evol_8390_measure_type-H2.sql | 0 .../6.0/08_1_evol_8390_measure_type-PG.sql | 0 .../migration/6.0/08_evol_8390_measure_type-H2.sql | 0 .../migration/6.0/08_evol_8390_measure_type-PG.sql | 0 .../6.0/09_evol_7877_targetLength_add_sex-H2.sql | 0 .../6.0/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 .../6.0/11_evol_8571_length_add_tagNumber-H2.sql | 0 .../6.0/11_evol_8571_length_add_tagNumber-PG.sql | 0 .../6.0/12_evol_8475_vessel_add_fields-H2.sql | 0 .../6.0/12_evol_8475_vessel_add_fields-PG.sql | 0 .../6.0/13_evol_7901_add_armateur_table-H2.sql | 0 .../6.0/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 .../16_evol_8377_speciesFate_add_discard-H2.sql | 0 .../16_evol_8377_speciesFate_add_discard-PG.sql | 0 ...ol_8376_vesselActivitySeine_add_allowFad-H2.sql | 0 ...ol_8376_vesselActivitySeine_add_allowFad-PG.sql | 0 .../6.0/18_evol_8404_lengthLengthParameter-H2.sql | 0 .../6.0/18_evol_8404_lengthLengthParameter-PG.sql | 0 .../6.0/19_ano_8554_brancheline_add_section-H2.sql | 0 .../6.0/19_ano_8554_brancheline_add_section-PG.sql | 0 ...evol_8391_species_drop_lengthmeasuretype-H2.sql | 0 ...evol_8391_species_drop_lengthmeasuretype-PG.sql | 0 .../old/3.10/V3_10_01_remove-person-H2.sql | 0 .../old/3.10/V3_10_01_remove-person-PG.sql | 0 .../old/3.10/V3_10_02_add-missing-fk-H2.sql | 0 .../old/3.10/V3_10_02_add-missing-fk-PG.sql | 0 .../3.10/V3_10_03_increase-comment-field-H2.sql | 0 .../3.10/V3_10_03_increase-comment-field-PG.sql | 0 .../old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql | 0 .../old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql | 0 .../old/3.10/V3_10_05_normalize-sections-H2.sql | 0 .../old/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 .../old/3.11/V3_11_03_add-fpaZones-H2.sql | 0 .../old/3.11/V3_11_03_add-fpaZones-PG.sql | 0 .../old/3.11/V3_11_04_add-activity-ersId-H2.sql | 0 .../old/3.11/V3_11_04_add-activity-ersId-PG.sql | 0 .../old/3.11/V3_11_05_add-person-country-H2.sql | 0 .../old/3.11/V3_11_05_add-person-country-PG.sql | 0 .../old/3.11/V3_11_06_add-harbours-H2.sql | 0 .../old/3.11/V3_11_06_add-harbours-PG.sql | 0 .../old/3.12/V3_12_01_add-missing-boat-H2.sql | 0 .../old/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 .../3.15/V3_15_03_remove-brancheline-fields-H2.sql | 0 .../3.15/V3_15_03_remove-brancheline-fields-PG.sql | 0 .../old/3.16/V3_16_01_add-gear-referential-H2.sql | 0 .../old/3.16/V3_16_01_add-gear-referential-PG.sql | 0 .../old/3.16/V3_16_02_add-gear-data-H2.sql | 0 .../old/3.16/V3_16_02_add-gear-data-PG.sql | 0 .../3.16/V3_16_03_remove-tripSeine-seine-H2.sql | 0 .../3.16/V3_16_03_remove-tripSeine-seine-PG.sql | 0 .../db/migration/old/3.5/V3_5_01_migration-H2.sql | 0 .../db/migration/old/3.5/V3_5_01_migration-PG.sql | 0 .../old/3.5/V3_5_02_add-longline-schema-H2.sql | 0 .../old/3.5/V3_5_02_add-longline-schema-PG.sql | 0 .../3.5/V3_5_03_update-common-references-H2.sql | 0 .../3.5/V3_5_03_update-common-references-PG.sql | 0 .../old/3.5/V3_5_04_add-longline-references-H2.sql | 0 .../old/3.5/V3_5_04_add-longline-references-PG.sql | 0 .../old/3.7/V3_7_01_rename-seine-model-H2.sql | 0 .../old/3.7/V3_7_01_rename-seine-model-PG.sql | 0 .../old/3.7/V3_7_02_remove-trip-organism-H2.sql | 0 .../old/3.7/V3_7_02_remove-trip-organism-PG.sql | 0 .../3.7/V3_7_03_add-referential-needComment-H2.sql | 0 .../3.7/V3_7_03_add-referential-needComment-PG.sql | 0 .../old/3.7/V3_7_04_normalize-triplongline-H2.sql | 0 .../old/3.7/V3_7_04_normalize-triplongline-PG.sql | 0 .../3.7/V3_7_05_normalize-activitylongline-H2.sql | 0 .../3.7/V3_7_05_normalize-activitylongline-PG.sql | 0 .../old/3.7/V3_7_06_normalize-setlongline-H2.sql | 0 .../old/3.7/V3_7_06_normalize-setlongline-PG.sql | 0 .../old/3.7/V3_7_07_normalize-catchlongline-H2.sql | 0 .../old/3.7/V3_7_07_normalize-catchlongline-PG.sql | 0 .../migration/old/3.7/V3_7_08_normalize-tdr-H2.sql | 0 .../migration/old/3.7/V3_7_08_normalize-tdr-PG.sql | 0 .../old/3.7/V3_7_09_add-species-list-H2.sql | 0 .../old/3.7/V3_7_09_add-species-list-PG.sql | 0 .../old/3.7/V3_7_10_increase-comment-field-H2.sql | 0 .../old/3.7/V3_7_10_increase-comment-field-PG.sql | 0 .../db/migration/old/3.8/V3_8_01_fix-person-H2.sql | 0 .../db/migration/old/3.8/V3_8_01_fix-person-PG.sql | 0 .../3.8/V3_8_02_fix-branchelinecomposition-H2.sql | 0 .../3.8/V3_8_02_fix-branchelinecomposition-PG.sql | 0 .../old/3.8/V3_8_03_normalize-sensorused-H2.sql | 0 .../old/3.8/V3_8_03_normalize-sensorused-PG.sql | 0 .../migration/old/3.8/V3_8_04_normalize-tdr-H2.sql | 0 .../migration/old/3.8/V3_8_04_normalize-tdr-PG.sql | 0 .../3.9/V3_9_01_add-dataFilename-attribute-H2.sql | 0 .../3.9/V3_9_01_add-dataFilename-attribute-PG.sql | 0 .../old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql | 0 .../old/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 .../old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql | 0 .../old/4.0-RC-4/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 .../4.0.1/V4_0_1_01_remove-gender-column-H2.sql | 0 .../old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql | 0 .../old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql | 0 .../4.0.2/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/old/4.0/V4_0_01_empty-H2.sql | 0 .../db/migration/old/4.0/V4_0_01_empty-PG.sql | 0 .../src/main/xmi/observe-common.zargo | Bin .../src/main/xmi/observe-longline.zargo | Bin .../src/main/xmi/observe-seine.zargo | Bin {entities => persistence}/src/main/xmi/observe.ini | 0 .../java/fr/ird/observe/RelationRegexTest.java | 0 .../src/test/java/fr/ird/observe/ScriptTest.java | 0 .../entities/longline/SectionTemplateTest.java | 0 .../entities/referentiel/FormulaHelperTest.java | 0 ...rveMigrationCallBackForVersionResolverTest.java | 4 +- .../src/test/resources/log4j.properties | 0 pom.xml | 4 +- services-dto/pom.xml | 5 + .../service/seine/TripSeineServiceRestTest.java | 37 +----- services-topia-binder/pom.xml | 2 +- .../services/topia/binder/BinderEngine.java | 2 +- .../topia/binder/BinderEngineInitializer.java | 2 +- .../services/topia/binder/BinderSupport.java | 2 +- .../topia/binder/BinderEngineMetadataTest.java | 2 +- services-topia-validation/pom.xml | 4 +- .../validation/BeanValidatorDetectorTest.java | 2 +- services-topia-validators/pom.xml | 2 +- services-topia/pom.xml | 8 +- .../services/topia/ObserveSecurityHelper.java | 2 +- .../services/topia/ObserveServiceContextTopia.java | 4 +- .../services/topia/ObserveServiceFactoryTopia.java | 4 +- .../services/topia/ObserveServiceTopia.java | 2 +- .../ObserveTopiaApplicationContextFactory.java | 6 +- .../topia/service/DataSourceServiceTopia.java | 10 +- .../topia/service/LastUpdateDateServiceTopia.java | 2 +- .../ConsolidateActivitySeineDataResultBuilder.java | 8 +- .../consolidate/ConsolidateDataServiceTopia.java | 4 +- .../service/actions/report/ReportServiceTopia.java | 3 +- .../ReferentialSynchronizeDiffServiceTopia.java | 6 +- ...nalReferentialSynchronizeLocalServiceTopia.java | 2 +- .../ReferentialSynchronizeSqlsRequestBuilder.java | 2 +- .../sql/InsertSqlStatementGenerator.java | 2 +- .../actions/validate/ValidateServiceTopia.java | 4 +- .../validate/ValidationMessageDetector.java | 2 +- .../service/data/ImportTripScriptTopiaSqlWork.java | 2 +- .../service/data/TripManagementServiceTopia.java | 2 +- .../data/longline/TripLonglineServiceTopia.java | 15 +-- .../service/data/seine/RouteServiceTopia.java | 2 +- .../service/data/seine/TripSeineServiceTopia.java | 17 --- .../referential/ReferentialServiceTopia.java | 4 +- .../referential/ReferentialsShellBuilder.java | 2 +- .../service/sql/SqlScriptProducerServiceTopia.java | 12 +- .../services/topia/DataSourcesForTestManager.java | 2 +- .../services/topia/TopiaTestMethodResource.java | 4 +- .../services/topia/binder/BinderEngineTest.java | 2 +- .../topia/entity/LengthWeightParemetersTest.java | 4 +- .../topia/entity/ReplicateTestSupport.java | 4 +- .../topia/service/AbstractServiceTopiaTest.java | 2 +- .../topia/service/DataSourceServiceTopiaTest.java | 2 +- .../topia/service/ReferentialServiceTopiaTest.java | 2 +- .../observe/services/topia/service/RigthTest.java | 2 +- .../ConsolidateDataServiceTopiaTest.java | 2 +- .../UnidirectionalSynchronizeReferentialTest.java | 4 +- .../data/seine/TripSeineServiceTopiaTest.java | 40 +----- services-topia/src/test/resources/log4j.properties | 2 +- .../service/data/longline/TripLonglineService.java | 4 - .../service/data/seine/TripSeineService.java | 4 - .../toolbox/GenerateValidatorsDescriptorMojo.java | 2 +- 368 files changed, 377 insertions(+), 1592 deletions(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index c289f2d..ad6c2ae 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -72,6 +72,10 @@ <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> <!-- Nuiton --> <dependency> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java index 568bb77..94c3caa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java @@ -143,11 +143,11 @@ public class ReferentialSynchronizeTreeModelsBuilder { if (!references.isEmpty()) { TypeReferentialSynchroNode typeNode = rootNode.getOrAddTypeNode(referentialName); if (references.get(0).getPropertyNames().contains(ReferentialDto.PROPERTY_CODE)) { - Collections.sort(references, new ReferentialReferenceComparatorFromCode<>()); + references.sort(new ReferentialReferenceComparatorFromCode<>()); } else { DecoratorService decoratorService = ObserveSwingApplicationContext.get().getDecoratorService(); ReferentialReferenceDecorator<R> decorator = decoratorService.getReferentialReferenceDecorator(referentialName); - Collections.sort(references, new ReferentialReferenceComparatorFromDecorator<>(decorator)); + references.sort(new ReferentialReferenceComparatorFromDecorator<>(decorator)); } for (ReferentialReference<R> reference : references) { createNode.createNode(typeNode, reference); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java index 1f2d56a..583cb20 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/RolesTableModel.java @@ -92,7 +92,7 @@ public class RolesTableModel extends AbstractTableModel { this.model = model; this.roles = Lists.newArrayList(model.getUsersWithoutAdministrator()); - Collections.sort(this.roles, ObserveDbUserHelper.getUserDtoComparator()); + (this.roles).sort(ObserveDbUserHelper.getUserDtoComparator()); fireTableDataChanged(); } diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java index 046cab5..91b9467 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/longline/TripLonglineServiceController.java @@ -51,11 +51,6 @@ public class TripLonglineServiceController extends ObserveAuthenticatedServiceCo } @Override - public DataReferenceList<TripLonglineDto> getTripLonglineByProgram(String programId) { - return service.getTripLonglineByProgram(programId); - } - - @Override public int getTripLonglinePositionInProgram(String programId, String tripLonglineId) { return service.getTripLonglinePositionInProgram(programId, tripLonglineId); } diff --git a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java index f36de46..c85f1ef 100644 --- a/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java +++ b/application-web/src/main/java/fr/ird/observe/application/web/controller/v1/data/seine/TripSeineServiceController.java @@ -51,11 +51,6 @@ public class TripSeineServiceController extends ObserveAuthenticatedServiceContr } @Override - public DataReferenceList<TripSeineDto> getTripSeineByProgram(String programId) { - return service.getTripSeineByProgram(programId); - } - - @Override public int getTripSeinePositionInProgram(String programId, String tripSeineId) { return service.getTripSeinePositionInProgram(programId, tripSeineId); } diff --git a/application-web/src/main/resources/mapping b/application-web/src/main/resources/mapping index cf6faf6..7e3ac57 100644 --- a/application-web/src/main/resources/mapping +++ b/application-web/src/main/resources/mapping @@ -111,7 +111,6 @@ GET /api/v1/data/longline/TripLonglineGearUseService/loadForm GET /api/v1/data/longline/TripLonglineService/exists v1.data.longline.TripLonglineServiceController.exists GET /api/v1/data/longline/TripLonglineService/getAllTripLongline v1.data.longline.TripLonglineServiceController.getAllTripLongline GET /api/v1/data/longline/TripLonglineService/getSpeciesByListAndTrip v1.data.longline.TripLonglineServiceController.getSpeciesByListAndTrip -GET /api/v1/data/longline/TripLonglineService/getTripLonglineByProgram v1.data.longline.TripLonglineServiceController.getTripLonglineByProgram GET /api/v1/data/longline/TripLonglineService/getTripLonglineMap v1.data.longline.TripLonglineServiceController.getTripLonglineMap GET /api/v1/data/longline/TripLonglineService/getTripLonglinePositionInProgram v1.data.longline.TripLonglineServiceController.getTripLonglinePositionInProgram GET /api/v1/data/longline/TripLonglineService/loadDto v1.data.longline.TripLonglineServiceController.loadDto @@ -159,7 +158,6 @@ GET /api/v1/data/seine/TripSeineGearUseService/loadForm GET /api/v1/data/seine/TripSeineService/exists v1.data.seine.TripSeineServiceController.exists GET /api/v1/data/seine/TripSeineService/getAllTripSeine v1.data.seine.TripSeineServiceController.getAllTripSeine GET /api/v1/data/seine/TripSeineService/getSpeciesByListAndTrip v1.data.seine.TripSeineServiceController.getSpeciesByListAndTrip -GET /api/v1/data/seine/TripSeineService/getTripSeineByProgram v1.data.seine.TripSeineServiceController.getTripSeineByProgram GET /api/v1/data/seine/TripSeineService/getTripSeineMap v1.data.seine.TripSeineServiceController.getTripSeineMap GET /api/v1/data/seine/TripSeineService/getTripSeinePositionInProgram v1.data.seine.TripSeineServiceController.getTripSeinePositionInProgram GET /api/v1/data/seine/TripSeineService/loadDto v1.data.seine.TripSeineServiceController.loadDto diff --git a/entities/LICENSE.txt b/common/LICENSE.txt similarity index 100% rename from entities/LICENSE.txt rename to common/LICENSE.txt diff --git a/entities/README.md b/common/README.md similarity index 100% rename from entities/README.md rename to common/README.md diff --git a/common/pom.xml b/common/pom.xml new file mode 100644 index 0000000..207a721 --- /dev/null +++ b/common/pom.xml @@ -0,0 +1,53 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>fr.ird.observe</groupId> + <artifactId>observe</artifactId> + <version>6.0-SNAPSHOT</version> + </parent> + + <artifactId>common</artifactId> + + <name>ObServe :: Common</name> + <description>ObServe common module</description> + + <dependencies> + + <!-- nuiton dependencies --> + <!--dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-version</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency--> + + <!-- commons dependencies --> + <!--dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-collections4</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency--> + + </dependencies> + +</project> \ No newline at end of file diff --git a/entities-migration/src/license/THIRD-PARTY.properties b/common/src/license/THIRD-PARTY.properties similarity index 62% rename from entities-migration/src/license/THIRD-PARTY.properties rename to common/src/license/THIRD-PARTY.properties index e7f6efe..ffed9d9 100644 --- a/entities-migration/src/license/THIRD-PARTY.properties +++ b/common/src/license/THIRD-PARTY.properties @@ -1,18 +1,11 @@ # Generated by org.codehaus.mojo.license.AddThirdPartyMojo #------------------------------------------------------------------------------- # Already used licenses in project : -# - AL 2.0 # - Apache License 2.0 -# - Apache License, version 2.0 -# - Apache Software License, version 1.1 # - BSD License # - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 -# - Common Development and Distribution License -# - Common Public License Version 1.0 -# - Eclipse Distribution License (EDL), Version 1.0 -# - Eclipse Public License (EPL), Version 1.0 -# - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Library or Lesser General Public License +# - Eclipse Public License 1.0 +# - General Public License (GPL) # - Indiana University Extreme! Lab Software License, vesion 1.1.1 # - Lesser General Public License (LGPL) # - Lesser General Public License (LGPL) v 3.0 @@ -21,13 +14,10 @@ # - MIT License # - MPL 1.1 # - New BSD License -# - Public Domain # - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 #------------------------------------------------------------------------------- # Please fill the missing licenses for dependencies : # # -#Tue Aug 26 01:19:49 CEST 2014 +#Mon Sep 07 10:22:53 CEST 2015 commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/entities-migration/pom.xml b/entities-migration/pom.xml deleted file mode 100644 index 7b4383d..0000000 --- a/entities-migration/pom.xml +++ /dev/null @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - #%L - ObServe :: Business - - $HeadURL: https://svn.mpl.ird.fr/osiris/observe/trunk/observe-business/pom.xml $ - %% - Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Lesser 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 Lesser Public License for more details. - - You should have received a copy of the GNU General Lesser Public - License along with this program. If not, see - <http://www.gnu.org/licenses/lgpl-3.0.html>. - #L% - --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>fr.ird.observe</groupId> - <artifactId>observe</artifactId> - <version>6.0-SNAPSHOT</version> - </parent> - - <artifactId>entities-migration</artifactId> - - <name>ObServe :: Entities Migration</name> - <description>ObServe entities migration module</description> - - <dependencies> - - <!-- sibling dependencies --> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>entities</artifactId> - <version>${project.version}</version> - </dependency> - - <!-- Nuiton --> - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-version</artifactId> - </dependency> - - <!-- commons --> - <dependency> - <groupId> org.apache.commons</groupId> - <artifactId>commons-lang3</artifactId> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - </dependency> - <dependency> - <groupId>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - - <!-- ToPIA --> - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-service-migration</artifactId> - </dependency> - - <!-- test --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-jcl</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>com.h2database</groupId> - <artifactId>h2</artifactId> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.postgresql</groupId> - <artifactId>postgresql</artifactId> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - </dependencies> - -</project> diff --git a/entities-migration/src/test/resources/log4j.properties b/entities-migration/src/test/resources/log4j.properties deleted file mode 100644 index b6de28f..0000000 --- a/entities-migration/src/test/resources/log4j.properties +++ /dev/null @@ -1,33 +0,0 @@ -### -# #%L -# ObServe :: Entities Migration -# %% -# Copyright (C) 2008 - 2016 IRD, Code Lutin, 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% -### - -# Global logging configuration -log4j.rootLogger=ERROR, stdout -# Console output... -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n - -# package level -log4j.logger.fr.ird.observe=INFO -log4j.logger.org.nuiton.topia=INFO -log4j.logger.jaxx.runtime.decorator=INFO diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java b/entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java deleted file mode 100644 index 060b0a5..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/longline/Baskets.java +++ /dev/null @@ -1,50 +0,0 @@ -package fr.ird.observe.entities.longline; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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 java.util.ArrayList; -import java.util.List; - -/** - * Created on 12/14/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.10 - */ -public class Baskets { - - public static List<Basket> getBaskets(List<Section> sections) { - - List<Basket> baskets = new ArrayList<>(); - for (Section section : sections) { - - if (!section.isBasketEmpty()) { - baskets.addAll(section.getBasket()); - } - - } - return baskets; - - } - -} diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java b/entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java deleted file mode 100644 index f44430d..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/longline/Branchlines.java +++ /dev/null @@ -1,49 +0,0 @@ -package fr.ird.observe.entities.longline; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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 java.util.ArrayList; -import java.util.List; - -/** - * Created on 12/14/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.10 - */ -public class Branchlines { - - public static List<Branchline> getBranchlines(List<Basket> baskets) { - - List<Branchline> branchlines = new ArrayList<>(); - for (Basket basket : baskets) { - - if (!basket.isBranchlineEmpty()) { - branchlines.addAll(basket.getBranchline()); - } - - } - return branchlines; - - } -} diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/Sections.java b/entities/src/main/java/fr/ird/observe/entities/longline/Sections.java deleted file mode 100644 index 4db0412..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/longline/Sections.java +++ /dev/null @@ -1,47 +0,0 @@ -package fr.ird.observe.entities.longline; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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.Iterables; - -/** - * Created on 3/18/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.15 - */ -public class Sections { - - - public static Basket getFirstBasket(Section section) { - - return section.isBasketEmpty() ? null : Iterables.getFirst(section.getBasket(), null); - - } - - public static Basket getLastBasket(Section section) { - - return section.isBasketEmpty() ? null : Iterables.getLast(section.getBasket()); - - } -} diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java b/entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java deleted file mode 100644 index 7e18e69..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/longline/TdrTopiaDao.java +++ /dev/null @@ -1,103 +0,0 @@ -package fr.ird.observe.entities.longline; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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.ArrayListMultimap; -import com.google.common.collect.Multimap; -import org.nuiton.topia.persistence.support.TopiaSqlQuery; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.List; -import java.util.Map; -import java.util.Set; - -public class TdrTopiaDao extends AbstractTdrTopiaDao<Tdr> { - - - public Multimap<String, String> getTdrIdsBySeineIds(TripLongline tripLongline) { - - Set<String> setLonglineIds = TripLonglines.getSetIdsWithTdr(tripLongline); - - Multimap<String, String> result = ArrayListMultimap.create(); - - GetTdrIdsQuery sqlQuery = new GetTdrIdsQuery(); - - for (String setLonglineId : setLonglineIds) { - - sqlQuery.setSetId(setLonglineId); - - List<String> tdrIds = topiaSqlSupport.findMultipleResult(sqlQuery); - - result.putAll(setLonglineId, tdrIds); - - } - return result; - - } - - public void applyTdrAssociationFix(Multimap<String, String> tdrAssociation) { - - String request = "\nUPDATE OBSERVE_LONGLINE.TDR SET SET = '%s' WHERE topiaid = '%s';"; - - StringBuilder builder = new StringBuilder(); - - if (tdrAssociation != null) { - for (Map.Entry<String, String> entry : tdrAssociation.entries()) { - String setLonglineId = entry.getKey(); - String tdrId = entry.getValue(); - builder.append(String.format(request, setLonglineId, tdrId)); - } - } - - topiaSqlSupport.executeSql(builder.toString()); - - } - - private static class GetTdrIdsQuery extends TopiaSqlQuery<String> { - - protected String setId; - - @Override - public PreparedStatement prepareQuery(Connection connection) throws SQLException { - String sql = "SELECT t.topiaId " + - "FROM OBSERVE_LONGLINE.TDR t " + - "WHERE t.SET = ?"; - PreparedStatement ps = connection.prepareStatement(sql); - ps.setString(1, setId); - return ps; - } - - @Override - public String prepareResult(ResultSet set) throws SQLException { - return set.getString(1); - } - - public void setSetId(String setId) { - this.setId = setId; - } - } - -} diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java deleted file mode 100644 index f344ae6..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/GearCaracteristicTypes.java +++ /dev/null @@ -1,83 +0,0 @@ -package fr.ird.observe.entities.referentiel; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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.Sets; - -import java.util.Set; - -/** - * Created on 4/7/15. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.16 - */ -public class GearCaracteristicTypes { - - public static final Set<String> INTEGER_IDS = Sets.newHashSet( - "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.3", - "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.5" - ); - - public static final Set<String> FLOAT_IDS = Sets.newHashSet( - "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.4", - "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.6" - ); - - - public static boolean isBoolean(GearCaracteristicType type) { - return "fr.ird.observe.entities.referentiel.GearCaracteristicType#1239832686123#0.2".equals(type.getTopiaId()); - } - - public static boolean isInteger(GearCaracteristicType type) { - return INTEGER_IDS.contains(type.getTopiaId()); - } - - public static boolean isFloat(GearCaracteristicType type) { - return FLOAT_IDS.contains(type.getTopiaId()); - } - - public static Object getTypeValue(GearCaracteristicType type, Object value) { - - if (value != null) { - - if (isBoolean(type)) { - - value = Boolean.valueOf((String) value); - - } else if (isInteger(type)) { - - value = Float.valueOf((String) value).intValue(); - - } else if (isFloat(type)) { - - value = Float.valueOf((String) value); - - } - } - - return value; - - } - -} diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/Persons.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/Persons.java deleted file mode 100644 index 4675ac6..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/Persons.java +++ /dev/null @@ -1,39 +0,0 @@ -package fr.ird.observe.entities.referentiel; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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 java.util.function.Predicate; - -/** - * Created on 6/24/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 4.0 - */ -public class Persons { - - public static final Predicate<Person> OBSERVER_PREDICATE = Person::isObserver; - public static final Predicate<Person> CAPTAIN_PREDICATE = Person::isCaptain; - public static final Predicate<Person> DATA_ENTRY_OPERATOR_PREDICATE = Person::isDataEntryOperator; - -} diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java deleted file mode 100644 index 245eab2..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/Programs.java +++ /dev/null @@ -1,62 +0,0 @@ -package fr.ird.observe.entities.referentiel; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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.constants.GearTypePersist; - -import java.util.Collections; -import java.util.Comparator; -import java.util.List; - -/** - * Created on 8/25/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.7 - */ -public class Programs { - - /** - * Comparateur de {@link Program} basé sur la propriété {@link - * Program#getLabel2()}. - * - * FIXME-TC-20100205 : il faudrait que le comparateur soit sur le bon - * libelle selon la langue de base choisie... - */ - public static final Comparator<Program> PROGRAMME_COMPARATOR = (o1, o2) -> o1.getLabel2().compareTo(o2.getLabel2()); - - public static void sort(List<Program> programs) { - //FIXME-TC20100207 : make possible sort on different libelles coming - //from the ObserConfig.getDbLocale - Collections.sort(programs, PROGRAMME_COMPARATOR); - } - - public static boolean isProgramLongline(Program program) { - return GearTypePersist.longline.equals(program.getGearType()); - } - - public static boolean isProgramSeine(Program program) { - return GearTypePersist.seine.equals(program.getGearType()); - } - -} diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/Vessels.java b/entities/src/main/java/fr/ird/observe/entities/referentiel/Vessels.java deleted file mode 100644 index d4350dc..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/Vessels.java +++ /dev/null @@ -1,79 +0,0 @@ -package fr.ird.observe.entities.referentiel; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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.ImmutableSet; -import com.google.common.collect.Sets; - -import java.util.Set; -import java.util.function.Predicate; - -/** - * Created on 11/27/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.8 - */ -public class Vessels { - - //FIXME - private static final ImmutableSet<String> LONGLINE_VESSEL_TYPE_IDS = ImmutableSet.copyOf( - Sets.newHashSet("fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.044156847891821505", - "fr.ird.observe.entities.referentiel.VesselType#1239832675736#0.8708229847859869", - "fr.ird.observe.entities.referentiel.VesselType#1239832686137#0.1")); - - //FIXME - private static final ImmutableSet<String> SEINE_VESSEL_TYPE_IDS = ImmutableSet.copyOf( - Sets.newHashSet("fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.044156847891821505", - "fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.307197212385357", - "fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.7380146830307519", - "fr.ird.observe.entities.referentiel.VesselType#1239832675735#0.9086075071905084", - "fr.ird.observe.entities.referentiel.VesselType#1239832675737#0.43324169605639407")); - - - public static Predicate<Vessel> newVesselLonglinePredicate() { - - return new VesselByVesselTypeIdPredicate(LONGLINE_VESSEL_TYPE_IDS); - - } - - public static Predicate<Vessel> newVesselSeinePredicate() { - - return new VesselByVesselTypeIdPredicate(SEINE_VESSEL_TYPE_IDS); - - } - - private static class VesselByVesselTypeIdPredicate implements Predicate<Vessel> { - - final Set<String> vesselTypeIds; - - private VesselByVesselTypeIdPredicate(Set<String> vesselTypeIds) { - this.vesselTypeIds = vesselTypeIds; - } - - @Override - public boolean test(Vessel input) { - return vesselTypeIds.contains(input.getVesselType().getTopiaId()); - } - } -} diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/Routes.java b/entities/src/main/java/fr/ird/observe/entities/seine/Routes.java deleted file mode 100644 index b8d9e5d..0000000 --- a/entities/src/main/java/fr/ird/observe/entities/seine/Routes.java +++ /dev/null @@ -1,93 +0,0 @@ -package fr.ird.observe.entities.seine; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2016 IRD, Code Lutin, 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.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.List; -import java.util.function.Predicate; - -/** - * Created on 8/25/14. - * - * @author Tony Chemit - chemit@codelutin.com - * @since 3.7 - */ -public class Routes { - - /** Logger. */ - private static final Log log = LogFactory.getLog(Routes.class); - - /** - * Comparateur de {@link Route} basé sur la propriété {@link - * Route#getDate()}. - */ - public static final Comparator<Route> ROUTE_COMPARATOR = (o1, o2) -> o1.getDate().compareTo(o2.getDate()); - - public static void sort(List<Route> routes) { - Collections.sort(routes, ROUTE_COMPARATOR); - } - - public static Route getPreviousRoute(List<Route> routes, Route route) { - - if (route == null) { - // pas de route courante - return null; - } - - if (routes == null || routes.size() < 2) { - // pas plus de 2 routes, donc pas de route precedente - return null; - } - sort(routes); - Route previous = null; - for (Route r : routes) { - if (r.getDate().getTime() < - route.getDate().getTime()) { - previous = r; - continue; - } - // la route courante est - break; - } - if (previous != null) { - if (log.isDebugEnabled()) - log.debug("previous route " + - previous.getDate()); - } else { - if (log.isDebugEnabled()) { - log.debug("no previous route for " + route); - } - - } - return previous; - } - - public static Predicate<Route> newDateBeforePredicate(final Date date) { - return input -> input.getDate().before(date); - } -} diff --git a/entities-migration/LICENSE.txt b/persistence/LICENSE.txt similarity index 100% rename from entities-migration/LICENSE.txt rename to persistence/LICENSE.txt diff --git a/entities-migration/README.md b/persistence/README.md similarity index 100% rename from entities-migration/README.md rename to persistence/README.md diff --git a/entities/pom.xml b/persistence/pom.xml similarity index 95% rename from entities/pom.xml rename to persistence/pom.xml index 95cab3b..a69543a 100644 --- a/entities/pom.xml +++ b/persistence/pom.xml @@ -31,10 +31,10 @@ <version>6.0-SNAPSHOT</version> </parent> - <artifactId>entities</artifactId> + <artifactId>persistence</artifactId> - <name>ObServe :: Entities</name> - <description>ObServe entities module</description> + <name>ObServe :: Persistence</name> + <description>ObServe Persistence module</description> <dependencies> @@ -44,6 +44,11 @@ <artifactId>topia-extension</artifactId> <version>${project.version}</version> </dependency> + <!--dependency> + <groupId>${project.groupId}</groupId> + <artifactId>common</artifactId> + <version>${project.version}</version> + </dependency--> <!-- Nuiton --> <dependency> @@ -101,10 +106,6 @@ <groupId>org.hibernate</groupId> <artifactId>hibernate-core</artifactId> </dependency> - <!--dependency> - <groupId>org.hibernate</groupId> - <artifactId>hibernate-c3p0</artifactId> - </dependency--> <dependency> <groupId>com.zaxxer</groupId> <artifactId>HikariCP</artifactId> @@ -216,7 +217,7 @@ <phase>generate-sources</phase> <id>generate-persistence</id> <configuration> - <defaultPackage>fr.ird.observe</defaultPackage> + <defaultPackage>fr.ird.observe.persistence</defaultPackage> <fullPackagePath>fr.ird.observe</fullPackagePath> <modelExtensionFile>${project.build.directory}/xmi/observe.ini</modelExtensionFile> <inputs> diff --git a/entities/src/license/THIRD-PARTY.properties b/persistence/src/license/THIRD-PARTY.properties similarity index 100% rename from entities/src/license/THIRD-PARTY.properties rename to persistence/src/license/THIRD-PARTY.properties diff --git a/entities/src/main/java/fr/ird/observe/entities/Activity.java b/persistence/src/main/java/fr/ird/observe/entities/Activity.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/Activity.java rename to persistence/src/main/java/fr/ird/observe/entities/Activity.java diff --git a/entities/src/main/java/fr/ird/observe/entities/EntityMap.java b/persistence/src/main/java/fr/ird/observe/entities/EntityMap.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/EntityMap.java rename to persistence/src/main/java/fr/ird/observe/entities/EntityMap.java diff --git a/entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java diff --git a/entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java b/persistence/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java rename to persistence/src/main/java/fr/ird/observe/entities/LengthWeightComputable.java diff --git a/entities/src/main/java/fr/ird/observe/entities/ObserveSet.java b/persistence/src/main/java/fr/ird/observe/entities/ObserveSet.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/ObserveSet.java rename to persistence/src/main/java/fr/ird/observe/entities/ObserveSet.java diff --git a/entities/src/main/java/fr/ird/observe/entities/Trip.java b/persistence/src/main/java/fr/ird/observe/entities/Trip.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/Trip.java rename to persistence/src/main/java/fr/ird/observe/entities/Trip.java diff --git a/entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java b/persistence/src/main/java/fr/ird/observe/entities/TripMapPoint.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java rename to persistence/src/main/java/fr/ird/observe/entities/TripMapPoint.java diff --git a/entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java rename to persistence/src/main/java/fr/ird/observe/entities/constants/GearTypePersist.java diff --git a/entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java rename to persistence/src/main/java/fr/ird/observe/entities/constants/ReferenceStatusPersist.java diff --git a/entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java rename to persistence/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java diff --git a/entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java rename to persistence/src/main/java/fr/ird/observe/entities/constants/seine/NonTargetCatchComputedValueSourcePersist.java diff --git a/entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java rename to persistence/src/main/java/fr/ird/observe/entities/constants/seine/OwnershipPersist.java diff --git a/entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java rename to persistence/src/main/java/fr/ird/observe/entities/constants/seine/SchoolTypePersist.java diff --git a/entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java b/persistence/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java rename to persistence/src/main/java/fr/ird/observe/entities/constants/seine/TypeTransmittingBuoyOperationPersist.java diff --git a/entities/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java b/persistence/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java rename to persistence/src/main/java/fr/ird/observe/entities/gps/CoordinateHelper.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java similarity index 98% rename from entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java index b48957a..294a6eb 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java @@ -23,7 +23,7 @@ package fr.ird.observe.entities.longline; */ import com.google.common.base.MoreObjects; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.entities.gps.CoordinateHelper; import fr.ird.observe.entities.referentiel.longline.VesselActivityLongline; import org.nuiton.util.DateUtil; diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java similarity index 71% rename from entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java index b79eda7..f452176 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineTopiaDao.java @@ -42,12 +42,6 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A } - public ActivityLongline findStubByTopiaId(String activityId, int referenceLocale) { - - return StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale); - - } - private static class StubSqlQuery extends TopiaSqlQuery<ActivityLongline> { private final String sql; @@ -59,17 +53,16 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A public static List<ActivityLongline> findAll(TopiaSqlSupport context, String tripId, int referenceLocale) { String sql = "SELECT" + - " a.topiaId," + - " a.timestamp," + -// " a.open," + - " a.set," + - " va.topiaId," + - " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.activity a, observe_longline.vesselactivity va" + - " WHERE " + - " a.trip = ?" + - " AND a.vesselactivity = va.topiaid" + - " ORDER BY a.timestamp"; + " a.topiaId," + + " a.timestamp," + + " a.set," + + " va.topiaId," + + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + + " WHERE " + + " a.trip = ?" + + " AND a.vesselactivity = va.topiaid" + + " ORDER BY a.timestamp"; StubSqlQuery request = new StubSqlQuery(sql, tripId, referenceLocale); return context.findMultipleResult(request); @@ -79,17 +72,16 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A public static ActivityLongline find(TopiaSqlSupport context, String activityId, int referenceLocale) { String sql = "SELECT" + - " a.topiaId," + - " a.timestamp," + -// " a.open," + - " a.set," + - " va.topiaId," + - " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.activity a, observe_longline.vesselactivity va" + - " WHERE " + - " a.topiaId = ?" + - " AND a.vesselactivity = va.topiaid" + - " ORDER BY a.timestamp"; + " a.topiaId," + + " a.timestamp," + + " a.set," + + " va.topiaId," + + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " FROM observe_longline.activity a, observe_longline.vesselactivity va" + + " WHERE " + + " a.topiaId = ?" + + " AND a.vesselactivity = va.topiaid" + + " ORDER BY a.timestamp"; StubSqlQuery request = new StubSqlQuery(sql, activityId, referenceLocale); return context.findSingleResult(request); @@ -115,7 +107,6 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A ActivityLongline activity = new ActivityLonglineImpl(); activity.setTopiaId(set.getString(1)); activity.setTimeStamp(set.getTimestamp(2)); -// activity.setOpen(set.getBoolean(3)); String setId = set.getString(3); if (setId != null) { @@ -129,7 +120,7 @@ public class ActivityLonglineTopiaDao extends AbstractActivityLonglineTopiaDao<A String vesselActivityId = set.getString(4); vesselActivity.setTopiaId(vesselActivityId); String label = set.getString(5); - I18nReferenceEntities.setLabel(referenceLocale,vesselActivity, label); + I18nReferenceEntities.setLabel(referenceLocale, vesselActivity, label); activity.setVesselActivityLongline(vesselActivity); return activity; diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java similarity index 91% rename from entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java index 008e4cb..72f435a 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/ActivityLonglines.java @@ -40,10 +40,10 @@ public class ActivityLonglines { * Comparateur de {@link ActivityLongline} basé sur la propriété {@link * ActivityLongline#getTimeStamp()}. */ - public static final Comparator<ActivityLongline> ACTIVITY_LONGLINE_COMPARATOR = (o1, o2) -> o1.getTimeStamp().compareTo(o2.getTimeStamp()); + public static final Comparator<ActivityLongline> ACTIVITY_LONGLINE_COMPARATOR = Comparator.comparing(ActivityLongline::getTimeStamp); public static void sort(List<ActivityLongline> routes) { - Collections.sort(routes, ACTIVITY_LONGLINE_COMPARATOR); + routes.sort(ACTIVITY_LONGLINE_COMPARATOR); } public static Predicate<ActivityLongline> newTimeStampBeforePredicate(Date timeStamp) { diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/BasketTopiaDao.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/BranchlineImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/BranchlineTopiaDao.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/GearUseFeaturesLonglineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/GearUseFeaturesLonglineImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/GearUseFeaturesLonglineImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/GearUseFeaturesLonglineImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/LonglineCompositionEntity.java b/persistence/src/main/java/fr/ird/observe/entities/longline/LonglineCompositionEntity.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/LonglineCompositionEntity.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/LonglineCompositionEntity.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/LonglinePositionAware.java b/persistence/src/main/java/fr/ird/observe/entities/longline/LonglinePositionAware.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/LonglinePositionAware.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/LonglinePositionAware.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/SectionTemplate.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/SectionTopiaDao.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplate.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplateImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/SectionWithTemplates.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java similarity index 99% rename from entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java index c8bd46c..ce4f4d5 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/SetLonglineImpl.java @@ -23,7 +23,7 @@ package fr.ird.observe.entities.longline; */ import com.google.common.base.MoreObjects; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.entities.gps.CoordinateHelper; import org.nuiton.util.DateUtil; diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/TdrImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java similarity index 67% rename from entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index 51f0511..7002ed4 100644 --- a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -26,15 +26,7 @@ import com.google.common.collect.Lists; import fr.ird.observe.entities.TripMapPoint; import fr.ird.observe.entities.constants.TripMapPointTypePersist; import fr.ird.observe.entities.referentiel.Harbour; -import fr.ird.observe.entities.referentiel.I18nReferenceEntities; -import fr.ird.observe.entities.referentiel.Person; -import fr.ird.observe.entities.referentiel.PersonImpl; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.ProgramImpl; -import fr.ird.observe.entities.referentiel.Vessel; -import fr.ird.observe.entities.referentiel.VesselImpl; -import fr.ird.observe.entities.referentiel.longline.TripType; -import fr.ird.observe.entities.referentiel.longline.TripTypeImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -56,7 +48,8 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl public int findPositionByProgramId(String programId, String tripId) { int result = 0; - List<TripLongline> list = findAllStubByProgramId(programId, 1); + //FIXME Bien vérifier que cela fonctionne + List<TripLongline> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll(); for (TripLongline e : list) { if (tripId.equals(e.getTopiaId())) { return result; @@ -68,18 +61,6 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl return -1; } - public List<TripLongline> findAllStubByProgramId(String programId, int referenceLocale) { - - return StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale); - - } - - public TripLongline findStubByTopiaId(String tripId, int referenceLocale) { - - return StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale); - - } - public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId) { TripLongline tripLongline = forTopiaIdEquals(tripId).findUnique(); @@ -231,119 +212,6 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl } } - - private static class StubSqlQuery extends TopiaSqlQuery<TripLongline> { - - private final String sql; - - private final String id; - - private final int referenceLocale; - - StubSqlQuery(String sql, String id, int referenceLocale) { - this.sql = sql; - this.id = id; - this.referenceLocale = referenceLocale; - } - - public static List<TripLongline> findAll(TopiaSqlSupport context, String programId, int referenceLocale) { - - String sql = "SELECT" + - " t.topiaId," + - " t.startDate," + - " t.endDate," + - " pr.topiaId," + - " tt.topiaId," + - " p.lastName," + - " p.firstName," + - " v.topiaId," + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + "," + - " (select count(*) from observe_longline.activity a where a.trip = t.topiaId) as activityCount" + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr, observe_longline.triptype tt" + - " WHERE " + - " t.program = ?" + - " AND t.program = pr.topiaId" + - " AND t.tripType = tt.topiaId" + - " AND t.observer = p.topiaId" + - " AND t.vessel = v.topiaId" + - " ORDER BY t.endDate"; - - StubSqlQuery request = new StubSqlQuery(sql, programId, referenceLocale); - return context.findMultipleResult(request); - - } - - public static TripLongline find(TopiaSqlSupport context, String tripId, int referenceLocale) { - - String sql = "SELECT" + - " t.topiaId," + - " t.startDate," + - " t.endDate," + - " pr.topiaId," + - " tt.topiaId," + - " p.lastName," + - " p.firstName," + - " v.topiaId," + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + "," + - " (select count(*) from observe_longline.activity a where a.trip = t.topiaId) as activityCount" + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr, observe_longline.triptype tt" + - " WHERE " + - " t.topiaId = ?" + - " AND t.program = pr.topiaId" + - " AND t.tripType = tt.topiaId" + - " AND t.observer = p.topiaId" + - " AND t.vessel = v.topiaId" + - " ORDER BY t.endDate"; - - StubSqlQuery request = new StubSqlQuery(sql, tripId, referenceLocale); - return context.findSingleResult(request); - - } - - @Override - public PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement preparedStatement = connection.prepareStatement(sql); - preparedStatement.setString(1, id); - return preparedStatement; - } - - @Override - public TripLongline prepareResult(ResultSet set) throws SQLException { - - TripLongline trip = new TripLonglineImpl(); - trip.setTopiaId(set.getString(1)); - trip.setStartDate(set.getTimestamp(2)); - trip.setEndDate(set.getTimestamp(3)); - - Program program = new ProgramImpl(); - program.setTopiaId(set.getString(4)); - trip.setProgram(program); - - TripType tripType = new TripTypeImpl(); - tripType.setTopiaId(set.getString(5)); - trip.setTripType(tripType); - - String observerLastName = set.getString(6); - String observerFirstName = set.getString(7); - Person observer = new PersonImpl(); - observer.setFirstName(observerFirstName); - observer.setLastName(observerLastName); - trip.setObserver(observer); - - Vessel vessel = new VesselImpl(); - String vesselId = set.getString(8); - vessel.setTopiaId(vesselId); - String label = set.getString(9); - I18nReferenceEntities.setLabel(referenceLocale, vessel, label); - trip.setActivityCount(set.getInt(10)); - trip.setVessel(vessel); - - return trip; - - } - - } - public boolean updateEndDate(TripLongline trip) { boolean wasUpdated = false; diff --git a/entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java b/persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java rename to persistence/src/main/java/fr/ird/observe/entities/longline/TripLonglines.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/DuplicateLengthWeightParameterException.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaHelper.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/FormulaSupportImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/HarbourImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java similarity index 88% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java index 7f5f593..bf180b2 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/I18nReferenceEntities.java @@ -22,8 +22,6 @@ package fr.ird.observe.entities.referentiel; * #L% */ -import java.util.Locale; - /** * Created on 29/08/15. * @@ -31,18 +29,6 @@ import java.util.Locale; */ public class I18nReferenceEntities { - public static final Locale ES_LOCALE = new Locale("es", "ES"); - - public static Locale getLocale(int referenceLocaleOrdinal) { - Locale locale = Locale.FRANCE; - if (referenceLocaleOrdinal == 0) { - locale = Locale.UK; - } else if (referenceLocaleOrdinal == 2) { - locale = ES_LOCALE; - } - return locale; - } - public static String getPropertyName(int referenceLocaleOrdinal) { return "label" + (referenceLocaleOrdinal + 1); } diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameterTopiaDao.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java similarity index 96% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java index b852100..ed20237 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthLengthParameters.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel; * #L% */ -import fr.ird.observe.ObserveTopiaDaoSupplier; +import fr.ird.observe.persistence.ObserveTopiaDaoSupplier; import java.util.Optional; diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameterNotFoundException.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java similarity index 99% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java index 381826e..db81dd6 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel; * #L% */ -import fr.ird.observe.ObserveTopiaDaoSupplier; +import fr.ird.observe.persistence.ObserveTopiaDaoSupplier; import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java similarity index 97% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java index 2dfbbd8..4826d00 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntities.java @@ -22,8 +22,8 @@ package fr.ird.observe.entities.referentiel; * #L% */ -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.entities.constants.ReferenceStatusPersist; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/ObserveReferentialEntityImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/ProgramImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/Species2.java similarity index 61% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/Species2.java index cc58cb9..40e9950 100644 --- a/entities/src/main/java/fr/ird/observe/entities/referentiel/Species2.java +++ b/persistence/src/main/java/fr/ird/observe/entities/referentiel/Species2.java @@ -45,14 +45,6 @@ public class Species2 { // avoid instance } - public static Predicate<Species> newSpeciesByIdPredicate(Set<String> ids) { - return id -> ids.contains(id.getTopiaId()); - } - - public static Predicate<Species> newSpeciesListPredicate(SpeciesList speciesList) { - return speciesList::containsSpecies; - } - public static Predicate<Species> newSpeciesByOceanPredicate(Ocean ocean) { return o -> o.containsOcean(ocean); } @@ -62,21 +54,7 @@ public class Species2 { return speciess.stream().filter(newSpeciesByOceanPredicate(ocean)).collect(Collectors.toList()); } - public static List<WeightCategory> filterWeightCategoryBySpeciesIds(Collection<WeightCategory> speciess, Set<String> speciesIds) { - - return speciess.stream() - .filter(input -> speciesIds.contains(input.getSpecies().getTopiaId())) - .collect(Collectors.toList()); - } - - public static List<WeightCategory> filterWeightCategoryByOcean(Collection<WeightCategory> speciess, Ocean ocean) { - - return speciess.stream() - .filter(input -> input.getSpecies().getOcean().contains(ocean)) - .collect(Collectors.toList()); - } - - public static String decorate(Locale locale, Species species) { + public static String decorate(Species species) { StringBuilder builder = new StringBuilder(); builder.append(species.getFaoCode()); @@ -91,14 +69,4 @@ public class Species2 { } - public static List<Species> toSpecies(Collection<WeightCategory> categories) { - - Set<Species> result = Sets.newHashSet(); - - for (WeightCategory category : categories) { - result.add(category.getSpecies()); - } - return new ArrayList<>(result); - } - } diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java b/persistence/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java similarity index 99% rename from entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java index d3e4be5..9398bbf 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.seine; import com.google.common.base.MoreObjects; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.gps.CoordinateHelper; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java similarity index 69% rename from entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java index 9df9d8c..0b06ecc 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeineTopiaDao.java @@ -42,12 +42,6 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit } - public ActivitySeine findStubByTopiaId(String activityId, int referenceLocale) { - - return StubSqlQuery.find(topiaSqlSupport, activityId, referenceLocale); - - } - private static class StubSqlQuery extends TopiaSqlQuery<ActivitySeine> { private final String sql; @@ -59,41 +53,22 @@ public class ActivitySeineTopiaDao extends AbstractActivitySeineTopiaDao<Activit static List<ActivitySeine> findAll(TopiaSqlSupport context, String routeId, int referenceLocale) { String sql = "SELECT" + - " a.topiaId," + - " a.time," + - " a.set," + - " va.topiaId," + - " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.activity a, observe_seine.vesselactivity va" + - " WHERE " + - " a.route = ?" + - " AND a.vesselactivity = va.topiaid" + - " ORDER BY a.time"; + " a.topiaId," + + " a.time," + + " a.set," + + " va.topiaId," + + " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " FROM observe_seine.activity a, observe_seine.vesselactivity va" + + " WHERE " + + " a.route = ?" + + " AND a.vesselactivity = va.topiaid" + + " ORDER BY a.time"; StubSqlQuery request = new StubSqlQuery(sql, routeId, referenceLocale); return context.findMultipleResult(request); } - static ActivitySeine find(TopiaSqlSupport context, String activityId, int referenceLocale) { - - String sql = "SELECT" + - " a.topiaId," + - " a.time," + - " a.set," + - " va.topiaId," + - " va." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.activity a, observe_seine.vesselactivity va" + - " WHERE " + - " a.topiaId = ?" + - " AND a.vesselactivity = va.topiaid" + - " ORDER BY a.time"; - - StubSqlQuery request = new StubSqlQuery(sql, activityId, referenceLocale); - return context.findSingleResult(request); - - } - StubSqlQuery(String sql, String id, int referenceLocale) { this.sql = sql; this.id = id; diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java similarity index 92% rename from entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java index 5318d09..fff4493 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/ActivitySeines.java @@ -30,7 +30,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import java.util.ArrayList; -import java.util.Collections; import java.util.Comparator; import java.util.Date; import java.util.Iterator; @@ -50,8 +49,7 @@ public class ActivitySeines { * ActivitySeine#getTime()}. */ public static final Comparator<ActivitySeine> ACTIVITE_COMPARATOR = - (o1, o2) -> o1.getTime().compareTo( - o2.getTime()); + Comparator.comparing(ActivitySeine::getTime); /** Logger. */ private static final Log log = LogFactory.getLog(ActivitySeines.class); @@ -59,8 +57,8 @@ public class ActivitySeines { public static String decorate(int referenceLocale, ActivitySeine activitySeine) { return String.format("%1$tH:%1$tM", activitySeine.getTime()) - + " - " + - I18nReferenceEntities.getLabel(referenceLocale,activitySeine.getVesselActivitySeine()); + + " - " + + I18nReferenceEntities.getLabel(referenceLocale, activitySeine.getVesselActivitySeine()); } @@ -88,7 +86,7 @@ public class ActivitySeines { ActivitySeine previous = null; for (ActivitySeine a : activitySeines) { if (a.getTime().getTime() < - activitySeine.getTime().getTime()) { + activitySeine.getTime().getTime()) { previous = a; continue; } @@ -97,8 +95,7 @@ public class ActivitySeines { } if (previous != null) { if (log.isDebugEnabled()) { - log.debug("previous activity " + - previous.getTime()); + log.debug("previous activity " + previous.getTime()); } } else { if (log.isDebugEnabled()) { @@ -109,7 +106,7 @@ public class ActivitySeines { } public static void sort(List<ActivitySeine> activitySeines) { - Collections.sort(activitySeines, ACTIVITE_COMPARATOR); + activitySeines.sort(ACTIVITE_COMPARATOR); } /** @@ -230,7 +227,7 @@ public class ActivitySeines { return null; } - public static List<ActivitySeine> getActivityDebutDePechePositive(Route route) { + public static List<ActivitySeine> getActivityDebutDePechePositive(Route route) { List<ActivitySeine> result = new ArrayList<>(); if (!route.isActivitySeineEmpty()) { for (ActivitySeine a : route.getActivitySeine()) { @@ -244,7 +241,7 @@ public class ActivitySeines { return result; } - public static List<ActivitySeine> getActivityFinDePeche(Route route) { + public static List<ActivitySeine> getActivityFinDePeche(Route route) { List<ActivitySeine> result = new ArrayList<>(); if (!route.isActivitySeineEmpty()) { for (ActivitySeine a : route.getActivitySeine()) { @@ -262,7 +259,7 @@ public class ActivitySeines { return getActivityFinDeVeille(route) != null; } - public static ActivitySeine getActivityFinDeVeille(Route route) { + public static ActivitySeine getActivityFinDeVeille(Route route) { if (route.isActivitySeineEmpty()) { return null; } @@ -289,7 +286,7 @@ public class ActivitySeines { while (itr.hasNext()) { ActivitySeine a = itr.next(); if (currentTime.before(a.getTime()) || - currentTime.equals(a.getTime())) { + currentTime.equals(a.getTime())) { break; } i++; diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java similarity index 78% rename from entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java index 9c8a0e9..8b1259b 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/FloatingObjectTopiaDao.java @@ -42,12 +42,6 @@ public class FloatingObjectTopiaDao extends AbstractFloatingObjectTopiaDao<Float } - public FloatingObject findStubByTopiaId(String floatingObjectId, int referenceLocale) { - - return StubSqlQuery.find(topiaSqlSupport, floatingObjectId, referenceLocale); - - } - private static class StubSqlQuery extends TopiaSqlQuery<FloatingObject> { private final String sql; @@ -72,22 +66,6 @@ public class FloatingObjectTopiaDao extends AbstractFloatingObjectTopiaDao<Float } - static FloatingObject find(TopiaSqlSupport context, String floatingObjectId, int referenceLocale) { - - String sql = "SELECT" + - " fo.topiaId," + - " ot." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.floatingobject fo, observe_seine.objecttype ot" + - " WHERE " + - " fo.topiaId = ?" + - " AND fo.objecttype = ot.topiaid" + - " ORDER BY ot." + I18nReferenceEntities.getPropertyName(referenceLocale); - - StubSqlQuery request = new StubSqlQuery(sql, floatingObjectId, referenceLocale); - return context.findSingleResult(request); - - } - StubSqlQuery(String sql, String id, int referenceLocale) { this.sql = sql; this.id = id; diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/GearUseFeaturesSeineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/GearUseFeaturesSeineImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/GearUseFeaturesSeineImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/GearUseFeaturesSeineImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java b/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetCatches.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java similarity index 69% rename from entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java index 38b3b63..5b7236c 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/RouteTopiaDao.java @@ -41,12 +41,6 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { } - public Route findStubByTopiaId(String routeId) { - - return StubSqlQuery.find(topiaSqlSupport, routeId); - - } - private static class StubSqlQuery extends TopiaSqlQuery<Route> { @@ -57,33 +51,18 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { static List<Route> findAll(TopiaSqlSupport context, String tripSeineId) { String sql = "SELECT" + - " r.topiaId," + - " r.date" + - " FROM observe_seine.route r" + - " WHERE " + - " r.trip = ?" + - " ORDER BY r.date"; + " r.topiaId," + + " r.date" + + " FROM observe_seine.route r" + + " WHERE " + + " r.trip = ?" + + " ORDER BY r.date"; StubSqlQuery request = new StubSqlQuery(sql, tripSeineId); return context.findMultipleResult(request); } - static Route find(TopiaSqlSupport context, String routeId) { - - String sql = "SELECT" + - " r.topiaId," + - " r.date" + - " FROM observe_seine.route r" + - " WHERE " + - " r.topiaId = ?" + - " ORDER BY r.date"; - - StubSqlQuery request = new StubSqlQuery(sql, routeId); - return context.findSingleResult(request); - - } - StubSqlQuery(String sql, String id) { this.id = id; this.sql = sql; @@ -126,14 +105,14 @@ public class RouteTopiaDao extends AbstractRouteTopiaDao<Route> { topiaSqlSupport.doSqlWork(connection -> { String sql = "UPDATE observe_seine.SET" + - " SET ENDPURSINGTIMESTAMP = (? || ' ' || ENDPURSINGTIMESTAMP::time)::timestamp," + - " ENDSETTIMESTAMP = (? || ' ' || ENDSETTIMESTAMP::time)::timestamp" + - " WHERE TOPIAID IN " + - " (" + - " SELECT s.TOPIAID" + - " FROM observe_seine.ACTIVITY a, observe_seine.SET s" + - " WHERE a.ROUTE = ? AND a.SET = s.TOPIAID" + - " );"; + " SET ENDPURSINGTIMESTAMP = (? || ' ' || ENDPURSINGTIMESTAMP::TIME)::TIMESTAMP," + + " ENDSETTIMESTAMP = (? || ' ' || ENDSETTIMESTAMP::TIME)::TIMESTAMP" + + " WHERE TOPIAID IN " + + " (" + + " SELECT s.TOPIAID" + + " FROM observe_seine.ACTIVITY a, observe_seine.SET s" + + " WHERE a.ROUTE = ? AND a.SET = s.TOPIAID" + + " );"; PreparedStatement ps = connection.prepareStatement(sql); ps.setDate(1, date); diff --git a/entities/src/main/java/fr/ird/observe/entities/Trips.java b/persistence/src/main/java/fr/ird/observe/entities/seine/Routes.java similarity index 70% rename from entities/src/main/java/fr/ird/observe/entities/Trips.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/Routes.java index 971f722..33c4b83 100644 --- a/entities/src/main/java/fr/ird/observe/entities/Trips.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/Routes.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities; +package fr.ird.observe.entities.seine; /* * #%L @@ -22,21 +22,18 @@ package fr.ird.observe.entities; * #L% */ -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.seine.TripSeine; +import java.util.Date; +import java.util.function.Predicate; /** - * Created on 2/4/15. + * Created on 8/25/14. * * @author Tony Chemit - chemit@codelutin.com - * @since 3.15 + * @since 3.7 */ -public class Trips { - - public static boolean isTripId(String id) { - - return id.startsWith(TripSeine.class.getName()) || id.startsWith(TripLongline.class.getName()); +public class Routes { + public static Predicate<Route> newDateBeforePredicate(final Date date) { + return input -> input.getDate().before(date); } - } diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java b/persistence/src/main/java/fr/ird/observe/entities/seine/SetSeines.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/SetSeines.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/SetSeines.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java b/persistence/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/TargetCatchs.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java b/persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java similarity index 63% rename from entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 0a1224d..cfae063 100644 --- a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -25,13 +25,7 @@ import fr.ird.observe.entities.TripMapPoint; import fr.ird.observe.entities.constants.TripMapPointTypePersist; import fr.ird.observe.entities.constants.seine.SchoolTypePersist; import fr.ird.observe.entities.referentiel.Harbour; -import fr.ird.observe.entities.referentiel.I18nReferenceEntities; -import fr.ird.observe.entities.referentiel.Person; -import fr.ird.observe.entities.referentiel.PersonImpl; import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.ProgramImpl; -import fr.ird.observe.entities.referentiel.Vessel; -import fr.ird.observe.entities.referentiel.VesselImpl; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -54,10 +48,10 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { public static final String ACTIVITY_HARBOUR_ID = "fr.ird.observe.entities.referentiel.seine.VesselActivitySeine#1239832675349#0.363119635949572"; - //FIXME Si on veut juste récupérer les positions, on fait une requete spécifique :( public int findPositionByProgramId(String programId, String tripId) { int result = 0; - List<TripSeine> list = findAllStubByProgramId(programId, 1); + //FIXME Bien vérifier que cela fonctionne + List<TripSeine> list = forProgramEquals(topiaDaoSupplier.getDao(Program.class).forTopiaIdEquals(programId).findUnique()).findAll(); for (TripSeine e : list) { if (tripId.equals(e.getTopiaId())) { return result; @@ -69,18 +63,6 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { return -1; } - public List<TripSeine> findAllStubByProgramId(String programId, int referenceLocale) { - - return StubSqlQuery.findAll(topiaSqlSupport, programId, referenceLocale); - - } - - public TripSeine findStubByTopiaId(String tripId, int referenceLocale) { - - return StubSqlQuery.find(topiaSqlSupport, tripId, referenceLocale); - - } - public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId) { TripSeine tripSeine = forTopiaIdEquals(tripId).findUnique(); @@ -177,113 +159,6 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } } - - private static class StubSqlQuery extends TopiaSqlQuery<TripSeine> { - - private final String sql; - - private final String id; - - private final int referenceLocale; - - static <E extends TripSeine> List<TripSeine> findAll(TopiaSqlSupport context, String programId, int referenceLocale) { - - String sql = "SELECT" + - " t.topiaId," + - " t.startDate," + - " t.endDate," + - " pr.topiaId," + - " p.lastName," + - " p.firstName," + - " v.topiaId, " + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + "," + - " (select count(*) from observe_seine.route r where r.trip = t.topiaId) as routeCount" + - " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v,observe_common.program pr " + - " WHERE " + - " t.program = ?" + - " AND t.program = pr.topiaId" + - " AND t.observer = p.topiaId" + - " AND t.vessel = v.topiaId" + - " ORDER BY t.endDate"; - - StubSqlQuery request = new StubSqlQuery(sql, programId, referenceLocale); - return context.findMultipleResult(request); - - } - - static TripSeine find(TopiaSqlSupport context, String tripId, int referenceLocale) { - - String sql = "SELECT" + - " t.topiaId," + - " t.startDate," + - " t.endDate," + - " pr.topiaId," + - " p.lastName," + - " p.firstName," + - " v.topiaId," + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + "," + - " (select count(*) from observe_seine.route r where r.trip = t.topiaId) as routeCount" + - " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v, observe_common.program pr" + - " WHERE " + - " t.topiaId = ?" + - " AND t.program = pr.topiaId" + - " AND t.observer = p.topiaId" + - " AND t.vessel = v.topiaId" + - " ORDER BY t.endDate"; - - StubSqlQuery request = new StubSqlQuery(sql, tripId, referenceLocale); - return context.findSingleResult(request); - - } - - StubSqlQuery(String sql, String id, int referenceLocale) { - this.sql = sql; - this.id = id; - this.referenceLocale = referenceLocale; - } - - @Override - public PreparedStatement prepareQuery(Connection connection) throws SQLException { - PreparedStatement preparedStatement = connection.prepareStatement(sql); - preparedStatement.setString(1, id); - return preparedStatement; - } - - @Override - public TripSeine prepareResult(ResultSet set) throws SQLException { - - TripSeineImpl trip = new TripSeineImpl(); - - trip.setTopiaId(set.getString(1)); - trip.setStartDate(set.getDate(2)); - trip.setEndDate(set.getDate(3)); - - Program program = new ProgramImpl(); - program.setTopiaId(set.getString(4)); - trip.setProgram(program); - - String observerLastName = set.getString(5); - String observerFirstName = set.getString(6); - Person observer = new PersonImpl(); - observer.setFirstName(observerFirstName); - observer.setLastName(observerLastName); - trip.setObserver(observer); - - Vessel vessel = new VesselImpl(); - String vesselId = set.getString(7); - vessel.setTopiaId(vesselId); - String label = set.getString(8); - I18nReferenceEntities.setLabel(referenceLocale, vessel, label); - trip.setVessel(vessel); - trip.setRouteCount(set.getInt(9)); - - - return trip; - - } - - } - public boolean updateEndDate(TripSeine trip) { boolean wasUpdated = false; diff --git a/entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java b/persistence/src/main/java/fr/ird/observe/entities/seine/TripSeines.java similarity index 100% rename from entities/src/main/java/fr/ird/observe/entities/seine/TripSeines.java rename to persistence/src/main/java/fr/ird/observe/entities/seine/TripSeines.java diff --git a/entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java b/persistence/src/main/java/fr/ird/observe/persistence/AbstractObserveTopiaDao.java similarity index 98% rename from entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java rename to persistence/src/main/java/fr/ird/observe/persistence/AbstractObserveTopiaDao.java index ec4aa7f..42f4796 100644 --- a/entities/src/main/java/fr/ird/observe/AbstractObserveTopiaDao.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/AbstractObserveTopiaDao.java @@ -1,4 +1,4 @@ -package fr.ird.observe; +package fr.ird.observe.persistence; /* * #%L diff --git a/entities/src/main/java/fr/ird/observe/entities/Entities.java b/persistence/src/main/java/fr/ird/observe/persistence/Entities.java similarity index 99% rename from entities/src/main/java/fr/ird/observe/entities/Entities.java rename to persistence/src/main/java/fr/ird/observe/persistence/Entities.java index 33f3682..1ef3b61 100644 --- a/entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/Entities.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities; +package fr.ird.observe.persistence; /* * #%L @@ -25,7 +25,7 @@ package fr.ird.observe.entities; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.entities.ObserveEntity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.util.NumberUtil; diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java similarity index 99% rename from entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java rename to persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java index 86832ba..60fd74b 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaApplicationContext.java @@ -1,4 +1,4 @@ -package fr.ird.observe; +package fr.ird.observe.persistence; /* * #%L @@ -23,9 +23,8 @@ package fr.ird.observe; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; -import fr.ird.observe.entities.migration.ObserveMigrationEngine; +import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider; +import fr.ird.observe.persistence.migration.ObserveMigrationEngine; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -90,7 +89,7 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat public ObserveTopiaApplicationContext(ObserveTopiaConfiguration topiaConfiguration) { super(topiaConfiguration); this.authenticationToken = UUID.randomUUID().toString(); - this.topiaMetadataModelSupport = new TopiaMetadataModelSupportImpl("fr.ird.observe", "Observe"); + this.topiaMetadataModelSupport = new TopiaMetadataModelSupportImpl("fr.ird.observe.persistence", "Observe"); this.topiaSqlTablesFactory = new TopiaSqlTablesFactory(getMetadataModel(), this); this.observeMigrationConfigurationProvider = ObserveMigrationConfigurationProvider.get(); } diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfiguration.java similarity index 98% rename from entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java rename to persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfiguration.java index 80293b7..32a8183 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfiguration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfiguration.java @@ -1,4 +1,4 @@ -package fr.ird.observe; +package fr.ird.observe.persistence; /* * #%L diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfigurationFactory.java similarity index 97% rename from entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java rename to persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfigurationFactory.java index 3f90d08..4ef50f5 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaConfigurationFactory.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaConfigurationFactory.java @@ -1,4 +1,4 @@ -package fr.ird.observe; +package fr.ird.observe.persistence; /* * #%L @@ -23,8 +23,8 @@ package fr.ird.observe; */ import com.google.common.collect.ImmutableMap; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; -import fr.ird.observe.entities.migration.ObserveMigrationEngine; +import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider; +import fr.ird.observe.persistence.migration.ObserveMigrationEngine; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.jdbc.JdbcConfiguration; diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java similarity index 97% rename from entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java rename to persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java index 0444c25..160b423 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaIdFactory.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaIdFactory.java @@ -1,4 +1,4 @@ -package fr.ird.observe; +package fr.ird.observe.persistence; /* * #%L diff --git a/entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaPersistenceContext.java similarity index 99% rename from entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java rename to persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaPersistenceContext.java index 43ac98d..4c9b0bd 100644 --- a/entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/ObserveTopiaPersistenceContext.java @@ -1,4 +1,4 @@ -package fr.ird.observe; +package fr.ird.observe.persistence; /* * #%L diff --git a/entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java b/persistence/src/main/java/fr/ird/observe/persistence/RunScriptTopiaSqlWork.java similarity index 99% rename from entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java rename to persistence/src/main/java/fr/ird/observe/persistence/RunScriptTopiaSqlWork.java index 41538b7..94a002e 100644 --- a/entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/RunScriptTopiaSqlWork.java @@ -1,4 +1,4 @@ -package fr.ird.observe; +package fr.ird.observe.persistence; /*- * #%L diff --git a/entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java b/persistence/src/main/java/fr/ird/observe/persistence/RunScriptsTopiaSqlWork.java similarity index 97% rename from entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java rename to persistence/src/main/java/fr/ird/observe/persistence/RunScriptsTopiaSqlWork.java index bf5a3c6..c4d9774 100644 --- a/entities/src/main/java/fr/ird/observe/RunScriptsTopiaSqlWork.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/RunScriptsTopiaSqlWork.java @@ -1,4 +1,4 @@ -package fr.ird.observe; +package fr.ird.observe.persistence; /*- * #%L diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/AbstractDataSourceMigration.java similarity index 97% rename from entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/AbstractDataSourceMigration.java index d59b8ab..c21e229 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/AbstractDataSourceMigration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/AbstractDataSourceMigration.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; import org.nuiton.version.Version; diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/AbstractObserveMigrationCallBack.java similarity index 98% rename from entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/AbstractObserveMigrationCallBack.java index 97f70b5..0a2a3f6 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/AbstractObserveMigrationCallBack.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/AbstractObserveMigrationCallBack.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; /*- * #%L diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java similarity index 99% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java index 2308013..dc183c0 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_5_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_5_0.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; /* * #%L diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java similarity index 99% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java index fe55699..94550e1 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/DataSourceMigrationForVersion_6_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/DataSourceMigrationForVersion_6_0.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; /*- * #%L diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java similarity index 99% rename from entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java index 3b609de..7dc77e6 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/H2DataSourceMigration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/H2DataSourceMigration.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersion.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/MigrationVersion.java similarity index 96% rename from entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersion.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/MigrationVersion.java index b46fdae..c6ed3fb 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/MigrationVersion.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/MigrationVersion.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; /*- * #%L diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationCallBackForVersionResolver.java similarity index 98% rename from entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationCallBackForVersionResolver.java index 955fece..95a4851 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolver.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationCallBackForVersionResolver.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationConfigurationProvider.java similarity index 97% rename from entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationConfigurationProvider.java index 2493b27..e432474 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationConfigurationProvider.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationConfigurationProvider.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; /*- * #%L @@ -61,7 +61,7 @@ public final class ObserveMigrationConfigurationProvider { TreeMap<Version, Class<?>> builder = new TreeMap<>(); - Set<Class<?>> types = new Reflections("fr.ird.observe.entities.migration").getTypesAnnotatedWith(MigrationVersion.class); + Set<Class<?>> types = new Reflections("fr.ird.observe.persistence.migration").getTypesAnnotatedWith(MigrationVersion.class); for (Class<?> type : types) { Version version = getVersion(type); builder.put(version, type); diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationEngine.java similarity index 96% rename from entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationEngine.java index adb25a2..603ed3a 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/ObserveMigrationEngine.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/ObserveMigrationEngine.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; /* * #%L diff --git a/entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java similarity index 99% rename from entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java index 8eb7f36..5043643 100644 --- a/entities/src/main/java/fr/ird/observe/entities/migration/PGDataSourceMigration.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/PGDataSourceMigration.java @@ -19,7 +19,7 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_1.java similarity index 93% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_1.java index db3b3a8..5747aa0 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_1.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_1.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,9 +22,9 @@ package fr.ird.observe.entities.migration.old; * #L% */ -import fr.ird.observe.entities.migration.AbstractDataSourceMigration; -import fr.ird.observe.entities.migration.AbstractObserveMigrationCallBack; -import fr.ird.observe.entities.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.MigrationVersion; import org.apache.commons.lang3.tuple.Pair; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_10.java similarity index 85% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_10.java index 8960db1..eefa52b 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_10.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_10.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_11.java similarity index 86% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_11.java index 28c6ade..18f62c3 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_11.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_11.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_12.java similarity index 84% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_12.java index 23110fd..c483042 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_12.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_12.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_14.java similarity index 85% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_14.java index 09f0037..7dc952e 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_14.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_14.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_15.java similarity index 85% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_15.java index e4ccc82..ad01043 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_15.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_15.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java similarity index 94% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java index bbf8963..3db5a9e 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_16.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_16.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.support.TopiaSqlSupport; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_5.java similarity index 95% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_5.java index 6e65380..acba64e 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_5.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_5.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_7.java similarity index 87% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_7.java index 38fff87..dc602b5 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_7.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_7.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_8.java similarity index 85% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_8.java index e23a8ae..16096d4 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_8.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_8.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_9.java similarity index 84% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_9.java index 0366583..0ed2cec 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_3_9.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_3_9.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0.java similarity index 84% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0.java index becf610..24709a2 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java similarity index 95% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java index a795149..9e665d0 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_1.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_1.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -24,12 +24,12 @@ package fr.ird.observe.entities.migration.old; import com.google.common.collect.LinkedHashMultimap; import com.google.common.collect.Multimap; -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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.ObserveTopiaIdFactory; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import org.nuiton.topia.persistence.TopiaException; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_2.java similarity index 85% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_2.java index d171de9..91c32e5 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_4.java similarity index 84% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_4.java index a22c8e6..d7cd79e 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_4.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_4.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.persistence.support.TopiaSqlSupport; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java similarity index 88% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java index 218bee2..c94229c 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC2.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC2.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.sql.PreparedStatement; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java similarity index 96% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java index 45a109e..24aef8a 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC3.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC3.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaException; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC4.java similarity index 84% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC4.java index ccb6b69..f29187b 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC4.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC4.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC6.java similarity index 88% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC6.java index d1c39cd..97177e0 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC6.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC6.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC7.java similarity index 86% rename from entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java rename to persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC7.java index 1735c98..658cba6 100644 --- a/entities-migration/src/main/java/fr/ird/observe/entities/migration/old/DataSourceMigrationForVersion_4_0_RC7.java +++ b/persistence/src/main/java/fr/ird/observe/persistence/migration/old/DataSourceMigrationForVersion_4_0_RC7.java @@ -1,4 +1,4 @@ -package fr.ird.observe.entities.migration.old; +package fr.ird.observe.persistence.migration.old; /* * #%L @@ -22,11 +22,11 @@ package fr.ird.observe.entities.migration.old; * #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.MigrationVersion; -import fr.ird.observe.entities.migration.PGDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractDataSourceMigration; +import fr.ird.observe.persistence.migration.AbstractObserveMigrationCallBack; +import fr.ird.observe.persistence.migration.H2DataSourceMigration; +import fr.ird.observe.persistence.migration.MigrationVersion; +import fr.ird.observe.persistence.migration.PGDataSourceMigration; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import java.util.List; diff --git a/entities-migration/src/main/resources/db/3.5/constrainsts.csv b/persistence/src/main/resources/db/3.5/constrainsts.csv similarity index 100% rename from entities-migration/src/main/resources/db/3.5/constrainsts.csv rename to persistence/src/main/resources/db/3.5/constrainsts.csv diff --git a/entities-migration/src/main/resources/db/3.5/traduction_attributes.csv b/persistence/src/main/resources/db/3.5/traduction_attributes.csv similarity index 100% rename from entities-migration/src/main/resources/db/3.5/traduction_attributes.csv rename to persistence/src/main/resources/db/3.5/traduction_attributes.csv diff --git a/entities-migration/src/main/resources/db/3.5/traduction_tables.csv b/persistence/src/main/resources/db/3.5/traduction_tables.csv similarity index 100% rename from entities-migration/src/main/resources/db/3.5/traduction_tables.csv rename to persistence/src/main/resources/db/3.5/traduction_tables.csv diff --git a/entities-migration/src/main/resources/db/3.5/traduction_tables2.csv b/persistence/src/main/resources/db/3.5/traduction_tables2.csv similarity index 100% rename from entities-migration/src/main/resources/db/3.5/traduction_tables2.csv rename to persistence/src/main/resources/db/3.5/traduction_tables2.csv diff --git a/entities-migration/src/main/resources/db/migration/5.0/01_remove_open_field-H2.sql b/persistence/src/main/resources/db/migration/5.0/01_remove_open_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/01_remove_open_field-H2.sql rename to persistence/src/main/resources/db/migration/5.0/01_remove_open_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/01_remove_open_field-PG.sql b/persistence/src/main/resources/db/migration/5.0/01_remove_open_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/01_remove_open_field-PG.sql rename to persistence/src/main/resources/db/migration/5.0/01_remove_open_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-H2.sql b/persistence/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-H2.sql rename to persistence/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-PG.sql b/persistence/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-PG.sql rename to persistence/src/main/resources/db/migration/5.0/02_add_lastUpdateDate_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-H2.sql b/persistence/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-H2.sql rename to persistence/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql b/persistence/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql rename to persistence/src/main/resources/db/migration/5.0/03_add_lastUpdateDate_table-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/04_remove_unit_field-H2.sql b/persistence/src/main/resources/db/migration/5.0/04_remove_unit_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/04_remove_unit_field-H2.sql rename to persistence/src/main/resources/db/migration/5.0/04_remove_unit_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/04_remove_unit_field-PG.sql b/persistence/src/main/resources/db/migration/5.0/04_remove_unit_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/04_remove_unit_field-PG.sql rename to persistence/src/main/resources/db/migration/5.0/04_remove_unit_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/05_remove_gender_field-H2.sql b/persistence/src/main/resources/db/migration/5.0/05_remove_gender_field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/05_remove_gender_field-H2.sql rename to persistence/src/main/resources/db/migration/5.0/05_remove_gender_field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/05_remove_gender_field-PG.sql b/persistence/src/main/resources/db/migration/5.0/05_remove_gender_field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/05_remove_gender_field-PG.sql rename to persistence/src/main/resources/db/migration/5.0/05_remove_gender_field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-H2.sql b/persistence/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-H2.sql rename to persistence/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-PG.sql b/persistence/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-PG.sql rename to persistence/src/main/resources/db/migration/5.0/06_remove_duplicate_rows-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-H2.sql b/persistence/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-H2.sql rename to persistence/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-PG.sql b/persistence/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-PG.sql rename to persistence/src/main/resources/db/migration/5.0/07_drop_not_null_constraint_gearUseFeatures-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-H2.sql b/persistence/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-H2.sql rename to persistence/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-PG.sql b/persistence/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-PG.sql rename to persistence/src/main/resources/db/migration/5.0/08_drop_not_null_constraint_hauling_identifier-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-H2.sql b/persistence/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-H2.sql rename to persistence/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-PG.sql b/persistence/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-PG.sql rename to persistence/src/main/resources/db/migration/5.0/09_add_non_target_length_sex_fk-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-H2.sql b/persistence/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-H2.sql rename to persistence/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-PG.sql b/persistence/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-PG.sql rename to persistence/src/main/resources/db/migration/6.0/01_evol_8374_delete_sonarUsed-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-H2.sql b/persistence/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-H2.sql rename to persistence/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-PG.sql b/persistence/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-PG.sql rename to persistence/src/main/resources/db/migration/6.0/02_evol_7886_catch_add_set_idx-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql b/persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql rename to persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql b/persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql rename to persistence/src/main/resources/db/migration/6.0/03_evol_6997_delete_supportVesselName-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql b/persistence/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql rename to persistence/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql b/persistence/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql rename to persistence/src/main/resources/db/migration/6.0/04_evol_6832_branchlineComposition_add_tracelineLength-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-H2.sql b/persistence/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-H2.sql rename to persistence/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-PG.sql b/persistence/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-PG.sql rename to persistence/src/main/resources/db/migration/6.0/05_evol_6999_nonTargetCatch_add_well-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-H2.sql b/persistence/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-H2.sql rename to persistence/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-PG.sql b/persistence/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-PG.sql rename to persistence/src/main/resources/db/migration/6.0/06_evol_8375_setSeine_add_booleans-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-H2.sql b/persistence/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-H2.sql rename to persistence/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-PG.sql b/persistence/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-PG.sql rename to persistence/src/main/resources/db/migration/6.0/07_evol_8389_rename_source_columns-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-H2.sql b/persistence/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-H2.sql rename to persistence/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-PG.sql b/persistence/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-PG.sql rename to persistence/src/main/resources/db/migration/6.0/08_1_evol_8390_measure_type-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql b/persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql rename to persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql b/persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql rename to persistence/src/main/resources/db/migration/6.0/08_evol_8390_measure_type-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-H2.sql b/persistence/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-H2.sql rename to persistence/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-PG.sql b/persistence/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-PG.sql rename to persistence/src/main/resources/db/migration/6.0/09_evol_7877_targetLength_add_sex-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-H2.sql b/persistence/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-H2.sql rename to persistence/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-PG.sql b/persistence/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-PG.sql rename to persistence/src/main/resources/db/migration/6.0/10_evol_8391_species_add_sizeMeasureType-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-H2.sql b/persistence/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-H2.sql rename to persistence/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-PG.sql b/persistence/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-PG.sql rename to persistence/src/main/resources/db/migration/6.0/11_evol_8571_length_add_tagNumber-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-H2.sql b/persistence/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-H2.sql rename to persistence/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-PG.sql b/persistence/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-PG.sql rename to persistence/src/main/resources/db/migration/6.0/12_evol_8475_vessel_add_fields-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-H2.sql b/persistence/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-H2.sql rename to persistence/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-PG.sql b/persistence/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-PG.sql rename to persistence/src/main/resources/db/migration/6.0/13_evol_7901_add_armateur_table-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-H2.sql b/persistence/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-H2.sql rename to persistence/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-PG.sql b/persistence/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-PG.sql rename to persistence/src/main/resources/db/migration/6.0/14_evol_8196_lengthWeightParameter_add_source-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-H2.sql b/persistence/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-H2.sql rename to persistence/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-PG.sql b/persistence/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-PG.sql rename to persistence/src/main/resources/db/migration/6.0/15_evol_8578_nonTargetLength_add_speciesFate-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-H2.sql b/persistence/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-H2.sql rename to persistence/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-PG.sql b/persistence/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-PG.sql rename to persistence/src/main/resources/db/migration/6.0/16_evol_8377_speciesFate_add_discard-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql b/persistence/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql rename to persistence/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql b/persistence/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql rename to persistence/src/main/resources/db/migration/6.0/17_evol_8376_vesselActivitySeine_add_allowFad-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-H2.sql b/persistence/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-H2.sql rename to persistence/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-PG.sql b/persistence/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-PG.sql rename to persistence/src/main/resources/db/migration/6.0/18_evol_8404_lengthLengthParameter-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql b/persistence/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql rename to persistence/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql b/persistence/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql rename to persistence/src/main/resources/db/migration/6.0/19_ano_8554_brancheline_add_section-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-H2.sql b/persistence/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-H2.sql rename to persistence/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-PG.sql b/persistence/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-PG.sql rename to persistence/src/main/resources/db/migration/6.0/20_evol_8391_species_drop_lengthmeasuretype-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-H2.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-H2.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-PG.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-PG.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_01_remove-person-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-H2.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-H2.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-PG.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-PG.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_02_add-missing-fk-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-H2.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-H2.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-PG.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-PG.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_03_increase-comment-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_04_fix-sensorDataFormat-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-H2.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-H2.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-PG.sql b/persistence/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-PG.sql rename to persistence/src/main/resources/db/migration/old/3.10/V3_10_05_normalize-sections-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-H2.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-H2.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-PG.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-PG.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_02_add-country-on-transmitting-buoy-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-H2.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-H2.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-PG.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-PG.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_03_add-fpaZones-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-H2.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-H2.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-PG.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-PG.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_04_add-activity-ersId-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-H2.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-H2.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-PG.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-PG.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_05_add-person-country-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-H2.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-H2.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-PG.sql b/persistence/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-PG.sql rename to persistence/src/main/resources/db/migration/old/3.11/V3_11_06_add-harbours-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-H2.sql b/persistence/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-H2.sql rename to persistence/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-PG.sql b/persistence/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-PG.sql rename to persistence/src/main/resources/db/migration/old/3.12/V3_12_01_add-missing-boat-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-H2.sql b/persistence/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-H2.sql rename to persistence/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-PG.sql b/persistence/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-PG.sql rename to persistence/src/main/resources/db/migration/old/3.14/V3_14_01_remove-hooksPerBasketCount-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-H2.sql b/persistence/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-H2.sql rename to persistence/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-PG.sql b/persistence/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-PG.sql rename to persistence/src/main/resources/db/migration/old/3.14/V3_14_02_fix-targetsample-discarded-value-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-H2.sql b/persistence/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-H2.sql rename to persistence/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-PG.sql b/persistence/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-PG.sql rename to persistence/src/main/resources/db/migration/old/3.14/V3_14_03_remove-orphan-seine-sample-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-H2.sql b/persistence/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-H2.sql rename to persistence/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-PG.sql b/persistence/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-PG.sql rename to persistence/src/main/resources/db/migration/old/3.14/V3_14_04_remove-targetlength-discarded-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.15/V3_15_01_change-tdr-integer-field-to-float-H2.sql b/persistence/src/main/resources/db/migration/old/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/old/3.15/V3_15_01_change-tdr-integer-field-to-float-H2.sql rename to persistence/src/main/resources/db/migration/old/3.15/V3_15_01_change-tdr-integer-field-to-float-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.15/V3_15_01_change-tdr-integer-field-to-float-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/3.15/V3_15_01_change-tdr-integer-field-to-float-PG.sql rename to persistence/src/main/resources/db/migration/old/3.15/V3_15_01_change-tdr-integer-field-to-float-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-H2.sql b/persistence/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-H2.sql rename to persistence/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-PG.sql b/persistence/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-PG.sql rename to persistence/src/main/resources/db/migration/old/3.15/V3_15_02_remove-set-longline-length-fields-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-H2.sql b/persistence/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-H2.sql rename to persistence/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-PG.sql b/persistence/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-PG.sql rename to persistence/src/main/resources/db/migration/old/3.15/V3_15_03_remove-brancheline-fields-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-H2.sql b/persistence/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-H2.sql rename to persistence/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-PG.sql b/persistence/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-PG.sql rename to persistence/src/main/resources/db/migration/old/3.16/V3_16_01_add-gear-referential-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-H2.sql b/persistence/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-H2.sql rename to persistence/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-PG.sql b/persistence/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-PG.sql rename to persistence/src/main/resources/db/migration/old/3.16/V3_16_02_add-gear-data-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-H2.sql b/persistence/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-H2.sql rename to persistence/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-PG.sql b/persistence/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-PG.sql rename to persistence/src/main/resources/db/migration/old/3.16/V3_16_03_remove-tripSeine-seine-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.5/V3_5_01_migration-H2.sql b/persistence/src/main/resources/db/migration/old/3.5/V3_5_01_migration-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.5/V3_5_01_migration-H2.sql rename to persistence/src/main/resources/db/migration/old/3.5/V3_5_01_migration-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.5/V3_5_01_migration-PG.sql b/persistence/src/main/resources/db/migration/old/3.5/V3_5_01_migration-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.5/V3_5_01_migration-PG.sql rename to persistence/src/main/resources/db/migration/old/3.5/V3_5_01_migration-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-H2.sql b/persistence/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-H2.sql rename to persistence/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-PG.sql b/persistence/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-PG.sql rename to persistence/src/main/resources/db/migration/old/3.5/V3_5_02_add-longline-schema-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-H2.sql b/persistence/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-H2.sql rename to persistence/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-PG.sql b/persistence/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-PG.sql rename to persistence/src/main/resources/db/migration/old/3.5/V3_5_03_update-common-references-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-H2.sql b/persistence/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-H2.sql rename to persistence/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-PG.sql b/persistence/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-PG.sql rename to persistence/src/main/resources/db/migration/old/3.5/V3_5_04_add-longline-references-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_01_rename-seine-model-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_02_remove-trip-organism-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_03_add-referential-needComment-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_04_normalize-triplongline-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_05_normalize-activitylongline-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_06_normalize-setlongline-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_07_normalize-catchlongline-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_08_normalize-tdr-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_09_add-species-list-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-H2.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-H2.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-PG.sql b/persistence/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-PG.sql rename to persistence/src/main/resources/db/migration/old/3.7/V3_7_10_increase-comment-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-H2.sql b/persistence/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-H2.sql rename to persistence/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-PG.sql b/persistence/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-PG.sql rename to persistence/src/main/resources/db/migration/old/3.8/V3_8_01_fix-person-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-H2.sql b/persistence/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-H2.sql rename to persistence/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-PG.sql b/persistence/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-PG.sql rename to persistence/src/main/resources/db/migration/old/3.8/V3_8_02_fix-branchelinecomposition-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-H2.sql b/persistence/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-H2.sql rename to persistence/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-PG.sql b/persistence/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-PG.sql rename to persistence/src/main/resources/db/migration/old/3.8/V3_8_03_normalize-sensorused-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-H2.sql b/persistence/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-H2.sql rename to persistence/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-PG.sql b/persistence/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-PG.sql rename to persistence/src/main/resources/db/migration/old/3.8/V3_8_04_normalize-tdr-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-H2.sql b/persistence/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-H2.sql rename to persistence/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-PG.sql b/persistence/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-PG.sql rename to persistence/src/main/resources/db/migration/old/3.9/V3_9_01_add-dataFilename-attribute-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql b/persistence/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql rename to persistence/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql b/persistence/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql rename to persistence/src/main/resources/db/migration/old/3.9/V3_9_02_fill-sensorDataFormat-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql rename to persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-H2.sql rename to persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_01_clean-program-gear-type-PG.sql rename to persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql rename to persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql rename to persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql rename to persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql rename to persistence/src/main/resources/db/migration/old/4.0-RC-2/V4_0_RC_2_03_rename-unknown-longliner-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql rename to persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql rename to persistence/src/main/resources/db/migration/old/4.0-RC-4/V4_0_RC_4_01_add-gear-data-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql rename to persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql rename to persistence/src/main/resources/db/migration/old/4.0-RC-6/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql rename to persistence/src/main/resources/db/migration/old/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/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-7/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql rename to persistence/src/main/resources/db/migration/old/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/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql rename to persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql rename to persistence/src/main/resources/db/migration/old/4.0-RC-7/V4_0_RC_7_02_rename-unknown-longliner-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0.1/V4_0_1_01_remove-gender-column-H2.sql b/persistence/src/main/resources/db/migration/old/4.0.1/V4_0_1_01_remove-gender-column-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/4.0.1/V4_0_1_01_remove-gender-column-H2.sql rename to persistence/src/main/resources/db/migration/old/4.0.1/V4_0_1_01_remove-gender-column-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql b/persistence/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql rename to persistence/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql b/persistence/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql rename to persistence/src/main/resources/db/migration/old/4.0.1/V4_0_1_02_add-missing-fk-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0.2/V4_0_2_01_remove-gender-column-PG.sql b/persistence/src/main/resources/db/migration/old/4.0.2/V4_0_2_01_remove-gender-column-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/4.0.2/V4_0_2_01_remove-gender-column-PG.sql rename to persistence/src/main/resources/db/migration/old/4.0.2/V4_0_2_01_remove-gender-column-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql rename to persistence/src/main/resources/db/migration/old/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql b/persistence/src/main/resources/db/migration/old/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/old/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql rename to persistence/src/main/resources/db/migration/old/4.0.4/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0/V4_0_01_empty-H2.sql b/persistence/src/main/resources/db/migration/old/4.0/V4_0_01_empty-H2.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/4.0/V4_0_01_empty-H2.sql rename to persistence/src/main/resources/db/migration/old/4.0/V4_0_01_empty-H2.sql diff --git a/entities-migration/src/main/resources/db/migration/old/4.0/V4_0_01_empty-PG.sql b/persistence/src/main/resources/db/migration/old/4.0/V4_0_01_empty-PG.sql similarity index 100% rename from entities-migration/src/main/resources/db/migration/old/4.0/V4_0_01_empty-PG.sql rename to persistence/src/main/resources/db/migration/old/4.0/V4_0_01_empty-PG.sql diff --git a/entities/src/main/xmi/observe-common.zargo b/persistence/src/main/xmi/observe-common.zargo similarity index 100% rename from entities/src/main/xmi/observe-common.zargo rename to persistence/src/main/xmi/observe-common.zargo diff --git a/entities/src/main/xmi/observe-longline.zargo b/persistence/src/main/xmi/observe-longline.zargo similarity index 100% rename from entities/src/main/xmi/observe-longline.zargo rename to persistence/src/main/xmi/observe-longline.zargo diff --git a/entities/src/main/xmi/observe-seine.zargo b/persistence/src/main/xmi/observe-seine.zargo similarity index 100% rename from entities/src/main/xmi/observe-seine.zargo rename to persistence/src/main/xmi/observe-seine.zargo diff --git a/entities/src/main/xmi/observe.ini b/persistence/src/main/xmi/observe.ini similarity index 100% rename from entities/src/main/xmi/observe.ini rename to persistence/src/main/xmi/observe.ini diff --git a/entities/src/test/java/fr/ird/observe/RelationRegexTest.java b/persistence/src/test/java/fr/ird/observe/RelationRegexTest.java similarity index 100% rename from entities/src/test/java/fr/ird/observe/RelationRegexTest.java rename to persistence/src/test/java/fr/ird/observe/RelationRegexTest.java diff --git a/entities/src/test/java/fr/ird/observe/ScriptTest.java b/persistence/src/test/java/fr/ird/observe/ScriptTest.java similarity index 100% rename from entities/src/test/java/fr/ird/observe/ScriptTest.java rename to persistence/src/test/java/fr/ird/observe/ScriptTest.java diff --git a/entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java b/persistence/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java similarity index 100% rename from entities/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java rename to persistence/src/test/java/fr/ird/observe/entities/longline/SectionTemplateTest.java diff --git a/entities/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java b/persistence/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java similarity index 100% rename from entities/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java rename to persistence/src/test/java/fr/ird/observe/entities/referentiel/FormulaHelperTest.java diff --git a/entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java b/persistence/src/test/java/fr/ird/observe/persistence/migration/ObserveMigrationCallBackForVersionResolverTest.java similarity index 92% rename from entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java rename to persistence/src/test/java/fr/ird/observe/persistence/migration/ObserveMigrationCallBackForVersionResolverTest.java index 16a80d9..7c4a076 100644 --- a/entities-migration/src/test/java/fr/ird/observe/entities/migration/ObserveMigrationCallBackForVersionResolverTest.java +++ b/persistence/src/test/java/fr/ird/observe/persistence/migration/ObserveMigrationCallBackForVersionResolverTest.java @@ -19,8 +19,10 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package fr.ird.observe.entities.migration; +package fr.ird.observe.persistence.migration; +import fr.ird.observe.persistence.migration.ObserveMigrationCallBackForVersionResolver; +import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider; import org.junit.Assert; import org.junit.Test; import org.nuiton.topia.migration.TopiaMigrationCallbackByClass; diff --git a/entities/src/test/resources/log4j.properties b/persistence/src/test/resources/log4j.properties similarity index 100% rename from entities/src/test/resources/log4j.properties rename to persistence/src/test/resources/log4j.properties diff --git a/pom.xml b/pom.xml index b71a126..3e51a6b 100644 --- a/pom.xml +++ b/pom.xml @@ -116,8 +116,8 @@ <module>topia-extension</module> <module>topia-templates-extension</module> <module>test</module> - <module>entities</module> - <module>entities-migration</module> + <module>common</module> + <module>persistence</module> <module>services-configuration</module> <module>services-configuration-topia</module> <module>services-configuration-rest</module> diff --git a/services-dto/pom.xml b/services-dto/pom.xml index e3641a9..dfe69cd 100644 --- a/services-dto/pom.xml +++ b/services-dto/pom.xml @@ -44,6 +44,11 @@ <artifactId>services-configuration</artifactId> <version>${project.version}</version> </dependency> + <!--dependency> + <groupId>${project.groupId}</groupId> + <artifactId>common</artifactId> + <version>${project.version}</version> + </dependency--> <!-- Nuiton --> <dependency> diff --git a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java index a1c6ffa..b5eefd1 100644 --- a/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java +++ b/services-rest/src/test/java/fr/ird/observe/services/rest/service/seine/TripSeineServiceRestTest.java @@ -56,41 +56,6 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { } @Test - public void getTripSeineByProgramTest() { - - DataReferenceList<TripSeineDto> stubDtos = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); - - Assert.assertNotNull(stubDtos); - - Assert.assertEquals(134, stubDtos.sizeReference()); - - DataReference<TripSeineDto> tripSeineStub1Dto = DataReference.find(stubDtos.getReferences(), ObserveFixtures.TRIP_SEINE_ID_1); - - Assert.assertEquals(ObserveFixtures.TRIP_SEINE_ID_1, tripSeineStub1Dto.getId()); - Assert.assertEquals(DateUtil.createDate(25, 1, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); - Assert.assertEquals(DateUtil.createDate(27, 2, 2013), tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); - Assert.assertEquals("BERNICA", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); - Assert.assertEquals("Varenne Fanchon", tripSeineStub1Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - - DataReference<TripSeineDto> tripSeineStub2Dto = DataReference.find(stubDtos.getReferences(), ObserveFixtures.TRIP_SEINE_ID_2); - - Assert.assertEquals(ObserveFixtures.TRIP_SEINE_ID_2, tripSeineStub2Dto.getId()); - Assert.assertEquals(DateUtil.createDate(26, 1, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); - Assert.assertEquals(DateUtil.createDate(12, 3, 2013), tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); - Assert.assertEquals("VIA EUROS", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); - Assert.assertEquals("Protat Martin", tripSeineStub2Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - - DataReference<TripSeineDto> tripSeineStub3Dto = DataReference.find(stubDtos.getReferences(), ObserveFixtures.TRIP_SEINE_ID_3); - - Assert.assertEquals(ObserveFixtures.TRIP_SEINE_ID_3, tripSeineStub3Dto.getId()); - Assert.assertEquals(DateUtil.createDate(1, 2, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE)); - Assert.assertEquals(DateUtil.createDate(17, 3, 2013), tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE)); - Assert.assertEquals("GUERIDEN", tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); - Assert.assertEquals("Le Bourdonnec Pierre", tripSeineStub3Dto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - - } - - @Test public void loadFormTest() throws Exception { Form<TripSeineDto> form = service.loadForm(ObserveFixtures.TRIP_SEINE_ID_1); @@ -216,7 +181,7 @@ public class TripSeineServiceRestTest extends AbstractServiceRestTest { service.delete(ObserveFixtures.TRIP_SEINE_ID_1); - DataReferenceList<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); + DataReferenceList<TripSeineDto> tripSeineByProgram = service.getAllTripSeine(); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); diff --git a/services-topia-binder/pom.xml b/services-topia-binder/pom.xml index 7bdc233..47ee5a3 100644 --- a/services-topia-binder/pom.xml +++ b/services-topia-binder/pom.xml @@ -28,7 +28,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>entities</artifactId> + <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java index 706f891..d856a9d 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngine.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.binder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.topia.binder.data.DataBinderSupport; diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java index 6b490a8..8f87bda 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderEngineInitializer.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.binder; */ import com.google.common.collect.ImmutableMap; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.BaitsComposition; diff --git a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java index 16d2d20..8368dfc 100644 --- a/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java +++ b/services-topia-binder/src/main/java/fr/ird/observe/services/topia/binder/BinderSupport.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.binder; */ import com.google.common.collect.Iterables; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.constants.GearTypePersist; import fr.ird.observe.entities.constants.ReferenceStatusPersist; 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 b7507e9..65fa8c7 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 @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.binder; import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.longline.TdrRecord; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; diff --git a/services-topia-validation/pom.xml b/services-topia-validation/pom.xml index 9935928..1f69cf6 100644 --- a/services-topia-validation/pom.xml +++ b/services-topia-validation/pom.xml @@ -42,7 +42,7 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>entities</artifactId> + <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> <dependency> @@ -148,7 +148,7 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>entities</artifactId> + <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java index 8316fdb..d5ec892 100644 --- a/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java +++ b/services-topia-validation/src/test/java/fr/ird/observe/services/topia/validation/BeanValidatorDetectorTest.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.services.topia.validation; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.BaitsComposition; import fr.ird.observe.entities.longline.Basket; diff --git a/services-topia-validators/pom.xml b/services-topia-validators/pom.xml index e666e26..a769d51 100644 --- a/services-topia-validators/pom.xml +++ b/services-topia-validators/pom.xml @@ -44,7 +44,7 @@ <dependency> <groupId>${project.groupId}</groupId> - <artifactId>entities</artifactId> + <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> <dependency> diff --git a/services-topia/pom.xml b/services-topia/pom.xml index 551b8a3..c65e269 100644 --- a/services-topia/pom.xml +++ b/services-topia/pom.xml @@ -49,17 +49,11 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>entities</artifactId> + <artifactId>persistence</artifactId> <version>${project.version}</version> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>entities-migration</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>services-topia-validation</artifactId> <version>${project.version}</version> <scope>runtime</scope> diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java index d822c69..954d5f8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveSecurityHelper.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia; import com.google.common.collect.Iterables; import com.google.common.collect.Sets; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.ObserveDbUserHelper; import fr.ird.observe.services.dto.constants.ObserveDbRole; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java index 2515f1b..09c3bb3 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceContextTopia.java @@ -22,8 +22,8 @@ package fr.ird.observe.services.topia; * #L% */ -import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaApplicationContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceFactory; import fr.ird.observe.services.ObserveServiceInitializer; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java index 7014803..c50fcd2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceFactoryTopia.java @@ -26,8 +26,8 @@ import com.google.common.base.Preconditions; import com.google.common.cache.LoadingCache; import com.google.common.collect.ImmutableSet; import com.google.common.reflect.Reflection; -import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaApplicationContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.ObserveServiceFactorySupport; import fr.ird.observe.services.ObserveServiceInitializer; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java index a75e59b..9e6fde8 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveServiceTopia.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java index e98e0b1..4832482 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/ObserveTopiaApplicationContextFactory.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.topia; */ import com.google.common.base.Preconditions; -import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.ObserveTopiaConfiguration; -import fr.ird.observe.ObserveTopiaConfigurationFactory; +import fr.ird.observe.persistence.ObserveTopiaApplicationContext; +import fr.ird.observe.persistence.ObserveTopiaConfiguration; +import fr.ird.observe.persistence.ObserveTopiaConfigurationFactory; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaSupport; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java index 447c32a..ba17b70 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/DataSourceServiceTopia.java @@ -26,11 +26,11 @@ import com.google.common.base.Joiner; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.ObserveTopiaConfiguration; -import fr.ird.observe.ObserveTopiaConfigurationFactory; -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; +import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveTopiaApplicationContext; +import fr.ird.observe.persistence.ObserveTopiaConfiguration; +import fr.ird.observe.persistence.ObserveTopiaConfigurationFactory; +import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java index 8c2312c..b4a493f 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/LastUpdateDateServiceTopia.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service; */ import com.google.common.base.Optional; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.LastUpdateDate; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java index 9d111a9..ad8ba80 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateActivitySeineDataResultBuilder.java @@ -83,7 +83,7 @@ public class ConsolidateActivitySeineDataResultBuilder { public void flushTargetLengthModification(TargetLength targetLength, String... propertyNamesModified) { Species species = targetLength.getSpecies(); - String speciesLabel = Species2.decorate(locale, species); + String speciesLabel = Species2.decorate(species); for (String modifiedProperty : propertyNamesModified) { if (modifiedProperty.equals(TargetLength.PROPERTY_LENGTH)) { @@ -111,7 +111,7 @@ public class ConsolidateActivitySeineDataResultBuilder { public void flushNonTargetLengthModification(NonTargetLength nonTargetLength, String... propertyNamesModified) { Species species = nonTargetLength.getSpecies(); - String speciesLabel = Species2.decorate(locale, species); + String speciesLabel = Species2.decorate(species); for (String modifiedProperty : propertyNamesModified) { if (modifiedProperty.equals(NonTargetLength.PROPERTY_LENGTH)) { @@ -139,7 +139,7 @@ public class ConsolidateActivitySeineDataResultBuilder { public void flushNonTargetCatchModification(NonTargetCatch nonTargetCatch, String... propertyNamesModified) { Species species = nonTargetCatch.getSpecies(); - String speciesLabel = Species2.decorate(locale, species); + String speciesLabel = Species2.decorate(species); for (String modifiedProperty : propertyNamesModified) { switch (modifiedProperty) { case NonTargetCatch.PROPERTY_MEAN_LENGTH: { @@ -196,7 +196,7 @@ public class ConsolidateActivitySeineDataResultBuilder { } public ConsolidateActivitySeineDataResultBuilder registerLengthWeightParameterNotFound(Species species, Ocean ocean, Sex sex, Date routeDate) { - String speciesLabel = Species2.decorate(locale, species); + String speciesLabel = Species2.decorate(species); String oceanLabel = I18nReferenceEntities.getLabel(referenceLocale.ordinal(), ocean); String sexLabel = sex == null ? l(locale, "observe.service.actions.consolidate.noSex") : I18nReferenceEntities.getLabel(referenceLocale.ordinal(), sex); String message = l(locale, "observe.service.actions.consolidate.lengthWeightParameterNotFound", speciesLabel, oceanLabel, sexLabel, routeDate); 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 2a6b37d..c284470 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 @@ -23,8 +23,8 @@ package fr.ird.observe.services.topia.service.actions.consolidate; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveTopiaDaoSupplier; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaDaoSupplier; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.LengthWeightComputable; import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSourcePersist; import fr.ird.observe.entities.constants.seine.SchoolTypePersist; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java index f87f1f5..3994035 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/report/ReportServiceTopia.java @@ -23,11 +23,10 @@ package fr.ird.observe.services.topia.service.actions.report; */ import com.google.common.collect.Maps; -import fr.ird.observe.AbstractObserveTopiaDao; +import fr.ird.observe.persistence.AbstractObserveTopiaDao; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.entities.longline.GearUseFeaturesLongline; -import fr.ird.observe.entities.longline.GearUseFeaturesLonglineImpl; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.seine.GearUseFeaturesSeine; import fr.ird.observe.entities.seine.TripSeine; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java index 44ac839..7e46ffe 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/diff/ReferentialSynchronizeDiffServiceTopia.java @@ -23,9 +23,9 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.diff; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.entities.constants.ReferenceStatusPersist; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialDataSourceState; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java index 69ace5b..a0fd297 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/legacy/UnidirectionalReferentialSynchronizeLocalServiceTopia.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.legacy * #L% */ -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java index 05d48b3..5505551 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/ng/ReferentialSynchronizeSqlsRequestBuilder.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.ng; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.referential.ReferentialHelper; import fr.ird.observe.services.service.actions.synchro.referential.ng.ReferentialSynchronizeRequest; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java index 1d3135e..a904ad2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/synchro/referential/sql/InsertSqlStatementGenerator.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service.actions.synchro.referential.sql; * #L% */ -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.services.topia.binder.BinderEngine; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.ReferentialReference; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java index 261f3ee..f034c27 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidateServiceTopia.java @@ -27,8 +27,8 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import com.opensymphony.xwork2.ActionContext; import com.opensymphony.xwork2.util.ValueStack; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.Trip; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java index 608a523..4079390 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/actions/validate/ValidationMessageDetector.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.actions.validate; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import com.google.common.collect.Multimaps; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.longline.ActivityLongline; import fr.ird.observe.entities.longline.SetLongline; import fr.ird.observe.entities.longline.TripLongline; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/ImportTripScriptTopiaSqlWork.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/ImportTripScriptTopiaSqlWork.java index f693cda..a6ab2e7 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/ImportTripScriptTopiaSqlWork.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/ImportTripScriptTopiaSqlWork.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.data; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.RunScriptTopiaSqlWork; +import fr.ird.observe.persistence.RunScriptTopiaSqlWork; import fr.ird.observe.services.dto.ObserveBlobsContainer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopia.java index 2f2ee56..1897107 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/TripManagementServiceTopia.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service.data; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.dto.IdHelper; import fr.ird.observe.services.service.data.DeleteTripRequest; import fr.ird.observe.services.service.data.DeleteTripResult; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java index 1deee60..61f7eff 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/longline/TripLonglineServiceTopia.java @@ -24,7 +24,7 @@ package fr.ird.observe.services.topia.service.data.longline; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.TripMapPoint; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; @@ -80,19 +80,6 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri } @Override - public DataReferenceList<TripLonglineDto> getTripLonglineByProgram(String programId) { - if (log.isTraceEnabled()) { - log.trace("getTripLonglineByProgram(" + programId + ")"); - } - - List<TripLongline> tripLonglines = getDao().findAllStubByProgramId(programId, getReferentialLocale().ordinal()); - tripLonglines.sort(Comparator.comparing(TripLongline::getStartDate)); - return toDataReferenceList(TripLonglineDto.class, tripLonglines); - - } - - - @Override public TripLonglineDto loadDto(String tripLonglineId) { if (log.isTraceEnabled()) { log.trace("loadDto(" + tripLonglineId + ")"); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java index c629808..e73e5e5 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/RouteServiceTopia.java @@ -25,7 +25,7 @@ package fr.ird.observe.services.topia.service.data.seine; import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.seine.ActivitySeine; import fr.ird.observe.entities.seine.ActivitySeineImpl; import fr.ird.observe.entities.seine.Route; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java index 8a23634..691f899 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopia.java @@ -83,23 +83,6 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe } @Override - public DataReferenceList<TripSeineDto> getTripSeineByProgram(String programId) { - if (log.isTraceEnabled()) { - log.trace("getTripSeineByProgram(" + programId + ")"); - } - - ReferentialLocale referenceLocale = getReferentialLocale(); - - // pour verifier l'existance du programme - loadEntity(ProgramDto.class, programId); - - List<TripSeine> tripSeines = getDao().findAllStubByProgramId(programId, referenceLocale.ordinal()); - tripSeines.sort(Comparator.comparing(TripSeine::getStartDate)); - return toDataReferenceList(TripSeineDto.class, tripSeines); - - } - - @Override public int getTripSeinePositionInProgram(String programId, String tripSeineId) { if (log.isTraceEnabled()) { log.trace("getTripSeinePositionInProgram(" + programId + ", " + tripSeineId + ")"); diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java index 2dbceb4..b2fccf2 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialServiceTopia.java @@ -27,8 +27,8 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.SetMultimap; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.entities.EntityMap; import fr.ird.observe.entities.constants.ReferenceStatusPersist; import fr.ird.observe.entities.longline.TripLongline; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java index 99d3fc0..fefaa7e 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/referential/ReferentialsShellBuilder.java @@ -27,7 +27,7 @@ import com.google.common.cache.LoadingCache; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimaps; import com.google.common.collect.SetMultimap; -import fr.ird.observe.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveEntityEnum; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.topia.binder.BinderEngine; diff --git a/services-topia/src/main/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopia.java b/services-topia/src/main/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopia.java index 90002a4..10eda27 100644 --- a/services-topia/src/main/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopia.java +++ b/services-topia/src/main/java/fr/ird/observe/services/topia/service/sql/SqlScriptProducerServiceTopia.java @@ -24,9 +24,9 @@ package fr.ird.observe.services.topia.service.sql; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ListMultimap; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.persistence.ObserveTopiaApplicationContext; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.service.sql.AddSqlScriptProducerRequest; import fr.ird.observe.services.service.sql.AddSqlScriptProducerResult; @@ -53,9 +53,9 @@ import java.util.Set; import java.util.stream.Collectors; import java.util.zip.GZIPOutputStream; -import static fr.ird.observe.entities.Entities.IS_LONGLINE_ID; -import static fr.ird.observe.entities.Entities.IS_SEINE_ID; -import static fr.ird.observe.entities.Entities.REFERENCE_ENTITIES_LIST; +import static fr.ird.observe.persistence.Entities.IS_LONGLINE_ID; +import static fr.ird.observe.persistence.Entities.IS_SEINE_ID; +import static fr.ird.observe.persistence.Entities.REFERENCE_ENTITIES_LIST; /** * Created on 31/12/15. diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java b/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java index d1c741c..9b5f8f4 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/DataSourcesForTestManager.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia; * #L% */ -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; +import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.test.TestHelper; import org.apache.commons.logging.Log; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java index 35f6f24..3fe59f7 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/TopiaTestMethodResource.java @@ -22,8 +22,8 @@ package fr.ird.observe.services.topia; * #L% */ -import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaApplicationContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.ObserveService; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java index 9161480..914051f 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/binder/BinderEngineTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.binder; * #L% */ -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.ObserveDataEntity; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.services.dto.DataDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java index bcb6b6a..683a783 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/LengthWeightParemetersTest.java @@ -22,8 +22,8 @@ package fr.ird.observe.services.topia.entity; import com.opensymphony.xwork2.interceptor.annotations.After; -import fr.ird.observe.ObserveTopiaDaoSupplier; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaDaoSupplier; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.constants.ReferenceStatusPersist; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.LengthWeightParameterTopiaDao; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java index 634f5a0..7ce9fec 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/entity/ReplicateTestSupport.java @@ -24,8 +24,8 @@ package fr.ird.observe.services.topia.entity; import com.google.common.collect.ImmutableMap; import com.google.common.io.Files; -import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaApplicationContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.DataSourceCreateWithNoReferentialImportException; import fr.ird.observe.services.dto.IncompatibleDataSourceCreateConfigurationException; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java index 5f9241e..b7586ed 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/AbstractServiceTopiaTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service; * #L% */ -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.ObserveEntity; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.referential.ReferentialDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java index ef588d3..5e46c01 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/DataSourceServiceTopiaTest.java @@ -23,7 +23,7 @@ package fr.ird.observe.services.topia.service; */ import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveTopiaApplicationContext; +import fr.ird.observe.persistence.ObserveTopiaApplicationContext; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaH2; import fr.ird.observe.services.dto.DataSourceCreateConfigurationDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java index 88ba5f2..6d0757f 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/ReferentialServiceTopiaTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service; * #L% */ -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import fr.ird.observe.entities.referentiel.ObserveReferentialEntity; import fr.ird.observe.entities.referentiel.Program; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java index bc63a85..7517102 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/RigthTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service; * #L% */ -import fr.ird.observe.entities.migration.ObserveMigrationConfigurationProvider; +import fr.ird.observe.persistence.migration.ObserveMigrationConfigurationProvider; import fr.ird.observe.services.configuration.ObserveDataSourceConnection; import fr.ird.observe.services.configuration.topia.ObserveDataSourceConfigurationTopiaPG; import fr.ird.observe.services.dto.Form; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java index 853b3eb..fbe1f57 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/actions/consolidate/ConsolidateDataServiceTopiaTest.java @@ -22,7 +22,7 @@ package fr.ird.observe.services.topia.service.actions.consolidate; * #L% */ -import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.persistence.ObserveTopiaPersistenceContext; import fr.ird.observe.services.service.actions.consolidate.ConsolidateDataService; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataRequest; import fr.ird.observe.services.service.actions.consolidate.ConsolidateTripSeineDataResult; 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 e49e341..7bef6d2 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 @@ -22,8 +22,8 @@ package fr.ird.observe.services.topia.service.actions.synchro; * #L% */ -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.entities.Entities; +import fr.ird.observe.persistence.ObserveEntityEnum; +import fr.ird.observe.persistence.Entities; import fr.ird.observe.services.dto.referential.PersonDto; import fr.ird.observe.services.dto.referential.ReferentialDto; import fr.ird.observe.services.dto.referential.SpeciesDto; diff --git a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java index 1b9829d..774d0c8 100644 --- a/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java +++ b/services-topia/src/test/java/fr/ird/observe/services/topia/service/data/seine/TripSeineServiceTopiaTest.java @@ -72,44 +72,6 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { } @Test - public void getTripSeineByProgramTest() { - - DataReferenceList<TripSeineDto> stubDtos = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); - - Assert.assertNotNull(stubDtos); - - Assert.assertEquals(3, stubDtos.sizeReference()); - - DataReference<TripSeineDto> tripSeineStubDto = stubDtos.getReferenceByPosition(0); - TripSeine tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); - - Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - - tripSeineStubDto = stubDtos.getReferenceByPosition(1); - tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_2); - - Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - - tripSeineStubDto = stubDtos.getReferenceByPosition(2); - tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_3); - - Assert.assertEquals(tripSeine.getTopiaId(), tripSeineStubDto.getId()); - Assert.assertEquals(0, tripSeine.getStartDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_START_DATE))); - Assert.assertEquals(0, tripSeine.getEndDate().compareTo((Date) tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_END_DATE))); - Assert.assertEquals(tripSeine.getVessel().getLabel2(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_VESSEL)); - Assert.assertEquals(tripSeine.getObserverLabel(), tripSeineStubDto.getPropertyValue(TripSeineDto.PROPERTY_OBSERVER)); - - } - - @Test public void loadFormTest() throws Exception { TripSeine tripSeine = topiaTestMethodResource.findById(TripSeine.class, ObserveFixtures.TRIP_SEINE_ID_1); @@ -324,7 +286,7 @@ public class TripSeineServiceTopiaTest extends AbstractServiceTopiaTest { service.delete(ObserveFixtures.TRIP_SEINE_ID_1); - DataReferenceList<TripSeineDto> tripSeineByProgram = service.getTripSeineByProgram(ObserveFixtures.PROGRAM_ID); + DataReferenceList<TripSeineDto> tripSeineByProgram = service.getAllTripSeine(); Assert.assertEquals(2, tripSeineByProgram.sizeReference()); diff --git a/services-topia/src/test/resources/log4j.properties b/services-topia/src/test/resources/log4j.properties index d6a033f..2acb6ac 100644 --- a/services-topia/src/test/resources/log4j.properties +++ b/services-topia/src/test/resources/log4j.properties @@ -30,6 +30,6 @@ log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%c:%L) %M - %m%n #log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) %M - %m%n log4j.logger.fr.ird.observe=INFO -#log4j.logger.fr.ird.observe.RunScriptTopiaSqlWork=DEBUG +#log4j.logger.fr.ird.observe.persistence.RunScriptTopiaSqlWork=DEBUG log4j.logger.org.nuiton.topia=INFO log4j.logger.org.nuiton.topia.service.sql=DEBUG diff --git a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java index f18f4eb..48b3b95 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/longline/TripLonglineService.java @@ -48,10 +48,6 @@ public interface TripLonglineService extends ObserveService { @ReadDataPermission DataReferenceList<TripLonglineDto> getAllTripLongline(); - //FIXME Revoe this method (no more used) - @ReadDataPermission - DataReferenceList<TripLonglineDto> getTripLonglineByProgram(String programId); - @ReadDataPermission int getTripLonglinePositionInProgram(String programId, String tripLonglineId); diff --git a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java index 958767d..c1c875e 100644 --- a/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java +++ b/services/src/main/java/fr/ird/observe/services/service/data/seine/TripSeineService.java @@ -48,10 +48,6 @@ public interface TripSeineService extends ObserveService { @ReadDataPermission DataReferenceList<TripSeineDto> getAllTripSeine(); - //FIXME Revoe this method (no more used) - @ReadDataPermission - DataReferenceList<TripSeineDto> getTripSeineByProgram(String programId); - @ReadDataPermission int getTripSeinePositionInProgram(String programId, String tripSeineId); diff --git a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java index d13db49..509d8a6 100644 --- a/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java +++ b/toolbox-maven-plugin/src/main/java/fr/ird/observe/maven/plugins/toolbox/GenerateValidatorsDescriptorMojo.java @@ -105,7 +105,7 @@ class GenerateValidatorsDescriptorMojo extends GenerateValidatorMojoSupport { ArrayList<ValidatorsCache.ValidatorInfo> validatorList = new ArrayList<>(getValidators()); - Collections.sort(validatorList, (o1, o2) -> o1.getType().getName().compareToIgnoreCase(o2.getType().getName())); + validatorList.sort((o1, o2) -> o1.getType().getName().compareToIgnoreCase(o2.getType().getName())); Gson gson = new GsonBuilder() .setPrettyPrinting() -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.