Observe-commits

Download

observe-commits@list.forge.codelutin.com

January 2016

2 participants
30 discussions

branch develop updated (d5d5d55 -> d9a3ec7)
by codelutin.com scm 09 Jan '16

09 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from d5d5d55 Retour sur develop, mais le ticket n'est pas fini (il faut voir dans les ui comment bien utiliser la date de dernière mise à jour) Merge branch 'feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour' into develop new 4382936 Merge du module observe-entities-validation dans observe-entities new 3731a90 Merge branch 'feature/suppression_module_entities_validation' into develop new cab709a Suppression old code new 8200d6a Suppression de Numbers (utilisation de NumberUtil) Creation d'objets dans observe-entities pour representer les points d'une marée Suppression du lien services-model → entities new 3a88afb Passer par un ficher pour charger un script h2 new 0d65215 Renommage des constantes dans le module de persistence pour éviter des synonymes new 46019f8 Amélioration d'exécution d'un script sql new 84af08c Merge branch 'feature/casser_dependance_service_model_vers_entities' into develop new 03af3cc Normalisation des noms de scripts et utilisation de la layout de topia new 1e72867 Renommages version 5.0-xxx en 4.90x pour faciliter le passage en 5.0 + utilisation nouvelle layout de script de migration new 951a433 Ajout méthode pour faire une backup de base new 9760d00 Lors d'une migration on fait une backup complète new 2ca9cdc Revue de la version du modèle 4.902 pour toujours être inférieur à 5.0 new 9643382 Merge branch 'feature/normalisation_script_migrations' into develop new 8a3ba1e Ajout migration manquante (See #7542) new bbc74d0 Création tmsVersion si nécessaire lors de l'import d'une base new d865c18 Suppression bases de tests inutiles + alignements des bases new dce1d13 Utilisation base empty_h2 new d9a3ec7 Produire le schema pour h2 ou pg The 19 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d9a3ec72f3a0d723476f7f770bcca98f2283d2e0 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 18:16:31 2016 +0100 Produire le schema pour h2 ou pg commit dce1d13f4daed99016a4740a7b82bcd27e1629b4 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 18:15:45 2016 +0100 Utilisation base empty_h2 commit d865c18b26bfd5e610370c3c7ed1029a90829b26 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 18:14:44 2016 +0100 Suppression bases de tests inutiles + alignements des bases commit bbc74d017d0c110ea525f2af101d4449915a4449 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 18:13:29 2016 +0100 Création tmsVersion si nécessaire lors de l'import d'une base commit 8a3ba1e254d2fa32e846f7cab6d24c2e766bd8cf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 18:12:22 2016 +0100 Ajout migration manquante (See #7542) commit 96433820609f085256bdc1740b2d12364930ec21 Merge: 84af08c 2ca9cdc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 14:47:10 2016 +0100 Merge branch 'feature/normalisation_script_migrations' into develop commit 2ca9cdc3ed741da69e437103a212052d1bf17904 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 14:47:05 2016 +0100 Revue de la version du modèle 4.902 pour toujours être inférieur à 5.0 commit 9760d006a951fa11e7b72151812d0f7d038aa3f2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 14:46:36 2016 +0100 Lors d'une migration on fait une backup complète commit 951a433ca5497bd0a7ad92b9ce4df98fd31a8d45 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 14:46:19 2016 +0100 Ajout méthode pour faire une backup de base commit 1e728672bfa9273db046d2d6d994648b803de059 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 14:45:56 2016 +0100 Renommages version 5.0-xxx en 4.90x pour faciliter le passage en 5.0 + utilisation nouvelle layout de script de migration commit 03af3cc6875cb631850458f166f6545ee33a1be5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 14:44:24 2016 +0100 Normalisation des noms de scripts et utilisation de la layout de topia commit 84af08c026578acdf1df57e20a4cd7b0094a7c60 Merge: cab709a 46019f8 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 13:12:10 2016 +0100 Merge branch 'feature/casser_dependance_service_model_vers_entities' into develop commit 46019f827f4a20538ba65b19da8627089a79f1ae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 13:12:08 2016 +0100 Amélioration d'exécution d'un script sql commit 0d652158f644a8ecc863944d7f7e5b56e3dcf2d7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 11:42:21 2016 +0100 Renommage des constantes dans le module de persistence pour éviter des synonymes commit 3a88afbfc91fb6150c083a225ba4f30f1cde0a52 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 11:39:22 2016 +0100 Passer par un ficher pour charger un script h2 commit 8200d6a273a0d29c507cdabe9bfa49aca739724c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 10:43:38 2016 +0100 Suppression de Numbers (utilisation de NumberUtil) Creation d'objets dans observe-entities pour representer les points d'une marée Suppression du lien services-model → entities commit cab709a7a1ee1ca3bd90399f0577e04b744fd9cf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 09:43:38 2016 +0100 Suppression old code commit 3731a904b733ef7a48e3ccda2bc986d9b0f767d8 Merge: d5d5d55 4382936 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 09:42:17 2016 +0100 Merge branch 'feature/suppression_module_entities_validation' into develop commit 4382936a419c1cf9dee7d4e719b3f1c80c72aa7a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 09:42:13 2016 +0100 Merge du module observe-entities-validation dans observe-entities Summary of changes: observe-entities-validation/LICENSE.txt | 674 --- observe-entities-validation/README.txt | 2 - observe-entities-validation/changelog.txt | 2 - observe-entities-validation/pom.xml | 156 - .../src/license/THIRD-PARTY.properties | 32 - .../observe-entities-validation_en_GB.properties | 425 -- .../observe-entities-validation_es_ES.properties | 424 -- .../observe-entities-validation_fr_FR.properties | 425 -- .../src/test/resources/log4j.properties | 52 - observe-entities/pom.xml | 25 +- .../observe/ObserveTopiaApplicationContext.java | 52 +- .../observe/ObserveTopiaPersistenceContext.java | 10 +- .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 103 + .../java/fr/ird/observe/entities/Entities.java | 6 +- .../java/fr/ird/observe/entities/TripMapPoint.java | 59 + .../{GearType.java => GearTypePersist.java} | 10 +- ...enceStatus.java => ReferenceStatusPersist.java} | 2 +- .../constants/TripMapPointTypePersist.java | 6 +- ... NonTargetCatchComputedValueSourcePersist.java} | 4 +- .../{Ownership.java => OwnershipPersist.java} | 10 +- .../{SchoolType.java => SchoolTypePersist.java} | 4 +- ...a => TypeTransmittingBuoyOperationPersist.java} | 10 +- .../entities/longline/ActivityLonglineImpl.java | 12 - .../entities/longline/TripLonglineImpl.java | 112 - .../entities/longline/TripLonglineTopiaDao.java | 158 +- .../migration/AbstractDataSourceMigration.java | 40 +- .../AbstractObserveMigrationCallBack.java | 73 +- .../entities/migration/ObserveMigrationEngine.java | 8 + .../DataSourceMigrationForVersion_3_10.java | 10 +- .../DataSourceMigrationForVersion_3_11.java | 12 +- .../DataSourceMigrationForVersion_3_12.java | 2 +- .../DataSourceMigrationForVersion_3_14.java | 8 +- .../DataSourceMigrationForVersion_3_15.java | 6 +- .../DataSourceMigrationForVersion_3_16.java | 6 +- .../DataSourceMigrationForVersion_3_5.java | 24 +- .../DataSourceMigrationForVersion_3_7.java | 52 +- .../DataSourceMigrationForVersion_3_8.java | 8 +- .../DataSourceMigrationForVersion_3_9.java | 4 +- .../DataSourceMigrationForVersion_4_0.java | 2 +- .../DataSourceMigrationForVersion_4_0_1.java | 4 +- .../DataSourceMigrationForVersion_4_0_2.java | 2 +- ...va => DataSourceMigrationForVersion_4_0_4.java} | 32 +- .../DataSourceMigrationForVersion_4_0_RC2.java | 2 +- .../DataSourceMigrationForVersion_4_0_RC3.java | 24 +- .../DataSourceMigrationForVersion_4_0_RC4.java | 2 +- .../DataSourceMigrationForVersion_4_0_RC6.java | 2 +- .../DataSourceMigrationForVersion_4_0_RC7.java | 4 +- ...va => DataSourceMigrationForVersion_4_900.java} | 12 +- ...va => DataSourceMigrationForVersion_4_901.java} | 12 +- ...va => DataSourceMigrationForVersion_4_902.java} | 12 +- .../DataSourceMigrationForVersion_5_0.java | 8 +- .../referentiel/LengthWeightParameters.java | 6 +- .../referentiel/LengthWeightParemeterHelper.java | 6 +- .../referentiel/ObserveReferentialEntities.java | 4 +- .../referentiel/ObserveReferentialEntityImpl.java | 6 +- .../entities/referentiel/ProgramTopiaDao.java | 4 +- .../ird/observe/entities/referentiel/Programs.java | 6 +- .../observe/entities/referentiel/SpeciesImpl.java | 12 +- .../observe/entities/referentiel/VesselImpl.java | 10 +- .../observe/entities/seine/ActivitySeineImpl.java | 14 +- .../ird/observe/entities/seine/ActivitySeines.java | 10 +- .../observe/entities/seine/FloatingObjectImpl.java | 18 +- .../observe/entities/seine/NonTargetCatchImpl.java | 14 +- .../entities/seine/NonTargetLengthImpl.java | 8 +- .../fr/ird/observe/entities/seine/RouteImpl.java | 255 +- .../ird/observe/entities/seine/SetSeineImpl.java | 12 +- .../observe/entities/seine/TargetCatchImpl.java | 4 +- .../observe/entities/seine/TargetLengthImpl.java | 10 +- .../ird/observe/entities/seine/TripSeineImpl.java | 135 - .../observe/entities/seine/TripSeineTopiaDao.java | 118 +- .../CollectionFieldExpressionValidator2.java | 0 .../validator/CollectionUniqueKeyValidator2.java | 0 .../ObserveCollectionUniqueKeyValidator.java | 0 .../entities/AbstractEspeceFieldValidator.java | 0 .../ActivityFinDeVeilleExistsValidator.java | 0 .../entities/ActivitySimpleSpeedValidator.java | 0 .../validator/entities/ActivitySpeedValidator.java | 0 .../entities/SetLonglineUniqueHomeIdValidator.java | 0 .../entities/SetLonglineUniqueNumberValidator.java | 0 .../entities/SpeciesLengthFieldValidator.java | 0 .../entities/SpeciesWeightFieldValidator.java | 0 .../db/4.0-RC3/rename-unknown-longliner-H2.sql | 22 - .../db/4.0-RC3/rename-unknown-longliner-PG.sql | 22 - .../db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql | 22 - .../db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql | 22 - .../V3_10_01_remove-person-H2.sql} | 0 .../V3_10_01_remove-person-PG.sql} | 0 .../V3_10_02_add-missing-fk-H2.sql} | 0 .../V3_10_02_add-missing-fk-PG.sql} | 0 .../V3_10_03_increase-comment-field-H2.sql} | 0 .../V3_10_03_increase-comment-field-PG.sql} | 0 .../V3_10_04_fix-sensorDataFormat-H2.sql} | 0 .../V3_10_04_fix-sensorDataFormat-PG.sql} | 0 .../V3_10_05_normalize-sections-H2.sql} | 0 .../V3_10_05_normalize-sections-PG.sql} | 0 ..._01_remove-speciesGroup-obsolete-fields-H2.sql} | 0 ..._01_remove-speciesGroup-obsolete-fields-PG.sql} | 0 ..._11_02_add-country-on-transmitting-buoy-H2.sql} | 0 ..._11_02_add-country-on-transmitting-buoy-PG.sql} | 0 .../V3_11_03_add-fpaZones-H2.sql} | 0 .../V3_11_03_add-fpaZones-PG.sql} | 0 .../V3_11_04_add-activity-ersId-H2.sql} | 0 .../V3_11_04_add-activity-ersId-PG.sql} | 0 .../V3_11_05_add-person-country-H2.sql} | 0 .../V3_11_05_add-person-country-PG.sql} | 0 .../V3_11_06_add-harbours-H2.sql} | 0 .../V3_11_06_add-harbours-PG.sql} | 0 .../V3_12_01_add-missing-boat-H2.sql} | 0 .../V3_12_01_add-missing-boat-PG.sql} | 0 ..._14_01_remove-hooksPerBasketCount-field-H2.sql} | 0 ..._14_01_remove-hooksPerBasketCount-field-PG.sql} | 0 ..._14_02_fix-targetsample-discarded-value-H2.sql} | 0 ..._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 ..._04_remove-targetlength-discarded-field-H2.sql} | 0 ..._04_remove-targetlength-discarded-field-PG.sql} | 0 ...15_01_change-tdr-integer-field-to-float-H2.sql} | 0 ...15_01_change-tdr-integer-field-to-float-PG.sql} | 0 ...15_02_remove-set-longline-length-fields-H2.sql} | 0 ...15_02_remove-set-longline-length-fields-PG.sql} | 0 .../V3_15_03_remove-brancheline-fields-H2.sql} | 0 .../V3_15_03_remove-brancheline-fields-PG.sql} | 0 .../V3_16_01_add-gear-referential-H2.sql} | 0 .../V3_16_01_add-gear-referential-PG.sql} | 0 .../V3_16_02_add-gear-data-H2.sql} | 0 .../V3_16_02_add-gear-data-PG.sql} | 0 .../V3_16_03_remove-tripSeine-seine-H2.sql} | 0 .../V3_16_03_remove-tripSeine-seine-PG.sql} | 0 .../V3_5_01_migration-H2.sql} | 0 .../V3_5_01_migration-PG.sql} | 0 .../V3_5_02_add-longline-schema-H2.sql} | 0 .../V3_5_02_add-longline-schema-PG.sql} | 0 .../V3_5_03_update-common-references-H2.sql} | 0 .../V3_5_03_update-common-references-PG.sql} | 0 .../V3_5_04_add-longline-references-H2.sql} | 0 .../V3_5_04_add-longline-references-PG.sql} | 0 .../V3_7_01_rename-seine-model-H2.sql} | 0 .../V3_7_01_rename-seine-model-PG.sql} | 0 .../V3_7_02_remove-trip-organism-H2.sql} | 0 .../V3_7_02_remove-trip-organism-PG.sql} | 0 .../V3_7_03_add-referential-needComment-H2.sql} | 0 .../V3_7_03_add-referential-needComment-PG.sql} | 0 .../V3_7_04_normalize-triplongline-H2.sql} | 0 .../V3_7_04_normalize-triplongline-PG.sql} | 0 .../V3_7_05_normalize-activitylongline-H2.sql} | 0 .../V3_7_05_normalize-activitylongline-PG.sql} | 0 .../V3_7_06_normalize-setlongline-H2.sql} | 0 .../V3_7_06_normalize-setlongline-PG.sql} | 0 .../V3_7_07_normalize-catchlongline-H2.sql} | 0 .../V3_7_07_normalize-catchlongline-PG.sql} | 0 .../V3_7_08_normalize-tdr-H2.sql} | 0 .../V3_7_08_normalize-tdr-PG.sql} | 0 .../V3_7_09_add-species-list-H2.sql} | 0 .../V3_7_09_add-species-list-PG.sql} | 0 .../V3_7_10_increase-comment-field-H2.sql} | 0 .../V3_7_10_increase-comment-field-PG.sql} | 0 .../V3_8_01_fix-person-H2.sql} | 0 .../V3_8_01_fix-person-PG.sql} | 0 .../V3_8_02_fix-branchelinecomposition-H2.sql} | 0 .../V3_8_02_fix-branchelinecomposition-PG.sql} | 0 .../V3_8_03_normalize-sensorused-H2.sql} | 0 .../V3_8_03_normalize-sensorused-PG.sql} | 0 .../V3_8_04_normalize-tdr-H2.sql} | 0 .../V3_8_04_normalize-tdr-PG.sql} | 0 .../V3_9_01_add-dataFilename-attribute-H2.sql} | 0 .../V3_9_01_add-dataFilename-attribute-PG.sql} | 0 .../V3_9_02_fill-sensorDataFormat-H2.sql} | 0 .../V3_9_02_fill-sensorDataFormat-PG.sql} | 0 .../V4_0_01_empty-H2.sql} | 0 .../V4_0_01_empty-PG.sql} | 0 .../V4_0_1_01_remove-gender-column-H2.sql} | 0 .../V4_0_1_02_add-missing-fk-H2.sql} | 0 .../V4_0_1_02_add-missing-fk-PG.sql} | 0 .../V4_0_2_01_remove-gender-column-PG.sql} | 0 ..._4_01_remove-trip-datearriveeport-field-H2.sql} | 8 +- ..._4_01_remove-trip-datearriveeport-field-PG.sql} | 8 +- .../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 ..._0_RC_2_02_update-senne-gear-usedInTrip-H2.sql} | 0 ..._0_RC_2_02_update-senne-gear-usedInTrip-PG.sql} | 0 .../V4_0_RC_2_03_rename-unknown-longliner-H2.sql} | 0 .../V4_0_RC_2_03_rename-unknown-longliner-PG.sql} | 0 .../V4_0_RC_4_01_add-gear-data-H2.sql} | 0 .../V4_0_RC_4_01_add-gear-data-PG.sql} | 0 ..._0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql} | 0 ..._0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql} | 0 ..._0_RC_7_01_update-senne-gear-usedInTrip-H2.sql} | 0 ..._0_RC_7_01_update-senne-gear-usedInTrip-PG.sql} | 0 .../V4_0_RC_7_02_rename-unknown-longliner-H2.sql} | 0 .../V4_0_RC_7_02_rename-unknown-longliner-PG.sql} | 0 .../V4_900_01_remove_open_field-H2.sql} | 0 .../V4_900_01_remove_open_field-PG.sql} | 0 .../V4_901_01_add_lastUpdateDate_field-H2.sql} | 0 .../V4_901_01_add_lastUpdateDate_field-PG.sql} | 0 .../V4_902_01_add_lastUpdateDate_table-H2.sql} | 0 .../V4_902_01_add_lastUpdateDate_table-PG.sql} | 0 ...ActivityLongline-n1-create-error-validation.xml | 0 ...tivityLongline-n1-create-warning-validation.xml | 0 ...ngline-n1-update-encounter-error-validation.xml | 0 ...ActivityLongline-n1-update-error-validation.xml | 0 ...gline-n1-update-sensorUsed-error-validation.xml | 0 ...tivityLongline-n1-update-warning-validation.xml | 0 ...BaitsComposition-n1-update-error-validation.xml | 0 .../Basket-n1-update-table-error-validation.xml | 0 ...ne-n1-update-catchLongline-error-validation.xml | 0 .../Branchline-n1-update-error-validation.xml | 0 ...Branchline-n1-update-table-error-validation.xml | 0 .../Branchline-n1-update-warning-validation.xml | 0 ...linesComposition-n1-update-error-validation.xml | 0 .../CatchLongline-n1-update-error-validation.xml | 0 .../CatchLongline-n1-update-warning-validation.xml | 0 .../Encounter-n1-update-error-validation.xml | 0 .../Encounter-n1-update-warning-validation.xml | 0 ...linesComposition-n1-update-error-validation.xml | 0 ...FeaturesLongline-n1-update-error-validation.xml | 0 ...HooksComposition-n1-update-error-validation.xml | 0 .../Section-n1-update-table-error-validation.xml | 0 .../SensorUsed-n1-update-error-validation.xml | 0 .../SensorUsed-n1-update-warning-validation.xml | 0 .../SetLongline-n1-create-error-validation.xml | 0 .../SetLongline-n1-create-warning-validation.xml | 0 ...n1-update-baitsComposition-error-validation.xml | 0 ...ate-branchlinesComposition-error-validation.xml | 0 .../SetLongline-n1-update-error-validation.xml | 0 ...date-floatlinesComposition-error-validation.xml | 0 ...1-update-globalComposition-error-validation.xml | 0 ...n1-update-hooksComposition-error-validation.xml | 0 .../SetLongline-n1-update-warning-validation.xml | 0 .../longline/Tdr-n1-update-error-validation.xml | 0 .../longline/Tdr-n1-update-warning-validation.xml | 0 .../TripLongline-n1-create-error-validation.xml | 0 .../TripLongline-n1-create-warning-validation.xml | 0 .../TripLongline-n1-update-error-validation.xml | 0 .../TripLongline-n1-update-warning-validation.xml | 0 .../Country-n1-create-error-validation.xml | 0 .../Country-n1-create-warning-validation.xml | 0 .../Country-n1-update-error-validation.xml | 0 .../Country-n1-update-warning-validation.xml | 0 .../FpaZone-n1-create-error-validation.xml | 0 .../FpaZone-n1-create-warning-validation.xml | 0 .../FpaZone-n1-update-error-validation.xml | 0 .../FpaZone-n1-update-warning-validation.xml | 0 .../Gear-n1-create-error-validation.xml | 0 .../Gear-n1-create-warning-validation.xml | 0 .../Gear-n1-update-error-validation.xml | 0 .../Gear-n1-update-warning-validation.xml | 0 ...earCaracteristic-n1-create-error-validation.xml | 0 ...rCaracteristic-n1-create-warning-validation.xml | 0 ...earCaracteristic-n1-update-error-validation.xml | 0 ...rCaracteristic-n1-update-warning-validation.xml | 0 ...aracteristicType-n1-create-error-validation.xml | 0 ...acteristicType-n1-create-warning-validation.xml | 0 ...aracteristicType-n1-update-error-validation.xml | 0 ...acteristicType-n1-update-warning-validation.xml | 0 .../Harbour-n1-create-error-validation.xml | 0 .../Harbour-n1-create-warning-validation.xml | 0 .../Harbour-n1-update-error-validation.xml | 0 .../Harbour-n1-update-warning-validation.xml | 0 ...hWeightParameter-n1-create-error-validation.xml | 0 ...eightParameter-n1-create-warning-validation.xml | 0 ...hWeightParameter-n1-update-error-validation.xml | 0 ...eightParameter-n1-update-warning-validation.xml | 0 .../Ocean-n1-create-error-validation.xml | 0 .../Ocean-n1-create-warning-validation.xml | 0 .../Ocean-n1-update-error-validation.xml | 0 .../Ocean-n1-update-warning-validation.xml | 0 .../Organism-n1-create-error-validation.xml | 0 .../Organism-n1-create-warning-validation.xml | 0 .../Organism-n1-update-error-validation.xml | 0 .../Organism-n1-update-warning-validation.xml | 0 .../Person-n1-create-error-validation.xml | 0 .../Person-n1-create-warning-validation.xml | 0 .../Person-n1-update-error-validation.xml | 0 .../Person-n1-update-warning-validation.xml | 0 .../Program-n1-create-error-validation.xml | 0 .../Program-n1-create-warning-validation.xml | 0 .../Program-n1-update-error-validation.xml | 0 .../Program-n1-update-warning-validation.xml | 0 .../referentiel/Sex-n1-create-error-validation.xml | 0 .../Sex-n1-create-warning-validation.xml | 0 .../referentiel/Sex-n1-update-error-validation.xml | 0 .../Sex-n1-update-warning-validation.xml | 0 .../Species-n1-create-error-validation.xml | 0 .../Species-n1-create-warning-validation.xml | 0 .../Species-n1-update-error-validation.xml | 0 .../Species-n1-update-warning-validation.xml | 0 .../SpeciesGroup-n1-create-error-validation.xml | 0 .../SpeciesGroup-n1-create-warning-validation.xml | 0 .../SpeciesGroup-n1-update-error-validation.xml | 0 .../SpeciesGroup-n1-update-warning-validation.xml | 0 .../SpeciesList-n1-create-error-validation.xml | 0 .../SpeciesList-n1-create-warning-validation.xml | 0 .../SpeciesList-n1-update-error-validation.xml | 0 .../SpeciesList-n1-update-warning-validation.xml | 0 .../Vessel-n1-create-error-validation.xml | 0 .../Vessel-n1-create-warning-validation.xml | 0 .../Vessel-n1-update-error-validation.xml | 0 .../Vessel-n1-update-warning-validation.xml | 0 ...sselSizeCategory-n1-create-error-validation.xml | 0 ...elSizeCategory-n1-create-warning-validation.xml | 0 ...sselSizeCategory-n1-update-error-validation.xml | 0 ...elSizeCategory-n1-update-warning-validation.xml | 0 .../VesselType-n1-create-error-validation.xml | 0 .../VesselType-n1-create-warning-validation.xml | 0 .../VesselType-n1-update-error-validation.xml | 0 .../VesselType-n1-update-warning-validation.xml | 0 ...aitHaulingStatus-n1-create-error-validation.xml | 0 ...tHaulingStatus-n1-create-warning-validation.xml | 0 ...aitHaulingStatus-n1-update-error-validation.xml | 0 ...tHaulingStatus-n1-update-warning-validation.xml | 0 ...aitSettingStatus-n1-create-error-validation.xml | 0 ...tSettingStatus-n1-create-warning-validation.xml | 0 ...aitSettingStatus-n1-update-error-validation.xml | 0 ...tSettingStatus-n1-update-warning-validation.xml | 0 .../BaitType-n1-create-error-validation.xml | 0 .../BaitType-n1-create-warning-validation.xml | 0 .../BaitType-n1-update-error-validation.xml | 0 .../BaitType-n1-update-warning-validation.xml | 0 ...atchFateLongline-n1-create-error-validation.xml | 0 ...chFateLongline-n1-create-warning-validation.xml | 0 ...atchFateLongline-n1-update-error-validation.xml | 0 ...chFateLongline-n1-update-warning-validation.xml | 0 .../EncounterType-n1-create-error-validation.xml | 0 .../EncounterType-n1-create-warning-validation.xml | 0 .../EncounterType-n1-update-error-validation.xml | 0 .../EncounterType-n1-update-warning-validation.xml | 0 .../Healthness-n1-create-error-validation.xml | 0 .../Healthness-n1-create-warning-validation.xml | 0 .../Healthness-n1-update-error-validation.xml | 0 .../Healthness-n1-update-warning-validation.xml | 0 .../HookPosition-n1-create-error-validation.xml | 0 .../HookPosition-n1-create-warning-validation.xml | 0 .../HookPosition-n1-update-error-validation.xml | 0 .../HookPosition-n1-update-warning-validation.xml | 0 .../HookSize-n1-create-error-validation.xml | 0 .../HookSize-n1-create-warning-validation.xml | 0 .../HookSize-n1-update-error-validation.xml | 0 .../HookSize-n1-update-warning-validation.xml | 0 .../HookType-n1-create-error-validation.xml | 0 .../HookType-n1-create-warning-validation.xml | 0 .../HookType-n1-update-error-validation.xml | 0 .../HookType-n1-update-warning-validation.xml | 0 ...rizontalPosition-n1-create-error-validation.xml | 0 ...zontalPosition-n1-create-warning-validation.xml | 0 ...rizontalPosition-n1-update-error-validation.xml | 0 ...zontalPosition-n1-update-warning-validation.xml | 0 ...VerticalPosition-n1-create-error-validation.xml | 0 ...rticalPosition-n1-create-warning-validation.xml | 0 ...VerticalPosition-n1-update-error-validation.xml | 0 ...rticalPosition-n1-update-warning-validation.xml | 0 ...LightsticksColor-n1-create-error-validation.xml | 0 ...ghtsticksColor-n1-create-warning-validation.xml | 0 ...LightsticksColor-n1-update-error-validation.xml | 0 ...ghtsticksColor-n1-update-warning-validation.xml | 0 .../LightsticksType-n1-create-error-validation.xml | 0 ...ightsticksType-n1-create-warning-validation.xml | 0 .../LightsticksType-n1-update-error-validation.xml | 0 ...ightsticksType-n1-update-warning-validation.xml | 0 .../LineType-n1-create-error-validation.xml | 0 .../LineType-n1-create-warning-validation.xml | 0 .../LineType-n1-update-error-validation.xml | 0 .../LineType-n1-update-warning-validation.xml | 0 .../MaturityStatus-n1-create-error-validation.xml | 0 ...MaturityStatus-n1-create-warning-validation.xml | 0 .../MaturityStatus-n1-update-error-validation.xml | 0 ...MaturityStatus-n1-update-warning-validation.xml | 0 .../MitigationType-n1-create-error-validation.xml | 0 ...MitigationType-n1-create-warning-validation.xml | 0 .../MitigationType-n1-update-error-validation.xml | 0 ...MitigationType-n1-update-warning-validation.xml | 0 .../SensorBrand-n1-create-error-validation.xml | 0 .../SensorBrand-n1-create-warning-validation.xml | 0 .../SensorBrand-n1-update-error-validation.xml | 0 .../SensorBrand-n1-update-warning-validation.xml | 0 ...SensorDataFormat-n1-create-error-validation.xml | 0 ...nsorDataFormat-n1-create-warning-validation.xml | 0 ...SensorDataFormat-n1-update-error-validation.xml | 0 ...nsorDataFormat-n1-update-warning-validation.xml | 0 .../SensorType-n1-create-error-validation.xml | 0 .../SensorType-n1-create-warning-validation.xml | 0 .../SensorType-n1-update-error-validation.xml | 0 .../SensorType-n1-update-warning-validation.xml | 0 .../SettingShape-n1-create-error-validation.xml | 0 .../SettingShape-n1-create-warning-validation.xml | 0 .../SettingShape-n1-update-error-validation.xml | 0 .../SettingShape-n1-update-warning-validation.xml | 0 .../SizeMeasureType-n1-create-error-validation.xml | 0 ...izeMeasureType-n1-create-warning-validation.xml | 0 .../SizeMeasureType-n1-update-error-validation.xml | 0 ...izeMeasureType-n1-update-warning-validation.xml | 0 .../StomacFullness-n1-create-error-validation.xml | 0 ...StomacFullness-n1-create-warning-validation.xml | 0 .../StomacFullness-n1-update-error-validation.xml | 0 ...StomacFullness-n1-update-warning-validation.xml | 0 .../TripType-n1-create-error-validation.xml | 0 .../TripType-n1-create-warning-validation.xml | 0 .../TripType-n1-update-error-validation.xml | 0 .../TripType-n1-update-warning-validation.xml | 0 ...ActivityLongline-n1-create-error-validation.xml | 0 ...tivityLongline-n1-create-warning-validation.xml | 0 ...ActivityLongline-n1-update-error-validation.xml | 0 ...tivityLongline-n1-update-warning-validation.xml | 0 ...eightMeasureType-n1-create-error-validation.xml | 0 ...ghtMeasureType-n1-create-warning-validation.xml | 0 ...eightMeasureType-n1-update-error-validation.xml | 0 ...ghtMeasureType-n1-update-warning-validation.xml | 0 .../DetectionMode-n1-create-error-validation.xml | 0 .../DetectionMode-n1-create-warning-validation.xml | 0 .../DetectionMode-n1-update-error-validation.xml | 0 .../DetectionMode-n1-update-warning-validation.xml | 0 .../ObjectFate-n1-create-error-validation.xml | 0 .../ObjectFate-n1-create-warning-validation.xml | 0 .../ObjectFate-n1-update-error-validation.xml | 0 .../ObjectFate-n1-update-warning-validation.xml | 0 .../ObjectOperation-n1-create-error-validation.xml | 0 ...bjectOperation-n1-create-warning-validation.xml | 0 .../ObjectOperation-n1-update-error-validation.xml | 0 ...bjectOperation-n1-update-warning-validation.xml | 0 .../ObjectType-n1-create-error-validation.xml | 0 .../ObjectType-n1-create-warning-validation.xml | 0 .../ObjectType-n1-update-error-validation.xml | 0 .../ObjectType-n1-update-warning-validation.xml | 0 .../ObservedSystem-n1-create-error-validation.xml | 0 ...ObservedSystem-n1-create-warning-validation.xml | 0 .../ObservedSystem-n1-update-error-validation.xml | 0 ...ObservedSystem-n1-update-warning-validation.xml | 0 ...ReasonForDiscard-n1-create-error-validation.xml | 0 ...asonForDiscard-n1-create-warning-validation.xml | 0 ...ReasonForDiscard-n1-update-error-validation.xml | 0 ...asonForDiscard-n1-update-warning-validation.xml | 0 ...asonForNoFishing-n1-create-error-validation.xml | 0 ...onForNoFishing-n1-create-warning-validation.xml | 0 ...asonForNoFishing-n1-update-error-validation.xml | 0 ...onForNoFishing-n1-update-warning-validation.xml | 0 ...ReasonForNullSet-n1-create-error-validation.xml | 0 ...asonForNullSet-n1-create-warning-validation.xml | 0 ...ReasonForNullSet-n1-update-error-validation.xml | 0 ...asonForNullSet-n1-update-warning-validation.xml | 0 .../SpeciesFate-n1-create-error-validation.xml | 0 .../SpeciesFate-n1-create-warning-validation.xml | 0 .../SpeciesFate-n1-update-error-validation.xml | 0 .../SpeciesFate-n1-update-warning-validation.xml | 0 .../SpeciesStatus-n1-create-error-validation.xml | 0 .../SpeciesStatus-n1-create-warning-validation.xml | 0 .../SpeciesStatus-n1-update-error-validation.xml | 0 .../SpeciesStatus-n1-update-warning-validation.xml | 0 ...roundingActivity-n1-create-error-validation.xml | 0 ...undingActivity-n1-create-warning-validation.xml | 0 ...roundingActivity-n1-update-error-validation.xml | 0 ...undingActivity-n1-update-warning-validation.xml | 0 ...ingBuoyOperation-n1-create-error-validation.xml | 0 ...gBuoyOperation-n1-create-warning-validation.xml | 0 ...ingBuoyOperation-n1-update-error-validation.xml | 0 ...gBuoyOperation-n1-update-warning-validation.xml | 0 ...smittingBuoyType-n1-create-error-validation.xml | 0 ...ittingBuoyType-n1-create-warning-validation.xml | 0 ...smittingBuoyType-n1-update-error-validation.xml | 0 ...ittingBuoyType-n1-update-warning-validation.xml | 0 ...selActivitySeine-n1-create-error-validation.xml | 0 ...lActivitySeine-n1-create-warning-validation.xml | 0 ...selActivitySeine-n1-update-error-validation.xml | 0 ...lActivitySeine-n1-update-warning-validation.xml | 0 .../WeightCategory-n1-create-error-validation.xml | 0 ...WeightCategory-n1-create-warning-validation.xml | 0 .../WeightCategory-n1-update-error-validation.xml | 0 ...WeightCategory-n1-update-warning-validation.xml | 0 .../seine/Wind-n1-create-error-validation.xml | 0 .../seine/Wind-n1-create-warning-validation.xml | 0 .../seine/Wind-n1-update-error-validation.xml | 0 .../seine/Wind-n1-update-warning-validation.xml | 0 .../ActivitySeine-n1-create-error-validation.xml | 0 .../ActivitySeine-n1-create-warning-validation.xml | 0 .../ActivitySeine-n1-update-error-validation.xml | 0 ...e-n1-update-observedSystem-error-validation.xml | 0 ...n1-update-observedSystem-warning-validation.xml | 0 .../ActivitySeine-n1-update-warning-validation.xml | 0 .../FloatingObject-n1-create-error-validation.xml | 0 ...FloatingObject-n1-create-warning-validation.xml | 0 .../FloatingObject-n1-update-error-validation.xml | 0 ...pdate-objectSchoolEstimate-error-validation.xml | 0 ...-transmittingBuoyOperation-error-validation.xml | 0 ...FloatingObject-n1-update-warning-validation.xml | 0 ...UseFeaturesSeine-n1-update-error-validation.xml | 0 .../NonTargetCatch-n1-update-error-validation.xml | 0 ...NonTargetCatch-n1-update-warning-validation.xml | 0 .../NonTargetLength-n1-update-error-validation.xml | 0 ...onTargetLength-n1-update-warning-validation.xml | 0 .../NonTargetSample-n1-update-error-validation.xml | 0 ...tObservedSpecies-n1-update-error-validation.xml | 0 ...ctSchoolEstimate-n1-update-error-validation.xml | 0 ...SchoolEstimate-n1-update-warning-validation.xml | 0 .../seine/Route-n1-create-error-validation.xml | 0 .../seine/Route-n1-create-warning-validation.xml | 0 .../seine/Route-n1-update-error-validation.xml | 0 .../seine/Route-n1-update-warning-validation.xml | 0 .../SchoolEstimate-n1-update-error-validation.xml | 0 .../seine/SetSeine-n1-create-error-validation.xml | 0 .../SetSeine-n1-create-warning-validation.xml | 0 .../seine/SetSeine-n1-update-error-validation.xml | 0 ...e-n1-update-nonTargetCatch-error-validation.xml | 0 ...e-n1-update-schoolEstimate-error-validation.xml | 0 ...eine-n1-update-targetCatch-error-validation.xml | 0 ...-n1-update-targetDiscarded-error-validation.xml | 0 .../SetSeine-n1-update-warning-validation.xml | 0 ...atch-n1-update-targetCatch-error-validation.xml | 0 ...ch-n1-update-targetCatch-warning-validation.xml | 0 ...-n1-update-targetDiscarded-error-validation.xml | 0 ...1-update-targetDiscarded-warning-validation.xml | 0 .../TargetLength-n1-update-error-validation.xml | 0 .../TargetLength-n1-update-warning-validation.xml | 0 .../TargetSample-n1-update-error-validation.xml | 0 ...TransmittingBuoy-n1-update-error-validation.xml | 0 ...ansmittingBuoy-n1-update-warning-validation.xml | 0 .../seine/TripSeine-n1-create-error-validation.xml | 0 .../TripSeine-n1-create-warning-validation.xml | 0 .../seine/TripSeine-n1-update-error-validation.xml | 0 ...1-update-gearUseFeatures-warning-validation.xml | 0 .../TripSeine-n1-update-warning-validation.xml | 0 .../i18n/observe-entities_en_GB.properties | 425 ++ .../i18n/observe-entities_es_ES.properties | 424 ++ .../i18n/observe-entities_fr_FR.properties | 425 ++ observe-entities/src/main/xmi/observe-common.zargo | Bin 37603 -> 37331 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 84567 -> 84619 bytes .../validation/BeanValidatorDetectorTest.java | 0 .../business/validation/RelationRegexTest.java | 0 .../test/java/fr/ird/observe/util/NumbersTest.java | 86 - .../entities/ActivitySeineSpeedValidatorTest.java | 0 .../seine/Route-testSpeed-error-validation.xml | 0 .../src/test/resources/validators.xml | 0 .../services/service/SqlScriptProducerService.java | 9 +- .../fr/ird/observe/services/dto/TripMapDtos.java | 15 - .../longline/SetLonglineGlobalCompositionDto.java | 3 - .../seine/FloatingObjectTransmittingBuoyDto.java | 5 +- .../services/dto/seine/TargetLengthDto.java | 9 +- .../src/main/java/fr/ird/observe/util/Numbers.java | 87 - observe-services-topia/pom.xml | 6 - .../observe/services/AbstractObserveService.java | 514 -- .../ObserveServiceFactoryProviderTopia.java | 212 - .../observe/services/ReplicationServiceImpl.java | 445 -- .../observe/services/data/OpenableServiceImpl.java | 179 - .../ird/observe/services/data/TripServiceImpl.java | 233 - .../data/longline/ActivityLonglineServiceImpl.java | 167 - .../data/longline/BaitsCompositionServiceImpl.java | 98 - .../BranchlinesCompositionServiceImpl.java | 94 - .../data/longline/CatchLonglineServiceImpl.java | 267 - .../data/longline/EncounterServiceImpl.java | 94 - .../longline/FloatlinesCompositionServiceImpl.java | 94 - .../GearUseFeaturesLonglineServiceImpl.java | 236 - .../data/longline/HooksCompositionServiceImpl.java | 94 - .../LonglineDetailCompositionServiceImpl.java | 213 - .../LonglineGlobalCompositionServiceImpl.java | 87 - .../data/longline/SensorUsedServiceImpl.java | 129 - .../data/longline/SetLonglineServiceImpl.java | 201 - .../services/data/longline/TdrServiceImpl.java | 127 - .../data/longline/TripLonglineServiceImpl.java | 158 - .../data/seine/ActivitySeineServiceImpl.java | 224 - .../data/seine/FloatingObjectServiceImpl.java | 216 - .../seine/GearUseFeaturesSeineServiceImpl.java | 233 - .../data/seine/NonTargetCatchServiceImpl.java | 136 - .../data/seine/NonTargetSampleServiceImpl.java | 267 - .../seine/ObjectObservedSpeciesServiceImpl.java | 88 - .../seine/ObjectSchoolEstimateServiceImpl.java | 89 - .../services/data/seine/RouteServiceImpl.java | 184 - .../data/seine/SchoolEstimateServiceImpl.java | 94 - .../services/data/seine/SetSeineServiceImpl.java | 173 - .../data/seine/TargetCatchServiceImpl.java | 186 - .../data/seine/TargetSampleServiceImpl.java | 298 -- .../services/data/seine/TripSeineServiceImpl.java | 158 - .../services/operation/ComputeDataServiceImpl.java | 854 --- .../services/operation/GpsImportServiceImpl.java | 153 - .../services/operation/SynchronizeServiceImpl.java | 240 - .../services/operation/ValidationServiceImpl.java | 116 - .../referential/ReferentialServiceImpl.java | 540 -- .../ird/observe/services/binder/BinderSupport.java | 98 +- .../observe/services/entity/TripMapDtoFactory.java | 40 + .../services/service/DataSourceServiceTopia.java | 32 +- .../service/SqlScriptProducerServiceTopia.java | 18 + .../ConsolidateActivitySeineDataResultBuilder.java | 4 +- .../consolidate/ConsolidateDataServiceTopia.java | 30 +- .../service/longline/TripLonglineServiceTopia.java | 8 +- .../service/seine/SetSeineServiceTopia.java | 4 +- .../service/seine/TripSeineServiceTopia.java | 8 +- .../referentiel/LengthWeightParemetersTest.java | 4 +- .../replication/ReplicateReferentialsTest.java | 2 +- .../services/service/MigrateTestsDatabases.java | 60 +- .../service/SqlScriptProducerServiceTopiaTest.java | 2 +- .../java/fr/ird/observe/test/DatabaseName.java | 6 +- .../java/fr/ird/observe/test/ObserveFixtures.java | 4 +- .../src/main/resources/db/1.0.0/obstuna.sql | 3220 ------------ .../resources/db/1.0.0/referentiel-data.sql.gz | Bin 72773 -> 0 bytes .../src/main/resources/db/1.0.0/referentiel.sql.gz | Bin 70355 -> 0 bytes .../src/main/resources/db/1.2/obstuna.sql | 3662 ------------- .../main/resources/db/1.2/referentiel-data.sql.gz | Bin 79292 -> 0 bytes .../src/main/resources/db/1.2/referentiel.sql.gz | Bin 76900 -> 0 bytes .../src/main/resources/db/1.4/obstuna.sql | 3662 ------------- .../main/resources/db/1.4/referentiel-data.sql.gz | Bin 79303 -> 0 bytes .../src/main/resources/db/1.4/referentiel.sql.gz | Bin 76918 -> 0 bytes .../src/main/resources/db/1.5/obstuna.sql | 4493 ---------------- .../src/main/resources/db/1.5/referentiel.sql.gz | Bin 91316 -> 0 bytes .../src/main/resources/db/1.8/obstuna.sql | 4494 ---------------- .../src/main/resources/db/1.8/referentiel.sql.gz | Bin 91327 -> 0 bytes .../src/main/resources/db/1.9.1/obstuna.sql | 4494 ---------------- .../src/main/resources/db/1.9.1/referentiel.sql.gz | Bin 91350 -> 0 bytes .../src/main/resources/db/2.0/obstuna.sql | 3785 ------------- .../src/main/resources/db/2.0/referentiel.sql.gz | Bin 92706 -> 0 bytes .../src/main/resources/db/2.1/obstuna.sql | 3863 -------------- .../src/main/resources/db/2.1/referentiel.sql.gz | Bin 94448 -> 0 bytes .../src/main/resources/db/2.5/obstuna.sql | 3863 -------------- .../src/main/resources/db/2.5/referentiel.sql.gz | Bin 94448 -> 0 bytes .../src/main/resources/db/3.0/obstuna.sql | 5548 -------------------- .../src/main/resources/db/3.0/referentiel.sql.gz | Bin 100741 -> 0 bytes .../src/main/resources/db/3.1/referentiel.sql.gz | Bin 99989 -> 0 bytes .../src/main/resources/db/3.10/referentiel.sql.gz | Bin 114683 -> 0 bytes .../src/main/resources/db/3.11/referentiel.sql.gz | Bin 118206 -> 0 bytes .../src/main/resources/db/3.12/referentiel.sql.gz | Bin 135472 -> 0 bytes .../src/main/resources/db/3.14/referentiel.sql.gz | Bin 135463 -> 0 bytes .../src/main/resources/db/3.15/referentiel.sql.gz | Bin 135426 -> 0 bytes .../src/main/resources/db/3.16/referentiel.sql.gz | Bin 138114 -> 0 bytes .../src/main/resources/db/3.5/referentiel.sql.gz | Bin 113651 -> 0 bytes .../db/3.7/LL_species_ref_list_for_Observe.csv | 137 - .../src/main/resources/db/3.7/referentiel.sql.gz | Bin 114608 -> 0 bytes .../src/main/resources/db/3.8/referentiel.sql.gz | Bin 114558 -> 0 bytes .../src/main/resources/db/3.9/referentiel.sql.gz | Bin 114680 -> 0 bytes .../main/resources/db/4.0-RC2/referentiel.sql.gz | Bin 138115 -> 0 bytes .../main/resources/db/4.0-RC3/referentiel.sql.gz | Bin 138124 -> 0 bytes .../main/resources/db/4.0-RC4/referentiel.sql.gz | Bin 138256 -> 0 bytes .../main/resources/db/4.0-RC6/referentiel.sql.gz | Bin 138231 -> 0 bytes .../main/resources/db/4.0-RC7/referentiel.sql.gz | Bin 138230 -> 0 bytes .../resources/db/4.0.1/dataForTestSeine.sql.gz | Bin 430383 -> 430080 bytes .../src/main/resources/db/4.0.1/empty_h2.sql.gz | Bin 0 -> 5992 bytes .../src/main/resources/db/4.0.1/empty_pg.sql.gz | Bin 0 -> 5983 bytes .../src/main/resources/db/4.0.1/referentiel.sql.gz | Bin 138260 -> 137641 bytes .../resources/db/4.902/dataForTestLongline.sql.gz | Bin 0 -> 1621369 bytes .../resources/db/4.902/dataForTestSeine.sql.gz | Bin 0 -> 440282 bytes .../src/main/resources/db/4.902/empty_h2.sql.gz | Bin 0 -> 6020 bytes .../src/main/resources/db/4.902/empty_pg.sql.gz | Bin 0 -> 5994 bytes .../src/main/resources/db/4.902/referentiel.sql.gz | Bin 0 -> 162596 bytes .../resources/db/5.0-3/dataForTestLongline.sql.gz | Bin 1579146 -> 0 bytes .../resources/db/5.0-3/dataForTestSeine.sql.gz | Bin 439122 -> 0 bytes .../src/main/resources/db/5.0-3/empty.sql.gz | Bin 7858 -> 0 bytes .../src/main/resources/db/5.0-3/referentiel.sql.gz | Bin 162896 -> 0 bytes .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 438481 -> 0 bytes .../src/main/resources/db/5.0/referentiel.sql.gz | Bin 142316 -> 0 bytes pom.xml | 10 +- 646 files changed, 2106 insertions(+), 52732 deletions(-) delete mode 100644 observe-entities-validation/LICENSE.txt delete mode 100644 observe-entities-validation/README.txt delete mode 100644 observe-entities-validation/changelog.txt delete mode 100644 observe-entities-validation/pom.xml delete mode 100644 observe-entities-validation/src/license/THIRD-PARTY.properties delete mode 100644 observe-entities-validation/src/main/resources/i18n/observe-entities-validation_en_GB.properties delete mode 100644 observe-entities-validation/src/main/resources/i18n/observe-entities-validation_es_ES.properties delete mode 100644 observe-entities-validation/src/main/resources/i18n/observe-entities-validation_fr_FR.properties delete mode 100644 observe-entities-validation/src/test/resources/log4j.properties create mode 100644 observe-entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java rename observe-entities/src/main/java/fr/ird/observe/entities/constants/{GearType.java => GearTypePersist.java} (88%) rename observe-entities/src/main/java/fr/ird/observe/entities/constants/{ReferenceStatus.java => ReferenceStatusPersist.java} (96%) copy observe-application-swing/src/main/java/fr/ird/observe/entities/tripMap/TripMapPointType.java => observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointTypePersist.java (94%) rename observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/{NonTargetCatchComputedValueSource.java => NonTargetCatchComputedValueSourcePersist.java} (93%) rename observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/{Ownership.java => OwnershipPersist.java} (85%) rename observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/{SchoolType.java => SchoolTypePersist.java} (95%) rename observe-entities/src/main/java/fr/ird/observe/entities/constants/seine/{TypeTransmittingBuoyOperation.java => TypeTransmittingBuoyOperationPersist.java} (86%) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_4_0_2.java => DataSourceMigrationForVersion_4_0_4.java} (70%) rename observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_5_0_1.java => DataSourceMigrationForVersion_4_900.java} (86%) rename observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_5_0_2.java => DataSourceMigrationForVersion_4_901.java} (86%) rename observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_5_0_3.java => DataSourceMigrationForVersion_4_902.java} (86%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/CollectionUniqueKeyValidator2.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/entities/AbstractEspeceFieldValidator.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/entities/ActivityFinDeVeilleExistsValidator.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueHomeIdValidator.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueNumberValidator.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesLengthFieldValidator.java (100%) rename {observe-entities-validation => observe-entities}/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesWeightFieldValidator.java (100%) delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-H2.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/rename-unknown-longliner-PG.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-H2.sql delete mode 100644 observe-entities/src/main/resources/db/4.0-RC3/update-senne-gear-usedInTrip-PG.sql rename observe-entities/src/main/resources/db/{3.10/remove-person-PG.sql => migration/V3_10_01_remove-person-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.10/remove-person-H2.sql => migration/V3_10_01_remove-person-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.10/add-missing-fk-H2.sql => migration/V3_10_02_add-missing-fk-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.10/add-missing-fk-PG.sql => migration/V3_10_02_add-missing-fk-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.10/increase-comment-field-H2.sql => migration/V3_10_03_increase-comment-field-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.10/increase-comment-field-PG.sql => migration/V3_10_03_increase-comment-field-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.10/fix-sensorDataFormat-PG.sql => migration/V3_10_04_fix-sensorDataFormat-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.10/fix-sensorDataFormat-H2.sql => migration/V3_10_04_fix-sensorDataFormat-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.10/normalize-sections-PG.sql => migration/V3_10_05_normalize-sections-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.10/normalize-sections-H2.sql => migration/V3_10_05_normalize-sections-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/remove-speciesGroup-obsolete-fields-PG.sql => migration/V3_11_01_remove-speciesGroup-obsolete-fields-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/remove-speciesGroup-obsolete-fields-H2.sql => migration/V3_11_01_remove-speciesGroup-obsolete-fields-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-country-on-transmitting-buoy-H2.sql => migration/V3_11_02_add-country-on-transmitting-buoy-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-country-on-transmitting-buoy-PG.sql => migration/V3_11_02_add-country-on-transmitting-buoy-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-fpaZones-H2.sql => migration/V3_11_03_add-fpaZones-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-fpaZones-PG.sql => migration/V3_11_03_add-fpaZones-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-activity-ersId-H2.sql => migration/V3_11_04_add-activity-ersId-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-activity-ersId-PG.sql => migration/V3_11_04_add-activity-ersId-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-person-country-H2.sql => migration/V3_11_05_add-person-country-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-person-country-PG.sql => migration/V3_11_05_add-person-country-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-harbours-H2.sql => migration/V3_11_06_add-harbours-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.11/add-harbours-PG.sql => migration/V3_11_06_add-harbours-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.12/add-missing-boat-H2.sql => migration/V3_12_01_add-missing-boat-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.12/add-missing-boat-PG.sql => migration/V3_12_01_add-missing-boat-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.14/remove-hooksPerBasketCount-field-H2.sql => migration/V3_14_01_remove-hooksPerBasketCount-field-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.14/remove-hooksPerBasketCount-field-PG.sql => migration/V3_14_01_remove-hooksPerBasketCount-field-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.14/fix-targetsample-discarded-value-PG.sql => migration/V3_14_02_fix-targetsample-discarded-value-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.14/fix-targetsample-discarded-value-H2.sql => migration/V3_14_02_fix-targetsample-discarded-value-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.14/remove-orphan-seine-sample-PG.sql => migration/V3_14_03_remove-orphan-seine-sample-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.14/remove-orphan-seine-sample-H2.sql => migration/V3_14_03_remove-orphan-seine-sample-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.14/remove-targetlength-discarded-field-H2.sql => migration/V3_14_04_remove-targetlength-discarded-field-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.14/remove-targetlength-discarded-field-PG.sql => migration/V3_14_04_remove-targetlength-discarded-field-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.15/change-tdr-integer-field-to-float-H2.sql => migration/V3_15_01_change-tdr-integer-field-to-float-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.15/change-tdr-integer-field-to-float-PG.sql => migration/V3_15_01_change-tdr-integer-field-to-float-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.15/remove-set-longline-length-fields-PG.sql => migration/V3_15_02_remove-set-longline-length-fields-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.15/remove-set-longline-length-fields-H2.sql => migration/V3_15_02_remove-set-longline-length-fields-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.15/remove-brancheline-fields-PG.sql => migration/V3_15_03_remove-brancheline-fields-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.15/remove-brancheline-fields-H2.sql => migration/V3_15_03_remove-brancheline-fields-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.16/add-gear-referential-H2.sql => migration/V3_16_01_add-gear-referential-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.16/add-gear-referential-PG.sql => migration/V3_16_01_add-gear-referential-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.16/add-gear-data-H2.sql => migration/V3_16_02_add-gear-data-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.16/add-gear-data-PG.sql => migration/V3_16_02_add-gear-data-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.16/remove-tripSeine-seine-PG.sql => migration/V3_16_03_remove-tripSeine-seine-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.16/remove-tripSeine-seine-H2.sql => migration/V3_16_03_remove-tripSeine-seine-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.5/migration-H2.sql => migration/V3_5_01_migration-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.5/migration-PG.sql => migration/V3_5_01_migration-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.5/add-longline-schema-H2.sql => migration/V3_5_02_add-longline-schema-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.5/add-longline-schema-PG.sql => migration/V3_5_02_add-longline-schema-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.5/update-common-references-H2.sql => migration/V3_5_03_update-common-references-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.5/update-common-references-PG.sql => migration/V3_5_03_update-common-references-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.5/add-longline-references-H2.sql => migration/V3_5_04_add-longline-references-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.5/add-longline-references-PG.sql => migration/V3_5_04_add-longline-references-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/rename-seine-model-H2.sql => migration/V3_7_01_rename-seine-model-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/rename-seine-model-PG.sql => migration/V3_7_01_rename-seine-model-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/remove-trip-organism-PG.sql => migration/V3_7_02_remove-trip-organism-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/remove-trip-organism-H2.sql => migration/V3_7_02_remove-trip-organism-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/add-referential-needComment-PG.sql => migration/V3_7_03_add-referential-needComment-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/add-referential-needComment-H2.sql => migration/V3_7_03_add-referential-needComment-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-triplongline-H2.sql => migration/V3_7_04_normalize-triplongline-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-triplongline-PG.sql => migration/V3_7_04_normalize-triplongline-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-activitylongline-PG.sql => migration/V3_7_05_normalize-activitylongline-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-activitylongline-H2.sql => migration/V3_7_05_normalize-activitylongline-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-setlongline-H2.sql => migration/V3_7_06_normalize-setlongline-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-setlongline-PG.sql => migration/V3_7_06_normalize-setlongline-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-catchlongline-H2.sql => migration/V3_7_07_normalize-catchlongline-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-catchlongline-PG.sql => migration/V3_7_07_normalize-catchlongline-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-tdr-H2.sql => migration/V3_7_08_normalize-tdr-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/normalize-tdr-PG.sql => migration/V3_7_08_normalize-tdr-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/add-species-list-PG.sql => migration/V3_7_09_add-species-list-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/add-species-list-H2.sql => migration/V3_7_09_add-species-list-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/increase-comment-field-H2.sql => migration/V3_7_10_increase-comment-field-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.7/increase-comment-field-PG.sql => migration/V3_7_10_increase-comment-field-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.8/fix-person-PG.sql => migration/V3_8_01_fix-person-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.8/fix-person-H2.sql => migration/V3_8_01_fix-person-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.8/fix-branchelinecomposition-H2.sql => migration/V3_8_02_fix-branchelinecomposition-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.8/fix-branchelinecomposition-PG.sql => migration/V3_8_02_fix-branchelinecomposition-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.8/normalize-sensorused-H2.sql => migration/V3_8_03_normalize-sensorused-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.8/normalize-sensorused-PG.sql => migration/V3_8_03_normalize-sensorused-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.8/normalize-tdr-H2.sql => migration/V3_8_04_normalize-tdr-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.8/normalize-tdr-PG.sql => migration/V3_8_04_normalize-tdr-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.9/add-dataFilename-attribute-H2.sql => migration/V3_9_01_add-dataFilename-attribute-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.9/add-dataFilename-attribute-PG.sql => migration/V3_9_01_add-dataFilename-attribute-PG.sql} (100%) rename observe-entities/src/main/resources/db/{3.9/fill-sensorDataFormat-H2.sql => migration/V3_9_02_fill-sensorDataFormat-H2.sql} (100%) rename observe-entities/src/main/resources/db/{3.9/fill-sensorDataFormat-PG.sql => migration/V3_9_02_fill-sensorDataFormat-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0/empty-PG.sql => migration/V4_0_01_empty-H2.sql} (100%) copy observe-entities/src/main/resources/db/{4.0/empty-H2.sql => migration/V4_0_01_empty-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0.1/remove-gender-column-H2.sql => migration/V4_0_1_01_remove-gender-column-H2.sql} (100%) rename observe-entities/src/main/resources/db/{4.0.1/add-missing-fk-H2.sql => migration/V4_0_1_02_add-missing-fk-H2.sql} (100%) rename observe-entities/src/main/resources/db/{4.0.1/add-missing-fk-PG.sql => migration/V4_0_1_02_add-missing-fk-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0.2/remove-gender-column-PG.sql => migration/V4_0_2_01_remove-gender-column-PG.sql} (100%) copy observe-entities/src/main/resources/db/{4.0/empty-H2.sql => migration/V4_0_4_01_remove-trip-datearriveeport-field-H2.sql} (92%) rename observe-entities/src/main/resources/db/{4.0/empty-H2.sql => migration/V4_0_4_01_remove-trip-datearriveeport-field-PG.sql} (92%) rename observe-entities/src/main/resources/db/{4.0-RC3/add-foreign-key-indexes-PG.sql => migration/V4_0_RC_2_01_add-foreign-key-indexes-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC2/clean-program-gear-type-H2.sql => migration/V4_0_RC_2_01_clean-program-gear-type-H2.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC2/clean-program-gear-type-PG.sql => migration/V4_0_RC_2_01_clean-program-gear-type-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC7/update-senne-gear-usedInTrip-H2.sql => migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-H2.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC7/update-senne-gear-usedInTrip-PG.sql => migration/V4_0_RC_2_02_update-senne-gear-usedInTrip-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC7/rename-unknown-longliner-PG.sql => migration/V4_0_RC_2_03_rename-unknown-longliner-H2.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC7/rename-unknown-longliner-H2.sql => migration/V4_0_RC_2_03_rename-unknown-longliner-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC4/add-gear-data-H2.sql => migration/V4_0_RC_4_01_add-gear-data-H2.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC4/add-gear-data-PG.sql => migration/V4_0_RC_4_01_add-gear-data-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC6/fix-gearUseFeatures-topiaIds-PG.sql => migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-H2.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC6/fix-gearUseFeatures-topiaIds-H2.sql => migration/V4_0_RC_6_01_fix-gearUseFeatures-topiaIds-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC4/update-senne-gear-usedInTrip-H2.sql => migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-H2.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC4/update-senne-gear-usedInTrip-PG.sql => migration/V4_0_RC_7_01_update-senne-gear-usedInTrip-PG.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC4/rename-unknown-longliner-PG.sql => migration/V4_0_RC_7_02_rename-unknown-longliner-H2.sql} (100%) rename observe-entities/src/main/resources/db/{4.0-RC4/rename-unknown-longliner-H2.sql => migration/V4_0_RC_7_02_rename-unknown-longliner-PG.sql} (100%) rename observe-entities/src/main/resources/db/{5.0-1/remove_open_field-H2.sql => migration/V4_900_01_remove_open_field-H2.sql} (100%) rename observe-entities/src/main/resources/db/{5.0-1/remove_open_field-PG.sql => migration/V4_900_01_remove_open_field-PG.sql} (100%) rename observe-entities/src/main/resources/db/{5.0-2/add_lastUpdateDate_field-H2.sql => migration/V4_901_01_add_lastUpdateDate_field-H2.sql} (100%) rename observe-entities/src/main/resources/db/{5.0-2/add_lastUpdateDate_field-PG.sql => migration/V4_901_01_add_lastUpdateDate_field-PG.sql} (100%) rename observe-entities/src/main/resources/db/{5.0-3/add_lastUpdateDate_table-H2.sql => migration/V4_902_01_add_lastUpdateDate_table-H2.sql} (100%) rename observe-entities/src/main/resources/db/{5.0-3/add_lastUpdateDate_table-PG.sql => migration/V4_902_01_add_lastUpdateDate_table-PG.sql} (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-encounter-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-sensorUsed-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Basket-n1-update-table-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-catchLongline-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-table-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Section-n1-update-table-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-baitsComposition-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-branchlinesComposition-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-floatlinesComposition-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-globalComposition-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-hooksComposition-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-objectSchoolEstimate-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-transmittingBuoyOperation-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-nonTargetCatch-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-schoolEstimate-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetCatch-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetDiscarded-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TargetSample-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/test/java/fr/ird/observe/business/validation/BeanValidatorDetectorTest.java (100%) rename {observe-entities-validation => observe-entities}/src/test/java/fr/ird/observe/business/validation/RelationRegexTest.java (100%) delete mode 100644 observe-entities/src/test/java/fr/ird/observe/util/NumbersTest.java rename {observe-entities-validation => observe-entities}/src/test/java/fr/ird/observe/validation/validator/entities/ActivitySeineSpeedValidatorTest.java (100%) rename {observe-entities-validation => observe-entities}/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml (100%) rename {observe-entities-validation => observe-entities}/src/test/resources/validators.xml (100%) delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/TripMapDtos.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/util/Numbers.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ObserveServiceFactoryProviderTopia.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ReplicationServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/OpenableServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/TripServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/BaitsCompositionServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/BranchlinesCompositionServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/CatchLonglineServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/EncounterServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/FloatlinesCompositionServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/HooksCompositionServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineGlobalCompositionServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/SensorUsedServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/SetLonglineServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/TdrServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetSampleServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectObservedSpeciesServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectSchoolEstimateServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/RouteServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/SchoolEstimateServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetCatchServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetSampleServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/ComputeDataServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/GpsImportServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/SynchronizeServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/ValidationServiceImpl.java delete mode 100644 observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/referential/ReferentialServiceImpl.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java delete mode 100644 observe-test-data/src/main/resources/db/1.0.0/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/1.0.0/referentiel-data.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/1.0.0/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/1.2/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/1.2/referentiel-data.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/1.2/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/1.4/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/1.4/referentiel-data.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/1.4/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/1.5/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/1.5/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/1.8/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/1.8/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/1.9.1/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/1.9.1/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/2.0/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/2.0/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/2.1/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/2.1/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/2.5/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/2.5/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.0/obstuna.sql delete mode 100644 observe-test-data/src/main/resources/db/3.0/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.1/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.10/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.11/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.12/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.14/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.15/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.16/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.5/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.7/LL_species_ref_list_for_Observe.csv delete mode 100644 observe-test-data/src/main/resources/db/3.7/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.8/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/3.9/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/4.0-RC2/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/4.0-RC3/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/4.0-RC4/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/4.0-RC6/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/4.0-RC7/referentiel.sql.gz create mode 100644 observe-test-data/src/main/resources/db/4.0.1/empty_h2.sql.gz create mode 100644 observe-test-data/src/main/resources/db/4.0.1/empty_pg.sql.gz create mode 100644 observe-test-data/src/main/resources/db/4.902/dataForTestLongline.sql.gz create mode 100644 observe-test-data/src/main/resources/db/4.902/dataForTestSeine.sql.gz create mode 100644 observe-test-data/src/main/resources/db/4.902/empty_h2.sql.gz create mode 100644 observe-test-data/src/main/resources/db/4.902/empty_pg.sql.gz create mode 100644 observe-test-data/src/main/resources/db/4.902/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/5.0-3/dataForTestLongline.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/5.0-3/dataForTestSeine.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/5.0-3/empty.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/5.0-3/referentiel.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/5.0/dataForTestSeine.sql.gz delete mode 100644 observe-test-data/src/main/resources/db/5.0/referentiel.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 13

07/19: Amélioration d'exécution d'un script sql
by codelutin.com scm 09 Jan '16

09 Jan '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 46019f827f4a20538ba65b19da8627089a79f1ae Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 13:12:08 2016 +0100 Amélioration d'exécution d'un script sql --- .../observe/ObserveTopiaApplicationContext.java | 49 +++------- .../observe/ObserveTopiaPersistenceContext.java | 10 +- .../java/fr/ird/observe/RunScriptTopiaSqlWork.java | 103 +++++++++++++++++++++ .../services/service/DataSourceServiceTopia.java | 31 +------ 4 files changed, 130 insertions(+), 63 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index 2a9ee57..9735743 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -25,7 +25,6 @@ package fr.ird.observe; import com.google.common.collect.ImmutableSet; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.migration.ObserveMigrationEngine; -import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.hibernate.HibernateException; @@ -38,21 +37,15 @@ import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.service.sql.batch.TopiaSqlBatchService; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTablesFactory; -import org.nuiton.util.GZUtil; import org.nuiton.util.StringUtil; -import java.io.BufferedInputStream; -import java.io.ByteArrayInputStream; import java.io.IOException; -import java.io.InputStreamReader; -import java.io.StringWriter; import java.nio.file.Files; import java.nio.file.Path; import java.util.LinkedHashSet; import java.util.Objects; import java.util.Set; import java.util.UUID; -import java.util.zip.GZIPInputStream; public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicationContext { @@ -135,10 +128,19 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat } } - public void executeSqlStatements(byte... content) throws IOException { + public void executeSqlStatements(byte... content) { - if (getConfiguration().isH2Configuration()) { + try { + executeSqlStatements0(content); + } catch (IOException e) { + throw new TopiaException(e); + } + + } + + protected void executeSqlStatements0(byte... content) throws IOException { + if (getConfiguration().isH2Configuration()) { Path tempFile = Files.createTempFile("observeRestoreH2", ".sql"); log.info(String.format("Restore script size: %s to h2 from file : %s", StringUtil.convertMemory(content.length), tempFile.toString())); @@ -152,36 +154,11 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat } else { - boolean gzip; - try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(content)) { - gzip = GZUtil.isGzipStream(byteArrayInputStream); - } - - String sqlScript; - - try (StringWriter writer = new StringWriter()) { - if (gzip) { - - try (InputStreamReader inputSream = new InputStreamReader(new BufferedInputStream(new GZIPInputStream(new ByteArrayInputStream(content))))) { - IOUtils.copy(inputSream, writer); - } - sqlScript = writer.toString(); - log.info(String.format("Gunzip script %s to %s", StringUtil.convertMemory(content.length), StringUtil.convertMemory(sqlScript.length()))); - - } else { - - try (InputStreamReader inputSream = new InputStreamReader(new BufferedInputStream(new ByteArrayInputStream(content)))) { - IOUtils.copy(inputSream, writer); - } - sqlScript = writer.toString(); - log.info(String.format("Load script (size: %s)", StringUtil.convertMemory(sqlScript.length()))); - } - - } + log.info(String.format("Load script (size: %s)", StringUtil.convertMemory(content.length))); try (ObserveTopiaPersistenceContext persistenceContext = newPersistenceContext()) { - persistenceContext.getSqlSupport().executeSql(sqlScript); + persistenceContext.executeSqlScript(content); persistenceContext.commit(); } } diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java index 7e2cf3c..32e3f6e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaPersistenceContext.java @@ -32,6 +32,7 @@ import org.nuiton.topia.persistence.TopiaDao; import org.nuiton.topia.persistence.internal.AbstractTopiaPersistenceContextConstructorParameter; import org.nuiton.topia.persistence.support.TopiaSqlQuery; +import java.io.IOException; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; @@ -40,7 +41,9 @@ import java.util.Date; public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersistenceContext { - /** Logger. */ + /** + * Logger. + */ private static final Log log = LogFactory.getLog(ObserveTopiaPersistenceContext.class); public ObserveTopiaPersistenceContext(AbstractTopiaPersistenceContextConstructorParameter parameter) { @@ -126,4 +129,9 @@ public class ObserveTopiaPersistenceContext extends AbstractObserveTopiaPersiste return set.getLong(1); } } + + public void executeSqlScript(byte... content) throws IOException { + + getSqlSupport().doSqlWork(new RunScriptTopiaSqlWork(1000, content)); + } } diff --git a/observe-entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java b/observe-entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java new file mode 100644 index 0000000..fe74133 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/RunScriptTopiaSqlWork.java @@ -0,0 +1,103 @@ +package fr.ird.observe; + +import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.support.TopiaSqlWork; +import org.nuiton.util.GZUtil; + +import java.io.BufferedInputStream; +import java.io.BufferedReader; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.zip.GZIPInputStream; + +/** + * TODO Move this in ToPIA. + * + * Created on 09/01/16. + * + * @author Tony Chemit - chemit(a)codelutin.com + */ +public class RunScriptTopiaSqlWork implements TopiaSqlWork { + + protected final byte[] content; + protected final boolean gzip; + protected final int batchSize; + + public RunScriptTopiaSqlWork(int batchSize, byte[] content) throws IOException { + this.batchSize = batchSize; + this.content = content; + + try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(content)) { + gzip = GZUtil.isGzipStream(byteArrayInputStream); + } + } + + @Override + public void execute(Connection connection) throws SQLException { + + boolean autoCommit = connection.getAutoCommit(); + + try { + connection.setAutoCommit(false); + try (BufferedReader reader = createReader()) { + + try (Statement statement = connection.createStatement()) { + + int batchSize = 0; + String command = null; + String next; + while ((next = reader.readLine()) != null) { + + String trimLine = next.trim(); + + if (trimLine.startsWith("--")) { + continue; + } + + if (command == null) { + command = next; + } else { + command += ' ' + next; + } + if (trimLine.endsWith(";")) { + statement.addBatch(command); + batchSize++; + command = null; + + if (batchSize % this.batchSize == 0) { + flushStatement(statement); + } + } + + } + + flushStatement(statement); + } + + } catch (IOException e) { + throw new TopiaException(e); + } + } finally { + connection.setAutoCommit(autoCommit); + } + } + + protected void flushStatement(Statement statement) throws SQLException { + + statement.executeBatch(); + statement.clearBatch(); + + } + + protected BufferedReader createReader() { + try { + return new BufferedReader(new InputStreamReader(new BufferedInputStream(gzip ? new GZIPInputStream(new ByteArrayInputStream(content)) : new ByteArrayInputStream(content)))); + } catch (IOException e) { + throw new TopiaException(e); + } + } +} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java index f679560..0e8d482 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceServiceTopia.java @@ -51,7 +51,6 @@ import org.nuiton.topia.persistence.jdbc.JdbcHelper; import org.nuiton.util.version.Version; import java.io.File; -import java.io.IOException; import java.util.Set; import static org.nuiton.i18n.I18n.l; @@ -168,8 +167,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } byte[] importDatabase = dataSourceCreateConfiguration.getImportDatabase(); - executeGzipSqlStatements(topiaApplicationContext, importDatabase); - + topiaApplicationContext.executeSqlStatements(importDatabase); topiaApplicationContext.getMigrationService().runSchemaMigration(); } else { @@ -198,11 +196,9 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS } ObserveDataSourceConfiguration importDataSourceConfiguration = dataSourceCreateConfiguration.getImportReferentialDataSourceConfiguration(); - - // Récupération du dump qui contient le référentiel SqlScriptProducerService dumpProducerService = serviceContext.newService(importDataSourceConfiguration, SqlScriptProducerService.class); byte[] referentialDump = dumpProducerService.getReferentialDump(); - executeGzipSqlStatements(topiaApplicationContext, referentialDump); + topiaApplicationContext.executeSqlStatements(referentialDump); referantialImported = true; @@ -226,7 +222,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS if (log.isInfoEnabled()) { log.info("Import referential."); } - executeGzipSqlStatements(topiaApplicationContext, referentialDump); + topiaApplicationContext.executeSqlStatements(referentialDump); } @@ -242,7 +238,7 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS if (log.isInfoEnabled()) { log.info("Import data."); } - executeGzipSqlStatements(topiaApplicationContext, dataDump); + topiaApplicationContext.executeSqlStatements(dataDump); } @@ -355,29 +351,12 @@ public class DataSourceServiceTopia extends ObserveServiceTopia implements DataS @Override public void importData(ImportDataDto importData) { - // création d'une base temporaire pour y importer le référentiel et les données -// ObserveDataSourceConfigurationTopiaH2 temporaryDataSourceConfiguration = createTemporaryDatabaseFromDump("ImportData", importData.getDumpData()); -// ObserveTopiaApplicationContext temporaryTopiaApplicationContext = ObserveTopiaApplicationContextFactory.getOrCreateTopiaApplicationContext(temporaryDataSourceConfiguration); - if (log.isInfoEnabled()) { log.info("Import data."); } - // Réplication des données ObserveTopiaApplicationContext topiaApplicationContext = serviceContext.getTopiaApplicationContext(); - executeGzipSqlStatements(topiaApplicationContext, importData.getDumpData()); -// replicateData(temporaryTopiaApplicationContext, topiaApplicationContext, importData.getImportDataIds()); - - } - - protected void executeGzipSqlStatements(ObserveTopiaApplicationContext topiaApplicationContext, byte... content) { - - try { - topiaApplicationContext.executeSqlStatements(content); - } catch (IOException e) { - //TODO Avoir une exception concrete - throw new RuntimeException("Could not execute GZipSqlStatements", e); - } + topiaApplicationContext.executeSqlStatements(importData.getDumpData()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

05/19: Passer par un ficher pour charger un script h2
by codelutin.com scm 09 Jan '16

09 Jan '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 3a88afbfc91fb6150c083a225ba4f30f1cde0a52 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 11:39:22 2016 +0100 Passer par un ficher pour charger un script h2 --- .../observe/ObserveTopiaApplicationContext.java | 57 ++++++++++++++++------ 1 file changed, 42 insertions(+), 15 deletions(-) diff --git a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java index 8484845..2a9ee57 100644 --- a/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java +++ b/observe-entities/src/main/java/fr/ird/observe/ObserveTopiaApplicationContext.java @@ -32,18 +32,22 @@ import org.hibernate.HibernateException; import org.hibernate.cfg.Configuration; import org.hibernate.tool.hbm2ddl.SchemaExport; import org.nuiton.topia.persistence.TopiaException; +import org.nuiton.topia.persistence.jdbc.JdbcH2Helper; import org.nuiton.topia.persistence.jdbc.JdbcHelper; import org.nuiton.topia.persistence.metadata.TopiaMetadataEntity; import org.nuiton.topia.service.sql.batch.TopiaSqlBatchService; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTables; import org.nuiton.topia.service.sql.batch.tables.TopiaSqlTablesFactory; import org.nuiton.util.GZUtil; +import org.nuiton.util.StringUtil; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; import java.io.StringWriter; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.LinkedHashSet; import java.util.Objects; import java.util.Set; @@ -133,30 +137,53 @@ public class ObserveTopiaApplicationContext extends AbstractObserveTopiaApplicat public void executeSqlStatements(byte... content) throws IOException { + if (getConfiguration().isH2Configuration()) { - boolean gzip; - try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(content)) { - gzip = GZUtil.isGzipStream(byteArrayInputStream); - } - try (StringWriter writer = new StringWriter()) { - if (gzip) { - try (InputStreamReader inputSream = new InputStreamReader(new BufferedInputStream(new GZIPInputStream(new ByteArrayInputStream(content))))) { - IOUtils.copyLarge(inputSream, writer); - } - } else { - try (InputStreamReader inputSream = new InputStreamReader(new BufferedInputStream(new ByteArrayInputStream(content)))) { - IOUtils.copyLarge(inputSream, writer); - } + Path tempFile = Files.createTempFile("observeRestoreH2", ".sql"); + log.info(String.format("Restore script size: %s to h2 from file : %s", StringUtil.convertMemory(content.length), tempFile.toString())); + try { + Files.write(tempFile, content); + JdbcH2Helper jdbcH2Helper = new JdbcH2Helper(configuration); + jdbcH2Helper.restore(tempFile.toFile()); + } finally { + Files.delete(tempFile); + } + + } else { + + boolean gzip; + try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(content)) { + gzip = GZUtil.isGzipStream(byteArrayInputStream); } - String sqlScript = writer.toString(); + String sqlScript; + + try (StringWriter writer = new StringWriter()) { + if (gzip) { + + try (InputStreamReader inputSream = new InputStreamReader(new BufferedInputStream(new GZIPInputStream(new ByteArrayInputStream(content))))) { + IOUtils.copy(inputSream, writer); + } + sqlScript = writer.toString(); + log.info(String.format("Gunzip script %s to %s", StringUtil.convertMemory(content.length), StringUtil.convertMemory(sqlScript.length()))); + + } else { + + try (InputStreamReader inputSream = new InputStreamReader(new BufferedInputStream(new ByteArrayInputStream(content)))) { + IOUtils.copy(inputSream, writer); + } + sqlScript = writer.toString(); + log.info(String.format("Load script (size: %s)", StringUtil.convertMemory(sqlScript.length()))); + } + + } try (ObserveTopiaPersistenceContext persistenceContext = newPersistenceContext()) { + persistenceContext.getSqlSupport().executeSql(sqlScript); persistenceContext.commit(); } - } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

04/19: Suppression de Numbers (utilisation de NumberUtil) Creation d'objets dans observe-entities pour representer les points d'une marée Suppression du lien services-model → entities
by codelutin.com scm 09 Jan '16

09 Jan '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 8200d6a273a0d29c507cdabe9bfa49aca739724c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 10:43:38 2016 +0100 Suppression de Numbers (utilisation de NumberUtil) Creation d'objets dans observe-entities pour representer les points d'une marée Suppression du lien services-model → entities --- observe-entities/pom.xml | 8 +- .../java/fr/ird/observe/entities/Entities.java | 6 +- .../java/fr/ird/observe/entities/TripMapPoint.java | 59 +++++ .../constants/TripMapPointPersistType.java | 58 +++++ .../entities/longline/ActivityLonglineImpl.java | 12 - .../entities/longline/TripLonglineImpl.java | 112 --------- .../entities/longline/TripLonglineTopiaDao.java | 158 ++++++------- .../referentiel/LengthWeightParameters.java | 6 +- .../referentiel/LengthWeightParemeterHelper.java | 6 +- .../observe/entities/referentiel/SpeciesImpl.java | 12 +- .../observe/entities/referentiel/VesselImpl.java | 10 +- .../observe/entities/seine/ActivitySeineImpl.java | 8 +- .../observe/entities/seine/NonTargetCatchImpl.java | 8 +- .../entities/seine/NonTargetLengthImpl.java | 8 +- .../fr/ird/observe/entities/seine/RouteImpl.java | 255 +-------------------- .../ird/observe/entities/seine/SetSeineImpl.java | 4 +- .../observe/entities/seine/TargetCatchImpl.java | 4 +- .../observe/entities/seine/TargetLengthImpl.java | 10 +- .../ird/observe/entities/seine/TripSeineImpl.java | 135 ----------- .../observe/entities/seine/TripSeineTopiaDao.java | 114 ++++----- .../test/java/fr/ird/observe/util/NumbersTest.java | 86 ------- .../fr/ird/observe/services/dto/TripMapDtos.java | 15 -- .../longline/SetLonglineGlobalCompositionDto.java | 3 - .../seine/FloatingObjectTransmittingBuoyDto.java | 7 +- .../services/dto/seine/TargetLengthDto.java | 9 +- .../src/main/java/fr/ird/observe/util/Numbers.java | 87 ------- .../observe/services/entity/TripMapDtoFactory.java | 40 ++++ .../service/longline/TripLonglineServiceTopia.java | 8 +- .../service/seine/TripSeineServiceTopia.java | 8 +- pom.xml | 8 +- 30 files changed, 354 insertions(+), 910 deletions(-) diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 597cc7d..e7f2c13 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -38,19 +38,13 @@ <dependencies> -  +  <dependency> <groupId>${project.groupId}</groupId> <artifactId>observe-test-data</artifactId> <version>${project.version}</version> </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-services-model</artifactId> - <version>${project.version}</version> - </dependency> -  <dependency> <groupId>org.nuiton</groupId> diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java index c4df77e..2ed9d46 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/Entities.java @@ -29,11 +29,11 @@ import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.common.collect.Maps; import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.util.Numbers; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntities; +import org.nuiton.util.NumberUtil; import java.util.Arrays; import java.util.Collection; @@ -388,11 +388,11 @@ public class Entities { } public static void printDebugInformations(String propertyName, Object instance, Integer value) { - printDebugInformations0(propertyName, instance, Numbers.IS_INTEGER_CHANGED_TO_ZERO_OR_NULL, value); + printDebugInformations0(propertyName, instance, NumberUtil.NULL_OR_ZERO_INTEGER, value); } public static void printDebugInformations(String propertyName, Object instance, Float value) { - printDebugInformations0(propertyName, instance, Numbers.IS_FLOAT_CHANGED_TO_ZERO_OR_NULL, value); + printDebugInformations0(propertyName, instance, NumberUtil.NULL_OR_ZERO_FLOAT_THREE_DIGITS, value); } private static <O> void printDebugInformations0(String propertyName, Object instance, Predicate<O> nullPredicate, O value) { diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java b/observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java new file mode 100644 index 0000000..7d13fb3 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/TripMapPoint.java @@ -0,0 +1,59 @@ +package fr.ird.observe.entities; + +import fr.ird.observe.entities.constants.TripMapPointPersistType; + +import java.io.Serializable; +import java.util.Date; + +public class TripMapPoint implements Serializable { + + public static final String PROPERTY_TIME = "time"; + + public static final String PROPERTY_LATITUDE = "latitude"; + + public static final String PROPERTY_LONGITUDE = "longitude"; + + public static final String PROPERTY_TYPE = "type"; + + private static final long serialVersionUID = 1L; + + protected Date time; + + protected float latitude; + + protected float longitude; + + protected TripMapPointPersistType type; + + public Date getTime() { + return time; + } + + public void setTime(Date time) { + this.time = time; + } + + public float getLatitude() { + return latitude; + } + + public void setLatitude(float latitude) { + this.latitude = latitude; + } + + public float getLongitude() { + return longitude; + } + + public void setLongitude(float longitude) { + this.longitude = longitude; + } + + public TripMapPointPersistType getType() { + return type; + } + + public void setType(TripMapPointPersistType type) { + this.type = type; + } +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointPersistType.java b/observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointPersistType.java new file mode 100644 index 0000000..331d0e5 --- /dev/null +++ b/observe-entities/src/main/java/fr/ird/observe/entities/constants/TripMapPointPersistType.java @@ -0,0 +1,58 @@ +package fr.ird.observe.entities.constants; + +/* + * #%L + * ObServe :: Entities + * %% + * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import static org.nuiton.i18n.I18n.n; +import static org.nuiton.i18n.I18n.t; + +/** + * @author Sylvain Bavencoff - bavencoff(a)codelutin.com + */ +public enum TripMapPointPersistType { + + SEINE_DEPARTURE_HARBOUR(n("observe.map.seine.harbour.departure")), + SEINE_LANDING_HARBOUR(n("observe.map.seine.harbour.landing")), + SEINE_ACTIVITY(n("observe.map.seine.activity")), + SEINE_ACTIVITY_IN_HARBOUR(n("observe.map.seine.activity.inHarbour")), + SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.free")), + SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE(n("observe.map.seine.activity.schoolType.object")), + + LONGLINE_IN_HARBOUR(n("observe.map.longLine.seine.harbour")), + LONGLINE_ACTIVITY(n("observe.map.longLine.activity")), + LONGLINE_ACTIVITY_WITH_SETTING_START(n("observe.map.longLine.activity.setting.start")), + LONGLINE_ACTIVITY_WITH_SETTING_END(n("observe.map.longLine.activity.setting.end")), + LONGLINE_ACTIVITY_WITH_HAULING_START(n("observe.map.longLine.activity.hauling.start")), + LONGLINE_ACTIVITY_WITH_HAULING_END(n("observe.map.longLine.activity.hauling.end")), + LONGLINE_ACTIVITY_WITH_INTERACTION(n("observe.map.longLine.activity.interaction")), + LONGLINE_ACTIVITY_WITH_STATION(n("observe.map.longLine.activity.station")); + + String label; + + TripMapPointPersistType(String label) { + this.label = label; + } + + public String getLabel() { + return t(label); + } +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java index 247b8b0..8666fcf 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/ActivityLonglineImpl.java @@ -46,18 +46,6 @@ public class ActivityLonglineImpl extends ActivityLonglineAbstract { */ protected Integer quadrant; -// @Override -// public OpenableEntity getOpenChild() { -// // sur une activity, pas d'enfant OpenableEntity -// return null; -// } -// -// @Override -// public List getOpenableChilds() { -// // sur une activity, pas d'enfant OpenableEntity -// return null; -// } - @Override public Date getDate() { return timeStamp == null ? null : DateUtil.getDay(timeStamp); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java index 4edf361..74fc16b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineImpl.java @@ -47,116 +47,4 @@ public class TripLonglineImpl extends TripLonglineAbstract { return false; } -// @Override -// public ActivityLongline getOpenChild() { -// return OpenableEntities.getOpenEntity(activityLongline); -// } -// -// @Override -// public List<ActivityLongline> getOpenableChilds() { -// return activityLongline; -// } -// -// @Override -// public ActivityLongline getOpenActivity() { -// return getOpenChild(); -// } - -// @Override -// public ActivityLongline getPreviousActivity(ActivityLongline activity) { -// -// if (isActivityLonglineEmpty()) { -// -// // aucune route definie sur la maree -// return null; -// } -// int index = this.activityLongline.indexOf(activity); -// if (index < 1) { -// -// // la route donnee n'est pas definie sur cette maree ou est la -// // premiere route -// return null; -// } -// -// // on retourne la route precedente -// return this.activityLongline.get(index - 1); -// -// } -// -// @Override -// public ActivityLongline getNextActivity(ActivityLongline activity) { -// -// if (isActivityLonglineEmpty()) { -// -// // aucune route definie sur la maree -// return null; -// } -// int index = this.activityLongline.indexOf(activity); -// if (index == -1 || index + 1 >= sizeActivityLongline()) { -// -// // la route n'est pas definie sur cette maree, ou c'est la -// // dernière de la maree -// return null; -// } -// -// // on retourne la route suivante -// return this.activityLongline.get(index + 1); -// -// } -// -// @Override -// public ActivityLongline getLastActivity() { -// -// if (isActivityLonglineEmpty()) { -// -// // aucune route definie sur la maree -// return null; -// } -// -// // on retourne la dernière route de la maree -// return getActivityLongline().get(sizeActivityLongline() - 1); -// -// } - -// @Override -// public Date getEndDateTheorique() { -// Date d; -// if (isActivityLonglineEmpty()) { -// -// // pas de route, donc la date de fin est la date de debut -// d = getStartDate(); -// } else { -// List<ActivityLongline> routes = new ArrayList<ActivityLongline>(getActivityLongline()); -// -// // on trie la liste par jour d'observation -// ActivityLonglines.sort(routes); -// -// // on recupere la derniere route de la maree -// ActivityLongline route = routes.get(routes.size() - 1); -// -// // son jour d'observation est la date de fin de la maree -// d = route.getTimeStamp(); -// } -// -// // on conserve la date epuree (pas de notion de temps dans la date) -// d = DateUtil.getEndOfDay(d); -// return d; -// } - -// @Override -// public void updateDateFin() { -// -// // la date de fin theorique (date de la dernière route de la marée) -// Date endDate = getEndDateTheorique(); -// -// // la date de fin actuelle -// Date realDateFin = getEndDate(); -// -// if (realDateFin == null || endDate.after(realDateFin)) { -// -// // on utilise la nouvelle date theorique car l'ancienne n'existe pas -// // ou est antérieure à la date de fin théoriquue -// setEndDate(endDate); -// } -// } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java index b7f25b6..9b0ab9c 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/longline/TripLonglineTopiaDao.java @@ -23,14 +23,14 @@ package fr.ird.observe.entities.longline; */ import com.google.common.collect.Lists; +import fr.ird.observe.entities.TripMapPoint; +import fr.ird.observe.entities.constants.TripMapPointPersistType; 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.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; -import fr.ird.observe.services.dto.TripMapPointDto; -import fr.ird.observe.services.dto.constants.TripMapPointType; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -78,72 +78,72 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl } - public LinkedHashSet<TripMapPointDto> extractTripMapActivityPoints(String tripId) { + public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId) { TripLongline tripLongline = forTopiaIdEquals(tripId).findUnique(); - LinkedHashSet<TripMapPointDto> tripMapPoints = new LinkedHashSet<>(); + LinkedHashSet<TripMapPoint> tripMapPoints = new LinkedHashSet<>(); // add departure harbours Harbour departureHarbour = tripLongline.getDepartureHarbour(); if (departureHarbour != null - && departureHarbour.getLatitude() != null - && departureHarbour.getLongitude() != null) { - TripMapPointDto departurePoint = new TripMapPointDto(); + && departureHarbour.getLatitude() != null + && departureHarbour.getLongitude() != null) { + TripMapPoint departurePoint = new TripMapPoint(); departurePoint.setTime(tripLongline.getStartDate()); departurePoint.setLatitude(departureHarbour.getLatitude()); departurePoint.setLongitude(departureHarbour.getLongitude()); - departurePoint.setType(TripMapPointType.LONGLINE_IN_HARBOUR); + departurePoint.setType(TripMapPointPersistType.LONGLINE_IN_HARBOUR); tripMapPoints.add(departurePoint); } // Add Activities TripMapActivityPointQuery tripMapActivityPointQuery = new TripMapActivityPointQuery(tripId); - List<List<TripMapPointDto>> results = topiaSqlSupport.findMultipleResult(tripMapActivityPointQuery); - for (List<TripMapPointDto> result : results) { + List<List<TripMapPoint>> results = topiaSqlSupport.findMultipleResult(tripMapActivityPointQuery); + for (List<TripMapPoint> result : results) { tripMapPoints.addAll(result); } // add landing harbours Harbour landingHarbour = tripLongline.getLandingHarbour(); if (landingHarbour != null - && landingHarbour.getLatitude() != null - && landingHarbour.getLongitude() != null) { - TripMapPointDto landingPoint = new TripMapPointDto(); + && landingHarbour.getLatitude() != null + && landingHarbour.getLongitude() != null) { + TripMapPoint landingPoint = new TripMapPoint(); landingPoint.setTime(tripLongline.getEndDate()); landingPoint.setLatitude(landingHarbour.getLatitude()); landingPoint.setLongitude(landingHarbour.getLongitude()); - landingPoint.setType(TripMapPointType.LONGLINE_IN_HARBOUR); + landingPoint.setType(TripMapPointPersistType.LONGLINE_IN_HARBOUR); tripMapPoints.add(landingPoint); } return tripMapPoints; } - private static class TripMapActivityPointQuery extends TopiaSqlQuery<List<TripMapPointDto>> { + private static class TripMapActivityPointQuery extends TopiaSqlQuery<List<TripMapPoint>> { private static String SQL = "SELECT" + - " a.timestamp, " + - " a.latitude," + - " a.longitude," + - " a.vesselActivity," + - " s.settingStartTimestamp," + - " s.settingStartLatitude," + - " s.settingStartLongitude," + - " s.settingEndTimestamp," + - " s.settingEndLatitude," + - " s.settingEndLongitude," + - " s.haulingStartTimestamp," + - " s.haulingStartLatitude," + - " s.haulingStartLongitude," + - " s.haulingEndTimestamp," + - " s.haulingEndLatitude," + - " s.haulingEndLongitude" + - " FROM observe_longLine.activity a" + - " LEFT OUTER JOIN observe_longLine.set s" + - " ON s.topiaId = a.set" + - " WHERE a.trip = ?" + - " ORDER BY a.timestamp"; + " a.timestamp, " + + " a.latitude," + + " a.longitude," + + " a.vesselActivity," + + " s.settingStartTimestamp," + + " s.settingStartLatitude," + + " s.settingStartLongitude," + + " s.settingEndTimestamp," + + " s.settingEndLatitude," + + " s.settingEndLongitude," + + " s.haulingStartTimestamp," + + " s.haulingStartLatitude," + + " s.haulingStartLongitude," + + " s.haulingEndTimestamp," + + " s.haulingEndLatitude," + + " s.haulingEndLongitude" + + " FROM observe_longLine.activity a" + + " LEFT OUTER JOIN observe_longLine.set s" + + " ON s.topiaId = a.set" + + " WHERE a.trip = ?" + + " ORDER BY a.timestamp"; protected String tripId; @@ -159,27 +159,27 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl } @Override - public List<TripMapPointDto> prepareResult(ResultSet resultSet) throws SQLException { + public List<TripMapPoint> prepareResult(ResultSet resultSet) throws SQLException { - List<TripMapPointDto> result = Lists.newLinkedList(); + List<TripMapPoint> result = Lists.newLinkedList(); if (resultSet.getString(5) == null) { // activity - TripMapPointDto activity = new TripMapPointDto(); + TripMapPoint activity = new TripMapPoint(); activity.setTime(resultSet.getDate(1)); activity.setLatitude(resultSet.getFloat(2)); activity.setLongitude(resultSet.getFloat(3)); String vesselActivityId = resultSet.getString(4); if (vesselActivityId == null) { - activity.setType(TripMapPointType.LONGLINE_ACTIVITY); + activity.setType(TripMapPointPersistType.LONGLINE_ACTIVITY); } else if (ACTIVITY_INTERACTION_ID.equals(vesselActivityId)) { - activity.setType(TripMapPointType.LONGLINE_ACTIVITY_WITH_INTERACTION); + activity.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_INTERACTION); } else if (ACTIVITY_STATION_ID.equals(vesselActivityId)) { - activity.setType(TripMapPointType.LONGLINE_ACTIVITY_WITH_STATION); + activity.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_STATION); } else { - activity.setType(TripMapPointType.LONGLINE_ACTIVITY); + activity.setType(TripMapPointPersistType.LONGLINE_ACTIVITY); } result.add(activity); @@ -187,41 +187,41 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl // settingStart if (resultSet.getString(5) != null) { - TripMapPointDto settingStart = new TripMapPointDto(); + TripMapPoint settingStart = new TripMapPoint(); settingStart.setTime(resultSet.getDate(5)); settingStart.setLatitude(resultSet.getFloat(6)); settingStart.setLongitude(resultSet.getFloat(7)); - settingStart.setType(TripMapPointType.LONGLINE_ACTIVITY_WITH_SETTING_START); + settingStart.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_SETTING_START); result.add(settingStart); } // settingEnd if (resultSet.getString(8) != null) { - TripMapPointDto settingEnd = new TripMapPointDto(); + TripMapPoint settingEnd = new TripMapPoint(); settingEnd.setTime(resultSet.getDate(8)); settingEnd.setLatitude(resultSet.getFloat(9)); settingEnd.setLongitude(resultSet.getFloat(10)); - settingEnd.setType(TripMapPointType.LONGLINE_ACTIVITY_WITH_SETTING_END); + settingEnd.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_SETTING_END); result.add(settingEnd); } // haulingStart if (resultSet.getString(11) != null) { - TripMapPointDto haulingStart = new TripMapPointDto(); + TripMapPoint haulingStart = new TripMapPoint(); haulingStart.setTime(resultSet.getDate(11)); haulingStart.setLatitude(resultSet.getFloat(12)); haulingStart.setLongitude(resultSet.getFloat(13)); - haulingStart.setType(TripMapPointType.LONGLINE_ACTIVITY_WITH_HAULING_START); + haulingStart.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_HAULING_START); result.add(haulingStart); } // haulingEnd if (resultSet.getString(14) != null) { - TripMapPointDto haulingEnd = new TripMapPointDto(); + TripMapPoint haulingEnd = new TripMapPoint(); haulingEnd.setTime(resultSet.getDate(14)); haulingEnd.setLatitude(resultSet.getFloat(15)); haulingEnd.setLongitude(resultSet.getFloat(16)); - haulingEnd.setType(TripMapPointType.LONGLINE_ACTIVITY_WITH_HAULING_END); + haulingEnd.setType(TripMapPointPersistType.LONGLINE_ACTIVITY_WITH_HAULING_END); result.add(haulingEnd); } @@ -247,19 +247,19 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl public static List<TripLongline> findAll(TopiaSqlSupport context, String programId, int referenceLocale) { String sql = "SELECT" + - " t.topiaId," + - " t.startDate," + - " t.endDate," + - " p.lastName," + - " p.firstName," + - " v.topiaId," + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + - " WHERE " + - " t.program = ?" + - " AND t.observer = p.topiaId" + - " AND t.vessel = v.topiaId" + - " ORDER BY t.endDate"; + " t.topiaId," + + " t.startDate," + + " t.endDate," + + " p.lastName," + + " p.firstName," + + " v.topiaId," + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + + " WHERE " + + " t.program = ?" + + " 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); @@ -269,19 +269,19 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl public static TripLongline find(TopiaSqlSupport context, String tripId, int referenceLocale) { String sql = "SELECT" + - " t.topiaId," + - " t.startDate," + - " t.endDate," + - " p.lastName," + - " p.firstName," + - " v.topiaId," + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + - " WHERE " + - " t.topiaId = ?" + - " AND t.observer = p.topiaId" + - " AND t.vessel = v.topiaId" + - " ORDER BY t.endDate"; + " t.topiaId," + + " t.startDate," + + " t.endDate," + + " p.lastName," + + " p.firstName," + + " v.topiaId," + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " FROM observe_longline.trip t, observe_common.person p, observe_common.vessel v" + + " WHERE " + + " t.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); @@ -383,8 +383,8 @@ public class TripLonglineTopiaDao extends AbstractTripLonglineTopiaDao<TripLongl public static Timestamp find(TopiaSqlSupport context, String tripId) { String sql = "SELECT max(a.timestamp)" + - " FROM observe_longline.activity a" + - " WHERE a.trip = ?"; + " FROM observe_longline.activity a" + + " WHERE a.trip = ?"; TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); return context.findSingleResult(request); diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java index e52abe4..768e0e7 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParameters.java @@ -24,11 +24,11 @@ package fr.ird.observe.entities.referentiel; import com.google.common.base.Preconditions; import fr.ird.observe.ObserveTopiaDaoSupplier; -import fr.ird.observe.util.Numbers; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.NumberUtil; import javax.script.Bindings; import javax.script.ScriptContext; @@ -302,7 +302,7 @@ public class LengthWeightParameters { ); if (o != null) { - o = Numbers.round1Digit(o); + o = NumberUtil.roundOneDigit(o); } return o; } @@ -317,7 +317,7 @@ public class LengthWeightParameters { ); if (o != null) { - o = Numbers.round2Digits(o); + o = NumberUtil.roundTwoDigits(o); } return o; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java index 2680601..05bfedc 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/LengthWeightParemeterHelper.java @@ -22,11 +22,11 @@ package fr.ird.observe.entities.referentiel; import fr.ird.observe.ObserveTopiaPersistenceContext; -import fr.ird.observe.util.Numbers; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaDao; +import org.nuiton.util.NumberUtil; import javax.script.Bindings; import javax.script.ScriptContext; @@ -145,7 +145,7 @@ public class LengthWeightParemeterHelper { ); if (o != null) { - o = Numbers.round1Digit(o); + o = NumberUtil.roundOneDigit(o); } return o; } @@ -160,7 +160,7 @@ public class LengthWeightParemeterHelper { ); if (o != null) { - o = Numbers.round2Digits(o); + o = NumberUtil.roundTwoDigits(o); } return o; } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java index d041bb0..0d7ba4d 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/SpeciesImpl.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel; -import fr.ird.observe.util.Numbers; +import org.nuiton.util.NumberUtil; public class SpeciesImpl extends SpeciesAbstract { @@ -33,7 +33,7 @@ public class SpeciesImpl extends SpeciesAbstract { if (minLength != null) { // on arrondit à 2 décimales - minLength = Numbers.round2Digits(minLength); + minLength = NumberUtil.roundTwoDigits(minLength); } super.setMinLength(minLength); } @@ -43,7 +43,7 @@ public class SpeciesImpl extends SpeciesAbstract { if (maxLength != null) { // on arrondit à 2 décimales - maxLength = Numbers.round2Digits(maxLength); + maxLength = NumberUtil.roundTwoDigits(maxLength); } super.setMaxLength(maxLength); } @@ -53,7 +53,7 @@ public class SpeciesImpl extends SpeciesAbstract { if (minWeight != null) { // on arrondit à 2 décimales - minWeight = Numbers.round2Digits(minWeight); + minWeight = NumberUtil.roundTwoDigits(minWeight); } super.setMinWeight(minWeight); } @@ -63,8 +63,8 @@ public class SpeciesImpl extends SpeciesAbstract { if (maxWeight != null) { // on arrondit à 2 décimales - maxWeight = Numbers.round2Digits(maxWeight); + maxWeight = NumberUtil.roundTwoDigits(maxWeight); } super.setMaxWeight(maxWeight); } -} //SpeciesImpl +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java index b815e04..ea4de7b 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/referentiel/VesselImpl.java @@ -22,7 +22,7 @@ package fr.ird.observe.entities.referentiel; -import fr.ird.observe.util.Numbers; +import org.nuiton.util.NumberUtil; public class VesselImpl extends VesselAbstract { @@ -32,7 +32,7 @@ public class VesselImpl extends VesselAbstract { public void setCapacity(Float capacity) { // on arrondit à 2 décimales if (capacity != null) { - capacity = Numbers.round2Digits(capacity); + capacity = NumberUtil.roundTwoDigits(capacity); } super.setCapacity(capacity); } @@ -41,7 +41,7 @@ public class VesselImpl extends VesselAbstract { public void setSearchMaximum(Float searchMaximum) { // on arrondit à 2 décimales if (searchMaximum != null) { - searchMaximum = Numbers.round2Digits(searchMaximum); + searchMaximum = NumberUtil.roundTwoDigits(searchMaximum); } super.setSearchMaximum(searchMaximum); } @@ -50,8 +50,8 @@ public class VesselImpl extends VesselAbstract { public void setLength(Float length) { // on arrondit à 2 décimales if (length != null) { - length = Numbers.round2Digits(length); + length = NumberUtil.roundTwoDigits(length); } super.setLength(length); } -} //VesselImpl +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java index 52b3790..bbfd092 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/ActivitySeineImpl.java @@ -25,10 +25,10 @@ import com.google.common.base.MoreObjects; import fr.ird.observe.entities.Entities; import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.seine.VesselActivitySeine; -import fr.ird.observe.util.Numbers; import fr.ird.type.CoordinateHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.NumberUtil; import java.util.Arrays; import java.util.List; @@ -169,7 +169,7 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { // on arrondit à 2 décimales observedSystemDistance = - Numbers.round2Digits(observedSystemDistance); + NumberUtil.roundTwoDigits(observedSystemDistance); } super.setObservedSystemDistance(observedSystemDistance); } @@ -179,7 +179,7 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { if (vesselSpeed != null) { // on arrondit à 2 décimales - vesselSpeed = Numbers.round2Digits(vesselSpeed); + vesselSpeed = NumberUtil.roundTwoDigits(vesselSpeed); } super.setVesselSpeed(vesselSpeed); } @@ -189,7 +189,7 @@ public class ActivitySeineImpl extends ActivitySeineAbstract { if (seaSurfaceTemperature != null) { // on arrondit à 2 décimales - seaSurfaceTemperature = Numbers.round2Digits(seaSurfaceTemperature); + seaSurfaceTemperature = NumberUtil.roundTwoDigits(seaSurfaceTemperature); } super.setSeaSurfaceTemperature(seaSurfaceTemperature); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java index 4687589..a55328e 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetCatchImpl.java @@ -21,11 +21,11 @@ */ package fr.ird.observe.entities.seine; -import fr.ird.observe.util.Numbers; import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; import fr.ird.observe.entities.referentiel.LengthWeightParameter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.NumberUtil; /** * L'implantation par defaut d'une discarded faune. @@ -92,7 +92,7 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract { if (meanWeight != null) { // on arrondit à 2 décimales - meanWeight = Numbers.round2Digits(meanWeight); + meanWeight = NumberUtil.roundTwoDigits(meanWeight); if (log.isDebugEnabled()) { log.debug("weight moyen : " + meanWeight); } @@ -105,7 +105,7 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract { if (catchWeight != null) { // on arrondit à 3 décimales - catchWeight = Numbers.round3Digits(catchWeight); + catchWeight = NumberUtil.roundThreeDigits(catchWeight); if (log.isDebugEnabled()) { log.debug("weight estime : " + catchWeight); } @@ -118,7 +118,7 @@ public class NonTargetCatchImpl extends NonTargetCatchAbstract { if (meanLength != null) { // on arrondit à 1 décimale - meanLength = Numbers.round1Digit(meanLength); + meanLength = NumberUtil.roundOneDigit(meanLength); } super.setMeanLength(meanLength); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java index 09e1d3a..718af2a 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/NonTargetLengthImpl.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.entities.seine; -import fr.ird.observe.util.Numbers; +import org.nuiton.util.NumberUtil; public class NonTargetLengthImpl extends NonTargetLengthAbstract { @@ -33,7 +33,7 @@ public class NonTargetLengthImpl extends NonTargetLengthAbstract { if (weight != null) { // on arrondit à trois décimale - weight = Numbers.round2Digits(weight); + weight = NumberUtil.roundTwoDigits(weight); } super.setWeight(weight); } @@ -43,9 +43,9 @@ public class NonTargetLengthImpl extends NonTargetLengthAbstract { if (length != null) { // on arrondit à 1 décimale - length = Numbers.round1Digit(length); + length = NumberUtil.roundOneDigit(length); } super.setLength(length); } -} //NonTargetLengthImpl +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java index 3174b82..96151a0 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/RouteImpl.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.entities.seine; -import fr.ird.observe.util.Numbers; +import org.nuiton.util.NumberUtil; /** @author Tony Chemit - chemit(a)codelutin.com */ public class RouteImpl extends RouteAbstract { @@ -33,7 +33,7 @@ public class RouteImpl extends RouteAbstract { if (startLogValue != null) { // on arrondit à 2 décimales - startLogValue = Numbers.round2Digits(startLogValue); + startLogValue = NumberUtil.roundTwoDigits(startLogValue); } super.setStartLogValue(startLogValue); } @@ -43,258 +43,9 @@ public class RouteImpl extends RouteAbstract { if (endLogValue != null) { // on arrondit à 2 décimales - endLogValue = Numbers.round2Digits(endLogValue); + endLogValue = NumberUtil.roundTwoDigits(endLogValue); } super.setEndLogValue(endLogValue); } -// @Override -// public ActivitySeine getOpenChild() { -// return OpenableEntities.getOpenEntity(activitySeine); -// } -// -// @Override -// public List<ActivitySeine> getOpenableChilds() { -// return activitySeine; -// } -// -// @Override -// public ActivitySeine getOpenActivity() { -// return getOpenChild(); -// } -// -// /** -// * @param activitySeine null -// * @return l'activity precedente celle donnee ou null -// */ -// @Override -// public ActivitySeine getPreviousActivity(ActivitySeine activitySeine) { -// if (isActivitySeineEmpty()) { -// -// // pas d'activity definie sur la route -// return null; -// } -// int index = this.activitySeine.indexOf(activitySeine); -// if (index < 1) { -// -// // activity non trouvée sur cette route ou premiere activity -// // donc pas d'activity précédente -// return null; -// } -// -// // on retourne l'activity precedente -// return this.activitySeine.get(index - 1); -// } -// -// /** -// * @param activitySeine null -// * @return l'activity suivante celle donnee ou null -// */ -// @Override -// public ActivitySeine getNextActivity(ActivitySeine activitySeine) { -// if (isActivitySeineEmpty()) { -// -// // pas d'activity definie sur la route -// return null; -// } -// int index = this.activitySeine.indexOf(activitySeine); -// if (index == -1 || index + 1 >= sizeActivitySeine()) { -// -// // l'activity n'est pas definie sur cette route, ou c'est la -// // dernière de la route -// return null; -// } -// -// // on retourne l'activity suivante -// return this.activitySeine.get(index + 1); -// } -// -// /** @return la derniere activity */ -// @Override -// public ActivitySeine getLastActivity() { -// if (isActivitySeineEmpty()) { -// -// // pas d'activity definie sur la route -// return null; -// } -// -// // on retourne la derniere activity -// return activitySeine.get(sizeActivitySeine() - 1); -// } - -// @Override -// public boolean isActivityFindDeVeilleFound() { -// return getActivityFinDeVeille() != null; -// } -// -// @Override -// public ActivitySeine getActivityFinDeVeille() { -// if (activitySeine == null || isActivitySeineEmpty()) { -// return null; -// } -// ActivitySeine result = null; -// for (ActivitySeine a : activitySeine) { -// if (a.isActivityFinDeVeille()) { -// -// // il existe bien une activity de fin de veille -// result = a; -// break; -// } -// } -// return result; -// } -// -// @Override -// public List<ActivitySeine> getActivityDebutDePechePositive() { -// List<ActivitySeine> result = new ArrayList<ActivitySeine>(); -// if (activitySeine != null && !isActivitySeineEmpty()) { -// for (ActivitySeine a : activitySeine) { -// if (a.isActivityDebutDePechePositive()) { -// -// // activity de debut de peche positive -// result.add(a); -// } -// } -// } -// return result; -// } -// -// @Override -// public List<ActivitySeine> getActivityFinDePeche() { -// List<ActivitySeine> result = new ArrayList<ActivitySeine>(); -// if (activitySeine != null && !isActivitySeineEmpty()) { -// for (ActivitySeine a : activitySeine) { -// if (a.isActivityFinDePeche()) { -// -// // activity de debut de peche positive -// result.add(a); -// } -// } -// } -// return result; -// } -// -// @Override -// public ActivitySeine getNextActivityFinDePeche(ActivitySeine actitiveDebut) { -// if (activitySeine == null || isActivitySeineEmpty()) { -// -// // pas d'actitive dans la route -// return null; -// } -// int position = activitySeine.indexOf(actitiveDebut); -// if (position == -1) { -// -// // activity de debut non trouvee -// return null; -// } -// -// for (int i = position + 1, max = sizeActivitySeine(); i < max; i++) { -// ActivitySeine a = activitySeine.get(i); -// if (a.isActivityFinDePeche()) { -// -// // activity de fin de peche trouvee -// return a; -// } -// } -// return null; -// } -// -// @Override -// public ActivitySeine getNextActivityDebutDePechePositive(ActivitySeine actitiveDebut) { -// if (activitySeine == null || isActivitySeineEmpty()) { -// -// // pas d'actitive dans la route -// return null; -// } -// int position = activitySeine.indexOf(actitiveDebut); -// if (position == -1) { -// -// // activity de debut non trouvee -// return null; -// } -// -// for (int i = position + 1, max = sizeActivitySeine(); i < max; i++) { -// ActivitySeine a = activitySeine.get(i); -// if (a.isActivityDebutDePechePositive()) { -// -// // activity de fin de peche trouvee -// return a; -// } -// } -// return null; -// } -// -// @Override -// public ActivitySeine getLastActivityDebutDePechePositiveBefore(Date actitiveDebut) { -// -// if (activitySeine == null || isActivitySeineEmpty()) { -// -// // pas d'actitive dans la route -// return null; -// } -// -// int position = getLastActivityBefore(actitiveDebut); -// -// if (position == -1) { -// -// // activity avant toute les autres ou non trouvee -// return null; -// } -// -// // on parcours en ordre inverse depuis la position jusqu'à trouver -// // de debut de peche positive -// ActivitySeine result = null; -// for (int i = position; i > -1; i--) { -// ActivitySeine a = activitySeine.get(i); -// if (a.isActivityDebutDePechePositive()) { -// -// // on a trouve une activity de debut de peche positive -// result = a; -// break; -// } -// } -// return result; -// } - -// @Override -// @Deprecated -// public void updateDates() { -// throw new IllegalStateException("A NE PLUS UTILISER!!!"); -// } -// -// protected int getLastActivityBefore(Date currentTime) { -// if (activitySeine == null || isActivitySeineEmpty()) { -// -// // pas d'actitive dans la route -// return -1; -// } -// Iterator<ActivitySeine> itr = activitySeine.iterator(); -// int i = -1; -// while (itr.hasNext()) { -// ActivitySeine a = itr.next(); -// if (currentTime.before(a.getTime()) || -// currentTime.equals(a.getTime())) { -// break; -// } -// i++; -// } -// return i; -// } -// -// @Override -// public boolean isTimeAvailable(String activityId, Date time) { -// boolean result = true; -// if (!isActivitySeineEmpty()) { -// time = DateUtil.getTime(time, false, false); -// for (ActivitySeine a : getActivitySeine()) { -// if (DateUtil.getTime(a.getTime(), false, false).equals(time) && -// !a.getTopiaId().equals(activityId)) { -// // heure observation already used -// result = false; -// break; -// } -// } -// } -// return result; -// } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java index 275787e..6b66572 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/SetSeineImpl.java @@ -22,8 +22,8 @@ package fr.ird.observe.entities.seine; import fr.ird.observe.entities.constants.seine.SchoolType; -import fr.ird.observe.util.Numbers; import org.nuiton.util.DateUtil; +import org.nuiton.util.NumberUtil; import java.util.Date; @@ -133,7 +133,7 @@ public class SetSeineImpl extends SetSeineAbstract { if (currentSpeed != null) { // on arrondit à 3 décimales - currentSpeed = Numbers.round3Digits(currentSpeed); + currentSpeed = NumberUtil.roundThreeDigits(currentSpeed); } super.setCurrentSpeed(currentSpeed); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java index 5e68325..e859fb2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetCatchImpl.java @@ -21,8 +21,8 @@ */ package fr.ird.observe.entities.seine; -import fr.ird.observe.util.Numbers; import fr.ird.observe.entities.referentiel.Species; +import org.nuiton.util.NumberUtil; /** @author Tony Chemit - chemit(a)codelutin.com */ public class TargetCatchImpl extends TargetCatchAbstract { @@ -46,7 +46,7 @@ public class TargetCatchImpl extends TargetCatchAbstract { if (catchWeight != null) { // on arrondit à 3 décimales - catchWeight = Numbers.round3Digits(catchWeight); + catchWeight = NumberUtil.roundThreeDigits(catchWeight); } super.setCatchWeight(catchWeight); } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java index 4cafaf9..99b8508 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TargetLengthImpl.java @@ -21,7 +21,7 @@ */ package fr.ird.observe.entities.seine; -import fr.ird.observe.util.Numbers; +import org.nuiton.util.NumberUtil; public class TargetLengthImpl extends TargetLengthAbstract { @@ -33,7 +33,7 @@ public class TargetLengthImpl extends TargetLengthAbstract { if (weight != null) { // on arrondit à 2 décimales - weight = Numbers.round2Digits(weight); + weight = NumberUtil.roundTwoDigits(weight); } super.setWeight(weight); } @@ -43,7 +43,7 @@ public class TargetLengthImpl extends TargetLengthAbstract { if (length != null) { // on arrondit à 1 décimale - length = Numbers.round1Digit(length); + length = NumberUtil.roundOneDigit(length); } super.setLength(length); } @@ -52,9 +52,9 @@ public class TargetLengthImpl extends TargetLengthAbstract { public Float getTotalWeight() { Float result = null; if (getWeight() != null && getCount() != null) { - result = Numbers.round3Digits(getWeight() * getCount() / 1000.0f); + result = NumberUtil.roundThreeDigits(getWeight() * getCount() / 1000.0f); } return result; } -} //TargetLengthImpl +} diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java index 52d0e37..6ffea33 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineImpl.java @@ -29,144 +29,9 @@ public class TripSeineImpl extends TripSeineAbstract { private static final long serialVersionUID = 1L; -// @Override -// public Route getOpenChild() { -// return OpenableEntities.getOpenEntity(route); -// } -// -// @Override -// public Set<Route> getOpenableChilds() { -// return route; -// } - -// @Override -// public Route getOpenRoute() { -// return getOpenChild(); -// } -// -// @Override -// public Route getPreviousRoute(Route route) { -// if (isRouteEmpty()) { -// -// // aucune route definie sur la maree -// return null; -// } -// int index = this.route.indexOf(route); -// if (index < 1) { -// -// // la route donnee n'est pas definie sur cette maree ou est la -// // premiere route -// return null; -// } -// -// // on retourne la route precedente -// return this.route.get(index - 1); -// } -// -// /** -// * @param route null -// * @return la route suivante celle donnee ou null -// */ -// @Override -// public Route getNextRoute(Route route) { -// if (isRouteEmpty()) { -// -// // aucune route definie sur la maree -// return null; -// } -// int index = this.route.indexOf(route); -// if (index == -1 || index + 1 >= sizeRoute()) { -// -// // la route n'est pas definie sur cette maree, ou c'est la -// // dernière de la maree -// return null; -// } -// -// // on retourne la route suivante -// return this.route.get(index + 1); -// } -// -// /** @return la derniere route ou null */ -// @Override -// public Route getLastRoute() { -// if (isRouteEmpty()) { -// -// // aucune route definie sur la maree -// return null; -// } -// -// // on retourne la dernière route de la maree -// return getRoute().get(sizeRoute() - 1); -// } - -// @Override -// @Deprecated -// public Date getEndDateTheorique() { -// -// throw new IllegalStateException("A NE PLUS UTILISER!!!"); -// -//// Date d; -//// if (isRouteEmpty()) { -//// -//// // pas de route, donc la date de fin est la date de debut -//// d = getStartDate(); -//// } else { -//// List<Route> routes = new ArrayList<Route>(getRoute()); -//// -//// // on trie la liste par jour d'observation -//// Routes.sort(routes); -//// -//// // on recupere la derniere route de la maree -//// Route route = routes.get(routes.size() - 1); -//// -//// // son jour d'observation est la date de fin de la maree -//// d = route.getDate(); -//// } -//// -//// // on conserve la date epuree (pas de notion de temps dans la date) -//// d = DateUtil.getEndOfDay(d); -//// return d; -// } - -// @Override -// @Deprecated -// public void updateDateFin() { -// -// throw new IllegalStateException("A NE PLUS UTILISER!!!"); -// -//// // la date de fin theorique (date de la dernière route de la marée) -//// Date endDate = getEndDateTheorique(); -//// -//// // la date de fin actuelle -//// Date realDateFin = getEndDate(); -//// -//// if (realDateFin == null || endDate.after(realDateFin)) { -//// -//// // on utilise la nouvelle date theorique car l'ancienne n'existe pas -//// // ou est antérieure à la date de fin théoriquue -//// setEndDate(endDate); -//// } -// } - @Override public String getObserverLabel() { return observer == null ? "" : observer.getLastName() + " " + observer.getFirstName(); } -// @Override -// public boolean isDateAvailable(String routeId, Date date) { -// boolean result = true; -// if (!isRouteEmpty()) { -// date = DateUtil.getDay(date); -// for (Route r : getRoute()) { -// if (DateUtil.getDay(r.getDate()).equals(date) && -// !r.getTopiaId().equals(routeId)) { -// // jour observation already used -// result = false; -// break; -// } -// } -// } -// return result; -// } } diff --git a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java index 10033af..15177a2 100644 --- a/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java +++ b/observe-entities/src/main/java/fr/ird/observe/entities/seine/TripSeineTopiaDao.java @@ -21,6 +21,8 @@ */ package fr.ird.observe.entities.seine; +import fr.ird.observe.entities.TripMapPoint; +import fr.ird.observe.entities.constants.TripMapPointPersistType; import fr.ird.observe.entities.constants.seine.SchoolType; import fr.ird.observe.entities.referentiel.Harbour; import fr.ird.observe.entities.referentiel.I18nReferenceEntities; @@ -28,8 +30,6 @@ import fr.ird.observe.entities.referentiel.Person; import fr.ird.observe.entities.referentiel.PersonImpl; import fr.ird.observe.entities.referentiel.Vessel; import fr.ird.observe.entities.referentiel.VesselImpl; -import fr.ird.observe.services.dto.TripMapPointDto; -import fr.ird.observe.services.dto.constants.TripMapPointType; import org.nuiton.topia.persistence.support.TopiaSqlQuery; import org.nuiton.topia.persistence.support.TopiaSqlSupport; import org.nuiton.util.DateUtil; @@ -81,20 +81,20 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } - public LinkedHashSet<TripMapPointDto> extractTripMapActivityPoints(String tripId) { + public LinkedHashSet<TripMapPoint> extractTripMapActivityPoints(String tripId) { TripSeine tripSeine = forTopiaIdEquals(tripId).findUnique(); - LinkedHashSet<TripMapPointDto> tripMapPoints = new LinkedHashSet<>(); + LinkedHashSet<TripMapPoint> tripMapPoints = new LinkedHashSet<>(); // add departure harbours Harbour departureHarbour = tripSeine.getDepartureHarbour(); if (departureHarbour != null) { - TripMapPointDto departurePoint = new TripMapPointDto(); + TripMapPoint departurePoint = new TripMapPoint(); departurePoint.setTime(tripSeine.getStartDate()); departurePoint.setLatitude(departureHarbour.getLatitude()); departurePoint.setLongitude(departureHarbour.getLongitude()); - departurePoint.setType(TripMapPointType.SEINE_DEPARTURE_HARBOUR); + departurePoint.setType(TripMapPointPersistType.SEINE_DEPARTURE_HARBOUR); tripMapPoints.add(departurePoint); } @@ -105,33 +105,33 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { // add landing harbours Harbour landingHarbour = tripSeine.getLandingHarbour(); if (landingHarbour != null) { - TripMapPointDto landingPoint = new TripMapPointDto(); + TripMapPoint landingPoint = new TripMapPoint(); landingPoint.setTime(tripSeine.getEndDate()); landingPoint.setLatitude(landingHarbour.getLatitude()); landingPoint.setLongitude(landingHarbour.getLongitude()); - landingPoint.setType(TripMapPointType.SEINE_LANDING_HARBOUR); + landingPoint.setType(TripMapPointPersistType.SEINE_LANDING_HARBOUR); tripMapPoints.add(landingPoint); } return tripMapPoints; } - private static class TripMapActivityPointQuery extends TopiaSqlQuery<TripMapPointDto> { + private static class TripMapActivityPointQuery extends TopiaSqlQuery<TripMapPoint> { private static String SQL = "SELECT" + - " r.date, " + - " a.time, " + - " a.latitude," + - " a.longitude," + - " a.vesselactivity, " + - " s.schoolType" + - " FROM observe_seine.route r" + - " INNER JOIN observe_seine.activity a" + - " ON a.route = r.topiaId" + - " LEFT OUTER JOIN observe_seine.set s" + - " ON s.topiaId = a.set" + - " WHERE r.trip = ?" + - " ORDER BY r.date, a.time"; + " r.date, " + + " a.time, " + + " a.latitude," + + " a.longitude," + + " a.vesselactivity, " + + " s.schoolType" + + " FROM observe_seine.route r" + + " INNER JOIN observe_seine.activity a" + + " ON a.route = r.topiaId" + + " LEFT OUTER JOIN observe_seine.set s" + + " ON s.topiaId = a.set" + + " WHERE r.trip = ?" + + " ORDER BY r.date, a.time"; protected String tripId; @@ -147,28 +147,28 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { } @Override - public TripMapPointDto prepareResult(ResultSet resultSet) throws SQLException { + public TripMapPoint prepareResult(ResultSet resultSet) throws SQLException { - TripMapPointDto point = new TripMapPointDto(); + TripMapPoint point = new TripMapPoint(); Date time = DateUtil.getDateAndTime(resultSet.getDate(1), resultSet.getTime(2), true, false); point.setTime(time); point.setLatitude(resultSet.getFloat(3)); point.setLongitude(resultSet.getFloat(4)); if (ACTIVITY_HARBOUR_ID.equals(resultSet.getString(5))) { - point.setType(TripMapPointType.SEINE_ACTIVITY_IN_HARBOUR); + point.setType(TripMapPointPersistType.SEINE_ACTIVITY_IN_HARBOUR); } else if (resultSet.getString(6) == null) { - point.setType(TripMapPointType.SEINE_ACTIVITY); + point.setType(TripMapPointPersistType.SEINE_ACTIVITY); } else { SchoolType schoolType = SchoolType.values()[resultSet.getInt(6)]; switch (schoolType) { case libre: - point.setType(TripMapPointType.SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE); + point.setType(TripMapPointPersistType.SEINE_ACTIVITY_WITH_FREE_SCHOOL_TYPE); break; case objet: - point.setType(TripMapPointType.SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE); + point.setType(TripMapPointPersistType.SEINE_ACTIVITY_WITH_OBJECT_SCHOOL_TYPE); break; default: - point.setType(TripMapPointType.SEINE_ACTIVITY); + point.setType(TripMapPointPersistType.SEINE_ACTIVITY); } } @@ -189,19 +189,19 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { static <E extends TripSeine> List<TripSeine> findAll(TopiaSqlSupport context, String programId, int referenceLocale) { String sql = "SELECT" + - " t.topiaId," + - " t.startDate," + - " t.endDate," + - " p.lastName," + - " p.firstName," + - " v.topiaId, " + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + - " WHERE " + - " t.program = ?" + - " AND t.observer = p.topiaId" + - " AND t.vessel = v.topiaId" + - " ORDER BY t.endDate"; + " t.topiaId," + + " t.startDate," + + " t.endDate," + + " p.lastName," + + " p.firstName," + + " v.topiaId, " + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + + " WHERE " + + " t.program = ?" + + " 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); @@ -211,19 +211,19 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { static TripSeine find(TopiaSqlSupport context, String tripId, int referenceLocale) { String sql = "SELECT" + - " t.topiaId," + - " t.startDate," + - " t.endDate," + - " p.lastName," + - " p.firstName," + - " v.topiaId," + - " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + - " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + - " WHERE " + - " t.topiaId = ?" + - " AND t.observer = p.topiaId" + - " AND t.vessel = v.topiaId" + - " ORDER BY t.endDate"; + " t.topiaId," + + " t.startDate," + + " t.endDate," + + " p.lastName," + + " p.firstName," + + " v.topiaId," + + " v." + I18nReferenceEntities.getPropertyName(referenceLocale) + + " FROM observe_seine.trip t, observe_common.person p, observe_common.vessel v" + + " WHERE " + + " t.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); @@ -333,8 +333,8 @@ public class TripSeineTopiaDao extends AbstractTripSeineTopiaDao<TripSeine> { public static Date find(TopiaSqlSupport context, String tripId) { String sql = "SELECT max(r.date)" + - " FROM observe_seine.route r" + - " WHERE r.trip = ?"; + " FROM observe_seine.route r" + + " WHERE r.trip = ?"; TheoricalEndOfDateSqlQuery request = new TheoricalEndOfDateSqlQuery(sql, tripId); return context.findSingleResult(request); diff --git a/observe-entities/src/test/java/fr/ird/observe/util/NumbersTest.java b/observe-entities/src/test/java/fr/ird/observe/util/NumbersTest.java deleted file mode 100644 index 17309d3..0000000 --- a/observe-entities/src/test/java/fr/ird/observe/util/NumbersTest.java +++ /dev/null @@ -1,86 +0,0 @@ -package fr.ird.observe.util; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.junit.Assert; -import org.junit.Test; - -/** - * Created on 21/08/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - */ -public class NumbersTest { - - - @Test - public void testRound3Digits() { - - - assertRound3Digits(1.2f, 1.2f); - assertRound3Digits(1.22f, 1.22f); - assertRound3Digits(1.222f, 1.222f); - assertRound3Digits(1.2222f, 1.222f); - assertRound3Digits(1.2225f, 1.222f); - assertRound3Digits(1.2226f, 1.223f); - assertRound3Digits(11.2226f, 11.223f); - assertRound3Digits(111.2226f, 111.223f); - assertRound3Digits(1111.2226f, 1111.223f); - - assertRound3Digits(1111.999f, 1111.999f); - assertRound3Digits(1111.9994f, 1111.999f); - assertRound3Digits(1111.9995f, 1112f); - assertRound3Digits(1111.9996f, 1112f); - } - - @Test - public void testRoundTaille() { - - assertRound1Digit(1.2f, 1.2f); - assertRound1Digit(1.22f, 1.2f); - assertRound1Digit(1.5f, 1.5f); - assertRound1Digit(1.55f, 1.5f); - assertRound1Digit(1.56f, 1.6f); - assertRound1Digit(1.9f, 1.9f); - assertRound1Digit(1.222f, 1.2f); - assertRound1Digit(11.2226f, 11.2f); - assertRound1Digit(111.2226f, 111.2f); - assertRound1Digit(1111.2226f, 1111.2f); - - assertRound1Digit(1111.999f, 1112.0f); - assertRound1Digit(1111.9994f, 1112.0f); - assertRound1Digit(1111.9995f, 1112.0f); - assertRound1Digit(1111.9996f, 1112.0f); - } - - protected void assertRound3Digits(float number, float expected) { - float actual = Numbers.round3Digits(number); - Assert.assertEquals("" + expected, "" + actual); - } - - protected void assertRound1Digit(float number, float expected) { - Float actual = Numbers.round1Digit(number); - Assert.assertEquals("" + expected, "" + actual); - } - -} \ No newline at end of file diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/TripMapDtos.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/TripMapDtos.java deleted file mode 100644 index 458275a..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/TripMapDtos.java +++ /dev/null @@ -1,15 +0,0 @@ -package fr.ird.observe.services.dto; - - -import java.util.LinkedHashSet; - -public class TripMapDtos extends AbstractTripMapDtos { - - public static TripMapDto newTripMapDto(String tripId, LinkedHashSet<TripMapPointDto> points) { - TripMapDto tripMapDto = new TripMapDto(); - tripMapDto.setId(tripId); - tripMapDto.setPoints(points); - return tripMapDto; - } -} - diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java index 2c83aaa..94b72c6 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/longline/SetLonglineGlobalCompositionDto.java @@ -1,8 +1,5 @@ package fr.ird.observe.services.dto.longline; -import javax.annotation.Generated; - -@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer", date = "Thu Oct 22 14:47:01 CEST 2015") public class SetLonglineGlobalCompositionDto extends AbstractSetLonglineGlobalCompositionDto { private static final long serialVersionUID = 3473510292736074595L; diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java index 37255f3..47c9906 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/FloatingObjectTransmittingBuoyDto.java @@ -5,9 +5,6 @@ import fr.ird.observe.services.dto.constants.seine.TypeTransmittingBuoyOperation import fr.ird.observe.services.dto.referential.ReferentialReference; import fr.ird.observe.services.dto.referential.seine.TransmittingBuoyOperationDto; -import javax.annotation.Generated; - -@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer", date = "Thu Oct 15 11:11:56 CEST 2015") public class FloatingObjectTransmittingBuoyDto extends AbstractFloatingObjectTransmittingBuoyDto { private static final long serialVersionUID = 7148959059263172961L; @@ -41,7 +38,7 @@ public class FloatingObjectTransmittingBuoyDto extends AbstractFloatingObjectTra case 2: // recuperation - return TypeTransmittingBuoyOperation.recuperation; + return TypeTransmittingBuoyOperation.recupeNration; case 3: // mise a l'eau d'une nouvelle balise @@ -60,4 +57,4 @@ public class FloatingObjectTransmittingBuoyDto extends AbstractFloatingObjectTra } -} //FloatingObjectTransmittingBuoyDto +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java index be99ea7..df44e6c 100644 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java +++ b/observe-services-model/src/main/java/fr/ird/observe/services/dto/seine/TargetLengthDto.java @@ -1,10 +1,7 @@ package fr.ird.observe.services.dto.seine; -import fr.ird.observe.util.Numbers; +import org.nuiton.util.NumberUtil; -import javax.annotation.Generated; - -@Generated(value = "org.nuiton.eugene.java.SimpleJavaBeanWithNoInterfaceTransformer", date = "Tue Oct 20 17:22:11 CEST 2015") public class TargetLengthDto extends AbstractTargetLengthDto { private static final long serialVersionUID = 7005688292510741559L; @@ -12,10 +9,10 @@ public class TargetLengthDto extends AbstractTargetLengthDto { public Float getTotalWeight() { Float result = null; if (getWeight() != null && getCount() != null) { - result = Numbers.round3Digits(getWeight() * getCount() / 1000.0f); + result = NumberUtil.roundThreeDigits(getWeight() * getCount() / 1000.0f); } return result; } -} //TargetLengthDto +} diff --git a/observe-services-model/src/main/java/fr/ird/observe/util/Numbers.java b/observe-services-model/src/main/java/fr/ird/observe/util/Numbers.java deleted file mode 100644 index 8a921ce..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/util/Numbers.java +++ /dev/null @@ -1,87 +0,0 @@ -package fr.ird.observe.util; - -/* - * #%L - * ObServe :: Entities - * %% - * Copyright (C) 2008 - 2014 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Predicate; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.math.BigDecimal; -import java.math.MathContext; - -/** - * Created on 8/25/14. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 3.7 - */ -public class Numbers { - - public static final Predicate<Float> IS_FLOAT_CHANGED_TO_ZERO_OR_NULL = new Predicate<Float>() { - - @Override - public boolean apply(Float input) { - return input == null || Math.abs(round3Digits(input)) < 0.001; - } - }; - - public static final Predicate<Integer> IS_INTEGER_CHANGED_TO_ZERO_OR_NULL = new Predicate<Integer>() { - - @Override - public boolean apply(Integer input) { - return input == null || input == 0; - } - }; - - /** Logger. */ - private static final Log log = LogFactory.getLog(Numbers.class); - - public static final MathContext mc1Digit = new MathContext(1); - - public static final MathContext mc2Digits = new MathContext(2); - - public static final MathContext mc3Digits = new MathContext(3); - - public static Float round3Digits(Float number) { - return round(number, mc3Digits); - } - - public static Float round2Digits(Float number) { - return round(number, mc2Digits); - } - - public static Float round1Digit(Float number) { - return round(number, mc1Digit); - } - - public static Float round(Float number, MathContext mc) { - float old = number; - float partieEntier = (int) old; - float digit = old - (int) old; - number = partieEntier + new BigDecimal(digit).round(mc).floatValue(); - if (log.isDebugEnabled()) { - log.debug("round " + old + " to " + number + " with mc = " + mc); - } - return number; - } -} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java new file mode 100644 index 0000000..f2306b2 --- /dev/null +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/entity/TripMapDtoFactory.java @@ -0,0 +1,40 @@ +package fr.ird.observe.services.entity; + +import com.google.common.base.Function; +import com.google.common.collect.Iterables; +import com.google.common.collect.Sets; +import fr.ird.observe.entities.TripMapPoint; +import fr.ird.observe.services.dto.TripMapDto; +import fr.ird.observe.services.dto.TripMapPointDto; +import fr.ird.observe.services.dto.constants.TripMapPointType; + +import java.util.LinkedHashSet; +import java.util.Set; + +/** + * Created on 09/01/16. + * + * @author Tony Chemit - chemit(a)codelutin.com + */ +public class TripMapDtoFactory { + + public static TripMapDto newTripMapDto(String tripId, Set<TripMapPoint> points) { + TripMapDto tripMapDto = new TripMapDto(); + tripMapDto.setId(tripId); + LinkedHashSet<TripMapPointDto> pointDtos = Sets.newLinkedHashSet(Iterables.transform(points, TRIP_MAP_POINT_TRIP_MAP_POINT_DTO_FUNCTION)); + tripMapDto.setPoints(pointDtos); + return tripMapDto; + } + + protected static final Function<TripMapPoint, TripMapPointDto> TRIP_MAP_POINT_TRIP_MAP_POINT_DTO_FUNCTION = new Function<TripMapPoint, TripMapPointDto>() { + @Override + public TripMapPointDto apply(TripMapPoint tripMapPoint) { + TripMapPointDto result = new TripMapPointDto(); + result.setLatitude(tripMapPoint.getLatitude()); + result.setLongitude(tripMapPoint.getLongitude()); + result.setTime(tripMapPoint.getTime()); + result.setType(TripMapPointType.valueOf(tripMapPoint.getType().name())); + return result; + } + }; +} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java index e526d16..765ba40 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/longline/TripLonglineServiceTopia.java @@ -23,6 +23,7 @@ package fr.ird.observe.services.service.longline; */ import fr.ird.observe.ObserveTopiaPersistenceContext; +import fr.ird.observe.entities.TripMapPoint; import fr.ird.observe.entities.longline.TripLongline; import fr.ird.observe.entities.longline.TripLonglineTopiaDao; import fr.ird.observe.entities.referentiel.Program; @@ -31,12 +32,11 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; -import fr.ird.observe.services.dto.TripMapDtos; -import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.result.SaveResultDto; +import fr.ird.observe.services.entity.TripMapDtoFactory; import org.nuiton.util.DateUtil; import java.util.ArrayList; @@ -88,9 +88,9 @@ public class TripLonglineServiceTopia extends ObserveServiceTopia implements Tri @Override public TripMapDto getTripLonglineMap(String tripLonglineId) { - LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripLonglineId); + LinkedHashSet<TripMapPoint> points = getDao().extractTripMapActivityPoints(tripLonglineId); - TripMapDto dto = TripMapDtos.newTripMapDto(tripLonglineId, points); + TripMapDto dto = TripMapDtoFactory.newTripMapDto(tripLonglineId, points); return dto; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java index f7a3812..997a3cc 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/seine/TripSeineServiceTopia.java @@ -22,6 +22,7 @@ package fr.ird.observe.services.service.seine; * #L% */ +import fr.ird.observe.entities.TripMapPoint; import fr.ird.observe.entities.referentiel.Program; import fr.ird.observe.entities.seine.TripSeine; import fr.ird.observe.entities.seine.TripSeineTopiaDao; @@ -30,13 +31,12 @@ import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.DataReferenceSet; import fr.ird.observe.services.dto.Form; import fr.ird.observe.services.dto.TripMapDto; -import fr.ird.observe.services.dto.TripMapDtos; -import fr.ird.observe.services.dto.TripMapPointDto; import fr.ird.observe.services.dto.constants.ReferentialLocale; import fr.ird.observe.services.dto.reference.request.ReferenceSetRequestDefinitions; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.result.SaveResultDto; import fr.ird.observe.services.dto.seine.TripSeineDto; +import fr.ird.observe.services.entity.TripMapDtoFactory; import org.nuiton.util.DateUtil; import java.util.ArrayList; @@ -114,9 +114,9 @@ public class TripSeineServiceTopia extends ObserveServiceTopia implements TripSe @Override public TripMapDto getTripSeineMap(String tripSeineId) { - LinkedHashSet<TripMapPointDto> points = getDao().extractTripMapActivityPoints(tripSeineId); + LinkedHashSet<TripMapPoint> points = getDao().extractTripMapActivityPoints(tripSeineId); - TripMapDto tripMapDto = TripMapDtos.newTripMapDto(tripSeineId, points); + TripMapDto tripMapDto = TripMapDtoFactory.newTripMapDto(tripSeineId, points); return tripMapDto; } diff --git a/pom.xml b/pom.xml index 188d937..101a2e5 100644 --- a/pom.xml +++ b/pom.xml @@ -81,16 +81,14 @@ </developers> <modules> - <module>observe-services-model</module> <module>observe-services-configuration-api</module> + <module>observe-services-configuration-topia</module> + <module>observe-services-configuration-rest</module> + <module>observe-services-model</module> <module>observe-services-api</module> <module>observe-test-data</module> <module>observe-entities</module> -  -  - <module>observe-services-configuration-topia</module> <module>observe-services-topia</module> - <module>observe-services-configuration-rest</module> <module>observe-services-rest</module> <module>observe-services-runner</module> <module>observe-application-web</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

03/19: Suppression old code
by codelutin.com scm 09 Jan '16

09 Jan '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit cab709a7a1ee1ca3bd90399f0577e04b744fd9cf Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 09:43:38 2016 +0100 Suppression old code --- .../observe/services/AbstractObserveService.java | 514 ------------- .../ObserveServiceFactoryProviderTopia.java | 212 ----- .../observe/services/ReplicationServiceImpl.java | 445 ----------- .../observe/services/data/OpenableServiceImpl.java | 179 ----- .../ird/observe/services/data/TripServiceImpl.java | 233 ------ .../data/longline/ActivityLonglineServiceImpl.java | 167 ---- .../data/longline/BaitsCompositionServiceImpl.java | 98 --- .../BranchlinesCompositionServiceImpl.java | 94 --- .../data/longline/CatchLonglineServiceImpl.java | 267 ------- .../data/longline/EncounterServiceImpl.java | 94 --- .../longline/FloatlinesCompositionServiceImpl.java | 94 --- .../GearUseFeaturesLonglineServiceImpl.java | 236 ------ .../data/longline/HooksCompositionServiceImpl.java | 94 --- .../LonglineDetailCompositionServiceImpl.java | 213 ----- .../LonglineGlobalCompositionServiceImpl.java | 87 --- .../data/longline/SensorUsedServiceImpl.java | 129 ---- .../data/longline/SetLonglineServiceImpl.java | 201 ----- .../services/data/longline/TdrServiceImpl.java | 127 --- .../data/longline/TripLonglineServiceImpl.java | 158 ---- .../data/seine/ActivitySeineServiceImpl.java | 224 ------ .../data/seine/FloatingObjectServiceImpl.java | 216 ------ .../seine/GearUseFeaturesSeineServiceImpl.java | 233 ------ .../data/seine/NonTargetCatchServiceImpl.java | 136 ---- .../data/seine/NonTargetSampleServiceImpl.java | 267 ------- .../seine/ObjectObservedSpeciesServiceImpl.java | 88 --- .../seine/ObjectSchoolEstimateServiceImpl.java | 89 --- .../services/data/seine/RouteServiceImpl.java | 184 ----- .../data/seine/SchoolEstimateServiceImpl.java | 94 --- .../services/data/seine/SetSeineServiceImpl.java | 173 ----- .../data/seine/TargetCatchServiceImpl.java | 186 ----- .../data/seine/TargetSampleServiceImpl.java | 298 ------- .../services/data/seine/TripSeineServiceImpl.java | 158 ---- .../services/operation/ComputeDataServiceImpl.java | 854 --------------------- .../services/operation/GpsImportServiceImpl.java | 153 ---- .../services/operation/SynchronizeServiceImpl.java | 240 ------ .../services/operation/ValidationServiceImpl.java | 116 --- .../referential/ReferentialServiceImpl.java | 540 ------------- 37 files changed, 7891 deletions(-) diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java deleted file mode 100644 index d744aec..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/AbstractObserveService.java +++ /dev/null @@ -1,514 +0,0 @@ -package fr.ird.observe.services; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import fr.ird.observe.BinderService; -import fr.ird.observe.IObserveConfig; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.EntityMap; -import fr.ird.observe.entities.constants.ReferenceLocale; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; -import org.nuiton.topia.TopiaContext; - -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; -import org.nuiton.topia.persistence.util.TopiaEntityHelper; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * @author Sylvain Bavencoff - bavencoff(a)codelutin.com - * @since 4.0 - */ -public abstract class AbstractObserveService implements ObserveService { - - /** Logger. */ - private static final Log log = LogFactory.getLog(AbstractObserveService.class); - - String PARENT_BEAN = "parentBean"; - - String BEAN = "bean"; - - protected ObserveServiceContext serviceContext; - - @Override - public void setServiceContext(ObserveServiceContext serviceContext) { - this.serviceContext = serviceContext; - } - - @Override - public <E extends TopiaEntity> EntityMap findAllUsages(E entity) { - - Class<E> entityType = getEntityContractClass(entity); - - TopiaDAO<E> dao = getDao(entityType); - - // always get a fresh version of object - entity = dao.findByTopiaId(entity.getTopiaId()); - EntityMap result; - result = new EntityMap(dao.findAllUsages(entity)); - // on charge les entites - for (Class<? extends TopiaEntity> aClass : result.keySet()) { - - List topiaEntities = result.get(aClass); - decorate(aClass, topiaEntities); - - } - return result; - - } - - @Override - public <E extends TopiaEntity> List<E> getList(Class<E> klass) { - - List<E> list = getList(klass, null); - return list; - } - - @Override - public <E extends TopiaEntity> List<E> getList(Class<E> klass, Predicate<E> predicate) { - - if (Entities.isDataClass(klass)) { - // on verifie que l'on a le droit de lire la donnee - if (!getDataSource().canReadData()) { - if (log.isDebugEnabled()) { - log.debug("Can not read data, no read credential"); - } - return new ArrayList<E>(); - } - } - - if (Entities.isReferentielClass(klass)) { - // on verifie que l'on a le droit de lire la donnee - if (!getDataSource().canReadReferentiel()) { - if (log.isDebugEnabled()) { - log.debug("Can not read referentiel, no read credential"); - } - return new ArrayList<E>(); - } - } - - List<E> result = getList0(klass, predicate); - - //TC-20100208 : on peut modifier la liste (pour supprimer par - // exemple les entites non active), on doit donc toujours travailler - // sur une copie de la liste - return new ArrayList<E>(result); - - } - - public TopiaContext getTransaction() { - return serviceContext.getTransaction(); - } - - public IObserveConfig getConfig() { - return serviceContext.getConfig(); - } - - public ReferenceLocale getReferentielLocale() { - return serviceContext.getReferentielLocale(); - } - - public Date now() { - return serviceContext.now(); - } - - public BinderService getBinderService() { - return serviceContext.getBinderService(); - } - - public <E extends TopiaEntity> void copy(Class<E> type, String context, E source, E target) { - getBinderService().copy(type, context, source, target); - } - - public <E extends TopiaEntity> void copyExcluding(Class<E> type, String context, E source, E target, String... propertyNames) { - getBinderService().copyExcluding(type, context, source, target, propertyNames); - } - - public <E extends TopiaEntity> void copyExcluding(Class<E> type, String context, E source, E target, boolean bindTechnical, String... propertyNames) { - getBinderService().copyExcluding(type, context, source, target, bindTechnical, propertyNames); - } - - public <E extends TopiaEntity> void copy(Class<E> type, String context, E source, E target, boolean bindTechnical) { - getBinderService().copy(type, context, source, target, bindTechnical); - } - - public <E extends TopiaEntity> Map<String, Object> obtainProperties(Class<E> type, String context, E source) { - return getBinder(type, context).obtainProperties(source); - } - - public <E extends TopiaEntity> TopiaEntityBinder<E> getBinder(Class<E> entityClass, String contextName) { - return getBinderService().getBinder(entityClass, contextName); - } - - protected <E extends TopiaEntity> TopiaDAO<E> getDao(E entity) { - Class<E> entityType = getEntityContractClass(entity); - return getDataSource().getDAO(getTransaction(), entityType); - } - - protected DataSource getDataSource() { - return serviceContext.getDataSource(); - } - - protected <E extends TopiaEntity> TopiaDAO<E> getDao(Class<E> entityType) { - return getDataSource().getDAO(getTransaction(), entityType); - } - - protected <E extends TopiaEntity> E findByTopiaId(Class<E> entityType, String topiaId) { - - TopiaDAO<E> dao = getDataSource().getDAO(getTransaction(), entityType); - return dao.findByTopiaId(topiaId); - - } - - protected <O> Decorator<O> getDecoratorByType(Class<O> entityType, String context) { - return serviceContext.getDecoratorService().getDecoratorByType(entityType, context); - } - - - protected <O> void decorate(Class<O> objectType, Collection<O> objects) { - - Decorator<O> decorator = getDecoratorByType(objectType, null); - for (Object object : objects) { - decorator.toString(object); - } - - } - - protected <O> void decorate(Class<O> objectType, O object) { - - Decorator<O> decorator = getDecoratorByType(objectType, null); - decorator.toString(object); - - } - - protected <E extends TopiaEntity> String decorateEntity(E entity) { - - Class<E> entityType = getEntityContractClass(entity); - Decorator<E> decorator = getDecoratorByType(entityType, null); - return decorator.toString(entity); - - } - - protected <E extends TopiaEntity> Class<E> getEntityContractClass(E entity) { - return (Class<E>) ObserveEntityEnum.valueOf(entity).getContract(); - } - - protected <E extends TopiaEntity> List<E> getList0(Class<E> klass, Predicate<E> predicate) { - - TopiaDAO<E> dao = getDao(klass); - List<E> result = dao.findAll(); - - if (predicate != null) { - - // use a filter - result = Lists.newArrayList(Iterables.filter(result, predicate)); - - } - - return result; - - } - - protected <P extends TopiaEntity, E extends TopiaEntity> String doSave(String parentId, E toSave, SaveAction<P, E> saveAction) { - E saved; - - saveAction.beforeSave(parentId, toSave); - - P parent = null; - - if (parentId != null) { - - parent = findByTopiaId(saveAction.parentClass, parentId); - - checkNotNullAndExistingEntity(PARENT_BEAN, parent); - } - - if (Entities.isNew(toSave)) { - - checkNotNullAndNoneExistingEntity(BEAN, toSave); - - saved = saveAction.onCreate(parent, toSave); - - } else { - - checkNotNullAndExistingEntity(BEAN, toSave); - - saved = saveAction.onUpdate(parent, toSave); - - checkNotNullAndExistingEntity(BEAN, saved); - - } - - if (parent == null) { - - // sauvegarde de l'entité - getDao(saveAction.entityClass).update(saved); - - } else { - - // sauvegarde du père de l'entité - getDao(saveAction.parentClass).update(parent); - - } - - return saved.getTopiaId(); - - - } - - protected abstract class SaveAction<P extends TopiaEntity, E extends TopiaEntity> { - - protected final Class<P> parentClass; - - protected final Class<E> entityClass; - - public SaveAction(Class<P> parentClass, Class<E> entityClass) { - this.parentClass = parentClass; - this.entityClass = entityClass; - } - - public void beforeSave(String parentId, E toSave) { - - } - - public abstract E onCreate(P parent, E toCreate); - - public E onUpdate(P parent, E toSave) { - - E saved = findByTopiaId(entityClass, toSave.getTopiaId()); - checkNotNullAndExistingEntity(BEAN, saved); - return saved; - - } - - } - - protected <P extends TopiaEntity, E extends TopiaEntity> void doDelete(String parentId, String idToDelete, DeleteAction<P, E> deleteAction) { - - P parent = null; - - if (parentId != null) { - - parent = findByTopiaId(deleteAction.parentClass, parentId); - - checkNotNullAndExistingEntity(PARENT_BEAN, parent); - - } - - E toDelete = findByTopiaId(deleteAction.entityClass, idToDelete); - - checkNotNullAndExistingEntity(BEAN, toDelete); - - deleteAction.onDelete(parent, toDelete); - - if (parentId != null) { - - getDao(deleteAction.parentClass).update(parent); - - } - - } - - protected class DeleteAction<P extends TopiaEntity, E extends TopiaEntity> { - - protected final Class<P> parentClass; - - protected final Class<E> entityClass; - - public DeleteAction(Class<P> parentClass, Class<E> entityClass) { - this.parentClass = parentClass; - this.entityClass = entityClass; - } - - public void onDelete(P parent, E toDelete) { - getDao(entityClass).delete(toDelete); - } - - } - - protected <P extends TopiaEntity, E extends TopiaEntity> void doSaveList(P parentToSave, SaveCollectionAction<P, E> saveCollectionAction) { - - Collection<E> childrenToSave = saveCollectionAction.listUpdator.getChilds(parentToSave); - - saveCollectionAction.prepareSave(parentToSave, childrenToSave); - - P parentSaved = saveCollectionAction.onUpdateParent(parentToSave); - - List<E> oldChilds = new ArrayList<E>(saveCollectionAction.listUpdator.getChilds(parentSaved)); - - saveCollectionAction.listUpdator.removeAll(parentSaved); - - for (E childToSave : childrenToSave) { - - E childSaved; - - if (Entities.isNew(childToSave)) { - - // creation du fils - childSaved = saveCollectionAction.onCreateChild(childToSave); - - } else { - - // mise a jour du fils - childSaved = saveCollectionAction.onUpdateChild(childToSave); - - } - - saveCollectionAction.listUpdator.addToList(parentSaved, childSaved); - - } - - for (E childNotSaved : Iterables.filter(oldChilds, Predicates.not(saveCollectionAction.childPredicate))) { - saveCollectionAction.listUpdator.addToList(parentSaved, childNotSaved); - } - - // on donne la main aux implantations pour faire des traitements supplémentaires - saveCollectionAction.onUpdateFinalize(parentSaved, oldChilds); - - } - - - protected class SaveCollectionAction<P extends TopiaEntity, E extends TopiaEntity> { - - protected final Class<P> parentClass; - - protected final Class<E> entityClass; - - protected final EntityListUpdator<P, E> listUpdator; - - protected final TopiaEntityBinder<P> parentBinder; - - protected final TopiaEntityBinder<E> childBinder; - - protected final Predicate<E> childPredicate; - - public SaveCollectionAction(Class<P> parentClass, - Class<E> entityClass, - EntityListUpdator<P, E> listUpdator, - TopiaEntityBinder<P> parentBinder, - TopiaEntityBinder<E> childBinder, - Predicate<E> childPredicate) { - this.parentClass = parentClass; - this.entityClass = entityClass; - this.listUpdator = listUpdator; - this.parentBinder = parentBinder; - this.childBinder = childBinder; - this.childPredicate = childPredicate; - } - - public SaveCollectionAction(Class<P> parentClass, - Class<E> entityClass, - EntityListUpdator<P, E> listUpdator, - TopiaEntityBinder<P> parentBinder, - TopiaEntityBinder<E> childBinder) { - this.parentClass = parentClass; - this.entityClass = entityClass; - this.listUpdator = listUpdator; - this.parentBinder = parentBinder; - this.childBinder = childBinder; - this.childPredicate = Predicates.alwaysTrue(); - } - - public void prepareSave(P parentToSave, Collection<E> toSaves) { - // par defaut, rien de specifique a faire avant de faire la sauvegarde - } - - public void onUpdateFinalize(P parentSaved, Collection<E> oldChilds) { - // par défaut, rien à faire après la sauvegarde de la liste - } - - public P onUpdateParent(P parentToSave) { - - TopiaDAO<P> dao = getDao(parentClass); - - P parentSaved = dao.findByTopiaId(parentToSave.getTopiaId()); - parentBinder.copyExcluding(parentToSave, parentSaved, listUpdator.getPropertyName()); - parentSaved = dao.update(parentSaved); - - return parentSaved; - - } - - public E onCreateChild(E childToCreate) { - - Map<String, Object> properties = childBinder.obtainProperties(childToCreate); - E childCreated = getDao(entityClass).create(properties); - - return childCreated; - - } - - public E onUpdateChild(E childToUpdate) { - - TopiaDAO<E> dao = getDao(entityClass); - - E childUpdated = dao.findByTopiaId(childToUpdate.getTopiaId()); - childBinder.load(childToUpdate, childUpdated, true); - childUpdated = dao.update(childUpdated); - - return childUpdated; - - } - - } - - protected <E extends TopiaEntity> void checkNotNullAndNoneExistingEntity(String variableName, E entity) { - TopiaEntityHelper.checkNotNullAndNoneExistingEntity(variableName, entity); - } - - - protected <E extends TopiaEntity> void checkNotNullAndExistingEntity(String variableName, E entity) { - TopiaEntityHelper.checkNotNullAndExistingEntity(variableName, entity); - } - - protected <S extends ObserveService> S newService(Class<S> serviceType) { - - S service = ObserveServiceFactoryTopia.newSimpleService(serviceType, serviceContext); - return service; - - } - - protected <S extends ObserveService> S newService(DataSource dataSource, Class<S> serviceType) { - - ObserveServiceContext serviceContext1 = new ObserveServiceContext(serviceContext.applicationContext, dataSource); - S service = new ObserveServiceFactoryTopia().newService(serviceType, serviceContext1); - return service; - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ObserveServiceFactoryProviderTopia.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ObserveServiceFactoryProviderTopia.java deleted file mode 100644 index 2efa703..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ObserveServiceFactoryProviderTopia.java +++ /dev/null @@ -1,212 +0,0 @@ -package fr.ird.observe.services; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Preconditions; -import com.google.common.collect.Sets; -import fr.ird.observe.ObserveTechnicalException; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.impl.H2DataSource; -import fr.ird.observe.business.db.impl.PGDataSource; -import org.apache.commons.lang3.reflect.ConstructorUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; -import java.util.Set; - -/** - * Created on 5/4/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class ObserveServiceFactoryProviderTopia implements ObserveServiceFactory { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ObserveServiceFactoryProviderTopia.class); - - @Override - public boolean acceptDataSource(DataSource dataSource) { - - boolean result = false; - if (dataSource instanceof H2DataSource) { - result = true; - } else if (dataSource instanceof PGDataSource) { - result = true; - } - return result; - - } - - @Override - public <S extends ObserveService> S newService(Class<S> serviceType, ObserveServiceContext serviceContext) { - - Preconditions.checkNotNull(serviceType, "serviceType can't be null"); - Preconditions.checkArgument(serviceType.isInterface(), "serviceType must be an interface"); - Preconditions.checkNotNull(serviceContext, "serviceContext can't be null"); - - S service = newSimpleService(serviceType, serviceContext); - S proxyService = addProxyService(serviceType, service, serviceContext); - return proxyService; - - } - - public static <S extends ObserveService> S newSimpleService(Class<S> serviceType, ObserveServiceContext serviceContext) { - - //FIXME Rename implementation to TopiaImpl - Class<S> serviceImpl; - try { - serviceImpl = (Class<S>) Class.forName(serviceType.getName() + "Impl"); - } catch (ClassNotFoundException e) { - throw new IllegalStateException("Could not find implementation class for " + serviceType); - } - - try { - - // Instanciate concrete service - S service = ConstructorUtils.invokeConstructor(serviceImpl); - service.setServiceContext(serviceContext); - - return service; - - } catch (Exception e) { - throw new ObserveTechnicalException("Could not create service: " + serviceType, e); - } - - } - - protected <S extends ObserveService> S addProxyService(Class<S> serviceType, S service, ObserveServiceContext serviceContext) { - - // Instanciate transactional proxied service - ServiceInvocationHandler invocationHandler = new ServiceInvocationHandler(serviceContext, service); - S proxyService = (S) Proxy.newProxyInstance(ObserveServiceFactoryProviderTopia.class.getClassLoader(), new Class[]{serviceType}, invocationHandler); - - return proxyService; - - } - - protected static class ServiceInvocationHandler implements InvocationHandler { - - private final ObserveServiceContext serviceContext; - - private final ObserveService target; - - private final Set<String> methodNamesToByPass; - - protected ServiceInvocationHandler(ObserveServiceContext serviceContext, ObserveService target) { - - this.serviceContext = serviceContext; - this.target = target; - this.methodNamesToByPass = Sets.newHashSet( - "equals", - "hashCode", - "finalize", - "toString", - "clone", - "getClass", - "close"); - - } - - @Override - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - - Object result; - - if (methodNamesToByPass.contains(method.getName()) || method.isAnnotationPresent(NoTransaction.class)) { - - result = invokeMethod(method, args); - - } else { - - result = invokeMethodWithTransaction(method, args); - - } - - return result; - - } - - protected Object invokeMethod(Method method, Object... args) throws Throwable { - try { - Object result = method.invoke(target, args); - return result; - } catch (InvocationTargetException e) { - if (log.isErrorEnabled()) { - log.error("Error in method " + method.getName(), e); - } - throw e.getCause(); - } - } - - - protected Object invokeMethodWithTransaction(Method method, Object... args) throws Throwable { - - String methodName = method.getName(); - - DataSource source = serviceContext.getDataSource(); - - TopiaContext tx = source.beginTransaction(methodName); - - try { - - serviceContext.setTransaction(tx); - - Object invoke = invokeMethod(method, args); - - if (method.isAnnotationPresent(Commit.class)) { - - // do commit - source.commitTransaction(tx, methodName); - - } - - return invoke; - - } finally { - - try { - - // always rollback transaction to avoid dirty transactions - source.rollbackTransaction(tx, methodName); - - - } finally { - - serviceContext.setTransaction(null); - source.closeTransaction(tx, methodName); - - } - - } - - } - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ReplicationServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ReplicationServiceImpl.java deleted file mode 100644 index 5148447..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/ReplicationServiceImpl.java +++ /dev/null @@ -1,445 +0,0 @@ -package fr.ird.observe.services; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.DecoratorService; -import fr.ird.observe.ObserveDAOHelper; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.SendMessageAble; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; -import fr.ird.observe.business.db.constants.DataSourceState; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.Trip; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.longline.TripLonglines; -import fr.ird.observe.entities.seine.TripSeineDAO; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.tuple.Pair; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.TopiaContext; - -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.framework.TopiaSQLQuery; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.replication.TopiaReplicationService; -import org.nuiton.topia.replication.model.ReplicationModel; -import org.nuiton.util.StringUtil; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - -import static org.nuiton.i18n.I18n.t; - -/** - * Created on 5/3/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class ReplicationServiceImpl extends AbstractObserveService implements ReplicationService { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ReplicationServiceImpl.class); - - @Override - public void replicateObsoletesEntities(List<TopiaEntity> obsoleteEntities, DataSource source, SendMessageAble messanger) throws DataSourceException { - - String txName = "replicateObsoletesEntities"; - TopiaContext sourceCtxt = source.beginTransaction(txName); - try { - - for (ObserveEntityEnum constant : Entities.REFERENCE_ENTITIES) { - - Class<? extends TopiaEntity> contractClass = constant.getContract(); - List<TopiaEntity> toReplicate = new ArrayList<TopiaEntity>(); - for (Iterator<TopiaEntity> itr = obsoleteEntities.iterator(); itr.hasNext(); ) { - - TopiaEntity e = itr.next(); - if (contractClass.isAssignableFrom(e.getClass())) { - if (log.isDebugEnabled()) { - log.debug("obsolete to inject : " + e.getTopiaId()); - } - itr.remove(); - - // cet objet doit etre replique - toReplicate.add(e); - - messanger.sendMessage(t("observe.message.synchro.obsolete.data.to.duplicate", e)); - } - } - - if (toReplicate.isEmpty()) { - if (log.isDebugEnabled()) { - log.debug("no obsolete entity " + constant); - } - continue; - } - - if (log.isDebugEnabled()) { - log.debug("inject obsolete entity " + constant + " (" + toReplicate.size() + ")"); - } - - sourceCtxt.replicateEntities(getTransaction(), toReplicate); - - getTransaction().commitTransaction(); - - } - - } finally { - - source.closeTransaction(sourceCtxt, txName); - - } - - if (!obsoleteEntities.isEmpty()) { - throw new IllegalStateException("there is still obsolete entities to inject in synchro db : " + obsoleteEntities); - } - - } - - /** - * Duplication du référentiel depuis la source donnée en paramètre vers la source de ce service. - * - * @param srcService le service source qui contient les référentiels à repliquer - * @throws DataSourceException if pb - */ - public void replicateReferentiel(DataSource srcService) throws DataSourceException { - - if (srcService == null) { - throw new NullPointerException("srcService can not be null"); - } - - srcService.checkState(DataSourceState.OPEN); - - if (srcService.equals(getDataSource())) { - throw new IllegalArgumentException("can not duplicate to the same service..."); - } - long t0 = System.nanoTime(); - - Date date = new Date(); - srcService.fireNewMessage(t("observe.storage.message.replicate.referentiel.starting", date)); - - try { - - TopiaReplicationService service = srcService.getTopiaService(TopiaReplicationService.class); - - ReplicationModel model = service.prepareForAll(Entities.REFERENCE_ENTITIES); - - service.doReplicate(model, getTransaction()); - - String delay = StringUtil.convertTime(t0, System.nanoTime()); - srcService.fireNewMessage( - t("observe.storage.message.replicate.referentiel.done", delay)); - } catch (Exception e) { - throw new DataSourceException(e, "replicateReferentiel"); - } - } - - @Override - public void replicateReferentiel(DataSource srcService, List<String> ids, SendMessageAble messanger) throws DataSourceException { - - for (String id : ids) { - - String txName = "replicateReferentiel::" + id; - TopiaContext tx = srcService.beginTransaction(txName); - - try { - - TopiaEntity entity = tx.findByTopiaId(id); - String message = t("observe.synchro.add.object", id); - messanger.sendMessage(message); - tx.replicateEntity(getTransaction(), entity); - - // On est obligé de commiter à chaque ajout sinon si - // une autre entité à ajouter depend de celle là, on - // ne la retrouve pas - getTransaction().commitTransaction(); - if (log.isDebugEnabled()) { - log.debug("add [" + id + "] : "); - } - - } finally { - - // rollback context since we do not want to keep any modification - try { - srcService.rollbackTransaction(tx, txName); - } finally { - srcService.closeTransaction(tx, txName); - } - - } - - } - - } - - /** - * Duplication de toutes les données depuis le service passé en paramètre. - * - * @param srcService le service source - * @throws DataSourceException if pb - */ - public void replicateAllData(DataSource srcService) throws DataSourceException { - - srcService.checkState(DataSourceState.OPEN); - - // le service peut-être en cours d'ouverture - getDataSource().checkState(DataSourceState.INIT, DataSourceState.OPEN); - - if (srcService.equals(getDataSource())) { - throw new IllegalArgumentException("can not replcate to the same service..."); - } - - // recuperation des marees a repliquer - - String[] topiaIds = null; - - TopiaContext srcCtxt = srcService.beginTransaction("replicateData"); - try { - - TripSeineDAO srcTripDAO = ObserveDAOHelper.getTripSeineDAO(srcCtxt); - List<String> allIds = srcTripDAO.findAllIds(); - - if (CollectionUtils.isEmpty(allIds)) { - - // aucune donnee a repliquer - srcService.fireNewMessage(t("observe.storage.message.replicate.data.no.data")); - return; - - } - - topiaIds = allIds.toArray(new String[allIds.size()]); - - } catch (TopiaException e) { - - throw new DataSourceException(e, "replicateData"); - - } finally { - - // rollback context since we do not want to keep any modification - try { - srcService.rollbackTransaction(srcCtxt, "replicateData"); - } finally { - srcService.closeTransaction(srcCtxt, "replicateData"); - } - - } - - // replication des marees - replicateData(srcService, topiaIds); - - } - - /** - * Duplication de données observateur depuis la source passée en paramètre. - * - * @param srcService le service source - * @param ids les ids des entités à répliquer - * @throws DataSourceException if pb - */ - public void replicateData(DataSource srcService, String... ids) throws DataSourceException { - - if (srcService == null) { - throw new NullPointerException("srcService can not be null"); - } - - srcService.checkState(DataSourceState.OPEN); - // le service peut-être en cours d'ouverture - getDataSource().checkState(DataSourceState.INIT, DataSourceState.OPEN); - - if (srcService.equals(getDataSource())) { - throw new IllegalArgumentException("can not replcate to the same service..."); - } - - long t0 = System.nanoTime(); - - srcService.fireNewMessage(t("observe.storage.message.replicate.entities.starting", now())); - - for (String id : ids) { - replicateOneData(srcService, id); - } - - String time = StringUtil.convertTime(t0, System.nanoTime()); - srcService.fireNewMessage(t("observe.storage.message.replicate.entities.done", time)); - - } - - /** - * Duplication de l'unique donnée observateur depuis ce service vers le service donné. - * - * La duplication utilise une transaction dédiée afin de ne pas saturer le serveur - * et aussi une meilleure maitrise du rollback en cas d'une erreur. - * - * Voir http://forge.codelutin.com/issues/4837 - * - * @param srcService le service source - * @param id les ids des entités à répliquer - * @throws DataSourceException if pb - */ - protected void replicateOneData(DataSource srcService, String id) throws DataSourceException { - - String dstLabel = getDataSource().getShortLabel(); - - TopiaReplicationService service = srcService.getTopiaService(TopiaReplicationService.class); - - ReplicationModel model; - try { - model = service.prepare(Entities.DATA_ENTITIES, false, id); - } catch (TopiaException e) { - throw new DataSourceException(e, "replicateData"); - } - - // To fix missing tdr associations (see https://forge.codelutin.com/issues/6611) - List<Pair<String, String>> tdrAssociation = null; - - TopiaContext srcCtxt = srcService.beginTransaction("replicateData"); - try { - - TopiaEntity e = srcCtxt.findByTopiaId(id); - String label = t(DecoratorService.getEntityLabel(e.getClass())) + " :: " + id; - srcService.fireNewMessage(t("observe.storage.message.replicate.data.entity", label, dstLabel)); - - if (e instanceof Trip && Entities.isLonglineId(id)) { - - // Grab tdr missing associations (see https://forge.codelutin.com/issues/6611) - if (log.isInfoEnabled()) { - log.info("Should keep SetLongline - Tdr association ids for: " + id); - } - - tdrAssociation = getTdrAssociationIds(srcCtxt, (TripLongline) e); - - } - } catch (TopiaException e) { - throw new DataSourceException(e, "replicateData"); - } finally { - srcService.closeTransaction(srcCtxt, "replicateData"); - } - - TopiaContext dstCtxt = getTransaction(); - try { - - // do the replicate - service.doReplicate(model, dstCtxt); - - // Apply back tdr missing associations (see https://forge.codelutin.com/issues/6611) - applyTdrAssociationFix(dstCtxt, tdrAssociation); - - // commit the result - getTransaction().commitTransaction(); - - } catch (Exception e) { - getTransaction().rollbackTransaction(); - throw new DataSourceException(e, "replicateData"); - } finally { - - getTransaction().rollbackTransaction(); - - } - - } - - private void applyTdrAssociationFix(TopiaContext dstCtxt, List<Pair<String, String>> tdrAssociation) { - - String request = "\nUPDATE OBSERVE_LONGLINE.TDR SET SET = '%s' WHERE topiaid = '%s';"; - - StringBuilder builder = new StringBuilder(); - - if (CollectionUtils.isNotEmpty(tdrAssociation)) { - for (Pair<String, String> entry : tdrAssociation) { - builder.append(String.format(request, entry.getKey(), entry.getValue())); - } - } - - dstCtxt.executeSQL(builder.toString()); - - } - - private List<Pair<String, String>> getTdrAssociationIds(TopiaContext srcCtxt, TripLongline e) { - - List<Pair<String, String>> result = new ArrayList<Pair<String, String>>(); - - Set<String> setIds = TripLonglines.getSetIdsWithTdr(e); - - GetTdrIdsQuery query = new GetTdrIdsQuery(); - - for (String setId : setIds) { - - List<Pair<String, String>> multipleResult = query.execute((TopiaContextImplementor) srcCtxt, setId); - - if (log.isDebugEnabled()) { - log.debug("Found TDR associations: " + multipleResult); - } - result.addAll(multipleResult); - - } - - return result; - } - - - private static class GetTdrIdsQuery extends TopiaSQLQuery<Pair<String, String>> { - - private String setId; - - public List<Pair<String, String>> execute(TopiaContextImplementor tx, String setId) { - try { - - this.setId = setId; - return findMultipleResult(tx); - - } finally { - - this.setId = null; - - } - } - - @Override - protected PreparedStatement prepareQuery(Connection connection) throws SQLException { - String sql = "SELECT t.SET, t.topiaId " + - "FROM OBSERVE_LONGLINE.TDR t " + - "WHERE t.SET = ?"; - PreparedStatement ps = connection.prepareStatement(sql); - ps.setString(1, setId); - return ps; - } - - @Override - protected Pair<String, String> prepareResult(ResultSet set) throws SQLException { - Pair<String, String> result = - Pair.of(set.getString(1), set.getString(2)); - return result; - } - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/OpenableServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/OpenableServiceImpl.java deleted file mode 100644 index 6f1dc8f..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/OpenableServiceImpl.java +++ /dev/null @@ -1,179 +0,0 @@ -package fr.ird.observe.services.data; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.entities.OpenableEntity; -import fr.ird.observe.entities.OpenableEntityDAOImpl; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.ActivityLonglineDAO; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.longline.TripLonglineDAO; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.ActivitySeineDAO; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.RouteDAO; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.entities.seine.TripSeineDAO; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaEntity; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class OpenableServiceImpl extends AbstractObserveService implements OpenableService { - - @Override - public String[] getOpenIds() { - - List<String> result = new ArrayList<String>(); - - { - TripSeine trip = getOpen(TripSeine.class); - if (trip != null) { - if (trip.getProgram() != null) { - result.add(trip.getProgram().getTopiaId()); - } - result.add(trip.getTopiaId()); - Route route = getOpen(Route.class); - if (route != null) { - result.add(route.getTopiaId()); - ActivitySeine activity = getOpen(ActivitySeine.class); - if (activity != null) { - result.add(activity.getTopiaId()); - SetSeine set = activity.getSetSeine(); - if (set != null) { - result.add(set.getTopiaId()); - } - } - } - } - } - - { - TripLongline trip = getOpen(TripLongline.class); - if (trip != null) { - if (trip.getProgram() != null) { - result.add(trip.getProgram().getTopiaId()); - } - result.add(trip.getTopiaId()); - ActivityLongline activity = getOpen(ActivityLongline.class); - if (activity != null) { - result.add(activity.getTopiaId()); - SetLongline set = activity.getSetLongline(); - if (set != null) { - result.add(set.getTopiaId()); - } - } - } - } - - return result.toArray(new String[result.size()]); - - } - - @Override - public <E extends OpenableEntity & TopiaEntity> E getOpen(Class<E> klass) { - - OpenableEntityDAOImpl dao = (OpenableEntityDAOImpl) getDao(klass); - E result = (E) dao.findByOpen(true); - return result; - - } - - @Override - public void updateOpenState(String topiaId, boolean openState) { - - OpenableEntity entity = findByTopiaId(OpenableEntity.class, topiaId); - entity.setOpen(openState); - - } - - public int getOpenablePosition(String containerId, String childId) { - if (childId.startsWith(TripSeine.class.getName())) { - return getTripSeinePosition(containerId, childId); - } - if (childId.startsWith(TripLongline.class.getName())) { - return getTripLonglinePosition(containerId, childId); - } - if (childId.startsWith(Route.class.getName())) { - return getRoutePosition(containerId, childId); - } - if (childId.startsWith(ActivitySeine.class.getName())) { - return getActivitySeinePosition(containerId, childId); - } - if (childId.startsWith(ActivityLongline.class.getName())) { - return getActivityLonglinePosition(containerId, childId); - } - throw new IllegalStateException("Can not come here!"); - } - - protected int getTripLonglinePosition(String programId, String tripLonglineId) { - - TripLonglineDAO dao = (TripLonglineDAO) getDao(TripLongline.class); - int pos = dao.findPositionByProgramId(programId, tripLonglineId); - return pos; - - } - - protected int getActivityLonglinePosition(String tripLonglineId, String activityLonglineId) { - - ActivityLonglineDAO dao = (ActivityLonglineDAO) getDao(ActivityLongline.class); - int pos = dao.getActivityLonglinePosition(tripLonglineId, activityLonglineId); - return pos; - - } - - protected int getTripSeinePosition(String programId, String tripSeineId) { - - TripSeineDAO dao = (TripSeineDAO) getDao(TripSeine.class); - int pos = dao.findPositionByProgramId(programId, tripSeineId); - return pos; - - } - - protected int getRoutePosition(String tripSeineId, String routeId) { - - RouteDAO dao = (RouteDAO) getDao(Route.class); - int position = dao.getRoutePosition(tripSeineId, routeId); - return position; - - } - - - protected int getActivitySeinePosition(String routeId, String activitySeineId) { - - ActivitySeineDAO dao = (ActivitySeineDAO) getDao(ActivitySeine.class); - int pos = dao.getActivitySeinePosition(routeId, activitySeineId); - return pos; - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/TripServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/TripServiceImpl.java deleted file mode 100644 index 88cd4c4..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/TripServiceImpl.java +++ /dev/null @@ -1,233 +0,0 @@ -package fr.ird.observe.services.data; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.ObserveTechnicalException; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.Trip; -import fr.ird.observe.entities.constants.GearType; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.longline.TripLonglineDAO; -import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.ProgramDAO; -import fr.ird.observe.entities.referentiel.Programs; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.entities.seine.TripSeineDAO; -import fr.ird.observe.services.AbstractObserveService; -import fr.ird.observe.services.data.longline.TripLonglineService; -import fr.ird.observe.services.data.seine.TripSeineService; -import fr.ird.observe.services.referential.ReferentialService; -import fr.ird.observe.tripMap.TripMapPoint; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class TripServiceImpl extends AbstractObserveService implements TripService { - - /** Logger. */ - private static final Log log = LogFactory.getLog(TripServiceImpl.class); - - @Override - public DataSelectionModel loadDataSelectionModel() { - - DataSelectionModel result = new DataSelectionModel(); - - Map<String, List<String>> datas = new HashMap<String, List<String>>(); - - TripSeineService tripSeineService = newService(TripSeineService.class); - TripLonglineService tripLonglineService = newService(TripLonglineService.class); - - List<Program> programs = newService(ReferentialService.class).getAllProgramStub(); - for (Program program : programs) { - - if (Programs.isProgramSeine(program)) { - List<TripSeine> trips = tripSeineService.getTripSeineStubByProgram(program.getTopiaId()); - populate(result, program, trips, datas); - } - - if (Programs.isProgramLongline(program)) { - List<TripLongline> trips = tripLonglineService.getTripLonglineStubByProgram(program.getTopiaId()); - populate(result, program, trips, datas); - } - - } - result.setDatas(datas); - - return result; - - } - - @Override - public List<Program> getPossibleProgramsForTrip(String tripId) { - - Trip trip = getTrip(tripId); - - GearType gearType = trip.getProgram().getGearType(); - - ProgramDAO dao = (ProgramDAO) getDao(Program.class); - - List<Program> programs = dao.findAllByGearType(gearType); - - decorate(Program.class, programs); - - Programs.sort(programs); - - return programs; - - } - - @Override - public Trip getTrip(String tripId) { - - Trip trip; - - if (tripId.startsWith(TripSeine.class.getName())) { - trip = findByTopiaId(TripSeine.class, tripId); - } else { - trip = findByTopiaId(TripLongline.class, tripId); - } - - return trip; - - } - - @Override - public Ocean getTripOcean(String tripId) { - - Trip trip = getTrip(tripId); - - return trip.getOcean(); - - } - - @Override - public void moveTripToProgram(String tripId, String programId) { - - Trip trip = getTrip(tripId); - - Program program = findByTopiaId(Program.class, programId); - - trip.setProgram(program); - - } - - @Override - public List<TripMapPoint> loadTripMapActivityPoints(String tripId) { - - List<TripMapPoint> tripMapPoints; - - if (Entities.isSeineId(tripId)) { - TripSeineDAO dao = (TripSeineDAO) getDao(TripSeine.class); - - tripMapPoints = dao.extractTripMapActivityPoints(tripId); - - } else if (Entities.isLonglineId(tripId)) { - - TripLonglineDAO dao = (TripLonglineDAO) getDao(TripLongline.class); - - tripMapPoints = dao.extractTripMapActivityPoints(tripId); - - } else { - throw new ObserveTechnicalException(String.format("id '%s' is not seine id or longe line id", tripId)); - } - - return tripMapPoints; - - } - - @Override - public void deleteTrip(String tripId) { - - if (Entities.isSeineId(tripId)) { - - TripSeineDAO dao = (TripSeineDAO) getDao(TripSeine.class); - TripSeine result = dao.findByTopiaId(tripId); - dao.delete(result); - - } else { - - TripLonglineDAO dao = (TripLonglineDAO) getDao(TripLongline.class); - TripLongline result = dao.findByTopiaId(tripId); - dao.delete(result); - - } - - } - - protected static <T extends Trip> void populate(DataSelectionModel model, - Program program, - List<T> trips, - Map<String, List<String>> datas) { - - model.cacheEntity(program); - - if (!trips.isEmpty()) { - List<String> tripIds = new ArrayList<String>(); - - if (model.isUseOpenData()) { - - // ajout de toutes les marées ouvertes ou non - for (T trip : trips) { - trip.setProgram(program); - model.cacheEntity(trip); - tripIds.add(trip.getTopiaId()); - } - - } else { - - // ajout de toutes les marées non ouvertes - for (T trip : trips) { - trip.setProgram(program); - if (!trip.isOpen()) { - model.cacheEntity(trip); - tripIds.add(trip.getTopiaId()); - } - } - - } - - if (!tripIds.isEmpty()) { - - datas.put(program.getTopiaId(), tripIds); - if (log.isDebugEnabled()) { - log.debug("Add program " + program.getLabel1() + " with " + tripIds.size() + " trip(s)."); - } - - } - - } - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java deleted file mode 100644 index f50463e..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/ActivityLonglineServiceImpl.java +++ /dev/null @@ -1,167 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.ActivityLonglineDAO; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.services.AbstractObserveService; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/25/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class ActivityLonglineServiceImpl extends AbstractObserveService implements ActivityLonglineService { - - @Override - public List<ActivityLongline> getActivityLonglineStubByTrip(String tripId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - List<ActivityLongline> result = getDao().findAllStubByTripId(tripId, referentielLocale); - return result; - - } - - @Override - public ActivityLongline getActivityLonglineStub(String activityId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - ActivityLongline result = getDao().findStubByTopiaId(activityId, referentielLocale); - return result; - - } - - @Override - public ActivityLongline loadForEdit(String activityLonglineId) { - - ActivityLongline loaded = getDao().newInstance(); - ActivityLongline toLoad = getDao().findByTopiaId(activityLonglineId); - copy(ActivityLongline.class, BinderService.EDIT, toLoad, loaded); - - return loaded; - - } - - - @Override - public ActivityLongline preCreate(String tripLonglineId) { - - TripLongline tripLongline = findByTopiaId(TripLongline.class, tripLonglineId); - - ActivityLongline preCreated = getDao().newInstance(); - - preCreated.setOpen(true); - - ActivityLongline lastActivityLongline = tripLongline.getLastActivity(); - - Date timestamp; - - if (lastActivityLongline == null) { - - // première activité, on utilise la date de début de marée (voir http://forge.codelutin.com/issues/6777) - Calendar calendar = Calendar.getInstance(); - calendar.setTime(tripLongline.getStartDate()); - timestamp = calendar.getTime(); - - } else { - - // passage en coordonnées absolue + quadrant - lastActivityLongline.initCoordinates(); - - // on recupère le quadrant de cette activity - // et on l'affecte à la nouvelle activity - Integer quadrant = lastActivityLongline.getQuadrant(); - - preCreated.setQuadrant(quadrant); - - // on reprend la date et l'heure de la dernière activité - timestamp = lastActivityLongline.getTimeStamp(); - } - - preCreated.setTimeStamp(timestamp); - - - return preCreated; - - } - - @Override - public String save(String tripLonglineId, ActivityLongline toSave) { - - String activityLonglineId = doSave(tripLonglineId, toSave, new SaveAction<TripLongline, ActivityLongline>(TripLongline.class, ActivityLongline.class) { - - @Override - public ActivityLongline onCreate(TripLongline parent, ActivityLongline toCreate) { - - Map<String, Object> properties = obtainProperties(ActivityLongline.class, BinderService.EDIT, toCreate); - ActivityLongline created = getDao().create(properties); - - parent.addActivityLongline(created); - return created; - } - - @Override - public ActivityLongline onUpdate(TripLongline parent, ActivityLongline toUpdate) { - - ActivityLongline updated = super.onUpdate(parent, toUpdate); - - copyExcluding(ActivityLongline.class, BinderService.EDIT, - toUpdate, updated, - ActivityLongline.PROPERTY_ENCOUNTER, - ActivityLongline.PROPERTY_SENSOR_USED); - return updated; - - } - }); - - return activityLonglineId; - - } - - @Override - public void delete(String tripLonglineId, String activityLonglineId) { - doDelete(tripLonglineId, activityLonglineId, new DeleteAction<TripLongline, ActivityLongline>(TripLongline.class, ActivityLongline.class) { - - @Override - public void onDelete(TripLongline parent, ActivityLongline toDelete) { - super.onDelete(parent, toDelete); - parent.removeActivityLongline(toDelete); - } - }); - - } - - protected ActivityLonglineDAO getDao() { - return (ActivityLonglineDAO) getDao(ActivityLongline.class); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/BaitsCompositionServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/BaitsCompositionServiceImpl.java deleted file mode 100644 index b373ea6..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/BaitsCompositionServiceImpl.java +++ /dev/null @@ -1,98 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.BaitsComposition; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created on 4/29/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class BaitsCompositionServiceImpl extends AbstractObserveService implements BaitsCompositionService { - - @Override - public SetLongline loadForEdit(String setLonglineId) { - - SetLongline parentToLoad = findByTopiaId(SetLongline.class, setLonglineId); - - SetLongline parentLoaded = getDao(SetLongline.class).newInstance(); - - copy(SetLongline.class, BinderService.EDIT_BAITS_COMPOSITION, parentToLoad, parentLoaded); - - if (!parentToLoad.isBaitsCompositionEmpty()) { - - TopiaEntityBinder<BaitsComposition> binder = getBinder(BaitsComposition.class, BinderService.EDIT); - - TopiaDAO<BaitsComposition> childDao = getDao(BaitsComposition.class); - - List<BaitsComposition> childs = new ArrayList<BaitsComposition>(); - - for (BaitsComposition sourceChild : parentToLoad.getBaitsComposition()) { - - BaitsComposition targetChild = childDao.newInstance(); - - binder.load(sourceChild, targetChild, true); - - childs.add(targetChild); - - } - - parentLoaded.setBaitsComposition(childs); - - } - - return parentLoaded; - - } - - @Override - public void save(SetLongline setLongline) { - - TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_BAITS_COMPOSITION); - TopiaEntityBinder<BaitsComposition> childBinder = getBinder(BaitsComposition.class, BinderService.EDIT); - - doSaveList(setLongline, new SaveCollectionAction<SetLongline, BaitsComposition>( - SetLongline.class, BaitsComposition.class, getListUpdator(), parentBinder, childBinder)); - - } - - protected EntityListUpdator<SetLongline, BaitsComposition> getListUpdator() { - EntityListUpdator<SetLongline, BaitsComposition> listUpdator = EntityListUpdator.newEntityListUpdator( - SetLongline.class, - BaitsComposition.class, - SetLongline.PROPERTY_BAITS_COMPOSITION); - return listUpdator; - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/BranchlinesCompositionServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/BranchlinesCompositionServiceImpl.java deleted file mode 100644 index dcb4a4b..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/BranchlinesCompositionServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.BranchlinesComposition; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created on 4/29/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class BranchlinesCompositionServiceImpl extends AbstractObserveService implements BranchlinesCompositionService { - - @Override - public SetLongline loadForEdit(String setLonglineId) { - - SetLongline parentToLoad = findByTopiaId(SetLongline.class, setLonglineId); - - SetLongline parentLoaded = getDao(SetLongline.class).newInstance(); - copy(SetLongline.class, BinderService.EDIT_BRANCHLINES_COMPOSITION, parentToLoad, parentLoaded); - - if (!parentToLoad.isBranchlinesCompositionEmpty()) { - - TopiaEntityBinder<BranchlinesComposition> binder = getBinder(BranchlinesComposition.class, BinderService.EDIT); - TopiaDAO<BranchlinesComposition> childDao = getDao(BranchlinesComposition.class); - - List<BranchlinesComposition> childs = new ArrayList<BranchlinesComposition>(); - - for (BranchlinesComposition sourceChild : parentToLoad.getBranchlinesComposition()) { - - BranchlinesComposition targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setBranchlinesComposition(childs); - - } - - return parentLoaded; - - } - - @Override - public void save(SetLongline setLongline) { - - TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_BRANCHLINES_COMPOSITION); - TopiaEntityBinder<BranchlinesComposition> childBinder = getBinder(BranchlinesComposition.class, BinderService.EDIT); - - doSaveList(setLongline, new SaveCollectionAction<SetLongline, BranchlinesComposition>( - SetLongline.class, BranchlinesComposition.class, getListUpdator(), parentBinder, childBinder)); - - } - - protected EntityListUpdator<SetLongline, BranchlinesComposition> getListUpdator() { - EntityListUpdator<SetLongline, BranchlinesComposition> listUpdator = EntityListUpdator.newEntityListUpdator( - SetLongline.class, - BranchlinesComposition.class, - SetLongline.PROPERTY_BRANCHLINES_COMPOSITION); - return listUpdator; - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/CatchLonglineServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/CatchLonglineServiceImpl.java deleted file mode 100644 index 899ed40..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/CatchLonglineServiceImpl.java +++ /dev/null @@ -1,267 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Lists; -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.BranchlineDAO; -import fr.ird.observe.entities.longline.CatchLongline; -import fr.ird.observe.entities.longline.CatchLonglineDAO; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.longline.SizeMeasure; -import fr.ird.observe.entities.longline.WeightMeasure; -import fr.ird.observe.services.AbstractObserveService; -import org.apache.commons.collections4.CollectionUtils; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class CatchLonglineServiceImpl extends AbstractObserveService implements CatchLonglineService { - - @Override - public Branchline loadBranchlineForEdit(String branchelineId) { - - BranchlineDAO dao = (BranchlineDAO) getDao(Branchline.class); - Branchline toLoad = dao.findByTopiaId(branchelineId); - Branchline loaded = dao.newInstance(); - copy(Branchline.class, BinderService.EDIT_CATCH_LONGLINE, toLoad, loaded); - return loaded; - - } - - @Override - public Branchline saveBranchline(Branchline toSave) { - - BranchlineDAO dao = (BranchlineDAO) getDao(Branchline.class); - Branchline saved = dao.findByTopiaId(toSave.getTopiaId()); - copy(Branchline.class, BinderService.EDIT_CATCH_LONGLINE, toSave, saved); - return saved; - - } - - @Override - public SetLongline loadForEdit(String setLonglineId) { - - SetLongline parentToLoad = findByTopiaId(SetLongline.class, setLonglineId); - - SetLongline parentLoaded = getDao(SetLongline.class).newInstance(); - copy(SetLongline.class, BinderService.EDIT_CATCH_LONGLINE, parentToLoad, parentLoaded); - - if (!parentToLoad.isCatchLonglineEmpty()) { - - TopiaEntityBinder<CatchLongline> binder = getBinder(CatchLongline.class, BinderService.EDIT); - TopiaDAO<CatchLongline> childDao = getDao(CatchLongline.class); - - List<CatchLongline> childs = new ArrayList<CatchLongline>(); - - for (CatchLongline sourceChild : parentToLoad.getCatchLongline()) { - - CatchLongline targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setCatchLongline(childs); - - } - - return parentLoaded; - - } - - @Override - public void save(SetLongline setLongline) { - - TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_CATCH_LONGLINE); - TopiaEntityBinder<CatchLongline> childBinder = getBinder(CatchLongline.class, BinderService.EDIT); - - doSaveList(setLongline, - new SaveCollectionAction<SetLongline, CatchLongline>(SetLongline.class, - CatchLongline.class, - getListUpdator(), parentBinder, childBinder) { - - @Override - public CatchLongline onCreateChild(CatchLongline childToCreate) { - - CatchLongline childCreated = super.onCreateChild(childToCreate); - saveSizeMeasures(childCreated, childToCreate.getSizeMeasure()); - saveWeightMeasures(childCreated, childToCreate.getWeightMeasure()); - return childCreated; - - } - - @Override - public CatchLongline onUpdateChild(CatchLongline childToUpdate) { - - CatchLongline childUpdated = super.onUpdateChild(childToUpdate); - saveSizeMeasures(childUpdated, childToUpdate.getSizeMeasure()); - saveWeightMeasures(childUpdated, childToUpdate.getWeightMeasure()); - return childUpdated; - - } - - protected void saveSizeMeasures(CatchLongline childSaved, Collection<SizeMeasure> sizeMeasuresToSave) { - - List<SizeMeasure> sizeMeasuresSaveds = Lists.newArrayList(); - - if (CollectionUtils.isNotEmpty(sizeMeasuresToSave)) { - - TopiaDAO<SizeMeasure> dao = getDao(SizeMeasure.class); - TopiaEntityBinder<SizeMeasure> binder = getBinder(SizeMeasure.class, BinderService.EDIT); - - for (SizeMeasure sizeMeasureToSave : sizeMeasuresToSave) { - - SizeMeasure sizeMeasureSaved; - - if (Entities.isNew(sizeMeasureToSave)) { - - Map<String, Object> properties = binder.obtainProperties(sizeMeasureToSave); - sizeMeasureSaved = dao.create(properties); - - } else { - - sizeMeasureSaved = dao.findByTopiaId(sizeMeasureToSave.getTopiaId()); - binder.load(sizeMeasureToSave, sizeMeasureSaved, true); - - } - - sizeMeasuresSaveds.add(sizeMeasureSaved); - - } - - } - - childSaved.clearSizeMeasure(); - childSaved.addAllSizeMeasure(sizeMeasuresSaveds); - - } - - protected void saveWeightMeasures(CatchLongline childSaved, Collection<WeightMeasure> weightMeasuresToSave) { - - List<WeightMeasure> weightMeasuresSaved = Lists.newArrayList(); - - if (CollectionUtils.isNotEmpty(weightMeasuresToSave)) { - - TopiaDAO<WeightMeasure> dao = getDao(WeightMeasure.class); - TopiaEntityBinder<WeightMeasure> binder = getBinder(WeightMeasure.class, BinderService.EDIT); - - for (WeightMeasure weightMeasureToSave : weightMeasuresToSave) { - - WeightMeasure weightMeasureSaved; - - if (Entities.isNew(weightMeasureToSave)) { - - Map<String, Object> properties = binder.obtainProperties(weightMeasureToSave); - weightMeasureSaved = dao.create(properties); - - } else { - - weightMeasureSaved = dao.findByTopiaId(weightMeasureToSave.getTopiaId()); - binder.load(weightMeasureToSave, weightMeasureSaved, true); - - } - - weightMeasuresSaved.add(weightMeasureSaved); - - } - - } - - childSaved.clearWeightMeasure(); - childSaved.addAllWeightMeasure(weightMeasuresSaved); - - } - } - - ); - - } - - @Override - public List<SizeMeasure> getCatchLonglineSizeMeasures(String catchLonglineId) { - - CatchLongline catchLongline = getDao().findByTopiaId(catchLonglineId); - List<SizeMeasure> result = new ArrayList<SizeMeasure>(); - if (!catchLongline.isSizeMeasureEmpty()) { - - TopiaEntityBinder<SizeMeasure> binder = getBinder(SizeMeasure.class, BinderService.EDIT); - TopiaDAO<SizeMeasure> sizeMeasureDao = getDao(SizeMeasure.class); - - for (SizeMeasure sizeSource : catchLongline.getSizeMeasure()) { - SizeMeasure target = sizeMeasureDao.newInstance(); - binder.load(sizeSource, target, true); - result.add(target); - } - } - return result; - - } - - @Override - public List<WeightMeasure> getCatchLonglineWeightMeasures(String catchLonglineId) { - - CatchLongline catchLongline = getDao().findByTopiaId(catchLonglineId); - List<WeightMeasure> result = new ArrayList<WeightMeasure>(); - if (!catchLongline.isWeightMeasureEmpty()) { - - TopiaEntityBinder<WeightMeasure> binder = getBinder(WeightMeasure.class, BinderService.EDIT); - TopiaDAO<WeightMeasure> weightMeasureDao = getDao(WeightMeasure.class); - - for (WeightMeasure weightSource : catchLongline.getWeightMeasure()) { - WeightMeasure target = weightMeasureDao.newInstance(); - binder.load(weightSource, target, true); - result.add(target); - } - - } - - return result; - - } - - protected CatchLonglineDAO getDao() { - return (CatchLonglineDAO) getDao(CatchLongline.class); - } - - protected EntityListUpdator<SetLongline, CatchLongline> getListUpdator() { - EntityListUpdator<SetLongline, CatchLongline> listUpdator = EntityListUpdator.newEntityListUpdator( - SetLongline.class, - CatchLongline.class, - SetLongline.PROPERTY_CATCH_LONGLINE); - return listUpdator; - } -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/EncounterServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/EncounterServiceImpl.java deleted file mode 100644 index 86632cb..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/EncounterServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.Encounter; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created on 4/29/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class EncounterServiceImpl extends AbstractObserveService implements EncounterService { - - @Override - public ActivityLongline loadForEdit(String activityLonglineId) { - - ActivityLongline parentToLoad = findByTopiaId(ActivityLongline.class, activityLonglineId); - - ActivityLongline parentLoaded = getDao(ActivityLongline.class).newInstance(); - copy(ActivityLongline.class, BinderService.EDIT_ENCOUNTER, parentToLoad, parentLoaded); - - if (!parentToLoad.isEncounterEmpty()) { - - TopiaEntityBinder<Encounter> binder = getBinder(Encounter.class, BinderService.EDIT); - TopiaDAO<Encounter> childDao = getDao(Encounter.class); - - List<Encounter> childs = new ArrayList<Encounter>(); - - for (Encounter sourceChild : parentToLoad.getEncounter()) { - - Encounter targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setEncounter(childs); - - } - - return parentLoaded; - - } - - @Override - public void save(ActivityLongline activityLongline) { - - TopiaEntityBinder<ActivityLongline> parentBinder = getBinder(ActivityLongline.class, BinderService.EDIT_ENCOUNTER); - TopiaEntityBinder<Encounter> childBinder = getBinder(Encounter.class, BinderService.EDIT); - - doSaveList(activityLongline, new SaveCollectionAction<ActivityLongline, Encounter>( - ActivityLongline.class, Encounter.class, getListUpdator(), parentBinder, childBinder)); - - } - - protected EntityListUpdator<ActivityLongline, Encounter> getListUpdator() { - EntityListUpdator<ActivityLongline, Encounter> listUpdator = EntityListUpdator.newEntityListUpdator( - ActivityLongline.class, - Encounter.class, - ActivityLongline.PROPERTY_ENCOUNTER); - return listUpdator; - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/FloatlinesCompositionServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/FloatlinesCompositionServiceImpl.java deleted file mode 100644 index 1825798..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/FloatlinesCompositionServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.FloatlinesComposition; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created on 4/29/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class FloatlinesCompositionServiceImpl extends AbstractObserveService implements FloatlinesCompositionService { - - @Override - public SetLongline loadForEdit(String setLonglineId) { - - SetLongline parentToLoad = findByTopiaId(SetLongline.class, setLonglineId); - - SetLongline parentLoaded = getDao(SetLongline.class).newInstance(); - copy(SetLongline.class, BinderService.EDIT_FLOATLINES_COMPOSITION, parentToLoad, parentLoaded); - - if (!parentToLoad.isFloatlinesCompositionEmpty()) { - - TopiaEntityBinder<FloatlinesComposition> binder = getBinder(FloatlinesComposition.class, BinderService.EDIT); - TopiaDAO<FloatlinesComposition> childDao = getDao(FloatlinesComposition.class); - - List<FloatlinesComposition> childs = new ArrayList<FloatlinesComposition>(); - - for (FloatlinesComposition sourceChild : parentToLoad.getFloatlinesComposition()) { - - FloatlinesComposition targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setFloatlinesComposition(childs); - - } - - return parentLoaded; - - } - - @Override - public void save(SetLongline setLongline) { - - TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_FLOATLINES_COMPOSITION); - TopiaEntityBinder<FloatlinesComposition> childBinder = getBinder(FloatlinesComposition.class, BinderService.EDIT); - - doSaveList(setLongline, new SaveCollectionAction<SetLongline, FloatlinesComposition>( - SetLongline.class, FloatlinesComposition.class, getListUpdator(), parentBinder, childBinder)); - - } - - protected EntityListUpdator<SetLongline, FloatlinesComposition> getListUpdator() { - EntityListUpdator<SetLongline, FloatlinesComposition> listUpdator = EntityListUpdator.newEntityListUpdator( - SetLongline.class, - FloatlinesComposition.class, - SetLongline.PROPERTY_FLOATLINES_COMPOSITION); - return listUpdator; - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java deleted file mode 100644 index 5cee70e..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/GearUseFeaturesLonglineServiceImpl.java +++ /dev/null @@ -1,236 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Lists; -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.longline.GearUseFeaturesLongline; -import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLongline; -import fr.ird.observe.entities.longline.GearUseFeaturesMeasurementLonglineDAO; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.referentiel.GearCaracteristic; -import fr.ird.observe.services.AbstractObserveService; -import org.apache.commons.collections4.CollectionUtils; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class GearUseFeaturesLonglineServiceImpl extends AbstractObserveService implements GearUseFeaturesLonglineService { - - @Override - public List<GearUseFeaturesMeasurementLongline> getDefaultGearUseFeaturesMeasurementLongline(String gearId) { - - Gear gear = findByTopiaId(Gear.class, gearId); - - List<GearUseFeaturesMeasurementLongline> result = new ArrayList<GearUseFeaturesMeasurementLongline>(); - - if (gear.isGearCaracteristicEmpty()) { - - GearUseFeaturesMeasurementLonglineDAO dao = getDao(); - - for (GearCaracteristic caracteristic : gear.getGearCaracteristic()) { - - GearUseFeaturesMeasurementLongline target = dao.newInstance(); - target.setGearCaracteristic(caracteristic); - result.add(target); - - } - - } - - return result; - - } - - @Override - public List<GearUseFeaturesMeasurementLongline> loadGearUseFeaturesMeasurementLonglineForEdit(String gearUseFeaturesLonglineId) { - - GearUseFeaturesLongline gearUseFeaturesLongline = findByTopiaId(GearUseFeaturesLongline.class, gearUseFeaturesLonglineId); - List<GearUseFeaturesMeasurementLongline> result = new ArrayList<GearUseFeaturesMeasurementLongline>(); - - if (!gearUseFeaturesLongline.isGearUseFeaturesMeasurementEmpty()) { - - GearUseFeaturesMeasurementLonglineDAO dao = getDao(); - TopiaEntityBinder<GearUseFeaturesMeasurementLongline> binder = getBinder(GearUseFeaturesMeasurementLongline.class, BinderService.EDIT); - - for (GearUseFeaturesMeasurementLongline measurementSource : gearUseFeaturesLongline.getGearUseFeaturesMeasurement()) { - - GearUseFeaturesMeasurementLongline target = dao.newInstance(); - measurementSource.getGearCaracteristic().getGearCaracteristicType(); - binder.load(measurementSource, target, true); - result.add(target); - - } - - } - - return result; - - } - - @Override - public TripLongline loadForEdit(String tripLonglineId) { - - TripLongline toLoad = findByTopiaId(TripLongline.class, tripLonglineId); - - TripLongline loaded = getDao(TripLongline.class).newInstance(); - copy(TripLongline.class, BinderService.EDIT_GEAR_USE_FEATURES_LONGLINE, toLoad, loaded); - - if (!toLoad.isGearUseFeaturesLonglineEmpty()) { - - TopiaDAO<GearUseFeaturesLongline> childDao = getDao(GearUseFeaturesLongline.class); - TopiaDAO<GearUseFeaturesMeasurementLongline> measurementDao = getDao(GearUseFeaturesMeasurementLongline.class); - TopiaEntityBinder<GearUseFeaturesLongline> childBinder = getBinder(GearUseFeaturesLongline.class, BinderService.EDIT); - TopiaEntityBinder<GearUseFeaturesMeasurementLongline> measurementBinder = getBinder(GearUseFeaturesMeasurementLongline.class, BinderService.EDIT); - - List<GearUseFeaturesLongline> childsLoaded = new ArrayList<GearUseFeaturesLongline>(); - - if (!toLoad.isGearUseFeaturesLonglineEmpty()) { - - for (GearUseFeaturesLongline childToLoad : toLoad.getGearUseFeaturesLongline()) { - - GearUseFeaturesLongline childLoaded = childDao.newInstance(); - childBinder.load(childToLoad, childLoaded, true); - childsLoaded.add(childLoaded); - - if (!childToLoad.isGearUseFeaturesMeasurementEmpty()) { - - List<GearUseFeaturesMeasurementLongline> measurementsLoaded = new ArrayList<GearUseFeaturesMeasurementLongline>(); - - for (GearUseFeaturesMeasurementLongline measurementToLoad : childToLoad.getGearUseFeaturesMeasurement()) { - - GearUseFeaturesMeasurementLongline measurementLoaded = measurementDao.newInstance(); - measurementBinder.load(measurementToLoad, measurementLoaded, true); - measurementsLoaded.add(measurementLoaded); - - } - - childLoaded.setGearUseFeaturesMeasurement(measurementsLoaded); - - } - - } - - } - - loaded.setGearUseFeaturesLongline(childsLoaded); - - } - - return loaded; - - } - - @Override - public void save(TripLongline tripLongline) { - - TopiaEntityBinder<TripLongline> parentBinder = getBinder(TripLongline.class, BinderService.EDIT_GEAR_USE_FEATURES_LONGLINE); - TopiaEntityBinder<GearUseFeaturesLongline> childBinder = getBinder(GearUseFeaturesLongline.class, BinderService.EDIT); - - doSaveList(tripLongline, new SaveCollectionAction<TripLongline, GearUseFeaturesLongline>( - TripLongline.class, GearUseFeaturesLongline.class, getListUpdator(), parentBinder, childBinder) { - - @Override - public GearUseFeaturesLongline onCreateChild(GearUseFeaturesLongline childToCreate) { - - GearUseFeaturesLongline childCreated = super.onCreateChild(childToCreate); - saveMeasurement(childCreated, childToCreate.getGearUseFeaturesMeasurement()); - return childCreated; - - } - - @Override - public GearUseFeaturesLongline onUpdateChild(GearUseFeaturesLongline childToUpdate) { - - GearUseFeaturesLongline childUpdated = super.onUpdateChild(childToUpdate); - saveMeasurement(childUpdated, childToUpdate.getGearUseFeaturesMeasurement()); - return childUpdated; - - } - - protected void saveMeasurement(GearUseFeaturesLongline childSaved, List<GearUseFeaturesMeasurementLongline> measurementsToSave) { - - List<GearUseFeaturesMeasurementLongline> measurementsSaved = Lists.newArrayList(); - - if (CollectionUtils.isNotEmpty(measurementsToSave)) { - - TopiaDAO<GearUseFeaturesMeasurementLongline> dao = getDao(GearUseFeaturesMeasurementLongline.class); - TopiaEntityBinder<GearUseFeaturesMeasurementLongline> binder = getBinder(GearUseFeaturesMeasurementLongline.class, BinderService.EDIT); - - for (GearUseFeaturesMeasurementLongline measurementToSave : measurementsToSave) { - - GearUseFeaturesMeasurementLongline measurementSaved; - - if (Entities.isNew(measurementToSave)) { - - Map<String, Object> properties = binder.obtainProperties(measurementToSave); - measurementSaved = dao.create(properties); - - } else { - - measurementSaved = dao.findByTopiaId(measurementToSave.getTopiaId()); - binder.load(measurementToSave, measurementSaved, true); - - } - - measurementsSaved.add(measurementSaved); - - } - - } - - childSaved.clearGearUseFeaturesMeasurement(); - childSaved.addAllGearUseFeaturesMeasurement(measurementsSaved); - - } - - - }); - - } - - protected GearUseFeaturesMeasurementLonglineDAO getDao() { - return (GearUseFeaturesMeasurementLonglineDAO) getDao(GearUseFeaturesMeasurementLongline.class); - } - - protected EntityListUpdator<TripLongline, GearUseFeaturesLongline> getListUpdator() { - EntityListUpdator<TripLongline, GearUseFeaturesLongline> listUpdator = EntityListUpdator.newEntityListUpdator( - TripLongline.class, - GearUseFeaturesLongline.class, - TripLongline.PROPERTY_GEAR_USE_FEATURES_LONGLINE); - return listUpdator; - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/HooksCompositionServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/HooksCompositionServiceImpl.java deleted file mode 100644 index 19990f8..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/HooksCompositionServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.HooksComposition; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created on 4/29/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class HooksCompositionServiceImpl extends AbstractObserveService implements HooksCompositionService { - - @Override - public SetLongline loadForEdit(String setLonglineId) { - - SetLongline parentToLoad = findByTopiaId(SetLongline.class, setLonglineId); - - SetLongline parentLoaded = getDao(SetLongline.class).newInstance(); - copy(SetLongline.class, BinderService.EDIT_HOOKS_COMPOSITION, parentToLoad, parentLoaded); - - if (!parentToLoad.isHooksCompositionEmpty()) { - - TopiaEntityBinder<HooksComposition> binder = getBinder(HooksComposition.class, BinderService.EDIT); - TopiaDAO<HooksComposition> childDao = getDao(HooksComposition.class); - - List<HooksComposition> childs = new ArrayList<HooksComposition>(); - - for (HooksComposition sourceChild : parentToLoad.getHooksComposition()) { - - HooksComposition targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setHooksComposition(childs); - - } - - return parentLoaded; - - } - - @Override - public void save(SetLongline setLongline) { - - TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_HOOKS_COMPOSITION); - TopiaEntityBinder<HooksComposition> childBinder = getBinder(HooksComposition.class, BinderService.EDIT); - - doSaveList(setLongline, new SaveCollectionAction<SetLongline, HooksComposition>( - SetLongline.class, HooksComposition.class, getListUpdator(), parentBinder, childBinder)); - - } - - protected EntityListUpdator<SetLongline, HooksComposition> getListUpdator() { - EntityListUpdator<SetLongline, HooksComposition> listUpdator = EntityListUpdator.newEntityListUpdator( - SetLongline.class, - HooksComposition.class, - SetLongline.PROPERTY_HOOKS_COMPOSITION); - return listUpdator; - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java deleted file mode 100644 index 9cc0c81..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineDetailCompositionServiceImpl.java +++ /dev/null @@ -1,213 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SectionWithTemplate; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.services.AbstractObserveService; - -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class LonglineDetailCompositionServiceImpl extends AbstractObserveService implements LonglineDetailCompositionService { - - @Override - public SetLongline loadForEdit(String setLonglineId) { - - TopiaDAO<SetLongline> dao = getDao(SetLongline.class); - SetLongline toLoad = dao.findByTopiaId(setLonglineId); - SetLongline loaded = dao.newInstance(); - copy(SetLongline.class, BinderService.EDIT_DETAIL_COMPOSITION, toLoad, loaded); - - return loaded; - - } - - @Override - public void save(SetLongline toSave, List<SectionWithTemplate> sections) { - - SetLongline saved = findByTopiaId(SetLongline.class, toSave.getTopiaId()); - - copyExcluding(SetLongline.class, BinderService.EDIT_DETAIL_COMPOSITION, toSave, saved, SetLongline.PROPERTY_SECTION); - - TopiaDAO<Section> sectionsDao = getDao(Section.class); - TopiaDAO<Basket> basketDao = getDao(Basket.class); - TopiaDAO<Branchline> branchlineDao = getDao(Branchline.class); - - TopiaEntityBinder<Section> sectionBinder = getBinder(Section.class, BinderService.EDIT_DETAIL_COMPOSITION); - TopiaEntityBinder<Basket> basketBinder = getBinder(Basket.class, BinderService.EDIT_DETAIL_COMPOSITION); - TopiaEntityBinder<Branchline> branchlineBinder = getBinder(Branchline.class, BinderService.EDIT_DETAIL_COMPOSITION); - - List<Section> sectionsToSave = new ArrayList<Section>(); - - for (SectionWithTemplate section : sections) { - - Section sectionToSave = persistSection(sectionBinder, - basketBinder, - branchlineBinder, - sectionsDao, - basketDao, - branchlineDao, - section); - sectionsToSave.add(sectionToSave); - sectionToSave.setSetLongline(saved); - - } - - saved.clearSection(); - saved.addAllSection(sectionsToSave); - - } - - protected Section persistSection(TopiaEntityBinder<Section> sectionBinder, - TopiaEntityBinder<Basket> basketBinder, - TopiaEntityBinder<Branchline> branchlineBinder, - TopiaDAO<Section> sectionsDao, - TopiaDAO<Basket> basketDao, - TopiaDAO<Branchline> branchlineDao, - Section section) { - - Section sectionToSave; - - if (Entities.isNew(section)) { - - // create - sectionToSave = sectionsDao.create( - Section.PROPERTY_SETTING_IDENTIFIER, section.getSettingIdentifier(), - Section.PROPERTY_HAULING_IDENTIFIER, section.getHaulingIdentifier()); - - } else { - - sectionToSave = sectionsDao.findByTopiaId(section.getTopiaId()); - - } - - sectionBinder.copyExcluding(section, sectionToSave, Section.PROPERTY_BASKET); - - Map<String, Basket> existingBasketsByTopiaId = Entities.toIdMap(sectionToSave.getBasket()); - - List<Basket> baskets = section.getBasket(); - sectionToSave.clearBasket(); - - for (Basket basket : baskets) { - - Basket basketToSave = persistBasket(basketBinder, - branchlineBinder, - basketDao, - branchlineDao, - existingBasketsByTopiaId, - basket); - sectionToSave.addBasket(basketToSave); - - } - - return sectionToSave; - - } - - protected Basket persistBasket(TopiaEntityBinder<Basket> basketBinder, - TopiaEntityBinder<Branchline> branchlineBinder, - TopiaDAO<Basket> basketDao, - TopiaDAO<Branchline> branchlineDao, - Map<String, Basket> existingBasketsByTopiaId, - Basket basket) { - - Basket basketToSave; - - if (Entities.isNew(basket)) { - - // create - basketToSave = basketDao.create( - Basket.PROPERTY_SETTING_IDENTIFIER, basket.getSettingIdentifier(), - Basket.PROPERTY_HAULING_IDENTIFIER, basket.getHaulingIdentifier()); - - } else { - - basketToSave = existingBasketsByTopiaId.get(basket.getTopiaId()); - - } - - basketBinder.copyExcluding(basket, basketToSave, Basket.PROPERTY_BRANCHLINE); - - Map<String, Branchline> existingBranchlinesByTopiaId = Entities.toIdMap(basketToSave.getBranchline()); - - basketToSave.clearBranchline(); - - List<Branchline> branchlines = basket.getBranchline(); - - for (Branchline branchline : branchlines) { - - Branchline branchlineToSave = persistBranchline(branchlineBinder, - branchlineDao, - existingBranchlinesByTopiaId, - branchline); - basketToSave.addBranchline(branchlineToSave); - - } - - return basketToSave; - - } - - protected Branchline persistBranchline(TopiaEntityBinder<Branchline> branchlineBinder, - TopiaDAO<Branchline> branchlineDao, - Map<String, Branchline> existingBranchlinesByTopiaId, - Branchline branchline) { - - Branchline branchlineToSave; - - if (Entities.isNew(branchline)) { - - // create - branchlineToSave = branchlineDao.create( - Branchline.PROPERTY_SETTING_IDENTIFIER, branchline.getSettingIdentifier(), - Branchline.PROPERTY_HAULING_IDENTIFIER, branchline.getHaulingIdentifier()); - - } else { - - branchlineToSave = existingBranchlinesByTopiaId.get(branchline.getTopiaId()); - - } - - branchlineBinder.copy(branchline, branchlineToSave); - - return branchlineToSave; - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineGlobalCompositionServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineGlobalCompositionServiceImpl.java deleted file mode 100644 index 2b50ee9..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/LonglineGlobalCompositionServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.referentiel.longline.MitigationType; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; - -import java.util.ArrayList; -import java.util.Collection; - -/** - * @author Sylvain Bavencoff - bavencoff(a)codelutin.com - * @since 4.0 - */ -public class LonglineGlobalCompositionServiceImpl extends AbstractObserveService implements LonglineGlobalCompositionService { - - @Override - public SetLongline loadForEdit(String setLonglineId) { - - TopiaDAO<SetLongline> dao = getDao(SetLongline.class); - SetLongline toLoad = dao.findByTopiaId(setLonglineId); - SetLongline loaded = dao.newInstance(); - copy(SetLongline.class, BinderService.EDIT_GLOBAL_COMPOSITION, toLoad, loaded); - - return loaded; - - } - - @Override - public String save(SetLongline toSave) { - - SetLongline saved = findByTopiaId(SetLongline.class, toSave.getTopiaId()); - - copyExcluding(SetLongline.class, BinderService.EDIT_GLOBAL_COMPOSITION, toSave, saved, SetLongline.PROPERTY_MITIGATION_TYPE); - - Collection<MitigationType> mitigationTypesSaved = new ArrayList<MitigationType>(); - - if (!toSave.isMitigationTypeEmpty()) { - - TopiaDAO<MitigationType> dao = getDao(MitigationType.class); - - for (MitigationType mitigationTypeToSave : toSave.getMitigationType()) { - - MitigationType mitigationTypeSaved = dao.findByTopiaId(mitigationTypeToSave.getTopiaId()); - mitigationTypesSaved.add(mitigationTypeSaved); - - } - } - - saved.clearMitigationType(); - saved.addAllMitigationType(mitigationTypesSaved); - - getDao(SetLongline.class).update(saved); - - newService(FloatlinesCompositionService.class).save(toSave); - newService(BranchlinesCompositionService.class).save(toSave); - newService(HooksCompositionService.class).save(toSave); - newService(BaitsCompositionService.class).save(toSave); - - return saved.getTopiaId(); - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/SensorUsedServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/SensorUsedServiceImpl.java deleted file mode 100644 index 1532b8d..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/SensorUsedServiceImpl.java +++ /dev/null @@ -1,129 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.SensorUsed; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.longline.TripLonglineDAO; -import fr.ird.observe.entities.referentiel.longline.SensorType; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class SensorUsedServiceImpl extends AbstractObserveService implements SensorUsedService { - - @Override - public String getSensorUsedDataFilename(SensorUsed sensorUsed) { - - TripLonglineDAO tripDao = (TripLonglineDAO) getDao(TripLongline.class); - TripLongline tripLongline = tripDao.findByOpen(true); - - StringBuilder filenameBuilder = new StringBuilder("sensorData"); - String code = tripLongline.getVessel().getCode(); - filenameBuilder.append("-").append(code); - - Date startDate = tripLongline.getStartDate(); - filenameBuilder.append("-").append(new SimpleDateFormat("yyyy.MM.dd").format(startDate)); - - SensorType sensorType = sensorUsed.getSensorType(); - if (sensorType != null && sensorType.getCode() != null) { - filenameBuilder.append("-").append(sensorType.getCode()); - } - - String sensorSerialNo = sensorUsed.getSensorSerialNo(); - if (sensorSerialNo != null) { - filenameBuilder.append("-").append(sensorSerialNo); - } - filenameBuilder.append("-").append(sensorUsed.getDataFilename()); - - String filename = filenameBuilder.toString(); - return filename; - - } - - - @Override - public ActivityLongline loadForEdit(String activityLonglineId) { - - ActivityLongline parentToLoad = findByTopiaId(ActivityLongline.class, activityLonglineId); - - ActivityLongline parentLoaded = getDao(ActivityLongline.class).newInstance(); - copy(ActivityLongline.class, BinderService.EDIT_SENSOR_USED, parentToLoad, parentLoaded); - - if (!parentToLoad.isSensorUsedEmpty()) { - - TopiaEntityBinder<SensorUsed> binder = getBinder(SensorUsed.class, BinderService.EDIT); - TopiaDAO<SensorUsed> childDao = getDao(SensorUsed.class); - - List<SensorUsed> childs = new ArrayList<SensorUsed>(); - - for (SensorUsed sourceChild : parentToLoad.getSensorUsed()) { - - SensorUsed targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setSensorUsed(childs); - - } - - return parentLoaded; - - } - - @Override - public void save(ActivityLongline activityLongline) { - - TopiaEntityBinder<ActivityLongline> parentBinder = getBinder(ActivityLongline.class, BinderService.EDIT_SENSOR_USED); - TopiaEntityBinder<SensorUsed> childBinder = getBinder(SensorUsed.class, BinderService.EDIT); - - doSaveList(activityLongline, new SaveCollectionAction<ActivityLongline, SensorUsed>( - ActivityLongline.class, SensorUsed.class, getListUpdator(), parentBinder, childBinder)); - - } - - protected EntityListUpdator<ActivityLongline, SensorUsed> getListUpdator() { - EntityListUpdator<ActivityLongline, SensorUsed> listUpdator = EntityListUpdator.newEntityListUpdator( - ActivityLongline.class, - SensorUsed.class, - ActivityLongline.PROPERTY_SENSOR_USED); - return listUpdator; - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/SetLonglineServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/SetLonglineServiceImpl.java deleted file mode 100644 index 6c0a39f..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/SetLonglineServiceImpl.java +++ /dev/null @@ -1,201 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Lists; -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.ActivityLongline; -import fr.ird.observe.entities.longline.Basket; -import fr.ird.observe.entities.longline.Branchline; -import fr.ird.observe.entities.longline.Section; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.longline.SetLonglineDAO; -import fr.ird.observe.services.AbstractObserveService; -import org.apache.commons.lang3.time.DateUtils; -import org.nuiton.topia.persistence.TopiaDAO; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class SetLonglineServiceImpl extends AbstractObserveService implements SetLonglineService { - - public List<Section> getSections(String setLonglineId) { - - TopiaDAO<Section> dao = getDao(Section.class); - - List<Section> sectionsSaved = dao.findAllByProperties(Section.PROPERTY_SET_LONGLINE + "." + Section.TOPIA_ID, setLonglineId); - - List<Section> sections = Lists.newLinkedList(); - - for (Section sectionSaved : sectionsSaved) { - - Section section = dao.newInstance(); - - copyExcluding(Section.class, BinderService.EDIT_DETAIL_COMPOSITION, sectionSaved, section, Section.PROPERTY_BASKET); - - for (Basket basketSaved : sectionSaved.getBasket()) { - - Basket basket = getDao(Basket.class).newInstance(); - - copyExcluding(Basket.class, BinderService.EDIT_DETAIL_COMPOSITION, basketSaved, basket, Basket.PROPERTY_BRANCHLINE); - - for (Branchline branchlineSaved : basketSaved.getBranchline()) { - - Branchline branchline = getDao(Branchline.class).newInstance(); - - copy(Branchline.class, BinderService.EDIT_DETAIL_COMPOSITION, branchlineSaved, branchline); - - basket.addBranchline(branchline); - - } - - section.addBasket(basket); - - } - - sections.add(section); - } - - return sections; - - } - - @Override - public SetLongline loadForDisplay(String setLonglineId) { - - SetLonglineDAO dao = getDao(); - - SetLongline loaded = dao.newInstance(); - SetLongline toLoad = dao.findByTopiaId(setLonglineId); - copy(SetLongline.class, BinderService.EDIT, toLoad, loaded); - return loaded; - - } - - @Override - public SetLongline loadForEdit(String setLonglineId) { - - SetLonglineDAO dao = getDao(); - - SetLongline loaded = dao.newInstance(); - SetLongline toLoad = dao.findByTopiaId(setLonglineId); - copy(SetLongline.class, BinderService.EDIT, toLoad, loaded); - return loaded; - - } - - @Override - public SetLongline preCreate(String activityLonglineId) { - - ActivityLongline activityLongline = findByTopiaId(ActivityLongline.class, activityLonglineId); - - SetLongline preCreated = getDao().newInstance(); - - // on utilise la date - heure de l'activité pour initialiser les horodatages - // de l'opération de peche - Date timeStamp = activityLongline.getTimeStamp(); - preCreated.setSettingStartTimeStamp(timeStamp); - preCreated.setSettingEndTimeStamp(DateUtils.addHours(timeStamp, 1)); - preCreated.setHaulingStartTimeStamp(DateUtils.addHours(timeStamp, 2)); - preCreated.setHaulingEndTimeStamp(DateUtils.addHours(timeStamp, 3)); - - // on reporte la position de l'activité pour la position de début de filage - Float latitude = activityLongline.getLatitude(); - Float longitude = activityLongline.getLongitude(); - - // On enregistre deux fois les coordonnées car la première fois on perd le signe à cause de l'éditeur - preCreated.setSettingStartLatitude(latitude); - preCreated.setSettingStartLongitude(longitude); - preCreated.setSettingStartLatitude(latitude); - preCreated.setSettingStartLongitude(longitude); - - return preCreated; - - } - - @Override - public String save(String activityLonglineId, SetLongline setLongline) { - - String setLonglineId = doSave(activityLonglineId, setLongline, new SaveAction<ActivityLongline, SetLongline>(ActivityLongline.class, SetLongline.class) { - - @Override - public SetLongline onCreate(ActivityLongline parent, SetLongline toCreate) { - - Map<String, Object> properties = obtainProperties(SetLongline.class, BinderService.EDIT, toCreate); - SetLongline created = getDao().create(properties); - parent.setSetLongline(created); - - return created; - } - - @Override - public SetLongline onUpdate(ActivityLongline parent, SetLongline toUpdate) { - - SetLongline updated = super.onUpdate(parent, toUpdate); - - copyExcluding(SetLongline.class, BinderService.EDIT, - toUpdate, updated, - SetLongline.PROPERTY_BAITS_COMPOSITION, - SetLongline.PROPERTY_FLOATLINES_COMPOSITION, - SetLongline.PROPERTY_HOOKS_COMPOSITION, - SetLongline.PROPERTY_BRANCHLINES_COMPOSITION, - SetLongline.PROPERTY_SECTION, - SetLongline.PROPERTY_CATCH_LONGLINE, - SetLongline.PROPERTY_MITIGATION_TYPE, - SetLongline.PROPERTY_TDR); - return updated; - - } - }); - - return setLonglineId; - - } - - @Override - public void delete(String activityLonglineId, String setLonglineId) { - - // on doit supprimer physiquement la set - // car il n'y a pas de delete-orphan sur une telle relation - SetLonglineDAO dao = getDao(); - SetLongline setsetLongline = dao.findByTopiaId(setLonglineId); - dao.delete(setsetLongline); - - // supprime la reference sur l'activite - ActivityLongline activitySeine = findByTopiaId(ActivityLongline.class, activityLonglineId); - activitySeine.setSetLongline(null); - - } - - protected SetLonglineDAO getDao() { - return (SetLonglineDAO) getDao(SetLongline.class); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/TdrServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/TdrServiceImpl.java deleted file mode 100644 index 20bc2a5..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/TdrServiceImpl.java +++ /dev/null @@ -1,127 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.longline.SetLongline; -import fr.ird.observe.entities.longline.Tdr; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.longline.TripLonglineDAO; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class TdrServiceImpl extends AbstractObserveService implements TdrService { - - public String getTdrDataFilename(Tdr tdr) { - - TripLonglineDAO tripDao = (TripLonglineDAO) getDao(TripLongline.class); - TripLongline tripLongline = tripDao.findByOpen(true); - - StringBuilder filenameBuilder = new StringBuilder("tdr"); - String code = tripLongline.getVessel().getCode(); - filenameBuilder.append("-").append(code); - - Date startDate = tripLongline.getStartDate(); - filenameBuilder.append("-").append(new SimpleDateFormat("yyyy.MM.dd").format(startDate)); - - String homeId = tdr.getHomeId(); - if (homeId != null) { - filenameBuilder.append("-").append(homeId); - } - - String serialNo = tdr.getSerialNo(); - if (serialNo != null) { - filenameBuilder.append("-").append(serialNo); - } - filenameBuilder.append("-").append(tdr.getDataFilename()); - - String filename = filenameBuilder.toString(); - return filename; - - - } - - @Override - public SetLongline loadForEdit(String setLonglineId) { - - SetLongline parentToLoad = findByTopiaId(SetLongline.class, setLonglineId); - - SetLongline parentLoaded = getDao(SetLongline.class).newInstance(); - copy(SetLongline.class, BinderService.EDIT_TDR, parentToLoad, parentLoaded); - - if (!parentToLoad.isTdrEmpty()) { - - TopiaEntityBinder<Tdr> binder = getBinder(Tdr.class, BinderService.EDIT); - TopiaDAO<Tdr> childDao = getDao(Tdr.class); - - List<Tdr> childs = new ArrayList<Tdr>(); - - for (Tdr sourceChild : parentToLoad.getTdr()) { - - Tdr targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setTdr(childs); - - } - - return parentLoaded; - - } - - @Override - public void save(SetLongline setLongline) { - - TopiaEntityBinder<SetLongline> parentBinder = getBinder(SetLongline.class, BinderService.EDIT_TDR); - TopiaEntityBinder<Tdr> childBinder = getBinder(Tdr.class, BinderService.EDIT); - - doSaveList(setLongline, new SaveCollectionAction<SetLongline, Tdr>( - SetLongline.class, Tdr.class, getListUpdator(), parentBinder, childBinder)); - - } - - protected EntityListUpdator<SetLongline, Tdr> getListUpdator() { - EntityListUpdator<SetLongline, Tdr> listUpdator = EntityListUpdator.newEntityListUpdator( - SetLongline.class, - Tdr.class, - SetLongline.PROPERTY_TDR); - return listUpdator; - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java deleted file mode 100644 index b7f8898..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/longline/TripLonglineServiceImpl.java +++ /dev/null @@ -1,158 +0,0 @@ -package fr.ird.observe.services.data.longline; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.longline.ActivityLonglines; -import fr.ird.observe.entities.longline.TripLongline; -import fr.ird.observe.entities.longline.TripLonglineDAO; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.util.DateUtil; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * @author Sylvain Bavencoff - bavencoff(a)codelutin.com - */ -public class TripLonglineServiceImpl extends AbstractObserveService implements TripLonglineService { - - @Override - public List<TripLongline> getTripLonglineStubByProgram(String programId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - List<TripLongline> result = getDao().findAllStubByProgramId(programId, referentielLocale); - return result; - - } - - @Override - public TripLongline getTripLonglineStub(String tripId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - TripLongline result = getDao().findStubByTopiaId(tripId, referentielLocale); - return result; - - } - - @Override - public TripLongline loadForDisplay(String tripLonglineId) { - - TripLongline loaded = getDao().newInstance(); - TripLongline toLoad = getDao().findByTopiaId(tripLonglineId); - copy(TripLongline.class, BinderService.EDIT, toLoad, loaded); - - if (!loaded.isActivityLonglineEmpty()) { - - // on force le trie des routes - ActivityLonglines.sort(loaded.getActivityLongline()); - - } - - return loaded; - - } - - @Override - public TripLongline loadForEdit(String tripLonglineId) { - - TripLongline loaded = loadForDisplay(tripLonglineId); - - if (loaded.getEndDate() == null) { - Date date = DateUtil.getEndOfDay(now()); - loaded.setEndDate(date); - } - - return loaded; - - } - - @Override - public TripLongline preCreate(String programId) { - - Program program = findByTopiaId(Program.class, programId); - - TripLongline preCreated = getDao().newInstance(); - - Date date = DateUtil.getDay(now()); - preCreated.setStartDate(date); - preCreated.setEndDate(date); - preCreated.setProgram(program); - - return preCreated; - - } - - @Override - public String save(TripLongline toSave) { - - String tripLonglineId = doSave(null, toSave, new SaveAction<Program, TripLongline>(Program.class, TripLongline.class) { - - @Override - public void beforeSave(String parentId, TripLongline toSave) { - - super.beforeSave(parentId, toSave); - Date startDate = DateUtil.getDay(toSave.getStartDate()); - toSave.setStartDate(startDate); - - // mise a jour de la date de fin - toSave.updateDateFin(); - - } - - @Override - public TripLongline onCreate(Program parent, TripLongline toCreate) { - - Map<String, Object> properties = obtainProperties(TripLongline.class, BinderService.EDIT, toCreate); - TripLongline created = getDao().create(properties); - return created; - - } - - @Override - public TripLongline onUpdate(Program parent, TripLongline toUpdate) { - - TripLongline updated = super.onUpdate(parent, toUpdate); - copyExcluding(TripLongline.class, BinderService.EDIT, toUpdate, updated, TripLongline.PROPERTY_ACTIVITY_LONGLINE); - return updated; - - } - }); - - return tripLonglineId; - - } - - @Override - public void delete(String tripLonglineId) { - doDelete(null, tripLonglineId, new DeleteAction<Program, TripLongline>(Program.class, TripLongline.class)); - } - - protected TripLonglineDAO getDao() { - return (TripLonglineDAO) getDao(TripLongline.class); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java deleted file mode 100644 index 76d8373..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ActivitySeineServiceImpl.java +++ /dev/null @@ -1,224 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.constants.seine.SchoolType; -import fr.ird.observe.entities.referentiel.FpaZone; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.ActivitySeineDAO; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.util.DateUtil; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/24/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class ActivitySeineServiceImpl extends AbstractObserveService implements ActivitySeineService { - - @Override - public List<ActivitySeine> getActivitySeineStubByRoute(String routeId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - List<ActivitySeine> result = getDao().findAllStubByRouteId(routeId, referentielLocale); - return result; - - } - - @Override - public ActivitySeine getActivitySeineStub(String activityId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - ActivitySeine result = getDao().findStubByTopiaId(activityId, referentielLocale); - return result; - - } - - @Override - public ActivitySeine loadForEdit(String activitySeineId) { - - ActivitySeine loaded = getDao().newInstance(); - ActivitySeine toLoad = getDao().findByTopiaId(activitySeineId); - copy(ActivitySeine.class, BinderService.EDIT, toLoad, loaded); - return loaded; - - } - - @Override - public ActivitySeine loadForEditObservedSystem(String activitySeineId) { - - ActivitySeine toLoad = getDao().findByTopiaId(activitySeineId); - ActivitySeine loaded = getDao().newInstance(); - copy(ActivitySeine.class, BinderService.EDIT_OBSERVED_SYSTEM, toLoad, loaded); - return loaded; - - } - - @Override - public ActivitySeine preCreate(String routeId) { - - Route tripLongline = findByTopiaId(Route.class, routeId); - - ActivitySeine preCreated = getDao().newInstance(); - - preCreated.setOpen(true); - - ActivitySeine lastActivitySeine = tripLongline.getLastActivity(); - - Date time; - - FpaZone currentFpaZone = null; - - if (lastActivitySeine == null) { - - // première activité, on utilise l'heure courante - time = serviceContext.now(); - - } else { - - // passage en coordonnées absolue + quadrant - lastActivitySeine.initCoordinates(); - - // on recupère le quadrant de cette activity - // et on l'affecte à la nouvelle activity - Integer quadrant = lastActivitySeine.getQuadrant(); - if (quadrant != null) { - - preCreated.setQuadrant(quadrant); - - } - - // on reprend l'heure de la dernière activité - time = lastActivitySeine.getTime(); - - // utilisation des zones fpa de la dernière activité - currentFpaZone = lastActivitySeine.getNextFpaZone(); - if (currentFpaZone == null) { - currentFpaZone = lastActivitySeine.getCurrentFpaZone(); - } - - } - - preCreated.setTime(DateUtil.getTime(time, false, false)); - preCreated.setCurrentFpaZone(currentFpaZone); - - return preCreated; - - } - - @Override - public ActivitySeine updateObservedSystem(ActivitySeine toUpdate) { - - ActivitySeineDAO dao = getDao(); - - boolean needUpdateSet = false; - SchoolType newTypeBanc = toUpdate.getSchoolType(); - SetSeine set = toUpdate.getSetSeine(); - if (set != null) { - - // on regarde si le type de banc de la calée a changé - SchoolType oldTypeBanc = set.getSchoolType(); - needUpdateSet = oldTypeBanc == null || newTypeBanc != oldTypeBanc; - - } - - ActivitySeine updated = dao.findByTopiaId(toUpdate.getTopiaId()); - - copy(ActivitySeine.class, BinderService.EDIT_OBSERVED_SYSTEM, toUpdate, updated); - - if (needUpdateSet) { - - // mise à jour de la propriété schoolType dans la set - updated.getSetSeine().setSchoolType(newTypeBanc); - - } - - return updated; - - } - - - @Override - public String save(String routeId, ActivitySeine toSave) { - - String activitySeineId = doSave(routeId, toSave, new SaveAction<Route, ActivitySeine>(Route.class, ActivitySeine.class) { - - @Override - public ActivitySeine onCreate(Route parent, ActivitySeine toCreate) { - - Map<String, Object> properties = obtainProperties(ActivitySeine.class, BinderService.EDIT, toCreate); - ActivitySeine created = getDao().create(properties); - - parent.addActivitySeine(created); - return created; - - } - - @Override - public ActivitySeine onUpdate(Route parent, ActivitySeine toUpdate) { - - ActivitySeine updated = super.onUpdate(parent, toUpdate); - - Date d = DateUtil.getDateAndTime(parent.getDate(), toUpdate.getTime(), false, false); - - toUpdate.setTime(d); - - copyExcluding(ActivitySeine.class, BinderService.EDIT, toUpdate, updated, true, - ActivitySeine.PROPERTY_OBSERVED_SYSTEM, ActivitySeine.PROPERTY_FLOATING_OBJECT); - return updated; - - } - }); - - return activitySeineId; - - } - - @Override - public void delete(String routeId, String activitySeineId) { - doDelete(routeId, activitySeineId, new DeleteAction<Route, ActivitySeine>(Route.class, ActivitySeine.class) { - - @Override - public void onDelete(Route parent, ActivitySeine toDelete) { - super.onDelete(parent, toDelete); - parent.removeActivitySeine(toDelete); - - } - }); - - } - - protected ActivitySeineDAO getDao() { - return (ActivitySeineDAO) getDao(ActivitySeine.class); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java deleted file mode 100644 index ed3b78f..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/FloatingObjectServiceImpl.java +++ /dev/null @@ -1,216 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.referentiel.Country; -import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyOperation; -import fr.ird.observe.entities.referentiel.seine.TransmittingBuoyType; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.FloatingObjectDAO; -import fr.ird.observe.entities.seine.TransmittingBuoy; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.decorator.Decorator; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/24/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class FloatingObjectServiceImpl extends AbstractObserveService implements FloatingObjectService { - - @Override - public List<FloatingObject> getFloatinObjectStubByActivitySeine(String activitySeineId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - List<FloatingObject> result = getDao().findAllStubByActivityId(activitySeineId, referentielLocale); - return result; - - } - - @Override - public FloatingObject getFloatinObjectStub(String floatingObjectId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - FloatingObject result = getDao().findStubByTopiaId(floatingObjectId, referentielLocale); - return result; - - } - - @Override - public FloatingObject loadForEdit(String floatingObjectId) { - - FloatingObjectDAO dao = getDao(); - - FloatingObject loaded = dao.newInstance(); - FloatingObject toLoad = dao.findByTopiaId(floatingObjectId); - copy(FloatingObject.class, BinderService.EDIT, toLoad, loaded, true); - - return loaded; - - } - - @Override - public FloatingObject loadForTransmittingBuoyOperation(String floatingObjectId) { - - FloatingObjectDAO dao = getDao(); - - FloatingObject loaded = dao.newInstance(); - FloatingObject toLoad = dao.findByTopiaId(floatingObjectId); - - copy(FloatingObject.class, BinderService.EDIT_OBJECT_OPERATION_TRANSMITTING_BUOY, toLoad, loaded); - - if (!toLoad.isTransmittingBuoyEmpty()) { - - Decorator<Country> countryDecorator = getDecoratorByType(Country.class, null); - Decorator<TransmittingBuoyOperation> transmittingBuoyOperationDecorator = getDecoratorByType(TransmittingBuoyOperation.class, null); - Decorator<TransmittingBuoyType> transmittingBuoyTypeDecorator = getDecoratorByType(TransmittingBuoyType.class, null); - - TopiaEntityBinder<TransmittingBuoy> binder = getBinder(TransmittingBuoy.class, BinderService.EDIT); - TopiaDAO<TransmittingBuoy> transmittingBuoyDao = getDao(TransmittingBuoy.class); - List<TransmittingBuoy> transmittingBuoys = new ArrayList<TransmittingBuoy>(); - for (TransmittingBuoy transmittingBuoyToLoad : toLoad.getTransmittingBuoy()) { - - transmittingBuoyOperationDecorator.toString(transmittingBuoyToLoad.getTransmittingBuoyOperation()); - transmittingBuoyTypeDecorator.toString(transmittingBuoyToLoad.getTransmittingBuoyType()); - countryDecorator.toString(transmittingBuoyToLoad.getCountry()); - - TransmittingBuoy transmittingBuoyLoaded = transmittingBuoyDao.newInstance(); - binder.load(transmittingBuoyToLoad, transmittingBuoyLoaded, true); - transmittingBuoys.add(transmittingBuoyLoaded); - - } - - loaded.setTransmittingBuoy(transmittingBuoys); - - } - return loaded; - - } - - @Override - public FloatingObject preCreate(String activitySeineId) { - - FloatingObject preCreated = getDao().newInstance(); - return preCreated; - - } - - @Override - public String save(String activitySeineId, FloatingObject toSave) { - - String floatingObjectId = doSave(activitySeineId, toSave, new SaveAction<ActivitySeine, FloatingObject>(ActivitySeine.class, FloatingObject.class) { - - @Override - public FloatingObject onCreate(ActivitySeine parent, FloatingObject toCreate) { - - Map<String, Object> properties = obtainProperties(FloatingObject.class, BinderService.EDIT, toCreate); - FloatingObject created = getDao().create(properties); - parent.addFloatingObject(created); - return created; - - } - - @Override - public FloatingObject onUpdate(ActivitySeine parent, FloatingObject toUpdate) { - - FloatingObject updated = super.onUpdate(parent, toUpdate); - copy(FloatingObject.class, BinderService.EDIT, toUpdate, updated, true); - return updated; - - } - }); - - return floatingObjectId; - - } - - @Override - public void saveForTransmittingBuoyOperation(FloatingObject toSave) { - - FloatingObject saved = getDao().findByTopiaId(toSave.getTopiaId()); - saved.setComment(toSave.getComment()); - saved.clearTransmittingBuoy(); - - if (!toSave.isTransmittingBuoyEmpty()) { - - TopiaEntityBinder<TransmittingBuoy> binder = getBinder(TransmittingBuoy.class, BinderService.EDIT); - TopiaDAO<TransmittingBuoy> transmittingBuoyDAO = getDao(TransmittingBuoy.class); - - List<TransmittingBuoy> transmittingBuoys = new ArrayList<TransmittingBuoy>(); - - for (TransmittingBuoy transmittingBuoyToSave : toSave.getTransmittingBuoy()) { - - TransmittingBuoy transmittingBuoySaved; - - if (Entities.isNew(transmittingBuoyToSave)) { - - // creation de la balise - Map<String, Object> properties = binder.obtainProperties(transmittingBuoyToSave); - transmittingBuoySaved = transmittingBuoyDAO.create(properties); - - } else { - - // mise a jour de la balise - - transmittingBuoySaved = transmittingBuoyDAO.findByTopiaId(transmittingBuoyToSave.getTopiaId()); - binder.load(transmittingBuoyToSave, transmittingBuoySaved, true); - - } - - transmittingBuoys.add(transmittingBuoySaved); - - } - - saved.addAllTransmittingBuoy(transmittingBuoys); - - } - - } - - @Override - public void delete(String activitySeineId, String floatingObjectId) { - - FloatingObjectDAO dao = getDao(); - FloatingObject toDelete = dao.findByTopiaId(floatingObjectId); - - ActivitySeine activitySeine = findByTopiaId(ActivitySeine.class, activitySeineId); - activitySeine.removeFloatingObject(toDelete); - - } - - protected FloatingObjectDAO getDao() { - return (FloatingObjectDAO) getDao(FloatingObject.class); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java deleted file mode 100644 index 1ae603a..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/GearUseFeaturesSeineServiceImpl.java +++ /dev/null @@ -1,233 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Lists; -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.referentiel.Gear; -import fr.ird.observe.entities.referentiel.GearCaracteristic; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeine; -import fr.ird.observe.entities.seine.GearUseFeaturesMeasurementSeineDAO; -import fr.ird.observe.entities.seine.GearUseFeaturesSeine; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.AbstractObserveService; -import org.apache.commons.collections4.CollectionUtils; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class GearUseFeaturesSeineServiceImpl extends AbstractObserveService implements GearUseFeaturesSeineService { - - @Override - public List<GearUseFeaturesMeasurementSeine> getDefaultGearUseFeaturesMeasurementSeine(String gearId) { - - Gear gear = findByTopiaId(Gear.class, gearId); - - List<GearUseFeaturesMeasurementSeine> result = new ArrayList<GearUseFeaturesMeasurementSeine>(); - - if (!gear.isGearCaracteristicEmpty()) { - - GearUseFeaturesMeasurementSeineDAO dao = getDao(); - - for (GearCaracteristic caracteristic : gear.getGearCaracteristic()) { - - GearUseFeaturesMeasurementSeine target = dao.newInstance(); - target.setGearCaracteristic(caracteristic); - result.add(target); - - } - - } - - return result; - - } - - @Override - public List<GearUseFeaturesMeasurementSeine> loadGearUseFeaturesMeasurementSeineForEdit(String gearUseFeaturesSeineId) { - - GearUseFeaturesSeine gearUseFeaturesSeine = findByTopiaId(GearUseFeaturesSeine.class, gearUseFeaturesSeineId); - List<GearUseFeaturesMeasurementSeine> result = new ArrayList<GearUseFeaturesMeasurementSeine>(); - - if (!gearUseFeaturesSeine.isGearUseFeaturesMeasurementEmpty()) { - - GearUseFeaturesMeasurementSeineDAO dao = getDao(); - TopiaEntityBinder<GearUseFeaturesMeasurementSeine> binder = getBinder(GearUseFeaturesMeasurementSeine.class, BinderService.EDIT); - - for (GearUseFeaturesMeasurementSeine measurementSource : gearUseFeaturesSeine.getGearUseFeaturesMeasurement()) { - - GearUseFeaturesMeasurementSeine target = dao.newInstance(); - measurementSource.getGearCaracteristic().getGearCaracteristicType(); - binder.load(measurementSource, target, true); - result.add(target); - - } - - } - - return result; - - } - - @Override - public TripSeine loadForEdit(String tripId) { - - TopiaDAO<TripSeine> dao = getDao(TripSeine.class); - TripSeine toLoad = dao.findByTopiaId(tripId); - - TripSeine loaded = dao.newInstance(); - - if (toLoad != null) { - - copyExcluding(TripSeine.class, BinderService.EDIT_GEAR_USE_FEATURES_SEINE, toLoad, loaded, TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); - - if (!toLoad.isGearUseFeaturesSeineEmpty()) { - - TopiaDAO<GearUseFeaturesSeine> childDao = getDao(GearUseFeaturesSeine.class); - TopiaDAO<GearUseFeaturesMeasurementSeine> measurementDao = getDao(GearUseFeaturesMeasurementSeine.class); - TopiaEntityBinder<GearUseFeaturesSeine> childBinder = getBinder(GearUseFeaturesSeine.class, BinderService.EDIT); - TopiaEntityBinder<GearUseFeaturesMeasurementSeine> measurementBinder = getBinder(GearUseFeaturesMeasurementSeine.class, BinderService.EDIT); - - List<GearUseFeaturesSeine> childsLoaded = new ArrayList<GearUseFeaturesSeine>(); - - for (GearUseFeaturesSeine childToLoad : toLoad.getGearUseFeaturesSeine()) { - - GearUseFeaturesSeine childLoaded = childDao.newInstance(); - childBinder.load(childToLoad, childLoaded, true); - childsLoaded.add(childLoaded); - - if (!childToLoad.isGearUseFeaturesMeasurementEmpty()) { - - List<GearUseFeaturesMeasurementSeine> measurementsLoaded = new ArrayList<GearUseFeaturesMeasurementSeine>(); - - for (GearUseFeaturesMeasurementSeine measurementToLoad : childToLoad.getGearUseFeaturesMeasurement()) { - - GearUseFeaturesMeasurementSeine measurementLoaded = measurementDao.newInstance(); - measurementBinder.load(measurementToLoad, measurementLoaded, true); - measurementsLoaded.add(measurementLoaded); - - } - - childLoaded.setGearUseFeaturesMeasurement(measurementsLoaded); - - } - - } - - loaded.setGearUseFeaturesSeine(childsLoaded); - - } - - } - - return loaded; - } - - @Override - public void save(TripSeine parent) { - - TopiaEntityBinder<TripSeine> parentBinder = getBinder(TripSeine.class, BinderService.EDIT_GEAR_USE_FEATURES_SEINE); - TopiaEntityBinder<GearUseFeaturesSeine> childBinder = getBinder(GearUseFeaturesSeine.class, BinderService.EDIT); - - doSaveList(parent, new SaveCollectionAction<TripSeine, GearUseFeaturesSeine>( - TripSeine.class, GearUseFeaturesSeine.class, getListUpdator(), parentBinder, childBinder) { - - @Override - public GearUseFeaturesSeine onCreateChild(GearUseFeaturesSeine childToCreate) { - - GearUseFeaturesSeine childCreated = super.onCreateChild(childToCreate); - saveMeasurement(childCreated, childToCreate.getGearUseFeaturesMeasurement()); - return childCreated; - - } - - @Override - public GearUseFeaturesSeine onUpdateChild(GearUseFeaturesSeine childToUpdate) { - - GearUseFeaturesSeine childUpdated = super.onUpdateChild(childToUpdate); - saveMeasurement(childUpdated, childToUpdate.getGearUseFeaturesMeasurement()); - return childUpdated; - - } - - protected void saveMeasurement(GearUseFeaturesSeine childSaved, List<GearUseFeaturesMeasurementSeine> measurementsToSave) { - - List<GearUseFeaturesMeasurementSeine> measurementsSaved = Lists.newArrayList(); - - if (CollectionUtils.isNotEmpty(measurementsToSave)) { - - TopiaDAO<GearUseFeaturesMeasurementSeine> dao = getDao(GearUseFeaturesMeasurementSeine.class); - TopiaEntityBinder<GearUseFeaturesMeasurementSeine> binder = getBinder(GearUseFeaturesMeasurementSeine.class, BinderService.EDIT); - - for (GearUseFeaturesMeasurementSeine measurementToSave : measurementsToSave) { - - GearUseFeaturesMeasurementSeine measurementSaved; - - if (Entities.isNew(measurementToSave)) { - - Map<String, Object> properties = binder.obtainProperties(measurementToSave); - measurementSaved = dao.create(properties); - - } else { - - measurementSaved = dao.findByTopiaId(measurementToSave.getTopiaId()); - binder.load(measurementToSave, measurementSaved, true); - - } - - measurementsSaved.add(measurementSaved); - - } - - } - - childSaved.clearGearUseFeaturesMeasurement(); - childSaved.addAllGearUseFeaturesMeasurement(measurementsSaved); - - } - }); - } - - protected EntityListUpdator<TripSeine, GearUseFeaturesSeine> getListUpdator() { - return EntityListUpdator.newEntityListUpdator( - TripSeine.class, - GearUseFeaturesSeine.class, - TripSeine.PROPERTY_GEAR_USE_FEATURES_SEINE); - } - - protected GearUseFeaturesMeasurementSeineDAO getDao() { - return (GearUseFeaturesMeasurementSeineDAO) getDao(GearUseFeaturesMeasurementSeine.class); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java deleted file mode 100644 index 8d6b3f5..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetCatchServiceImpl.java +++ /dev/null @@ -1,136 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.NonTargetCatch; -import fr.ird.observe.entities.seine.NonTargetLength; -import fr.ird.observe.entities.seine.NonTargetSample; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.AbstractObserveService; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.Collection; -import java.util.List; - -/** - * @author Sylvain Bavencoff - bavencoff(a)codelutin.com - */ -public class NonTargetCatchServiceImpl extends AbstractObserveService implements NonTargetCatchService { - - private static final Log log = LogFactory.getLog(NonTargetCatchServiceImpl.class); - - @Override - public SetSeine loadForEdit(String setId) { - - SetSeine toLoad = findByTopiaId(SetSeine.class, setId); - - SetSeine loaded = getDao(SetSeine.class).newInstance(); - - if (toLoad != null) { - - copyExcluding(SetSeine.class, BinderService.EDIT_NON_TARGET_CATCH, toLoad, loaded, SetSeine.PROPERTY_NON_TARGET_CATCH); - - if (!toLoad.isNonTargetCatchEmpty()) { - - TopiaDAO<NonTargetCatch> dao = getDao(NonTargetCatch.class); - TopiaEntityBinder<NonTargetCatch> binder = getBinder(NonTargetCatch.class, BinderService.EDIT); - - for (NonTargetCatch childToLoad : toLoad.getNonTargetCatch()) { - - NonTargetCatch childLoaded = dao.newInstance(); - binder.load(childToLoad, childLoaded, true); - loaded.addNonTargetCatch(childLoaded); - - } - } - - } - - return loaded; - - } - - @Override - public void save(SetSeine toSave, final List<NonTargetLength> nonTargetLengthsToDelete) { - - TopiaEntityBinder<SetSeine> parentBinder = getBinder(SetSeine.class, BinderService.EDIT_NON_TARGET_CATCH); - TopiaEntityBinder<NonTargetCatch> childbinder = getBinder(NonTargetCatch.class, BinderService.EDIT); - - doSaveList(toSave, new SaveCollectionAction<SetSeine, NonTargetCatch>( - SetSeine.class, NonTargetCatch.class, getListUpdator(), parentBinder, childbinder) { - - @Override - public void prepareSave(SetSeine parentToSave, Collection<NonTargetCatch> nonTargetCatchesToSave) { - - // mise a jour de la propriete nonTargetDiscarded - - boolean hasRejet = false; - for (NonTargetCatch c : nonTargetCatchesToSave) { - if (c.getReasonForDiscard() != null) { - // on a trouve un rejet de faune - hasRejet = true; - break; - } - } - - parentToSave.setNonTargetDiscarded(hasRejet); - - } - - @Override - public void onUpdateFinalize(SetSeine parentSaved, Collection<NonTargetCatch> oldChilds) { - - if (CollectionUtils.isNotEmpty(nonTargetLengthsToDelete)) { - - // on a demande la suppression de taille obsoletes - - if (log.isInfoEnabled()) { - log.info("Will remove " + nonTargetLengthsToDelete.size() + " obsolete nonTargetSample(s)."); - } - - NonTargetSample echantillon = parentSaved.getNonTargetSample().get(0); - - // on supprime les echantillons obsoletes - echantillon.getNonTargetLength().removeAll(nonTargetLengthsToDelete); - - } - } - }); - - } - - protected EntityListUpdator<SetSeine, NonTargetCatch> getListUpdator() { - return EntityListUpdator.newEntityListUpdator( - SetSeine.class, - NonTargetCatch.class, - SetSeine.PROPERTY_NON_TARGET_CATCH); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetSampleServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetSampleServiceImpl.java deleted file mode 100644 index 214547b..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/NonTargetSampleServiceImpl.java +++ /dev/null @@ -1,267 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Lists; -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.seine.NonTargetCatch; -import fr.ird.observe.entities.seine.NonTargetLength; -import fr.ird.observe.entities.seine.NonTargetSample; -import fr.ird.observe.entities.seine.NonTargetSampleDAO; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.AbstractObserveService; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class NonTargetSampleServiceImpl extends AbstractObserveService implements NonTargetSampleService { - - /** Logger. */ - private static final Log log = LogFactory.getLog(NonTargetSampleServiceImpl.class); - - protected NonTargetSampleDAO getDao() { - return (NonTargetSampleDAO) getDao(NonTargetSample.class); - } - - @Override - public List<Species> getAvailableSpeciesForNonTargetSample(String setSeineId) { - - List<Species> speciesList = new ArrayList<Species>(); - - SetSeine setSeine = findByTopiaId(SetSeine.class, setSeineId); - - // on recupere la liste des espèces faune utilisees dans le rejet - Collection<NonTargetCatch> nonTargetCatches = setSeine.getNonTargetCatch(); - - if (nonTargetCatches != null) { - - for (NonTargetCatch nonTargetCatch : nonTargetCatches) { - // on retient toute les espèces (capturées ou rejetées) - if (!speciesList.contains(nonTargetCatch.getSpecies())) { - speciesList.add(nonTargetCatch.getSpecies()); - } - } - - } - - return speciesList; - - } - - @Override - public NonTargetSample loadForEdit(String setSeineId) { - - SetSeine setSeine = findByTopiaId(SetSeine.class, setSeineId); - - NonTargetSample toLoad; - - if (setSeine.isNonTargetSampleEmpty()) { - - toLoad = null; - - } else { - - List<NonTargetSample> nonTargetSamples = setSeine.getNonTargetSample(); - toLoad = nonTargetSamples.get(0); - - } - - NonTargetSample loaded = getDao(NonTargetSample.class).newInstance(); - - if (toLoad != null) { - - copyExcluding(NonTargetSample.class, BinderService.EDIT_NON_TARGET_LENGTH, toLoad, loaded, NonTargetSample.PROPERTY_NON_TARGET_LENGTH); - - if (!toLoad.isNonTargetLengthEmpty()) { - - TopiaDAO<NonTargetLength> dao = getDao(NonTargetLength.class); - TopiaEntityBinder<NonTargetLength> binder = getBinder(NonTargetLength.class, BinderService.EDIT); - - for (NonTargetLength childToLoad : toLoad.getNonTargetLength()) { - - NonTargetLength childLoaded = dao.newInstance(); - binder.load(childToLoad, childLoaded, true); - loaded.addNonTargetLength(childLoaded); - - } - } - } - - return loaded; - } - - @Override - public boolean canUseNonTargetSample(String setSeineId) { - - SetSeine setSeine = findByTopiaId(SetSeine.class, setSeineId); - return setSeine.canUseNonTargetSample(); - - } - - @Override - public List<NonTargetLength> getObsoleteNonTargetLengths(String setSeineId, Set<String> speciesIdsUsed) { - - SetSeine setSeine = findByTopiaId(SetSeine.class, setSeineId); - - List<NonTargetLength> nonTargetLengthsToDelete = new ArrayList<NonTargetLength>(); - - if (!setSeine.isNonTargetSampleEmpty()) { - - NonTargetSample nonTargetSample = setSeine.getNonTargetSample().get(0); - - if (!nonTargetSample.isNonTargetLengthEmpty()) { - - for (NonTargetLength taille : nonTargetSample.getNonTargetLength()) { - - Species species = taille.getSpecies(); - if (!speciesIdsUsed.contains(species.getTopiaId())) { - - // l'espèce n'existe plus dans les rejet faune, on doit le supprimer - nonTargetLengthsToDelete.add(taille); - if (log.isDebugEnabled()) { - log.debug("remove obsolote echantillon " + taille + " for species " + species); - } - - } - - } - - } - - } - - return nonTargetLengthsToDelete; - - } - - @Override - public String save(String setSeineId, NonTargetSample nonTargetSampleToSave) { - - String savedId = doSave(setSeineId, nonTargetSampleToSave, new SaveAction<SetSeine, NonTargetSample>(SetSeine.class, NonTargetSample.class) { - - @Override - public NonTargetSample onCreate(SetSeine parent, NonTargetSample toCreate) { - - NonTargetSampleDAO dao = getDao(); - - Map<String, Object> properties = obtainProperties(NonTargetSample.class, BinderService.EDIT, toCreate); - NonTargetSample created = dao.create(properties); - parent.addNonTargetSample(created); - - saveTargetLengths(toCreate.getNonTargetLength(), created); - - dao.update(created); - return created; - - } - - @Override - public NonTargetSample onUpdate(SetSeine parent, NonTargetSample toUpdate) { - - NonTargetSample updated = super.onUpdate(parent, toUpdate); - - copyExcluding(NonTargetSample.class, BinderService.EDIT, toUpdate, updated, false, NonTargetSample.PROPERTY_NON_TARGET_LENGTH); - - saveTargetLengths(toUpdate.getNonTargetLength(), updated); - - getDao().update(updated); - return updated; - - } - - protected void saveTargetLengths(Collection<NonTargetLength> nonTargetLengthsToSave, NonTargetSample childSaved) { - - List<NonTargetLength> nonTargetLengthsSaved = Lists.newArrayList(); - - if (CollectionUtils.isNotEmpty(nonTargetLengthsToSave)) { - - TopiaDAO<NonTargetLength> dao = getDao(NonTargetLength.class); - TopiaEntityBinder<NonTargetLength> binder = getBinder(NonTargetLength.class, BinderService.EDIT); - - for (NonTargetLength nonTargetLengthToSave : nonTargetLengthsToSave) { - - NonTargetLength nonTargetLengthSaved; - - if (Entities.isNew(nonTargetLengthToSave)) { - - Map<String, Object> properties = binder.obtainProperties(nonTargetLengthToSave); - nonTargetLengthSaved = dao.create(properties); - - } else { - - nonTargetLengthSaved = dao.findByTopiaId(nonTargetLengthToSave.getTopiaId()); - binder.load(nonTargetLengthToSave, nonTargetLengthSaved, true); - - } - - nonTargetLengthsSaved.add(nonTargetLengthSaved); - - } - - } - - childSaved.clearNonTargetLength(); - childSaved.addAllNonTargetLength(nonTargetLengthsSaved); - - } - - }); - - return savedId; - - } - - @Override - public void delete(String setSeineId, NonTargetSample nonTargetSampleToDelete) { - - doDelete(setSeineId, nonTargetSampleToDelete.getTopiaId(), new DeleteAction<SetSeine, NonTargetSample>(SetSeine.class, NonTargetSample.class) { - - @Override - public void onDelete(SetSeine parent, NonTargetSample toDelete) { - - super.onDelete(parent, toDelete); - parent.removeNonTargetSample(toDelete); - - } - - }); - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectObservedSpeciesServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectObservedSpeciesServiceImpl.java deleted file mode 100644 index 5c1f06d..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectObservedSpeciesServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.ObjectObservedSpecies; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author Sylvain Bavencoff - bavencoff(a)codelutin.com - */ -public class ObjectObservedSpeciesServiceImpl extends AbstractObserveService implements ObjectObservedSpeciesService { - - @Override - public FloatingObject loadForEdit(String floatingObjectId) { - - FloatingObject parentToLoad = findByTopiaId(FloatingObject.class, floatingObjectId); - - FloatingObject parentLoaded = getDao(FloatingObject.class).newInstance(); - - copy(FloatingObject.class, BinderService.EDIT_OBJECT_OBSERVED_SPECIES, parentToLoad, parentLoaded); - - if (!parentToLoad.isObjectObservedSpeciesEmpty()) { - - TopiaDAO<ObjectObservedSpecies> childDao = getDao(ObjectObservedSpecies.class); - TopiaEntityBinder<ObjectObservedSpecies> binder = getBinder(ObjectObservedSpecies.class, BinderService.EDIT); - List<ObjectObservedSpecies> childs = new ArrayList<ObjectObservedSpecies>(); - - for (ObjectObservedSpecies sourceChild : parentToLoad.getObjectObservedSpecies()) { - - ObjectObservedSpecies targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setObjectObservedSpecies(childs); - - } - - return parentLoaded; - } - - @Override - public void save(FloatingObject floatingObject) { - - TopiaEntityBinder<FloatingObject> parentBinder = getBinder(FloatingObject.class, BinderService.EDIT_OBJECT_OBSERVED_SPECIES); - TopiaEntityBinder<ObjectObservedSpecies> childbinder = getBinder(ObjectObservedSpecies.class, BinderService.EDIT); - - doSaveList(floatingObject, new SaveCollectionAction<FloatingObject, ObjectObservedSpecies>( - FloatingObject.class, ObjectObservedSpecies.class, getListUpdator(), parentBinder, childbinder)); - - } - - protected EntityListUpdator<FloatingObject, ObjectObservedSpecies> getListUpdator() { - return EntityListUpdator.newEntityListUpdator( - FloatingObject.class, - ObjectObservedSpecies.class, - FloatingObject.PROPERTY_OBJECT_OBSERVED_SPECIES); - } -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectSchoolEstimateServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectSchoolEstimateServiceImpl.java deleted file mode 100644 index 9e8afad..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/ObjectSchoolEstimateServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.FloatingObject; -import fr.ird.observe.entities.seine.ObjectSchoolEstimate; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author Sylvain Bavencoff - bavencoff(a)codelutin.com - */ -public class ObjectSchoolEstimateServiceImpl extends AbstractObserveService implements ObjectSchoolEstimateService { - - @Override - public FloatingObject loadForEdit(String floatingObjectId) { - - FloatingObject parentToLoad = findByTopiaId(FloatingObject.class, floatingObjectId); - - FloatingObject parentLoaded = getDao(FloatingObject.class).newInstance(); - - copy(FloatingObject.class, BinderService.EDIT_OBJECT_SCHOOL_ESTIMATE, parentToLoad, parentLoaded); - - if (!parentToLoad.isObjectSchoolEstimateEmpty()) { - - TopiaDAO<ObjectSchoolEstimate> childDao = getDao(ObjectSchoolEstimate.class); - TopiaEntityBinder<ObjectSchoolEstimate> binder = getBinder(ObjectSchoolEstimate.class, BinderService.EDIT); - - List<ObjectSchoolEstimate> childs = new ArrayList<ObjectSchoolEstimate>(); - - for (ObjectSchoolEstimate sourceChild : parentToLoad.getObjectSchoolEstimate()) { - - ObjectSchoolEstimate targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setObjectSchoolEstimate(childs); - - } - - return parentLoaded; - } - - @Override - public void save(FloatingObject floatingObject) { - - TopiaEntityBinder<FloatingObject> parentBinder = getBinder(FloatingObject.class, BinderService.EDIT_OBJECT_SCHOOL_ESTIMATE); - TopiaEntityBinder<ObjectSchoolEstimate> childBinder = getBinder(ObjectSchoolEstimate.class, BinderService.EDIT); - - doSaveList(floatingObject, new SaveCollectionAction<FloatingObject, ObjectSchoolEstimate>( - FloatingObject.class, ObjectSchoolEstimate.class, getListUpdator(), parentBinder, childBinder)); - - } - - protected EntityListUpdator<FloatingObject, ObjectSchoolEstimate> getListUpdator() { - return EntityListUpdator.newEntityListUpdator( - FloatingObject.class, - ObjectSchoolEstimate.class, - FloatingObject.PROPERTY_OBJECT_SCHOOL_ESTIMATE); - } -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/RouteServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/RouteServiceImpl.java deleted file mode 100644 index 487bdef..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/RouteServiceImpl.java +++ /dev/null @@ -1,184 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.ActivitySeines; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.RouteDAO; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.AbstractObserveService; -import org.apache.commons.lang3.time.DateUtils; -import org.nuiton.util.DateUtil; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/24/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class RouteServiceImpl extends AbstractObserveService implements RouteService { - - @Override - public List<Route> getRouteStubByTrip(String tripSeineId) { - - List<Route> result = getDao().findAllStubByTripId(tripSeineId); - return result; - - } - - @Override - public Route getRouteStub(String routeId) { - - Route result = getDao().findStubByTopiaId(routeId); - return result; - - } - - @Override - public Route loadForEdit(String routeId) { - - Route loaded = getDao().newInstance(); - Route toLoad = getDao().findByTopiaId(routeId); - copy(Route.class, BinderService.EDIT, toLoad, loaded); - - if (!loaded.isActivitySeineEmpty()) { - - // on force le trie des activites - ActivitySeines.sort(loaded.getActivitySeine()); - } - - return loaded; - - } - - @Override - public Route preCreate(String tripSeineId) { - - TripSeine tripLongline = findByTopiaId(TripSeine.class, tripSeineId); - - Route preCreated = getDao().newInstance(); - - preCreated.setOpen(true); - - Route lastRoute = tripLongline.getLastRoute(); - - Date date; - if (lastRoute == null) { - - // aucune route defini, on utilise la date courante - date = now(); - - } else { - - // une route precedente est definie sur la maree - // le jour d'observation est le jour suivant celui de la - // derniere route - date = DateUtils.addDays(lastRoute.getDate(), 1); - - // le loch du matin est le loch du soir de la derniere route - preCreated.setStartLogValue(lastRoute.getEndLogValue()); - } - - preCreated.setDate(DateUtil.getDay(date)); - - return preCreated; - - } - - @Override - public String save(String tripSeineId, Route toSave) { - - String routeId = doSave(tripSeineId, toSave, new SaveAction<TripSeine, Route>(TripSeine.class, Route.class) { - - @Override - public Route onCreate(TripSeine parent, Route toCreate) { - - Map<String, Object> properties = obtainProperties(Route.class, BinderService.EDIT, toCreate); - Route created = getDao().create(properties); - - parent.addRoute(created); - - // on met a jour si necessaire la date de fin de la maree - parent.updateDateFin(); - - return created; - } - - @Override - public Route onUpdate(TripSeine parent, Route toUpdate) { - - Route updated = super.onUpdate(parent, toUpdate); - - // on conserve l'ancienne date d'observation - Date oldDate = DateUtil.getDay(toUpdate.getDate()); - - // recopie des propriétés vers le bean a sauver - copyExcluding(Route.class, BinderService.EDIT, toUpdate, updated, Route.PROPERTY_ACTIVITY_SEINE); - - if (!oldDate.equals(toUpdate.getDate())) { - - //FIXME Faire cela avec une requete sql, sinon ca charge trop de données - // le jour a change, il faut mettre à jour les dates des activites et des calees - updated.updateDates(); - - } - - // on met a jour si necessaire la date de fin de la maree - parent.updateDateFin(); - - return updated; - - } - }); - - return routeId; - - } - - @Override - public void delete(String tripSeineId, String routeId) { - doDelete(tripSeineId, routeId, new DeleteAction<TripSeine, Route>(TripSeine.class, Route.class) { - - @Override - public void onDelete(TripSeine parent, Route toDelete) { - super.onDelete(parent, toDelete); - - // suppression de la route - parent.removeRoute(toDelete); - - // mise à jour de la date de fin de marée - parent.updateDateFin(); - } - }); - } - - protected RouteDAO getDao() { - return (RouteDAO) getDao(Route.class); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/SchoolEstimateServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/SchoolEstimateServiceImpl.java deleted file mode 100644 index 597a70d..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/SchoolEstimateServiceImpl.java +++ /dev/null @@ -1,94 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.seine.SchoolEstimate; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.List; - -/** - * Created on 4/28/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class SchoolEstimateServiceImpl extends AbstractObserveService implements SchoolEstimateService { - - @Override - public SetSeine loadForEdit(String setSeineId) { - - SetSeine parentToLoad = findByTopiaId(SetSeine.class, setSeineId); - - SetSeine parentLoaded = getDao(SetSeine.class).newInstance(); - - copy(SetSeine.class, BinderService.EDIT_SCHOOL_ESTIMATE, parentToLoad, parentLoaded); - - if (!parentToLoad.isSchoolEstimateEmpty()) { - - TopiaDAO<SchoolEstimate> childDao = getDao(SchoolEstimate.class); - TopiaEntityBinder<SchoolEstimate> binder = getBinder(SchoolEstimate.class, BinderService.EDIT); - - List<SchoolEstimate> childs = new ArrayList<SchoolEstimate>(); - - for (SchoolEstimate sourceChild : parentToLoad.getSchoolEstimate()) { - - SchoolEstimate targetChild = childDao.newInstance(); - binder.load(sourceChild, targetChild, true); - childs.add(targetChild); - - } - - parentLoaded.setSchoolEstimate(childs); - - } - - return parentLoaded; - - } - - @Override - public void save(SetSeine parent) { - - TopiaEntityBinder<SetSeine> parentBinder = getBinder(SetSeine.class, BinderService.EDIT_SCHOOL_ESTIMATE); - TopiaEntityBinder<SchoolEstimate> childBinder = getBinder(SchoolEstimate.class, BinderService.EDIT); - - doSaveList(parent, new SaveCollectionAction<SetSeine, SchoolEstimate>( - SetSeine.class, SchoolEstimate.class, getListUpdator(), parentBinder, childBinder)); - } - - protected EntityListUpdator<SetSeine, SchoolEstimate> getListUpdator() { - return EntityListUpdator.newEntityListUpdator( - SetSeine.class, - SchoolEstimate.class, - SetSeine.PROPERTY_SCHOOL_ESTIMATE); - } - - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java deleted file mode 100644 index 463fdb9..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/SetSeineServiceImpl.java +++ /dev/null @@ -1,173 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.constants.seine.SchoolType; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.NonTargetSample; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.SetSeineDAO; -import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.util.DateUtil; - -import java.util.Date; -import java.util.Map; - -/** - * Created on 4/24/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class SetSeineServiceImpl extends AbstractObserveService implements SetSeineService { - - @Override - public SetSeine loadSet(String setSeineId) { - return null; - } - - @Override - public Date getRouteDate(String routeId) { - - Route route = findByTopiaId(Route.class, routeId); - Date date = route.getDate(); - return date; - - } - - @Override - public SetSeine loadForEdit(String setSeineId) { - - SetSeineDAO dao = getDao(); - SetSeine loaded = dao.newInstance(); - SetSeine toLoad = dao.findByTopiaId(setSeineId); - copy(SetSeine.class, BinderService.EDIT, toLoad, loaded); - - //FIXME See why need this ? - if (!loaded.isTargetSampleEmpty()) { - for (TargetSample e : loaded.getTargetSample()) { - e.isTargetLengthEmpty(); - } - } - - //FIXME See why need this ? - if (!loaded.isNonTargetSampleEmpty()) { - for (NonTargetSample e : loaded.getNonTargetSample()) { - e.isNonTargetLengthEmpty(); - } - } - - return loaded; - - } - - - @Override - public SetSeine preCreate(String routeId, String activitySeineId) { - - ActivitySeine activitySeine = findByTopiaId(ActivitySeine.class, activitySeineId); - - // on utilise l'heure de l'activité comme début de calée - Date date = DateUtil.getTime(activitySeine.getTime(), false, false); - - SetSeine preCreated = getDao().newInstance(); - - preCreated.setStartTime(date); - - // pour les dates de fin on utilise la date de la route - Date routeDate = getRouteDate(routeId); - - preCreated.setEndSetTimeStamp(date); - preCreated.setEndPursingTimeStamp(date); - - preCreated.setEndSetDate(routeDate); - preCreated.setEndPursingDate(routeDate); - - // recuperation du type de set a partir de l'activity - SchoolType schoolType = activitySeine.getSchoolType(); - preCreated.setSchoolType(schoolType); - - return preCreated; - - } - - @Override - public String save(String activitySeineId, SetSeine toSave) { - - String setSeineId = doSave(activitySeineId, toSave, new SaveAction<ActivitySeine, SetSeine>(ActivitySeine.class, SetSeine.class) { - - @Override - public SetSeine onCreate(ActivitySeine parent, SetSeine toCreate) { - - Map<String, Object> properties = obtainProperties(SetSeine.class, BinderService.EDIT, toCreate); - SetSeine created = getDao().create(properties); - - parent.setSetSeine(created); - - return created; - } - - @Override - public SetSeine onUpdate(ActivitySeine parent, SetSeine toUpdate) { - - SetSeine updated = super.onUpdate(parent, toUpdate); - - copyExcluding(SetSeine.class, - BinderService.EDIT, - toUpdate, - updated, - SetSeine.PROPERTY_TARGET_SAMPLE, - SetSeine.PROPERTY_NON_TARGET_SAMPLE); - return updated; - - } - }); - - return setSeineId; - - } - - - @Override - public void delete(String activitySeineId, String setSeineId) { - - // on doit supprimer physiquement la set - // car il n'y a pas de delete-orphan sur une telle relation - SetSeineDAO dao = getDao(); - SetSeine setSeine = dao.findByTopiaId(setSeineId); - dao.delete(setSeine); - - // supprime la reference sur l'activité - ActivitySeine activitySeine = findByTopiaId(ActivitySeine.class, activitySeineId); - activitySeine.setSetSeine(null); - - } - - protected SetSeineDAO getDao() { - return (SetSeineDAO) getDao(SetSeine.class); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetCatchServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetCatchServiceImpl.java deleted file mode 100644 index 2c726b5..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetCatchServiceImpl.java +++ /dev/null @@ -1,186 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Predicate; -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.referentiel.seine.WeightCategory; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TargetCatch; -import fr.ird.observe.entities.seine.TargetCatches; -import fr.ird.observe.entities.seine.TargetLength; -import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.services.AbstractObserveService; -import fr.ird.observe.services.referential.ReferentialService; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -/** - * Created on 5/2/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class TargetCatchServiceImpl extends AbstractObserveService implements TargetCatchService { - - /** Logger. */ - private static final Log log = LogFactory.getLog(TargetCatchServiceImpl.class); - - @Override - public SetSeine loadForEdit(String setSeineId) { - - SetSeine loaded = load(setSeineId, BinderService.EDIT_TARGET_CATCH, TargetCatches.TARGET_CATCH_IS_NOT_DISCARDED); - return loaded; - - } - - @Override - public SetSeine loadForEditDiscarded(String setSeineId) { - - SetSeine loaded = load(setSeineId, BinderService.EDIT_DISCARD_TARGET_CATCH, TargetCatches.TARGET_CATCH_IS_DISCARDED); - return loaded; - - } - - @Override - public void save(SetSeine setSeinetoSave, final List<TargetLength> targetLengthsToDelete) { - - save(setSeinetoSave, BinderService.EDIT_TARGET_CATCH, TargetCatches.TARGET_CATCH_IS_NOT_DISCARDED, targetLengthsToDelete); - - } - - @Override - public void saveForDiscarded(SetSeine setSeinetoSave, final List<TargetLength> targetLengthsToDelete) { - - save(setSeinetoSave, BinderService.EDIT_DISCARD_TARGET_CATCH, TargetCatches.TARGET_CATCH_IS_DISCARDED, targetLengthsToDelete); - - } - - protected SetSeine load(String setId, String binderContext, Predicate<TargetCatch> predicate) { - - TopiaDAO<SetSeine> setSeineDao = getDao(SetSeine.class); - SetSeine toLoad = setSeineDao.findByTopiaId(setId); - SetSeine loaded = setSeineDao.newInstance(); - - copyExcluding(SetSeine.class, binderContext, toLoad, loaded, SetSeine.PROPERTY_TARGET_CATCH); - - if (!toLoad.isTargetCatchEmpty()) { - - ReferentialService referentialService = newService(ReferentialService.class); - - TopiaDAO<TargetCatch> dao = getDao(TargetCatch.class); - TopiaEntityBinder<TargetCatch> binder = getBinder(TargetCatch.class, binderContext); - - List<TargetCatch> childsLoaded = new ArrayList<TargetCatch>(); - - for (TargetCatch childToLoad : toLoad.getTargetCatch()) { - - if (predicate.apply(childToLoad)) { - - WeightCategory weightCategory = childToLoad.getWeightCategory(); - if (weightCategory != null) { - referentialService.loadDecoratedWeightCategory(weightCategory); - } - - TargetCatch childLoaded = dao.newInstance(); - binder.load(childToLoad, childLoaded, true); - childsLoaded.add(childLoaded); - - } - - } - - loaded.setTargetCatch(childsLoaded); - - } - - return loaded; - - } - - void save(SetSeine setSeinetoSave, String binderContext, final Predicate<TargetCatch> predicate, final List<TargetLength> targetLengthsToDelete) { - - TopiaEntityBinder<SetSeine> parentBinder = getBinder(SetSeine.class, binderContext); - TopiaEntityBinder<TargetCatch> childBinder = getBinder(TargetCatch.class, binderContext); - - doSaveList(setSeinetoSave, new SaveCollectionAction<SetSeine, TargetCatch>( - SetSeine.class, TargetCatch.class, getListUpdator(), parentBinder, childBinder, predicate) { - - @Override - public void onUpdateFinalize(SetSeine parentSaved, Collection<TargetCatch> oldChilds) { - - if (CollectionUtils.isNotEmpty(oldChilds)) { - - Collection<TargetCatch> targetCatchesToReinject = new ArrayList<TargetCatch>(); - - for (TargetCatch oldChild : oldChilds) { - - if (predicate.apply(oldChild)) { - - // on réinjecte cette capture - targetCatchesToReinject.add(oldChild); - - } - - } - - parentSaved.addAllTargetCatch(targetCatchesToReinject); - - } - - if (CollectionUtils.isNotEmpty(targetLengthsToDelete)) { - - // suppression des échantillons obsoletes - - if (log.isInfoEnabled()) { - log.info("Will remove " + targetLengthsToDelete.size() + " obsolete targetLength(s)."); - } - - TargetSample targetSample = parentSaved.getTargetSample().get(0); - - // on supprime les echantillons obsoletes - targetSample.getTargetLength().removeAll(targetLengthsToDelete); - - } - } - }); - - } - - protected EntityListUpdator<SetSeine, TargetCatch> getListUpdator() { - return EntityListUpdator.newEntityListUpdator( - SetSeine.class, - TargetCatch.class, - SetSeine.PROPERTY_TARGET_CATCH); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetSampleServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetSampleServiceImpl.java deleted file mode 100644 index f1147a2..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TargetSampleServiceImpl.java +++ /dev/null @@ -1,298 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Lists; -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TargetCatch; -import fr.ird.observe.entities.seine.TargetLength; -import fr.ird.observe.entities.seine.TargetLengthDAO; -import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.entities.seine.TargetSampleDAO; -import fr.ird.observe.services.AbstractObserveService; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; -import java.util.Set; - -/** - * Created on 4/26/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class TargetSampleServiceImpl extends AbstractObserveService implements TargetSampleService { - - /** Logger. */ - private static final Log log = LogFactory.getLog(TargetSampleServiceImpl.class); - - @Override - public List<Species> getAvailableSpeciesForTargetSample(String setSeineId, boolean discarded) { - - List<Species> speciesList = new ArrayList<Species>(); - - SetSeine setSeine = findByTopiaId(SetSeine.class, setSeineId); - - // on recupere la liste des espèces thon utilisees dans le rejet - Collection<TargetCatch> targetCatches = setSeine.getTargetCatch(); - - // on filtre sur les espèces montées sur le pont et rejetées - - if (targetCatches != null) { - - for (TargetCatch targetCatch : targetCatches) { - - boolean keep; - - if (discarded) { - - // on ne conserve que les espèces rejectées montées sur le pont - keep = targetCatch.isDiscarded() && targetCatch.getBroughtOnDeck(); - - } else { - - // on ne conserve que les espèces rejectées - keep = !targetCatch.isDiscarded(); - } - - if (keep && - !speciesList.contains(targetCatch.getWeightCategory().getSpecies())) { - speciesList.add(targetCatch.getWeightCategory().getSpecies()); - } - - } - - } - - return speciesList; - - } - - @Override - public TargetSample loadForEdit(String setSeineId, boolean discarded) { - - SetSeine setSeine = findByTopiaId(SetSeine.class, setSeineId); - - TargetSample toLoad = null; - - if (!setSeine.isTargetSampleEmpty()) { - - List<TargetSample> targetSamples = setSeine.getTargetSample(); - for (TargetSample targetSample : targetSamples) { - - Boolean isDiscarded = targetSample.getDiscarded(); - - if (discarded == (isDiscarded != null && isDiscarded)) { - toLoad = targetSample; - } - - } - - } - - TargetSample loaded = getDao().newInstance(); - - if (toLoad != null) { - - copyExcluding(TargetSample.class, BinderService.EDIT_TARGET_LENGTH, toLoad, loaded, TargetSample.PROPERTY_TARGET_LENGTH); - - - if (!toLoad.isTargetLengthEmpty()) { - - TopiaEntityBinder<TargetLength> binder = getBinder(TargetLength.class, BinderService.EDIT); - TopiaDAO<TargetLength> dao = getDao(TargetLength.class); - - for (TargetLength childToLoad : toLoad.getTargetLength()) { - - TargetLength childLoaded = dao.newInstance(); - binder.load(childToLoad, childLoaded, true); - loaded.addTargetLength(childLoaded); - - } - } - } - - - return loaded; - } - - @Override - public boolean canUseTargetSample(String setSeineId, boolean discarded) { - - SetSeine setSeine = findByTopiaId(SetSeine.class, setSeineId); - return setSeine.canUseTargetSample(discarded); - - } - - @Override - public List<TargetLength> getObsoleteTargetLengths(String setSeineId, Set<String> speciesIdsUsed, boolean discarded) { - - SetSeine setSeine = findByTopiaId(SetSeine.class, setSeineId); - - List<TargetLength> targetLengthsToDelete = new ArrayList<TargetLength>(); - - if (!setSeine.isTargetSampleEmpty()) { - - TargetSample targetSample = setSeine.getTargetSample(discarded); - if (targetSample != null && !targetSample.isTargetLengthEmpty()) { - - for (TargetLength targetLength : targetSample.getTargetLength()) { - - Species species = targetLength.getSpecies(); - - if (!speciesIdsUsed.contains(species.getTopiaId())) { - // l'espèce n'existe plus dans les rejet faune, on doit le supprimer - targetLengthsToDelete.add(targetLength); - if (log.isDebugEnabled()) { - log.debug("remove obsolote echantillon " + targetLength + " for species " + species); - } - } - - } - - } - - } - - return targetLengthsToDelete; - - } - - @Override - public String save(String setSeineId, TargetSample toSave) { - - String savedId = doSave(setSeineId, toSave, new SaveAction<SetSeine, TargetSample>(SetSeine.class, TargetSample.class) { - - @Override - public TargetSample onCreate(SetSeine parent, TargetSample toCreate) { - - TargetSample created = getDao().create(); - copyExcluding(TargetSample.class, BinderService.EDIT, toCreate, created, false, TargetSample.PROPERTY_TARGET_LENGTH); - parent.addTargetSample(created); - - saveTargetLengths(toCreate.getTargetLength(), created); - - getDao().update(created); - return created; - - } - - @Override - public TargetSample onUpdate(SetSeine parent, TargetSample toUpdate) { - - TargetSample updated = super.onUpdate(parent, toUpdate); - - copyExcluding(TargetSample.class, BinderService.EDIT, toUpdate, updated, false, TargetSample.PROPERTY_TARGET_LENGTH); - - saveTargetLengths(toUpdate.getTargetLength(), updated); - - getDao().update(updated); - return updated; - - } - - protected void saveTargetLengths(Collection<TargetLength> targetLengthsToSave, TargetSample childSaved) { - - List<TargetLength> targetLengthsSaved = Lists.newArrayList(); - - if (CollectionUtils.isNotEmpty(targetLengthsToSave)) { - - TopiaDAO<TargetLength> dao = getDao(TargetLength.class); - TopiaEntityBinder<TargetLength> binder = getBinder(TargetLength.class, BinderService.EDIT); - - for (TargetLength targetLengthToSave : targetLengthsToSave) { - - TargetLength targetLengthSaved; - - if (Entities.isNew(targetLengthToSave)) { - - targetLengthSaved = dao.create(); - binder.load(targetLengthToSave, targetLengthSaved, false); - - } else { - - targetLengthSaved = dao.findByTopiaId(targetLengthToSave.getTopiaId()); - binder.load(targetLengthToSave, targetLengthSaved, true); - - } - - targetLengthsSaved.add(targetLengthSaved); - - } - - } - - childSaved.clearTargetLength(); - childSaved.addAllTargetLength(targetLengthsSaved); - - } - - - }); - - return savedId; - - } - - @Override - public void delete(String setSeineId, TargetSample bean) { - - doDelete(setSeineId, bean.getTopiaId(), new DeleteAction<SetSeine, TargetSample>(SetSeine.class, TargetSample.class) { - - @Override - public void onDelete(SetSeine parent, TargetSample toDelete) { - - super.onDelete(parent, toDelete); - parent.removeTargetSample(toDelete); - - } - }); - - } - - protected TargetSampleDAO getDao() { - return (TargetSampleDAO) getDao(TargetSample.class); - } - - protected TargetLengthDAO getChildDao() { - return (TargetLengthDAO) getDao(TargetLength.class); - } - - protected EntityListUpdator<TargetSample, TargetLength> getListUpdator() { - return EntityListUpdator.newEntityListUpdator( - TargetSample.class, - TargetLength.class, - TargetSample.PROPERTY_TARGET_LENGTH); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java deleted file mode 100644 index ed8182c..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/data/seine/TripSeineServiceImpl.java +++ /dev/null @@ -1,158 +0,0 @@ -package fr.ird.observe.services.data.seine; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.BinderService; -import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.seine.Routes; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.entities.seine.TripSeineDAO; -import fr.ird.observe.services.AbstractObserveService; -import org.nuiton.util.DateUtil; - -import java.util.Date; -import java.util.List; -import java.util.Map; - -/** - * Created on 4/24/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class TripSeineServiceImpl extends AbstractObserveService implements TripSeineService { - - protected TripSeineDAO getDao() { - return (TripSeineDAO) getDao(TripSeine.class); - } - - @Override - public List<TripSeine> getTripSeineStubByProgram(String programId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - List<TripSeine> result = getDao().findAllStubByProgramId(programId, referentielLocale); - return result; - - } - - @Override - public TripSeine getTripSeineStub(String tripId) { - - ReferenceLocale referentielLocale = getReferentielLocale(); - TripSeine result = getDao().findStubByTopiaId(tripId, referentielLocale); - return result; - - } - - @Override - public TripSeine loadForDisplay(String tripSeineId) { - - TripSeine loaded = getDao().newInstance(); - TripSeine toLoad = getDao().findByTopiaId(tripSeineId); - copy(TripSeine.class, BinderService.EDIT, toLoad, loaded); - - if (!loaded.isRouteEmpty()) { - - // on force le trie des routes - Routes.sort(loaded.getRoute()); - } - - return loaded; - - } - - @Override - public TripSeine loadForEdit(String tripSeineId) { - - TripSeine loaded = loadForDisplay(tripSeineId); - if (loaded.getEndDate() == null) { - Date date = DateUtil.getEndOfDay(now()); - loaded.setEndDate(date); - } - - return loaded; - - } - - @Override - public TripSeine preCreate(String programId) { - - Program program = findByTopiaId(Program.class, programId); - - TripSeine preCreated = getDao().newInstance(); - - Date date = DateUtil.getDay(now()); - preCreated.setStartDate(date); - preCreated.setEndDate(date); - preCreated.setProgram(program); - - return preCreated; - - } - - @Override - public String save(TripSeine toSave) { - String tripSeineId = doSave(null, toSave, new SaveAction<Program, TripSeine>(Program.class, TripSeine.class) { - - @Override - public void beforeSave(String parentId, TripSeine toSave) { - - super.beforeSave(parentId, toSave); - Date startDate = DateUtil.getDay(toSave.getStartDate()); - toSave.setStartDate(startDate); - - // mise a jour de la date de fin - toSave.updateDateFin(); - - } - - @Override - public TripSeine onCreate(Program parent, TripSeine toCreate) { - - Map<String, Object> properties = obtainProperties(TripSeine.class, BinderService.EDIT, toCreate); - TripSeine created = getDao().create(properties); - return created; - - } - - @Override - public TripSeine onUpdate(Program parent, TripSeine toUpdate) { - - TripSeine updated = super.onUpdate(parent, toUpdate); - copyExcluding(TripSeine.class, BinderService.EDIT, toUpdate, updated, TripSeine.PROPERTY_ROUTE); - return updated; - - } - }); - - return tripSeineId; - - } - - @Override - public void delete(String idtoDelete) { - doDelete(null, idtoDelete, new DeleteAction<Program, TripSeine>(Program.class, TripSeine.class)); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/ComputeDataServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/ComputeDataServiceImpl.java deleted file mode 100644 index 7fd4f0e..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/ComputeDataServiceImpl.java +++ /dev/null @@ -1,854 +0,0 @@ -package fr.ird.observe.services.operation; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.base.Predicate; -import com.google.common.base.Predicates; -import com.google.common.collect.Collections2; -import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; -import fr.ird.observe.DecoratorService; -import fr.ird.observe.ObserveDAOHelper; -import fr.ird.observe.SendMessageAble; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.LengthWeightComputable; -import fr.ird.observe.entities.constants.seine.NonTargetCatchComputedValueSource; -import fr.ird.observe.entities.constants.seine.SchoolType; -import fr.ird.observe.entities.referentiel.LengthWeightParameter; -import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.Sex; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.NonTargetCatch; -import fr.ird.observe.entities.seine.NonTargetLength; -import fr.ird.observe.entities.seine.NonTargetSample; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.SetSeine; -import fr.ird.observe.entities.seine.TargetLength; -import fr.ird.observe.entities.seine.TargetSample; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.AbstractObserveService; -import fr.ird.observe.services.referential.ReferentialService; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import org.nuiton.topia.persistence.util.TopiaEntityRef; -import org.nuiton.util.beans.BeanMonitor; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; - -import static org.nuiton.i18n.I18n.t; - -/** - * FIXME A revoir, utiliser un context pour ne pas avoir d'état dans le service + on ne peut plus utiliser de messager - * On retounera un objet de type result. - * - * Created on 5/3/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class ComputeDataServiceImpl extends AbstractObserveService implements ComputeDataService { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ComputeDataServiceImpl.class); - - private static final String MESSAGE_FORMAT_3 = - "[%1$s] %2$s calculé : %3$s (%4$s:%5$s, %6$s:%7$s)"; - - protected final BeanMonitor targetLengthMonitor = new BeanMonitor( - TargetLength.PROPERTY_LENGTH, - TargetLength.PROPERTY_LENGTH_SOURCE, - TargetLength.PROPERTY_WEIGHT, - TargetLength.PROPERTY_WEIGHT_SOURCE); - - protected final BeanMonitor nonTargetLengthMonitor = new BeanMonitor( - NonTargetLength.PROPERTY_LENGTH, - NonTargetLength.PROPERTY_LENGTH_SOURCE, - NonTargetLength.PROPERTY_WEIGHT, - NonTargetLength.PROPERTY_WEIGHT_SOURCE); - - protected final BeanMonitor nonTargetCatchMonitor = new BeanMonitor( - NonTargetCatch.PROPERTY_MEAN_LENGTH, - NonTargetCatch.PROPERTY_MEAN_LENGTH_COMPUTED_SOURCE, - NonTargetCatch.PROPERTY_MEAN_WEIGHT, - NonTargetCatch.PROPERTY_MEAN_WEIGHT_COMPUTED_SOURCE, - NonTargetCatch.PROPERTY_CATCH_WEIGHT, - NonTargetCatch.PROPERTY_CATCH_WEIGHT_COMPUTED_SOURCE, - NonTargetCatch.PROPERTY_TOTAL_COUNT, - NonTargetCatch.PROPERTY_TOTAL_COUNT_COMPUTED_SOURCE - ); - - protected String nonTargetCatcheLabel; - - protected String speciesLabel; - - protected ReferentialService referentialService; - - protected ReferentialService getReferentialService() { - if (referentialService == null) { - referentialService = newService(ReferentialService.class); - } - return referentialService; - } - - protected String getNonTargetCatcheLabel() { - if (nonTargetCatcheLabel == null) { - nonTargetCatcheLabel = t(DecoratorService.getEntityLabel(NonTargetCatch.class)); - } - return nonTargetCatcheLabel; - } - - protected String getSpeciesLabel() { - if (speciesLabel == null) { - speciesLabel = t(DecoratorService.getEntityLabel(Species.class)); - } - return speciesLabel; - - } - - protected void clear() { - - nonTargetLengthMonitor.setBean(null); - targetLengthMonitor.setBean(null); - nonTargetCatchMonitor.setBean(null); - nonTargetCatcheLabel = null; - speciesLabel = null; - - } - - @Override - public void consolidateTrips(SendMessageAble messager, Set<String> tripIds) { - - if (messager == null) { - - messager = new SendMessageAble() { - - @Override - public void sendMessage(String message) { - if (log.isInfoEnabled()) { - log.info(message); - } - } - }; - - } - - TopiaDAO<TripSeine> dao = getDao(TripSeine.class); - - List<TripSeine> toUpdate = new ArrayList<TripSeine>(tripIds.size()); - - for (String tripId : tripIds) { - - if (Entities.isSeineId(tripId)) { - - TripSeine trip = dao.findByTopiaId(tripId); - - boolean needUpdate = consolidateTripSeine(messager, trip); - if (needUpdate) { - - // on met a jour la maree en base - dao.update(trip); - - // on conserve une reference sur la maree mise à jour - toUpdate.add(trip); - - } - - } - - } - - // on commite si quelque chose a ete mise a jour - boolean needCommit = !toUpdate.isEmpty(); - - if (needCommit) { - - messager.sendMessage(t("observe.message.consolidate.save.changes", toUpdate.size())); - getTransaction().commitTransaction(); - - } - - } - - protected boolean consolidateTripSeine(SendMessageAble messager, TripSeine maree) { - - clear(); - - String mareeStr = decorateEntity(maree); - - messager.sendMessage(t("observe.message.consolidate.start.maree", mareeStr)); - - // recuperation des ids des sets de la maree - String[] activityIds = getActivityIds(maree); - - if (activityIds.length == 0) { - - // pas de set dans cette maree, donc rien a sauvegarder - messager.sendMessage(t("observe.message.consolidate.no.activity.from.maree", mareeStr)); - return false; - } - - // recuperation des references vers les activitys avec set - SortedMap<TopiaEntity, List<TopiaEntityRef>> result; - - result = TopiaEntityHelper.detectReferences( - ObserveDAOHelper.getContracts(), activityIds, maree); - - List<ActivitySeine> toUpdate = new ArrayList<ActivitySeine>(result.size()); - for (Map.Entry<TopiaEntity, List<TopiaEntityRef>> e : - result.entrySet()) { - ActivitySeine activitySeine = (ActivitySeine) e.getKey(); - List<TopiaEntityRef> refs = e.getValue(); - TopiaEntityRef ref = refs.get(0); - TopiaEntity[] path = ref.getPath(); - Route route = (Route) path[path.length - 2]; - boolean needUpdate = consolidateActivity(messager, - maree, - route, - activitySeine - ); - if (needUpdate) { - toUpdate.add(activitySeine); - } - } - if (toUpdate.isEmpty()) { - - // rien n'a ete modifie - messager.sendMessage(t("observe.message.consolidate.nothing.to.save.for.maree", mareeStr)); - return false; - - } - - // on devra mettre a jour en base la maree - messager.sendMessage(t("observe.message.consolidate.maree.need.update", mareeStr)); - - return true; - - } - - protected boolean consolidateActivity(SendMessageAble messager, - TripSeine maree, - Route route, - ActivitySeine activity) { - - messager.sendMessage(t("observe.message.consolidate.start.activity", decorateEntity(activity))); - - boolean needUpdate = false; - SetSeine set = activity.getSetSeine(); - SchoolType oldTypeBanc = set.getSchoolType(); - SchoolType newTypeBanc = activity.getSchoolType(); - if (oldTypeBanc == null || oldTypeBanc != newTypeBanc) { - - // le type de banc a change, on doit sauver l'activity - needUpdate = true; - set.setSchoolType(newTypeBanc); - } - - if (!set.isTargetSampleEmpty()) { - - // des echantillons thons trouves - for (TargetSample targetSample : set.getTargetSample()) { - if (!targetSample.isTargetLengthEmpty()) { - for (TargetLength targetLength : - targetSample.getTargetLength()) { - - targetLengthMonitor.setBean(targetLength); - - updateLengthWeightAble( - maree, - route.getDate(), - targetLength.getSpecies(), - null, // pas de gender precise - targetLength - ); - - if (targetLengthMonitor.wasModified()) { - needUpdate = true; - } - } - } - } - } - - if (!set.isNonTargetSampleEmpty()) { - - // des echantillons faunes trouves - for (NonTargetSample nonTargetSample : - set.getNonTargetSample()) { - - if (!nonTargetSample.isNonTargetLengthEmpty()) { - for (NonTargetLength nonTargetLength : - nonTargetSample.getNonTargetLength()) { - - nonTargetLengthMonitor.setBean(nonTargetLength); - - updateLengthWeightAble( - maree, - route.getDate(), - nonTargetLength.getSpecies(), - nonTargetLength.getSex(), - nonTargetLength - ); - if (nonTargetLengthMonitor.wasModified()) { - needUpdate = true; - } - } - } - } - } - - if (!set.isNonTargetCatchEmpty()) { - - // des captures (ou rejets) faunes trouves - for (NonTargetCatch nonTargetCatch : set.getNonTargetCatch()) { - - nonTargetCatchMonitor.setBean(nonTargetCatch); - - // suppression de tous les champs précédemment calculés - - if (nonTargetCatch.isCatchWeightComputed()) { - nonTargetCatch.setCatchWeight(null); - nonTargetCatch.setCatchWeightComputedSource(null); - } - - if (nonTargetCatch.isTotalCountComputed()) { - nonTargetCatch.setTotalCount(null); - nonTargetCatch.setTotalCountComputedSource(null); - } - - if (nonTargetCatch.isMeanWeightComputed()) { - nonTargetCatch.setMeanWeight(null); - nonTargetCatch.setMeanWeightComputedSource(null); - } - - if (nonTargetCatch.isMeanLengthComputed()) { - nonTargetCatch.setMeanLength(null); - nonTargetCatch.setMeanLengthComputedSource(null); - } - - updateNonTargetCatch( - maree, - set, - route.getDate(), - nonTargetCatch - ); - - if (nonTargetCatchMonitor.wasModified()) { - needUpdate = true; - } - } - } - return needUpdate; - } - - protected void updateNonTargetCatch(TripSeine maree, - SetSeine set, - Date jour, - NonTargetCatch nonTargetCatch) { - - final Species species = nonTargetCatch.getSpecies(); - - // récupération du référentiel - LengthWeightParameter parametrage = getReferentialService().findLengthWeightParameter(species, - maree.getOcean(), - null, // pas de sexe spécifié - jour); - - // -- Cas n°1 (calcul uniquement à partir des relations taille - poids) - updateNonTargetCatchByLengthWeightRelation(nonTargetCatch, parametrage); - - if (allNonTargetCatchDataFilled(nonTargetCatch)) { - - // tout est rempli, plus rien à faire - return; - } - - // répération des échantillon de cette espèce sur les calée - - Collection<NonTargetLength> samples = null; - - if (!set.isNonTargetSampleEmpty()) { - samples = Collections2.filter(set.getNonTargetSample().iterator().next().getNonTargetLength(), new Predicate<NonTargetLength>() { - - @Override - public boolean apply(NonTargetLength input) { - return species.equals(input.getSpecies()); - } - }); - } - - - if (nonTargetCatch.getCatchWeight() != null || nonTargetCatch.getTotalCount() != null) { - - // -- Cas n°2 (pas de taille / poids moyen mais au moins un des deux taille / poids) - computeNonTargetCatchTailleMoyenne(nonTargetCatch, samples, parametrage); - } - - if (allNonTargetCatchDataFilled(nonTargetCatch)) { - - // tout est rempli, plus rien à faire - return; - } - - // -- Cas n°3 (pas de nombre estimé) - - if (nonTargetCatch.getTotalCount() == null) { - - computeNonTargetCatchNombreEstime(nonTargetCatch, samples, parametrage); - - } - - if (allNonTargetCatchDataFilled(nonTargetCatch)) { - - // tout est rempli, plus rien à faire - return; - } - - // -- Cas n°4 (pas de poids moyen, taille moyenne) - - computeNonTargetCatchMeanValues(nonTargetCatch, parametrage); - } - - protected void updateNonTargetCatchByLengthWeightRelation(NonTargetCatch nonTargetCatch, - LengthWeightParameter parametrage) { - - // calcul via le paramétrage taille - poids - updateLengthWeightAble( - nonTargetCatch.getSpecies(), - nonTargetCatch, - parametrage - ); - - // calcule l'un des trois champs poids estimé - nbEstime - poids moyen - updateNonTargetCatchPoidsEstimeNbEstimePoidsMoyen(nonTargetCatch); - - // on ressaye d'appliquer la relation taille - poids au cas où une des - // trois valeurs précédentes a été calculée, on pourrait peut-être - // ainsi en déduire via le paramétrage la taille moyenne - updateLengthWeightAble( - nonTargetCatch.getSpecies(), - nonTargetCatch, - parametrage - ); - } - - protected void updateNonTargetCatchPoidsEstimeNbEstimePoidsMoyen(NonTargetCatch nonTargetCatch) { - - Float meanWeight = nonTargetCatch.getMeanWeight(); - Float catchWeight = nonTargetCatch.getCatchWeight(); - Integer nbEstime = nonTargetCatch.getTotalCount(); - - String entityLabel = getNonTargetCatcheLabel(); - - if (catchWeight == null && nbEstime != null && meanWeight != null) { - - // calcul le weight poids à partir de nb estime et du poids moyen - catchWeight = meanWeight * (float) nbEstime / 1000; - nonTargetCatch.setCatchWeight(catchWeight); - nonTargetCatch.setCatchWeightComputedSource(NonTargetCatchComputedValueSource.FROM_DATA); - String message = String.format(MESSAGE_FORMAT_3, - entityLabel, - t("observe.common.catchWeight"), - catchWeight, - t("observe.common.meanWeight"), - meanWeight, - t("observe.common.totalCount"), - nbEstime); - if (log.isInfoEnabled()) { - log.info(message); - } - } - - if (nbEstime == null && catchWeight != null && meanWeight != null) { - - // calcul le nb estime à partir du poids estime et du poids moyen - nbEstime = (int) ((float) 1000 * catchWeight / meanWeight); - nonTargetCatch.setTotalCount(nbEstime); - nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSource.FROM_DATA); - String message = String.format(MESSAGE_FORMAT_3, - entityLabel, - t("observe.common.totalCount"), - nbEstime, - t("observe.common.meanWeight"), - meanWeight, - t("observe.common.catchWeight"), - catchWeight); - if (log.isInfoEnabled()) { - log.info(message); - } - } - - if (meanWeight == null && nbEstime != null && nbEstime != 0 && catchWeight != null && - !NonTargetCatchComputedValueSource.FROM_SAMPLE.equals(nonTargetCatch.getTotalCountComputedSource())) { - - // calcul le poids moyen à partir de nb estime et du poids estime - // uniquement si le nombre estimé ne vient pas des échantillons (voir http://forge.codelutin.com/issues/4670) - - meanWeight = catchWeight * (float) 1000 / (float) nbEstime; - nonTargetCatch.setMeanWeight(meanWeight); - nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSource.FROM_DATA); - String message = String.format(MESSAGE_FORMAT_3, - entityLabel, - t("observe.common.meanWeight"), - meanWeight, - t("observe.common.totalCount"), - nbEstime, - t("observe.common.catchWeight"), - catchWeight); - if (log.isInfoEnabled()) { - log.info(message); - } - } - } - - protected void updateLengthWeightAble(TripSeine maree, - Date jour, - Species species, - Sex sex, - LengthWeightComputable e) { - - Ocean ocean = maree.getOcean(); - - String entityLabel = getSpeciesLabel(); - - Float weight = e.getWeight(); - boolean computePoids = false; - boolean computeTaille = false; - Float taille = e.getLength(); - - if (weight == null && taille != null) { - - // on essaye de calculer le weight - computePoids = true; - } - - if (taille == null && weight != null) { - - // on essaye de calcule la length - computeTaille = true; - } - - if (!computeTaille && !computePoids) { - - // rien a calculer - return; - } - - // recherche du parametrage adequate - LengthWeightParameter parametrage = - getReferentialService().findLengthWeightParameter( - species, - ocean, - sex, - jour - ); - - if (parametrage == null) { - - // aucun parametrage connu - - String message = t("observe.message.consolidate.no.parametrage.found", - t(entityLabel), - decorateEntity(species) - ); - if (log.isWarnEnabled()) { - log.warn(message); - } - return; - } - - if (computeTaille) { - Float newTaille = parametrage.computeLength(weight); - if (newTaille != null) { - - // la taille a ete calculee - String message = - "[" + t(entityLabel) + "] " + - t("observe.message.consolidate.computed.taille", - newTaille, - weight, - parametrage.getWeightLengthFormula(), - parametrage.getCoefficients() - ); - if (log.isInfoEnabled()) { - log.info(message); - } - e.setLength(newTaille); - e.setLengthSource(true); - return; - } - - // la taille n'a pas changee, on peut quitter car il est impossible - // de calculer et la taille et le poids... - return; - } - - // on cherche obligatoirement a calculer le poids - Float newPoids = parametrage.computeWeight(taille); - if (newPoids != null) { - - // le poids a ete calcule - String message = "[" + t(entityLabel) + "] " + - t("observe.message.consolidate.computed.weight", - newPoids, - taille, - parametrage.getLengthWeightFormula(), - parametrage.getCoefficients()); - if (log.isInfoEnabled()) { - log.info(message); - } - e.setWeight(newPoids); - e.setWeightSource(true); - } - } - - protected void updateLengthWeightAble(Species species, - LengthWeightComputable e, - LengthWeightParameter parametrage) { - - String entityLabel = getSpeciesLabel(); - - Float weight = e.getWeight(); - boolean computePoids = false; - boolean computeTaille = false; - Float taille = e.getLength(); - - if (weight == null && taille != null) { - - // on essaye de calculer le weight - computePoids = true; - } - - if (taille == null && weight != null) { - - // on essaye de calcule la length - computeTaille = true; - } - - if (!computeTaille && !computePoids) { - - // rien a calculer - return; - } - - if (parametrage == null) { - - // aucun parametrage connu - - String message = t("observe.message.consolidate.no.parametrage.found", - t(entityLabel), - decorateEntity(species) - ); - if (log.isWarnEnabled()) { - log.warn(message); - } - return; - } - - if (computeTaille) { - Float newTaille = parametrage.computeLength(weight); - if (newTaille != null) { - - // la taille a ete calculee - String message = - "[" + t(entityLabel) + "] " + - t("observe.message.consolidate.computed.taille", - newTaille, - weight, - parametrage.getWeightLengthFormula(), - parametrage.getCoefficients() - ); - if (log.isInfoEnabled()) { - log.info(message); - } - e.setLength(newTaille); - e.setLengthSource(true); - return; - } - - // la taille n'a pas changee, on peut quitter car il est impossible - // de calculer et la taille et le poids... - return; - } - - // on cherche obligatoirement a calculer le weight - Float newPoids = parametrage.computeWeight(taille); - if (newPoids != null) { - - // le weight a ete calcule - String message = "[" + t(entityLabel) + "] " + - t("observe.message.consolidate.computed.weight", - newPoids, - taille, - parametrage.getLengthWeightFormula(), - parametrage.getCoefficients()); - if (log.isInfoEnabled()) { - log.info(message); - } - e.setWeight(newPoids); - e.setWeightSource(true); - } - } - - protected void computeNonTargetCatchTailleMoyenne(NonTargetCatch nonTargetCatch, - Collection<NonTargetLength> samples, - LengthWeightParameter parametrage) { - - Float meanLength = null; - NonTargetCatchComputedValueSource computedSource = null; - - if (CollectionUtils.isNotEmpty(samples)) { - - // on calcul la taille moyenne à partir des échantillons - float totalTaille = 0f; - int nbIndividus = 0; - for (NonTargetLength sample : samples) { - - Integer count = sample.getCount(); - Float length = sample.getLength(); - - if (count != null && length != null) { - nbIndividus += count; - totalTaille += length * count; - } - } - - if (nbIndividus != 0) { - - meanLength = totalTaille / nbIndividus; - - computedSource = NonTargetCatchComputedValueSource.FROM_SAMPLE; - } - } - - if (meanLength == null && parametrage != null) { - - // on prend directement la valeur fournie par le référentiel - - meanLength = parametrage.getMeanLength(); - computedSource = NonTargetCatchComputedValueSource.FROM_REFERENTIEL; - } - - if (meanLength != null) { - - // la taille moyenne a pu etre calculee, on la pousse alors - nonTargetCatch.setMeanLength(meanLength); - nonTargetCatch.setMeanLengthComputedSource(computedSource); - - // on peut aussi relancer la calcul du cas n°1 - updateNonTargetCatchByLengthWeightRelation(nonTargetCatch, parametrage); - } - - } - - private void computeNonTargetCatchNombreEstime(NonTargetCatch nonTargetCatch, - Collection<NonTargetLength> samples, - LengthWeightParameter parametrage) { - - - if (CollectionUtils.isNotEmpty(samples)) { - - // on calcul la taille moyenne à partir des échantillons - int nbIndividus = 0; - for (NonTargetLength sample : samples) { - - Integer count = sample.getCount(); - - if (count != null) { - nbIndividus += count; - } - } - - if (nbIndividus != 0) { - - nonTargetCatch.setTotalCount(nbIndividus); - nonTargetCatch.setTotalCountComputedSource(NonTargetCatchComputedValueSource.FROM_SAMPLE); - - if (nonTargetCatch.getMeanWeight() != null || nonTargetCatch.getMeanLength() != null) { - - // on peut aussi relancer la calcul du cas n°1 - updateNonTargetCatchByLengthWeightRelation(nonTargetCatch, parametrage); - } - } - } - } - - private void computeNonTargetCatchMeanValues(NonTargetCatch nonTargetCatch, - LengthWeightParameter parametrage) { - - if (parametrage != null) { - - nonTargetCatch.setMeanLength(parametrage.getMeanLength()); - nonTargetCatch.setMeanLengthComputedSource(NonTargetCatchComputedValueSource.FROM_REFERENTIEL); - - nonTargetCatch.setMeanWeight(parametrage.getMeanWeight()); - nonTargetCatch.setMeanWeightComputedSource(NonTargetCatchComputedValueSource.FROM_REFERENTIEL); - - if (nonTargetCatch.getMeanWeight() != null || nonTargetCatch.getMeanLength() != null) { - - // on peut aussi relancer la calcul du cas n°1 - updateNonTargetCatchByLengthWeightRelation(nonTargetCatch, parametrage); - } - } - } - - //FIXME Use a simple sql query - protected String[] getActivityIds(TripSeine maree) { - List<String> tmpIds = new ArrayList<String>(); - if (!maree.isRouteEmpty()) { - for (Route route : maree.getRoute()) { - if (!route.isActivitySeineEmpty()) { - for (ActivitySeine activitySeine : route.getActivitySeine()) { - if (activitySeine.getSetSeine() != null) { - - // on ne retient que les activitys avec set - tmpIds.add(activitySeine.getTopiaId()); - } - } - } - } - } - String[] result = tmpIds.toArray(new String[tmpIds.size()]); - return result; - } - - protected boolean allNonTargetCatchDataFilled(NonTargetCatch nonTargetCatch) { - return Iterables.all( - Sets.newHashSet(nonTargetCatch.getCatchWeight(), - nonTargetCatch.getTotalCount(), - nonTargetCatch.getMeanWeight(), - nonTargetCatch.getMeanLength()), - Predicates.notNull()); - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/GpsImportServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/GpsImportServiceImpl.java deleted file mode 100644 index af83412..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/GpsImportServiceImpl.java +++ /dev/null @@ -1,153 +0,0 @@ -package fr.ird.observe.services.operation; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.SendMessageAble; -import fr.ird.observe.entities.seine.ActivitySeine; -import fr.ird.observe.entities.seine.Route; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.entities.seine.TripSeineDAO; -import fr.ird.observe.business.gps.GPSPoint; -import fr.ird.observe.services.AbstractObserveService; -import org.apache.commons.collections.primitives.ArrayIntList; -import org.apache.commons.collections.primitives.IntIterator; -import org.apache.commons.collections.primitives.IntList; -import org.nuiton.decorator.Decorator; -import org.nuiton.topia.persistence.TopiaDAO; - -import java.util.HashMap; -import java.util.Map; - -/** - * Created on 5/3/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class GpsImportServiceImpl extends AbstractObserveService implements GpsImportService { - - @Override - public Map<ActivitySeine, GPSPoint> getActivitiesForOpenRoute(String openTripSeineId) { - - Map<ActivitySeine, GPSPoint> data; - - - TripSeine openTripSeine = findByTopiaId(TripSeine.class, openTripSeineId); - - if (openTripSeine.isRouteEmpty()) { - - // pas de route sur la maree ouverte - data = null; - - } else { - - data = new HashMap<ActivitySeine, GPSPoint>(); - - for (Route r : openTripSeine.getRoute()) { - if (!r.isActivitySeineEmpty()) { - // on enregistre les actitives - for (ActivitySeine a : r.getActivitySeine()) { - data.put(a, null); - } - } - } - } - - return data; - - } - - @Override - public void applyPoints(Map<ActivitySeine, GPSPoint> data, int[] selectedIndex, SendMessageAble messanger) { - - Decorator<ActivitySeine> dActivity = getDecoratorByType(ActivitySeine.class, "activity-gps"); - Decorator<GPSPoint> dGPSPoint = getDecoratorByType(GPSPoint.class, "gpsPoint-gps"); - - IntList lIndex = new ArrayIntList(selectedIndex.length); - - for (int i : selectedIndex) { - lIndex.add(i); - } - IntIterator indexItr = lIndex.iterator(); - - int currentActivityIndex = 0; - int nextActivityIndex = indexItr.next(); - - TopiaDAO<ActivitySeine> activityDAO = getDao(ActivitySeine.class); - - for (ActivitySeine a : data.keySet()) { - - if (currentActivityIndex == nextActivityIndex) { - - // l'activité courante a ete selectionne - GPSPoint p = data.get(a); - - messanger.sendMessage(t("observe.message.importGPS.apply.point", dGPSPoint.toString(p), dActivity.toString(a))); -// sendMessage(t("observe.message.importGPS.apply.point", p, a.getVesselActivity().getLabel2())); - float latitude = Math.abs(p.getLatitude()); - float longitude = Math.abs(p.getLongitude()); - int quadrant = p.getQuadrant(); - // application de la position - - ActivitySeine aa = activityDAO.findByTopiaId(a.getTopiaId()); - aa.setLatitude(latitude); - aa.setLongitude(longitude); - aa.setQuadrant(quadrant); - //TODO appliquer la vitesse ? - //a.setVesselSpeed(p.getVitesse()); - - // mise a jour de l'activité - - activityDAO.update(aa); - - if (indexItr.hasNext()) { - - // il reste au moins une activité a traiter - // recuperation du prochain index d'activité a traiter - nextActivityIndex = indexItr.next(); - - } else { - - // plus d'activité a traiter - break; - - } - - } - - currentActivityIndex++; - - } - - } - - @Override - public TripSeine getOpenTrip() { - - TripSeineDAO dao = (TripSeineDAO) getDao(TripSeine.class); - TripSeine openTrip = dao.findByOpen(true); - return openTrip; - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/SynchronizeServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/SynchronizeServiceImpl.java deleted file mode 100644 index a63e645..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/SynchronizeServiceImpl.java +++ /dev/null @@ -1,240 +0,0 @@ -package fr.ird.observe.services.operation; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.DecoratorService; -import fr.ird.observe.ObserveDAOHelper; -import fr.ird.observe.ObserveEntityEnum; -import fr.ird.observe.SendMessageAble; -import fr.ird.observe.business.db.DataSource; -import fr.ird.observe.business.db.DataSourceException; -import fr.ird.observe.entities.Entities; -import fr.ird.observe.entities.referentiel.ReferenceEntities; -import fr.ird.observe.entities.seine.TripSeine; -import fr.ird.observe.services.AbstractObserveService; -import fr.ird.observe.services.ReplicationService; -import fr.ird.observe.services.referential.ReferentialService; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.collections4.MapUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.hibernate.jdbc.Work; - -import org.nuiton.topia.framework.TopiaContextImplementor; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.DiffState; -import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import org.nuiton.topia.persistence.util.TopiaEntityRef; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.SQLException; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; - -import static org.nuiton.i18n.I18n.t; - -/** - * FIXME Utiliser des pattern Request, Result, Context - * FIXME Ne plus utilisers des messanger - * - * Created on 5/3/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class SynchronizeServiceImpl extends AbstractObserveService implements SynchronizeService { - - /** Logger. */ - private static final Log log = LogFactory.getLog(SynchronizeServiceImpl.class); - - @Override - public DiffState.DiffStateMap buildReferentielDifferentiel(final DataSource centralDataSource, final SendMessageAble messanger) { - - final DiffState.DiffStateMap result = DiffState.newMap(); - - final ReferentialService centralReferentialService = newService(centralDataSource, ReferentialService.class); - - ReferenceEntities.walk(new ReferenceEntities.ReferentielWalker() { - - - public <E extends TopiaEntity> void walk(Class<E> contractClass) { - - String s = t(DecoratorService.getEntityLabel(contractClass)); - String message = - t("observe.service.build.synchro.referentiel", s); - if (messanger != null) { - messanger.sendMessage(message); - } - if (log.isInfoEnabled()) { - log.info(message); - } - List<E> list = centralReferentialService.getList(contractClass); - List<E> list2 = getList(contractClass); - DiffState.DiffStateMap tmp; - // recuperation du differentiel pour le type d'entitétmp = - tmp = TopiaEntityHelper.buildDifferentiel(list, list2); - // ajout au resultat - DiffState.addAll(result, tmp); - // on nettoie - DiffState.clear(tmp); - } - }); - DiffState.removeEmptyStates(result); - return result; - - } - - @Override - public SortedMap<TopiaEntity, List<TopiaEntityRef>> detectObsoleteEntities(DiffState.DiffStateMap diff) { - - // detection des entites obsoletes - - List<String> removedList = diff.get(DiffState.REMOVED); - - String[] ids = removedList.toArray(new String[removedList.size()]); - - // detection des entites obsoletes - - // des suppressions ont ete detectees, on doit retrouver - // dans la base locale les entites utilisant ces entites obsoletes - List<TripSeine> marees = getDao(TripSeine.class).findAll(); - - ObserveEntityEnum[] contracts = ObserveDAOHelper.getContracts(); - - SortedMap<TopiaEntity, List<TopiaEntityRef>> result; - - result = TopiaEntityHelper.detectReferences(contracts, ids, marees); - return result; - - } - - @Override - public void saveReferentiel(DataSource centralDataSource, - DiffState.DiffStateMap diff, - List<ObsoleteReferenceToReplace> obsoleteReferencesToReplace, - SendMessageAble messanger) throws DataSourceException { - - Map<TopiaEntity, Long> versionsToUpdate = new HashMap<TopiaEntity, Long>(); - - List<String> ids; - - // ajout des nouvelles entites du referentiel - - ids = diff.get(DiffState.NEW); - if (CollectionUtils.isNotEmpty(ids)) { - - ReplicationService replicationService = newService(ReplicationService.class); - - replicationService.replicateReferentiel(centralDataSource, ids, messanger); - - } - - ReferentialService localReferentialService = newService(ReferentialService.class); - - // mis a jour des entites modifiees - - ids = diff.get(DiffState.MODIFIED); - if (CollectionUtils.isNotEmpty(ids)) { - - ReferentialService service = newService(centralDataSource, ReferentialService.class); - Collection<? extends TopiaEntity> entitiesToCopy = service.loadSimpleEntities(ids); - - localReferentialService.copySimpleEntities(entitiesToCopy); - - } - - // mise à jour des données utilisateurs (remplacements d'objets obsolètes) - - for (ObsoleteReferenceToReplace referenceToReplace : obsoleteReferencesToReplace) { - - String message = t("observe.synchro.replaceObsolete.object", referenceToReplace.getObsoleteId()); - messanger.sendMessage(message); - - localReferentialService.replaceObsoleteReference(referenceToReplace); - - } - - // si on ne commite pas ici, les modifications utilisateurs sont perdues - getTransaction().commitTransaction(); - - // suppression des entités obsoletes de la base source - - ids = diff.get(DiffState.REMOVED); - if (CollectionUtils.isNotEmpty(ids)) { - - localReferentialService.deleteEntities(ids); - - } - - if (MapUtils.isNotEmpty(versionsToUpdate)) { - - // on applique le patch sur les versions pour bien avoir - // la bonne version de topiaversion et pas seulement un incrément - // de 1 puisque ce champs est géré par hibernate et qu'il ne nous laisse - // pas la possibilité de choisir la valeur qu'on veut attribuer au champs... - patchTopiaVersions(versionsToUpdate); - } - - getTransaction().commitTransaction(); - - } - - private static final String UPDATE_VERSION_PATTERN = "UPDATE %1$s SET topiaversion = %2$d WHERE topiaid='%3$s';\n"; - - protected void patchTopiaVersions(Map<TopiaEntity, Long> versionsToUpdate) { - - final StringBuilder buffer = new StringBuilder(); - - for (Map.Entry<TopiaEntity, Long> entry : - versionsToUpdate.entrySet()) { - TopiaEntity entity = entry.getKey(); - String id = entity.getTopiaId(); - Long version = entry.getValue(); - String tableName = Entities.getTableName(entity); - buffer.append(String.format(UPDATE_VERSION_PATTERN, tableName, version, id)); - - } - ((TopiaContextImplementor) getTransaction()).getHibernate().doWork(new Work() { - - @Override - public void execute(Connection connection) throws SQLException { - String sql = buffer.toString(); - PreparedStatement sta = connection.prepareStatement(sql); - try { - if (log.isDebugEnabled()) { - log.debug("Will execute sql code :\n" + sql); - } - sta.executeUpdate(); - } finally { - sta.close(); - } - } - }); - } - - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/ValidationServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/ValidationServiceImpl.java deleted file mode 100644 index b636e79..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/operation/ValidationServiceImpl.java +++ /dev/null @@ -1,116 +0,0 @@ -package fr.ird.observe.services.operation; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.DecoratorService; -import fr.ird.observe.SendMessageAble; -import fr.ird.observe.entities.Trip; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.services.AbstractObserveService; -import fr.ird.observe.services.data.TripService; -import fr.ird.observe.services.data.DataSelectionModel; -import fr.ird.observe.business.validation.ValidationMessageDetector; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; - -import java.util.List; -import java.util.Set; - -import static org.nuiton.i18n.I18n.t; - -/** - * //FIXME A revoir, on doit utiliser un pattern de Request, Context et Result - * //FIXME Le detector doit être interne - * Created on 5/3/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class ValidationServiceImpl extends AbstractObserveService implements ValidationService { - - @Override - public void validate(SendMessageAble messager, ValidationMessageDetector detector, DataSelectionModel dataModel) { - - if (dataModel.isUseReferentiel()) { - - // validation des referentiels selectionnes - - validateReferentiel(messager, detector, dataModel); - } - - if (dataModel.isUseData()) { - - // validation des donnees observateur selectionnee - - validateData(messager, detector, dataModel); - } - - } - - protected void validateData(SendMessageAble messager, - ValidationMessageDetector detector, - DataSelectionModel dataModel) { - - Set<String> tripIds = dataModel.getSelectedData(); - - TripService tripService = newService(TripService.class); - - for (String tripId : tripIds) { - - Trip trip = tripService.getTrip(tripId); - Program program = trip.getProgram(); - - messager.sendMessage(t("observe.message.validation.start.maree", decorateEntity(trip), decorateEntity(program))); - detector.detectMessages(trip); - - } - - } - - protected void validateReferentiel(SendMessageAble messager, - ValidationMessageDetector detector, - DataSelectionModel dataModel) { - - Set<Class<?>> classes = dataModel.getSelectedReferentiel(); - - for (Class<?> klass : classes) { - - Class<? extends TopiaEntity> refClass = (Class<? extends TopiaEntity>) klass; - TopiaDAO<? extends TopiaEntity> dao = getDao(refClass); - - List<String> ids = dao.findAllIds(); - String entityLabel = t(DecoratorService.getEntityLabel(klass)); - messager.sendMessage(t("observe.message.validation.start.referentiel", entityLabel, ids.size())); - - for (String id : ids) { - TopiaEntity entity = dao.findByTopiaId(id); - detector.detectMessages(entity); - } - - ids.clear(); - - } - - } - -} diff --git a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/referential/ReferentialServiceImpl.java b/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/referential/ReferentialServiceImpl.java deleted file mode 100644 index 8193714..0000000 --- a/observe-services-topia/src/main/fromRefactor/fr/ird/observe/services/referential/ReferentialServiceImpl.java +++ /dev/null @@ -1,540 +0,0 @@ -package fr.ird.observe.services.referential; - -/* - * #%L - * ObServe :: Services ToPIA Implementation - * %% - * Copyright (C) 2008 - 2015 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import com.google.common.collect.Lists; -import com.google.common.collect.Sets; -import fr.ird.observe.BinderService; -import fr.ird.observe.ObserveTechnicalException; -import fr.ird.observe.entities.constants.ReferenceLocale; -import fr.ird.observe.entities.constants.ReferenceStatus; -import fr.ird.observe.entities.referentiel.LengthWeightParameter; -import fr.ird.observe.entities.referentiel.LengthWeightParameterDAO; -import fr.ird.observe.entities.referentiel.LengthWeightParemeterHelper; -import fr.ird.observe.entities.referentiel.Ocean; -import fr.ird.observe.entities.referentiel.Program; -import fr.ird.observe.entities.referentiel.ProgramDAO; -import fr.ird.observe.entities.referentiel.Programs; -import fr.ird.observe.entities.referentiel.ReferenceEntity; -import fr.ird.observe.entities.referentiel.Sex; -import fr.ird.observe.entities.referentiel.SexDAO; -import fr.ird.observe.entities.referentiel.Species; -import fr.ird.observe.entities.referentiel.SpeciesList; -import fr.ird.observe.entities.referentiel.seine.WeightCategory; -import fr.ird.observe.services.AbstractObserveService; -import fr.ird.observe.services.operation.ObsoleteReferenceToReplace; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.jxpath.JXPathContext; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.nuiton.decorator.Decorator; -import org.nuiton.topia.persistence.TopiaDAO; -import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.EntityListUpdator; -import org.nuiton.topia.persistence.util.TopiaEntityBinder; -import org.nuiton.topia.persistence.util.TopiaEntityHelper; -import org.nuiton.topia.persistence.util.TopiaEntityRef; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * Created on 4/25/15. - * - * @author Tony Chemit - chemit(a)codelutin.com - * @since 4.0 - */ -public class ReferentialServiceImpl extends AbstractObserveService implements ReferentialService { - - /** Logger. */ - private static final Log log = LogFactory.getLog(ReferentialServiceImpl.class); - - @Override - public List<Program> getAllProgramStub() { - - ProgramDAO dao = (ProgramDAO) getDao(Program.class); - ReferenceLocale referentielLocale = getReferentielLocale(); - List<Program> result = dao.findAllStub(referentielLocale); - return result; - - } - - @Override - public int getProgramPosition(String programId) { - - List<Program> allProgramStub = getAllProgramStub(); - Program programStub = getProgramStub(programId); - int result = 0; - if (CollectionUtils.isNotEmpty(allProgramStub)) { - Programs.sort(allProgramStub); - result = allProgramStub.indexOf(programStub); - } - return result; - - } - - @Override - public Program getProgramStub(String programId) { - - ProgramDAO dao = (ProgramDAO) getDao(Program.class); - ReferenceLocale referentielLocale = getReferentielLocale(); - Program result = dao.findStubByTopiaId(programId, referentielLocale); - return result; - - } - - @Override - public <E extends ReferenceEntity> List<E> loadListForEdit(Class<E> entityType) { - - List<E> entities = getDao(entityType).findAll(); - TopiaEntityBinder<E> binder = getBinder(entityType, BinderService.EDIT); - for (E entity : entities) { - binder.obtainProperties(entity); - } - return Lists.newArrayList(entities); - - } - - @Override - public <E extends ReferenceEntity> List<E> loadAndDecorateList(Class<E> entityType) { - - List<E> entities = getDao(entityType).findAll(); - decorate(entityType, entities); - return Lists.newArrayList(entities); - - } - - @Override - public <E extends ReferenceEntity> E loadAndDecorate(Class<E> entityType, String topiaId) { - - E entity = findByTopiaId(entityType, topiaId); - decorate(entityType, entity); - return entity; - - } - - @Override - public List<Species> loadDecoratedSpecies(String speciesListCode) { - - List<Species> speciess = new ArrayList<Species>(); - - SpeciesList speciesList = findByTopiaId(SpeciesList.class, speciesListCode); - - speciess.addAll(speciesList.getSpecies()); - - decorate(Species.class, speciess); - - return speciess; - - } - - @Override - public List<WeightCategory> loadDecoratedWeightCategory() { - - List<WeightCategory> weightCategories = loadAndDecorateList(WeightCategory.class); - Decorator<Species> speciesDecorator = getDecoratorByType(Species.class, null); - for (WeightCategory weightCategory : weightCategories) { - speciesDecorator.toString(weightCategory.getSpecies()); - } - return weightCategories; - } - - @Override - public void loadDecoratedWeightCategory(WeightCategory weightCategory) { - - decorate(WeightCategory.class, weightCategory); - decorate(Species.class, weightCategory.getSpecies()); - - } - - @Override - public Collection<? extends TopiaEntity> loadSimpleEntities(Collection<String> entityIds) { - - Collection<TopiaEntity> result = new ArrayList<TopiaEntity>(); - - for (String entityId : entityIds) { - - TopiaEntity entityToLoad = getTransaction().findByTopiaId(entityId); - TopiaDAO<TopiaEntity> dao = getDao(entityToLoad); - TopiaEntity entityLoaded = dao.newInstance(); - loadEntity(entityToLoad, entityLoaded, true); - - result.add(entityLoaded); - - } - - return result; - - } - - @Override - public Set<String> getSpeciesListSpeciesIds(String speciesListId) { - - SpeciesList speciesList = findByTopiaId(SpeciesList.class, speciesListId); - - Set<String> ids = Sets.newHashSet(TopiaEntityHelper.getTopiaIdList(speciesList.getSpecies())); - - return ids; - - } - - /** - * Recherche d'un {@link LengthWeightParameter} à partir des paramètres donnés. - * - * La recherche peut ne peut être aussi exacte que les paramètres donnés : - * - * Dans le cas d'une espèce faune, si non trouvé alors on recherche sur son - * speciesGroup d'espèce. - * - * Si non trouvé pour l'océan donné (et que celui-ci est non null), alors on - * recherche avec un ocean vide. - * - * Si non trouvé sur le gender (et que le gender n'est pas indéterminé) , alors - * on recherche avec le gender indéterminé (gender=0). - * - * @param species l'espèce sur lequel on recherche le paramétrage - * @param ocean l'ocean recherché (peut être null) - * @param sex le sexe recherché (on essayera sans sexe (sexe.code=0) si non trouvé) - * @param date le jour recherché - * @return le paramétrage adéquate - * @since 1.5 - */ - public LengthWeightParameter findLengthWeightParameter(Species species, Ocean ocean, Sex sex, Date date) throws ObserveTechnicalException { - - LengthWeightParameterDAO dao = (LengthWeightParameterDAO) getDao(LengthWeightParameter.class); - List<LengthWeightParameter> list = dao.findAllBySpecies(species); - - if (CollectionUtils.isEmpty(list)) { - - // aucun parametrage pour le type donne - return null; - - } - - // filtrage par ocean - list = LengthWeightParemeterHelper.filterByOcean(list, ocean); - - if (CollectionUtils.isEmpty(list) && ocean != null) { - - // filtre par ocean null - list = LengthWeightParemeterHelper.filterByOcean(list, null); - - } - - if (CollectionUtils.isEmpty(list)) { - - // pas d'ocean adequate - return null; - - } - - // filtrage par sexe - list = LengthWeightParemeterHelper.filterBySexe(list, sex); - - if (CollectionUtils.isEmpty(list)) { - - // Sex with code 0 - Sex unkwonSex = ((SexDAO) getDao(Sex.class)).getUnknownSex(); - - if (unkwonSex.equals(sex)) { - - // filtrage par sexe indetermine - list = LengthWeightParemeterHelper.filterBySexe(list, unkwonSex); - - } - - } - - if (CollectionUtils.isEmpty(list)) { - - // pas de sexe adequate - return null; - - } - - // filtrage par startDate de validite - list = LengthWeightParemeterHelper.filterByDateDebutValidite(list, date); - - if (CollectionUtils.isEmpty(list)) { - - // pas de date de debut adequate - return null; - - } - - // filtrage par endDate de validite - list = LengthWeightParemeterHelper.filterByDateFinValidite(list, date); - - if (CollectionUtils.isEmpty(list)) { - - // pas de date de fin adequate - return null; - - } - - // au final il ne devrait en rester qu'un - - if (list.size() > 1) { - - StringBuilder sb = new StringBuilder("Il existe plusieurs paramétrages possibles pour les données suivantes :"); - sb.append("\nEspece : "); - sb.append(decorateEntity(species)); - sb.append("\nOcean : "); - sb.append(decorateEntity(ocean)); - sb.append("\nSex : "); - sb.append(decorateEntity(sex)); - sb.append("\nDate : ").append(date); - sb.append("\nParamétrages trouvés : "); - for (LengthWeightParameter p : list) { - sb.append("\n - ").append(decorateEntity(p)); - } - - //FIXME Use a specific exception for this - throw new ObserveTechnicalException(sb.toString()); - - } - - LengthWeightParameter result = list.get(0); - if (log.isDebugEnabled()) { - - StringBuilder sb = new StringBuilder("Paramétrage trouvé pour les données suivantes :"); - sb.append("\nEspece : "); - sb.append(decorateEntity(species)); - sb.append("\nOcean : "); - sb.append(decorateEntity(ocean)); - sb.append("\nSex : "); - sb.append(decorateEntity(sex)); - sb.append("\nDate : ").append(date); - sb.append("\nParamétrage: ").append(decorateEntity(result)); - log.debug(sb.toString()); - - } - - return result; - - } - - @Override - public <R extends ReferenceEntity> R preCreate(Class<R> entityType) { - - R preCreated = getDao(entityType).newInstance(); - preCreated.setStatus(ReferenceStatus.enabled); - return preCreated; - - } - - @Override - public <R extends ReferenceEntity> String save(R toSave) { - - Class<R> entityType = getEntityContractClass(toSave); - - String referentialId = doSave(null, toSave, new SaveAction<R, R>(entityType, entityType) { - - @Override - public R onCreate(R parent, R toCreate) { - - Map<String, Object> properties = obtainProperties(entityClass, BinderService.EDIT, toCreate); - R created = getDao(entityClass).create(properties); - - return created; - - } - - @Override - public R onUpdate(R parent, R toUpdate) { - - R updated = super.onUpdate(parent, toUpdate); - copy(entityClass, BinderService.EDIT, toUpdate, updated); - return updated; - - } - }); - - return referentialId; - - } - - @Override - public <R extends ReferenceEntity> void delete(Class<R> entityType, String referentialId) { - - doDelete(null, referentialId, new DeleteAction<R, R>(entityType, entityType)); - - } - - @Override - public void deleteEntities(Collection<String> entityIds) { - - for (String entityId : entityIds) { - - TopiaEntity entityToDelete = getTransaction().findByTopiaId(entityId); - Class<TopiaEntity> entityType = getEntityContractClass(entityToDelete); - TopiaDAO<TopiaEntity> dao = getDao(entityType); - dao.delete(entityToDelete); - - } - } - - @Override - public void copySimpleEntities(Collection<? extends TopiaEntity> entities) { - - for (TopiaEntity entity : entities) { - - TopiaDAO<TopiaEntity> dao = getDao(entity); - - TopiaEntity entityLoaded = dao.findByTopiaId(entity.getTopiaId()); - loadEntity(entity, entityLoaded, false); - - } - - } - - @Override - public void replaceObsoleteReference(ObsoleteReferenceToReplace action) { - - String obsoleteId = action.getObsoleteId(); - String safeId = action.getSafeId(); - TopiaEntityRef[] refs = action.getRefs(); - - if (log.isInfoEnabled()) { - log.info("load obsolete object " + obsoleteId); - } - - if (log.isInfoEnabled()) { - log.info("load safe object " + safeId); - } - - TopiaEntity safeRef = getTransaction().findByTopiaId(safeId); - - // on remplace les references - for (TopiaEntityRef ref : refs) { - - TopiaEntity invoker = ref.getInvoker(); - - if (invoker == null) { - throw new NullPointerException("can not have a null invoker in " + ref); - } - - TopiaDAO<TopiaEntity> dao = getDao(invoker); - - - if (log.isInfoEnabled()) { - log.info("load invoker object " + invoker.getTopiaId()); - } - - invoker = dao.findByTopiaId(invoker.getTopiaId()); - - // switch entity - - String path = ref.getInvokerProperty(); - - JXPathContext jxcontext = JXPathContext.newContext(invoker); - - TopiaEntity oldValue = (TopiaEntity) jxcontext.getValue(path); - - if (log.isDebugEnabled()) { - log.debug("property to switch " + path + " old : " + - oldValue); - } - - if (log.isInfoEnabled()) { - log.info("change path : " + path); - log.info("old value : " + oldValue.getTopiaId()); - } - - jxcontext.setValue(path, safeRef); - - TopiaEntity newValue = (TopiaEntity) jxcontext.getValue(path); - - if (log.isInfoEnabled()) { - log.info("new value : " + newValue.getTopiaId()); - } - if (log.isDebugEnabled()) { - log.debug("property to switch " + path + " new : " + - safeRef); - log.debug("property to switch " + path + " new Check : " + - newValue); - } - - dao.update(invoker); - - } - - } - - protected <E extends TopiaEntity> void loadEntity(E source, E target, boolean tech) { - - getBinderService().simpleCopy(source, target, tech); - - if (source instanceof Species) { - - // Need also to bind ocean - loadAssociation(Species.class, Ocean.class, Species.PROPERTY_OCEAN, (Species) source, (Species) target); - - } else if (source instanceof SpeciesList) { - - // Need also to bind species - loadAssociation(SpeciesList.class, Species.class, SpeciesList.PROPERTY_SPECIES, (SpeciesList) source, (SpeciesList) target); - - } - - } - - public <E extends TopiaEntity, C extends TopiaEntity> void loadAssociation(Class<E> entityType, - Class<C> childEntityType, - String propertyName, - E source, - E target) { - - EntityListUpdator<E, C> listUpdator = EntityListUpdator.newEntityListUpdator(entityType, childEntityType, propertyName); - - int size = listUpdator.size(source); - - List<C> targetList = Lists.newArrayListWithCapacity(size); - - if (size > 0) { - - TopiaDAO<C> dao = getDao(childEntityType); - - Collection<C> sourceList = listUpdator.getChilds(source); - - for (C childToLoad : sourceList) { - - C childLoaded = dao.newInstance(); - childLoaded.setTopiaId(childToLoad.getTopiaId()); - childLoaded.setTopiaVersion(childToLoad.getTopiaVersion()); - childLoaded.setTopiaCreateDate(childToLoad.getTopiaCreateDate()); - targetList.add(childLoaded); - - } - - } - - listUpdator.setChilds(target, targetList); - - } - -} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

02/19: Merge branch 'feature/suppression_module_entities_validation' into develop
by codelutin.com scm 09 Jan '16

09 Jan '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 3731a904b733ef7a48e3ccda2bc986d9b0f767d8 Merge: d5d5d55 4382936 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 09:42:17 2016 +0100 Merge branch 'feature/suppression_module_entities_validation' into develop observe-entities-validation/LICENSE.txt | 674 --------------------- observe-entities-validation/README.txt | 2 - observe-entities-validation/changelog.txt | 2 - observe-entities-validation/pom.xml | 156 ----- .../src/license/THIRD-PARTY.properties | 32 - .../observe-entities-validation_en_GB.properties | 425 ------------- .../observe-entities-validation_es_ES.properties | 424 ------------- .../observe-entities-validation_fr_FR.properties | 425 ------------- .../src/test/resources/log4j.properties | 52 -- observe-entities/pom.xml | 17 + .../CollectionFieldExpressionValidator2.java | 0 .../validator/CollectionUniqueKeyValidator2.java | 0 .../ObserveCollectionUniqueKeyValidator.java | 0 .../entities/AbstractEspeceFieldValidator.java | 0 .../ActivityFinDeVeilleExistsValidator.java | 0 .../entities/ActivitySimpleSpeedValidator.java | 0 .../validator/entities/ActivitySpeedValidator.java | 0 .../entities/SetLonglineUniqueHomeIdValidator.java | 0 .../entities/SetLonglineUniqueNumberValidator.java | 0 .../entities/SpeciesLengthFieldValidator.java | 0 .../entities/SpeciesWeightFieldValidator.java | 0 ...ActivityLongline-n1-create-error-validation.xml | 0 ...tivityLongline-n1-create-warning-validation.xml | 0 ...ngline-n1-update-encounter-error-validation.xml | 0 ...ActivityLongline-n1-update-error-validation.xml | 0 ...gline-n1-update-sensorUsed-error-validation.xml | 0 ...tivityLongline-n1-update-warning-validation.xml | 0 ...BaitsComposition-n1-update-error-validation.xml | 0 .../Basket-n1-update-table-error-validation.xml | 0 ...ne-n1-update-catchLongline-error-validation.xml | 0 .../Branchline-n1-update-error-validation.xml | 0 ...Branchline-n1-update-table-error-validation.xml | 0 .../Branchline-n1-update-warning-validation.xml | 0 ...linesComposition-n1-update-error-validation.xml | 0 .../CatchLongline-n1-update-error-validation.xml | 0 .../CatchLongline-n1-update-warning-validation.xml | 0 .../Encounter-n1-update-error-validation.xml | 0 .../Encounter-n1-update-warning-validation.xml | 0 ...linesComposition-n1-update-error-validation.xml | 0 ...FeaturesLongline-n1-update-error-validation.xml | 0 ...HooksComposition-n1-update-error-validation.xml | 0 .../Section-n1-update-table-error-validation.xml | 0 .../SensorUsed-n1-update-error-validation.xml | 0 .../SensorUsed-n1-update-warning-validation.xml | 0 .../SetLongline-n1-create-error-validation.xml | 0 .../SetLongline-n1-create-warning-validation.xml | 0 ...n1-update-baitsComposition-error-validation.xml | 0 ...ate-branchlinesComposition-error-validation.xml | 0 .../SetLongline-n1-update-error-validation.xml | 0 ...date-floatlinesComposition-error-validation.xml | 0 ...1-update-globalComposition-error-validation.xml | 0 ...n1-update-hooksComposition-error-validation.xml | 0 .../SetLongline-n1-update-warning-validation.xml | 0 .../longline/Tdr-n1-update-error-validation.xml | 0 .../longline/Tdr-n1-update-warning-validation.xml | 0 .../TripLongline-n1-create-error-validation.xml | 0 .../TripLongline-n1-create-warning-validation.xml | 0 .../TripLongline-n1-update-error-validation.xml | 0 .../TripLongline-n1-update-warning-validation.xml | 0 .../Country-n1-create-error-validation.xml | 0 .../Country-n1-create-warning-validation.xml | 0 .../Country-n1-update-error-validation.xml | 0 .../Country-n1-update-warning-validation.xml | 0 .../FpaZone-n1-create-error-validation.xml | 0 .../FpaZone-n1-create-warning-validation.xml | 0 .../FpaZone-n1-update-error-validation.xml | 0 .../FpaZone-n1-update-warning-validation.xml | 0 .../Gear-n1-create-error-validation.xml | 0 .../Gear-n1-create-warning-validation.xml | 0 .../Gear-n1-update-error-validation.xml | 0 .../Gear-n1-update-warning-validation.xml | 0 ...earCaracteristic-n1-create-error-validation.xml | 0 ...rCaracteristic-n1-create-warning-validation.xml | 0 ...earCaracteristic-n1-update-error-validation.xml | 0 ...rCaracteristic-n1-update-warning-validation.xml | 0 ...aracteristicType-n1-create-error-validation.xml | 0 ...acteristicType-n1-create-warning-validation.xml | 0 ...aracteristicType-n1-update-error-validation.xml | 0 ...acteristicType-n1-update-warning-validation.xml | 0 .../Harbour-n1-create-error-validation.xml | 0 .../Harbour-n1-create-warning-validation.xml | 0 .../Harbour-n1-update-error-validation.xml | 0 .../Harbour-n1-update-warning-validation.xml | 0 ...hWeightParameter-n1-create-error-validation.xml | 0 ...eightParameter-n1-create-warning-validation.xml | 0 ...hWeightParameter-n1-update-error-validation.xml | 0 ...eightParameter-n1-update-warning-validation.xml | 0 .../Ocean-n1-create-error-validation.xml | 0 .../Ocean-n1-create-warning-validation.xml | 0 .../Ocean-n1-update-error-validation.xml | 0 .../Ocean-n1-update-warning-validation.xml | 0 .../Organism-n1-create-error-validation.xml | 0 .../Organism-n1-create-warning-validation.xml | 0 .../Organism-n1-update-error-validation.xml | 0 .../Organism-n1-update-warning-validation.xml | 0 .../Person-n1-create-error-validation.xml | 0 .../Person-n1-create-warning-validation.xml | 0 .../Person-n1-update-error-validation.xml | 0 .../Person-n1-update-warning-validation.xml | 0 .../Program-n1-create-error-validation.xml | 0 .../Program-n1-create-warning-validation.xml | 0 .../Program-n1-update-error-validation.xml | 0 .../Program-n1-update-warning-validation.xml | 0 .../referentiel/Sex-n1-create-error-validation.xml | 0 .../Sex-n1-create-warning-validation.xml | 0 .../referentiel/Sex-n1-update-error-validation.xml | 0 .../Sex-n1-update-warning-validation.xml | 0 .../Species-n1-create-error-validation.xml | 0 .../Species-n1-create-warning-validation.xml | 0 .../Species-n1-update-error-validation.xml | 0 .../Species-n1-update-warning-validation.xml | 0 .../SpeciesGroup-n1-create-error-validation.xml | 0 .../SpeciesGroup-n1-create-warning-validation.xml | 0 .../SpeciesGroup-n1-update-error-validation.xml | 0 .../SpeciesGroup-n1-update-warning-validation.xml | 0 .../SpeciesList-n1-create-error-validation.xml | 0 .../SpeciesList-n1-create-warning-validation.xml | 0 .../SpeciesList-n1-update-error-validation.xml | 0 .../SpeciesList-n1-update-warning-validation.xml | 0 .../Vessel-n1-create-error-validation.xml | 0 .../Vessel-n1-create-warning-validation.xml | 0 .../Vessel-n1-update-error-validation.xml | 0 .../Vessel-n1-update-warning-validation.xml | 0 ...sselSizeCategory-n1-create-error-validation.xml | 0 ...elSizeCategory-n1-create-warning-validation.xml | 0 ...sselSizeCategory-n1-update-error-validation.xml | 0 ...elSizeCategory-n1-update-warning-validation.xml | 0 .../VesselType-n1-create-error-validation.xml | 0 .../VesselType-n1-create-warning-validation.xml | 0 .../VesselType-n1-update-error-validation.xml | 0 .../VesselType-n1-update-warning-validation.xml | 0 ...aitHaulingStatus-n1-create-error-validation.xml | 0 ...tHaulingStatus-n1-create-warning-validation.xml | 0 ...aitHaulingStatus-n1-update-error-validation.xml | 0 ...tHaulingStatus-n1-update-warning-validation.xml | 0 ...aitSettingStatus-n1-create-error-validation.xml | 0 ...tSettingStatus-n1-create-warning-validation.xml | 0 ...aitSettingStatus-n1-update-error-validation.xml | 0 ...tSettingStatus-n1-update-warning-validation.xml | 0 .../BaitType-n1-create-error-validation.xml | 0 .../BaitType-n1-create-warning-validation.xml | 0 .../BaitType-n1-update-error-validation.xml | 0 .../BaitType-n1-update-warning-validation.xml | 0 ...atchFateLongline-n1-create-error-validation.xml | 0 ...chFateLongline-n1-create-warning-validation.xml | 0 ...atchFateLongline-n1-update-error-validation.xml | 0 ...chFateLongline-n1-update-warning-validation.xml | 0 .../EncounterType-n1-create-error-validation.xml | 0 .../EncounterType-n1-create-warning-validation.xml | 0 .../EncounterType-n1-update-error-validation.xml | 0 .../EncounterType-n1-update-warning-validation.xml | 0 .../Healthness-n1-create-error-validation.xml | 0 .../Healthness-n1-create-warning-validation.xml | 0 .../Healthness-n1-update-error-validation.xml | 0 .../Healthness-n1-update-warning-validation.xml | 0 .../HookPosition-n1-create-error-validation.xml | 0 .../HookPosition-n1-create-warning-validation.xml | 0 .../HookPosition-n1-update-error-validation.xml | 0 .../HookPosition-n1-update-warning-validation.xml | 0 .../HookSize-n1-create-error-validation.xml | 0 .../HookSize-n1-create-warning-validation.xml | 0 .../HookSize-n1-update-error-validation.xml | 0 .../HookSize-n1-update-warning-validation.xml | 0 .../HookType-n1-create-error-validation.xml | 0 .../HookType-n1-create-warning-validation.xml | 0 .../HookType-n1-update-error-validation.xml | 0 .../HookType-n1-update-warning-validation.xml | 0 ...rizontalPosition-n1-create-error-validation.xml | 0 ...zontalPosition-n1-create-warning-validation.xml | 0 ...rizontalPosition-n1-update-error-validation.xml | 0 ...zontalPosition-n1-update-warning-validation.xml | 0 ...VerticalPosition-n1-create-error-validation.xml | 0 ...rticalPosition-n1-create-warning-validation.xml | 0 ...VerticalPosition-n1-update-error-validation.xml | 0 ...rticalPosition-n1-update-warning-validation.xml | 0 ...LightsticksColor-n1-create-error-validation.xml | 0 ...ghtsticksColor-n1-create-warning-validation.xml | 0 ...LightsticksColor-n1-update-error-validation.xml | 0 ...ghtsticksColor-n1-update-warning-validation.xml | 0 .../LightsticksType-n1-create-error-validation.xml | 0 ...ightsticksType-n1-create-warning-validation.xml | 0 .../LightsticksType-n1-update-error-validation.xml | 0 ...ightsticksType-n1-update-warning-validation.xml | 0 .../LineType-n1-create-error-validation.xml | 0 .../LineType-n1-create-warning-validation.xml | 0 .../LineType-n1-update-error-validation.xml | 0 .../LineType-n1-update-warning-validation.xml | 0 .../MaturityStatus-n1-create-error-validation.xml | 0 ...MaturityStatus-n1-create-warning-validation.xml | 0 .../MaturityStatus-n1-update-error-validation.xml | 0 ...MaturityStatus-n1-update-warning-validation.xml | 0 .../MitigationType-n1-create-error-validation.xml | 0 ...MitigationType-n1-create-warning-validation.xml | 0 .../MitigationType-n1-update-error-validation.xml | 0 ...MitigationType-n1-update-warning-validation.xml | 0 .../SensorBrand-n1-create-error-validation.xml | 0 .../SensorBrand-n1-create-warning-validation.xml | 0 .../SensorBrand-n1-update-error-validation.xml | 0 .../SensorBrand-n1-update-warning-validation.xml | 0 ...SensorDataFormat-n1-create-error-validation.xml | 0 ...nsorDataFormat-n1-create-warning-validation.xml | 0 ...SensorDataFormat-n1-update-error-validation.xml | 0 ...nsorDataFormat-n1-update-warning-validation.xml | 0 .../SensorType-n1-create-error-validation.xml | 0 .../SensorType-n1-create-warning-validation.xml | 0 .../SensorType-n1-update-error-validation.xml | 0 .../SensorType-n1-update-warning-validation.xml | 0 .../SettingShape-n1-create-error-validation.xml | 0 .../SettingShape-n1-create-warning-validation.xml | 0 .../SettingShape-n1-update-error-validation.xml | 0 .../SettingShape-n1-update-warning-validation.xml | 0 .../SizeMeasureType-n1-create-error-validation.xml | 0 ...izeMeasureType-n1-create-warning-validation.xml | 0 .../SizeMeasureType-n1-update-error-validation.xml | 0 ...izeMeasureType-n1-update-warning-validation.xml | 0 .../StomacFullness-n1-create-error-validation.xml | 0 ...StomacFullness-n1-create-warning-validation.xml | 0 .../StomacFullness-n1-update-error-validation.xml | 0 ...StomacFullness-n1-update-warning-validation.xml | 0 .../TripType-n1-create-error-validation.xml | 0 .../TripType-n1-create-warning-validation.xml | 0 .../TripType-n1-update-error-validation.xml | 0 .../TripType-n1-update-warning-validation.xml | 0 ...ActivityLongline-n1-create-error-validation.xml | 0 ...tivityLongline-n1-create-warning-validation.xml | 0 ...ActivityLongline-n1-update-error-validation.xml | 0 ...tivityLongline-n1-update-warning-validation.xml | 0 ...eightMeasureType-n1-create-error-validation.xml | 0 ...ghtMeasureType-n1-create-warning-validation.xml | 0 ...eightMeasureType-n1-update-error-validation.xml | 0 ...ghtMeasureType-n1-update-warning-validation.xml | 0 .../DetectionMode-n1-create-error-validation.xml | 0 .../DetectionMode-n1-create-warning-validation.xml | 0 .../DetectionMode-n1-update-error-validation.xml | 0 .../DetectionMode-n1-update-warning-validation.xml | 0 .../ObjectFate-n1-create-error-validation.xml | 0 .../ObjectFate-n1-create-warning-validation.xml | 0 .../ObjectFate-n1-update-error-validation.xml | 0 .../ObjectFate-n1-update-warning-validation.xml | 0 .../ObjectOperation-n1-create-error-validation.xml | 0 ...bjectOperation-n1-create-warning-validation.xml | 0 .../ObjectOperation-n1-update-error-validation.xml | 0 ...bjectOperation-n1-update-warning-validation.xml | 0 .../ObjectType-n1-create-error-validation.xml | 0 .../ObjectType-n1-create-warning-validation.xml | 0 .../ObjectType-n1-update-error-validation.xml | 0 .../ObjectType-n1-update-warning-validation.xml | 0 .../ObservedSystem-n1-create-error-validation.xml | 0 ...ObservedSystem-n1-create-warning-validation.xml | 0 .../ObservedSystem-n1-update-error-validation.xml | 0 ...ObservedSystem-n1-update-warning-validation.xml | 0 ...ReasonForDiscard-n1-create-error-validation.xml | 0 ...asonForDiscard-n1-create-warning-validation.xml | 0 ...ReasonForDiscard-n1-update-error-validation.xml | 0 ...asonForDiscard-n1-update-warning-validation.xml | 0 ...asonForNoFishing-n1-create-error-validation.xml | 0 ...onForNoFishing-n1-create-warning-validation.xml | 0 ...asonForNoFishing-n1-update-error-validation.xml | 0 ...onForNoFishing-n1-update-warning-validation.xml | 0 ...ReasonForNullSet-n1-create-error-validation.xml | 0 ...asonForNullSet-n1-create-warning-validation.xml | 0 ...ReasonForNullSet-n1-update-error-validation.xml | 0 ...asonForNullSet-n1-update-warning-validation.xml | 0 .../SpeciesFate-n1-create-error-validation.xml | 0 .../SpeciesFate-n1-create-warning-validation.xml | 0 .../SpeciesFate-n1-update-error-validation.xml | 0 .../SpeciesFate-n1-update-warning-validation.xml | 0 .../SpeciesStatus-n1-create-error-validation.xml | 0 .../SpeciesStatus-n1-create-warning-validation.xml | 0 .../SpeciesStatus-n1-update-error-validation.xml | 0 .../SpeciesStatus-n1-update-warning-validation.xml | 0 ...roundingActivity-n1-create-error-validation.xml | 0 ...undingActivity-n1-create-warning-validation.xml | 0 ...roundingActivity-n1-update-error-validation.xml | 0 ...undingActivity-n1-update-warning-validation.xml | 0 ...ingBuoyOperation-n1-create-error-validation.xml | 0 ...gBuoyOperation-n1-create-warning-validation.xml | 0 ...ingBuoyOperation-n1-update-error-validation.xml | 0 ...gBuoyOperation-n1-update-warning-validation.xml | 0 ...smittingBuoyType-n1-create-error-validation.xml | 0 ...ittingBuoyType-n1-create-warning-validation.xml | 0 ...smittingBuoyType-n1-update-error-validation.xml | 0 ...ittingBuoyType-n1-update-warning-validation.xml | 0 ...selActivitySeine-n1-create-error-validation.xml | 0 ...lActivitySeine-n1-create-warning-validation.xml | 0 ...selActivitySeine-n1-update-error-validation.xml | 0 ...lActivitySeine-n1-update-warning-validation.xml | 0 .../WeightCategory-n1-create-error-validation.xml | 0 ...WeightCategory-n1-create-warning-validation.xml | 0 .../WeightCategory-n1-update-error-validation.xml | 0 ...WeightCategory-n1-update-warning-validation.xml | 0 .../seine/Wind-n1-create-error-validation.xml | 0 .../seine/Wind-n1-create-warning-validation.xml | 0 .../seine/Wind-n1-update-error-validation.xml | 0 .../seine/Wind-n1-update-warning-validation.xml | 0 .../ActivitySeine-n1-create-error-validation.xml | 0 .../ActivitySeine-n1-create-warning-validation.xml | 0 .../ActivitySeine-n1-update-error-validation.xml | 0 ...e-n1-update-observedSystem-error-validation.xml | 0 ...n1-update-observedSystem-warning-validation.xml | 0 .../ActivitySeine-n1-update-warning-validation.xml | 0 .../FloatingObject-n1-create-error-validation.xml | 0 ...FloatingObject-n1-create-warning-validation.xml | 0 .../FloatingObject-n1-update-error-validation.xml | 0 ...pdate-objectSchoolEstimate-error-validation.xml | 0 ...-transmittingBuoyOperation-error-validation.xml | 0 ...FloatingObject-n1-update-warning-validation.xml | 0 ...UseFeaturesSeine-n1-update-error-validation.xml | 0 .../NonTargetCatch-n1-update-error-validation.xml | 0 ...NonTargetCatch-n1-update-warning-validation.xml | 0 .../NonTargetLength-n1-update-error-validation.xml | 0 ...onTargetLength-n1-update-warning-validation.xml | 0 .../NonTargetSample-n1-update-error-validation.xml | 0 ...tObservedSpecies-n1-update-error-validation.xml | 0 ...ctSchoolEstimate-n1-update-error-validation.xml | 0 ...SchoolEstimate-n1-update-warning-validation.xml | 0 .../seine/Route-n1-create-error-validation.xml | 0 .../seine/Route-n1-create-warning-validation.xml | 0 .../seine/Route-n1-update-error-validation.xml | 0 .../seine/Route-n1-update-warning-validation.xml | 0 .../SchoolEstimate-n1-update-error-validation.xml | 0 .../seine/SetSeine-n1-create-error-validation.xml | 0 .../SetSeine-n1-create-warning-validation.xml | 0 .../seine/SetSeine-n1-update-error-validation.xml | 0 ...e-n1-update-nonTargetCatch-error-validation.xml | 0 ...e-n1-update-schoolEstimate-error-validation.xml | 0 ...eine-n1-update-targetCatch-error-validation.xml | 0 ...-n1-update-targetDiscarded-error-validation.xml | 0 .../SetSeine-n1-update-warning-validation.xml | 0 ...atch-n1-update-targetCatch-error-validation.xml | 0 ...ch-n1-update-targetCatch-warning-validation.xml | 0 ...-n1-update-targetDiscarded-error-validation.xml | 0 ...1-update-targetDiscarded-warning-validation.xml | 0 .../TargetLength-n1-update-error-validation.xml | 0 .../TargetLength-n1-update-warning-validation.xml | 0 .../TargetSample-n1-update-error-validation.xml | 0 ...TransmittingBuoy-n1-update-error-validation.xml | 0 ...ansmittingBuoy-n1-update-warning-validation.xml | 0 .../seine/TripSeine-n1-create-error-validation.xml | 0 .../TripSeine-n1-create-warning-validation.xml | 0 .../seine/TripSeine-n1-update-error-validation.xml | 0 ...1-update-gearUseFeatures-warning-validation.xml | 0 .../TripSeine-n1-update-warning-validation.xml | 0 .../i18n/observe-entities_en_GB.properties | 425 +++++++++++++ .../i18n/observe-entities_es_ES.properties | 424 +++++++++++++ .../i18n/observe-entities_fr_FR.properties | 425 +++++++++++++ .../validation/BeanValidatorDetectorTest.java | 0 .../business/validation/RelationRegexTest.java | 0 .../entities/ActivitySeineSpeedValidatorTest.java | 0 .../seine/Route-testSpeed-error-validation.xml | 0 .../src/test/resources/validators.xml | 0 observe-services-topia/pom.xml | 6 - pom.xml | 2 +- 353 files changed, 1292 insertions(+), 2199 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

01/19: Merge du module observe-entities-validation dans observe-entities
by codelutin.com scm 09 Jan '16

09 Jan '16

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 4382936a419c1cf9dee7d4e719b3f1c80c72aa7a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 09:42:13 2016 +0100 Merge du module observe-entities-validation dans observe-entities --- observe-entities-validation/LICENSE.txt | 674 --------------------- observe-entities-validation/README.txt | 2 - observe-entities-validation/changelog.txt | 2 - observe-entities-validation/pom.xml | 156 ----- .../src/license/THIRD-PARTY.properties | 32 - .../observe-entities-validation_en_GB.properties | 425 ------------- .../observe-entities-validation_es_ES.properties | 424 ------------- .../observe-entities-validation_fr_FR.properties | 425 ------------- .../src/test/resources/log4j.properties | 52 -- observe-entities/pom.xml | 17 + .../CollectionFieldExpressionValidator2.java | 0 .../validator/CollectionUniqueKeyValidator2.java | 0 .../ObserveCollectionUniqueKeyValidator.java | 0 .../entities/AbstractEspeceFieldValidator.java | 0 .../ActivityFinDeVeilleExistsValidator.java | 0 .../entities/ActivitySimpleSpeedValidator.java | 0 .../validator/entities/ActivitySpeedValidator.java | 0 .../entities/SetLonglineUniqueHomeIdValidator.java | 0 .../entities/SetLonglineUniqueNumberValidator.java | 0 .../entities/SpeciesLengthFieldValidator.java | 0 .../entities/SpeciesWeightFieldValidator.java | 0 ...ActivityLongline-n1-create-error-validation.xml | 0 ...tivityLongline-n1-create-warning-validation.xml | 0 ...ngline-n1-update-encounter-error-validation.xml | 0 ...ActivityLongline-n1-update-error-validation.xml | 0 ...gline-n1-update-sensorUsed-error-validation.xml | 0 ...tivityLongline-n1-update-warning-validation.xml | 0 ...BaitsComposition-n1-update-error-validation.xml | 0 .../Basket-n1-update-table-error-validation.xml | 0 ...ne-n1-update-catchLongline-error-validation.xml | 0 .../Branchline-n1-update-error-validation.xml | 0 ...Branchline-n1-update-table-error-validation.xml | 0 .../Branchline-n1-update-warning-validation.xml | 0 ...linesComposition-n1-update-error-validation.xml | 0 .../CatchLongline-n1-update-error-validation.xml | 0 .../CatchLongline-n1-update-warning-validation.xml | 0 .../Encounter-n1-update-error-validation.xml | 0 .../Encounter-n1-update-warning-validation.xml | 0 ...linesComposition-n1-update-error-validation.xml | 0 ...FeaturesLongline-n1-update-error-validation.xml | 0 ...HooksComposition-n1-update-error-validation.xml | 0 .../Section-n1-update-table-error-validation.xml | 0 .../SensorUsed-n1-update-error-validation.xml | 0 .../SensorUsed-n1-update-warning-validation.xml | 0 .../SetLongline-n1-create-error-validation.xml | 0 .../SetLongline-n1-create-warning-validation.xml | 0 ...n1-update-baitsComposition-error-validation.xml | 0 ...ate-branchlinesComposition-error-validation.xml | 0 .../SetLongline-n1-update-error-validation.xml | 0 ...date-floatlinesComposition-error-validation.xml | 0 ...1-update-globalComposition-error-validation.xml | 0 ...n1-update-hooksComposition-error-validation.xml | 0 .../SetLongline-n1-update-warning-validation.xml | 0 .../longline/Tdr-n1-update-error-validation.xml | 0 .../longline/Tdr-n1-update-warning-validation.xml | 0 .../TripLongline-n1-create-error-validation.xml | 0 .../TripLongline-n1-create-warning-validation.xml | 0 .../TripLongline-n1-update-error-validation.xml | 0 .../TripLongline-n1-update-warning-validation.xml | 0 .../Country-n1-create-error-validation.xml | 0 .../Country-n1-create-warning-validation.xml | 0 .../Country-n1-update-error-validation.xml | 0 .../Country-n1-update-warning-validation.xml | 0 .../FpaZone-n1-create-error-validation.xml | 0 .../FpaZone-n1-create-warning-validation.xml | 0 .../FpaZone-n1-update-error-validation.xml | 0 .../FpaZone-n1-update-warning-validation.xml | 0 .../Gear-n1-create-error-validation.xml | 0 .../Gear-n1-create-warning-validation.xml | 0 .../Gear-n1-update-error-validation.xml | 0 .../Gear-n1-update-warning-validation.xml | 0 ...earCaracteristic-n1-create-error-validation.xml | 0 ...rCaracteristic-n1-create-warning-validation.xml | 0 ...earCaracteristic-n1-update-error-validation.xml | 0 ...rCaracteristic-n1-update-warning-validation.xml | 0 ...aracteristicType-n1-create-error-validation.xml | 0 ...acteristicType-n1-create-warning-validation.xml | 0 ...aracteristicType-n1-update-error-validation.xml | 0 ...acteristicType-n1-update-warning-validation.xml | 0 .../Harbour-n1-create-error-validation.xml | 0 .../Harbour-n1-create-warning-validation.xml | 0 .../Harbour-n1-update-error-validation.xml | 0 .../Harbour-n1-update-warning-validation.xml | 0 ...hWeightParameter-n1-create-error-validation.xml | 0 ...eightParameter-n1-create-warning-validation.xml | 0 ...hWeightParameter-n1-update-error-validation.xml | 0 ...eightParameter-n1-update-warning-validation.xml | 0 .../Ocean-n1-create-error-validation.xml | 0 .../Ocean-n1-create-warning-validation.xml | 0 .../Ocean-n1-update-error-validation.xml | 0 .../Ocean-n1-update-warning-validation.xml | 0 .../Organism-n1-create-error-validation.xml | 0 .../Organism-n1-create-warning-validation.xml | 0 .../Organism-n1-update-error-validation.xml | 0 .../Organism-n1-update-warning-validation.xml | 0 .../Person-n1-create-error-validation.xml | 0 .../Person-n1-create-warning-validation.xml | 0 .../Person-n1-update-error-validation.xml | 0 .../Person-n1-update-warning-validation.xml | 0 .../Program-n1-create-error-validation.xml | 0 .../Program-n1-create-warning-validation.xml | 0 .../Program-n1-update-error-validation.xml | 0 .../Program-n1-update-warning-validation.xml | 0 .../referentiel/Sex-n1-create-error-validation.xml | 0 .../Sex-n1-create-warning-validation.xml | 0 .../referentiel/Sex-n1-update-error-validation.xml | 0 .../Sex-n1-update-warning-validation.xml | 0 .../Species-n1-create-error-validation.xml | 0 .../Species-n1-create-warning-validation.xml | 0 .../Species-n1-update-error-validation.xml | 0 .../Species-n1-update-warning-validation.xml | 0 .../SpeciesGroup-n1-create-error-validation.xml | 0 .../SpeciesGroup-n1-create-warning-validation.xml | 0 .../SpeciesGroup-n1-update-error-validation.xml | 0 .../SpeciesGroup-n1-update-warning-validation.xml | 0 .../SpeciesList-n1-create-error-validation.xml | 0 .../SpeciesList-n1-create-warning-validation.xml | 0 .../SpeciesList-n1-update-error-validation.xml | 0 .../SpeciesList-n1-update-warning-validation.xml | 0 .../Vessel-n1-create-error-validation.xml | 0 .../Vessel-n1-create-warning-validation.xml | 0 .../Vessel-n1-update-error-validation.xml | 0 .../Vessel-n1-update-warning-validation.xml | 0 ...sselSizeCategory-n1-create-error-validation.xml | 0 ...elSizeCategory-n1-create-warning-validation.xml | 0 ...sselSizeCategory-n1-update-error-validation.xml | 0 ...elSizeCategory-n1-update-warning-validation.xml | 0 .../VesselType-n1-create-error-validation.xml | 0 .../VesselType-n1-create-warning-validation.xml | 0 .../VesselType-n1-update-error-validation.xml | 0 .../VesselType-n1-update-warning-validation.xml | 0 ...aitHaulingStatus-n1-create-error-validation.xml | 0 ...tHaulingStatus-n1-create-warning-validation.xml | 0 ...aitHaulingStatus-n1-update-error-validation.xml | 0 ...tHaulingStatus-n1-update-warning-validation.xml | 0 ...aitSettingStatus-n1-create-error-validation.xml | 0 ...tSettingStatus-n1-create-warning-validation.xml | 0 ...aitSettingStatus-n1-update-error-validation.xml | 0 ...tSettingStatus-n1-update-warning-validation.xml | 0 .../BaitType-n1-create-error-validation.xml | 0 .../BaitType-n1-create-warning-validation.xml | 0 .../BaitType-n1-update-error-validation.xml | 0 .../BaitType-n1-update-warning-validation.xml | 0 ...atchFateLongline-n1-create-error-validation.xml | 0 ...chFateLongline-n1-create-warning-validation.xml | 0 ...atchFateLongline-n1-update-error-validation.xml | 0 ...chFateLongline-n1-update-warning-validation.xml | 0 .../EncounterType-n1-create-error-validation.xml | 0 .../EncounterType-n1-create-warning-validation.xml | 0 .../EncounterType-n1-update-error-validation.xml | 0 .../EncounterType-n1-update-warning-validation.xml | 0 .../Healthness-n1-create-error-validation.xml | 0 .../Healthness-n1-create-warning-validation.xml | 0 .../Healthness-n1-update-error-validation.xml | 0 .../Healthness-n1-update-warning-validation.xml | 0 .../HookPosition-n1-create-error-validation.xml | 0 .../HookPosition-n1-create-warning-validation.xml | 0 .../HookPosition-n1-update-error-validation.xml | 0 .../HookPosition-n1-update-warning-validation.xml | 0 .../HookSize-n1-create-error-validation.xml | 0 .../HookSize-n1-create-warning-validation.xml | 0 .../HookSize-n1-update-error-validation.xml | 0 .../HookSize-n1-update-warning-validation.xml | 0 .../HookType-n1-create-error-validation.xml | 0 .../HookType-n1-create-warning-validation.xml | 0 .../HookType-n1-update-error-validation.xml | 0 .../HookType-n1-update-warning-validation.xml | 0 ...rizontalPosition-n1-create-error-validation.xml | 0 ...zontalPosition-n1-create-warning-validation.xml | 0 ...rizontalPosition-n1-update-error-validation.xml | 0 ...zontalPosition-n1-update-warning-validation.xml | 0 ...VerticalPosition-n1-create-error-validation.xml | 0 ...rticalPosition-n1-create-warning-validation.xml | 0 ...VerticalPosition-n1-update-error-validation.xml | 0 ...rticalPosition-n1-update-warning-validation.xml | 0 ...LightsticksColor-n1-create-error-validation.xml | 0 ...ghtsticksColor-n1-create-warning-validation.xml | 0 ...LightsticksColor-n1-update-error-validation.xml | 0 ...ghtsticksColor-n1-update-warning-validation.xml | 0 .../LightsticksType-n1-create-error-validation.xml | 0 ...ightsticksType-n1-create-warning-validation.xml | 0 .../LightsticksType-n1-update-error-validation.xml | 0 ...ightsticksType-n1-update-warning-validation.xml | 0 .../LineType-n1-create-error-validation.xml | 0 .../LineType-n1-create-warning-validation.xml | 0 .../LineType-n1-update-error-validation.xml | 0 .../LineType-n1-update-warning-validation.xml | 0 .../MaturityStatus-n1-create-error-validation.xml | 0 ...MaturityStatus-n1-create-warning-validation.xml | 0 .../MaturityStatus-n1-update-error-validation.xml | 0 ...MaturityStatus-n1-update-warning-validation.xml | 0 .../MitigationType-n1-create-error-validation.xml | 0 ...MitigationType-n1-create-warning-validation.xml | 0 .../MitigationType-n1-update-error-validation.xml | 0 ...MitigationType-n1-update-warning-validation.xml | 0 .../SensorBrand-n1-create-error-validation.xml | 0 .../SensorBrand-n1-create-warning-validation.xml | 0 .../SensorBrand-n1-update-error-validation.xml | 0 .../SensorBrand-n1-update-warning-validation.xml | 0 ...SensorDataFormat-n1-create-error-validation.xml | 0 ...nsorDataFormat-n1-create-warning-validation.xml | 0 ...SensorDataFormat-n1-update-error-validation.xml | 0 ...nsorDataFormat-n1-update-warning-validation.xml | 0 .../SensorType-n1-create-error-validation.xml | 0 .../SensorType-n1-create-warning-validation.xml | 0 .../SensorType-n1-update-error-validation.xml | 0 .../SensorType-n1-update-warning-validation.xml | 0 .../SettingShape-n1-create-error-validation.xml | 0 .../SettingShape-n1-create-warning-validation.xml | 0 .../SettingShape-n1-update-error-validation.xml | 0 .../SettingShape-n1-update-warning-validation.xml | 0 .../SizeMeasureType-n1-create-error-validation.xml | 0 ...izeMeasureType-n1-create-warning-validation.xml | 0 .../SizeMeasureType-n1-update-error-validation.xml | 0 ...izeMeasureType-n1-update-warning-validation.xml | 0 .../StomacFullness-n1-create-error-validation.xml | 0 ...StomacFullness-n1-create-warning-validation.xml | 0 .../StomacFullness-n1-update-error-validation.xml | 0 ...StomacFullness-n1-update-warning-validation.xml | 0 .../TripType-n1-create-error-validation.xml | 0 .../TripType-n1-create-warning-validation.xml | 0 .../TripType-n1-update-error-validation.xml | 0 .../TripType-n1-update-warning-validation.xml | 0 ...ActivityLongline-n1-create-error-validation.xml | 0 ...tivityLongline-n1-create-warning-validation.xml | 0 ...ActivityLongline-n1-update-error-validation.xml | 0 ...tivityLongline-n1-update-warning-validation.xml | 0 ...eightMeasureType-n1-create-error-validation.xml | 0 ...ghtMeasureType-n1-create-warning-validation.xml | 0 ...eightMeasureType-n1-update-error-validation.xml | 0 ...ghtMeasureType-n1-update-warning-validation.xml | 0 .../DetectionMode-n1-create-error-validation.xml | 0 .../DetectionMode-n1-create-warning-validation.xml | 0 .../DetectionMode-n1-update-error-validation.xml | 0 .../DetectionMode-n1-update-warning-validation.xml | 0 .../ObjectFate-n1-create-error-validation.xml | 0 .../ObjectFate-n1-create-warning-validation.xml | 0 .../ObjectFate-n1-update-error-validation.xml | 0 .../ObjectFate-n1-update-warning-validation.xml | 0 .../ObjectOperation-n1-create-error-validation.xml | 0 ...bjectOperation-n1-create-warning-validation.xml | 0 .../ObjectOperation-n1-update-error-validation.xml | 0 ...bjectOperation-n1-update-warning-validation.xml | 0 .../ObjectType-n1-create-error-validation.xml | 0 .../ObjectType-n1-create-warning-validation.xml | 0 .../ObjectType-n1-update-error-validation.xml | 0 .../ObjectType-n1-update-warning-validation.xml | 0 .../ObservedSystem-n1-create-error-validation.xml | 0 ...ObservedSystem-n1-create-warning-validation.xml | 0 .../ObservedSystem-n1-update-error-validation.xml | 0 ...ObservedSystem-n1-update-warning-validation.xml | 0 ...ReasonForDiscard-n1-create-error-validation.xml | 0 ...asonForDiscard-n1-create-warning-validation.xml | 0 ...ReasonForDiscard-n1-update-error-validation.xml | 0 ...asonForDiscard-n1-update-warning-validation.xml | 0 ...asonForNoFishing-n1-create-error-validation.xml | 0 ...onForNoFishing-n1-create-warning-validation.xml | 0 ...asonForNoFishing-n1-update-error-validation.xml | 0 ...onForNoFishing-n1-update-warning-validation.xml | 0 ...ReasonForNullSet-n1-create-error-validation.xml | 0 ...asonForNullSet-n1-create-warning-validation.xml | 0 ...ReasonForNullSet-n1-update-error-validation.xml | 0 ...asonForNullSet-n1-update-warning-validation.xml | 0 .../SpeciesFate-n1-create-error-validation.xml | 0 .../SpeciesFate-n1-create-warning-validation.xml | 0 .../SpeciesFate-n1-update-error-validation.xml | 0 .../SpeciesFate-n1-update-warning-validation.xml | 0 .../SpeciesStatus-n1-create-error-validation.xml | 0 .../SpeciesStatus-n1-create-warning-validation.xml | 0 .../SpeciesStatus-n1-update-error-validation.xml | 0 .../SpeciesStatus-n1-update-warning-validation.xml | 0 ...roundingActivity-n1-create-error-validation.xml | 0 ...undingActivity-n1-create-warning-validation.xml | 0 ...roundingActivity-n1-update-error-validation.xml | 0 ...undingActivity-n1-update-warning-validation.xml | 0 ...ingBuoyOperation-n1-create-error-validation.xml | 0 ...gBuoyOperation-n1-create-warning-validation.xml | 0 ...ingBuoyOperation-n1-update-error-validation.xml | 0 ...gBuoyOperation-n1-update-warning-validation.xml | 0 ...smittingBuoyType-n1-create-error-validation.xml | 0 ...ittingBuoyType-n1-create-warning-validation.xml | 0 ...smittingBuoyType-n1-update-error-validation.xml | 0 ...ittingBuoyType-n1-update-warning-validation.xml | 0 ...selActivitySeine-n1-create-error-validation.xml | 0 ...lActivitySeine-n1-create-warning-validation.xml | 0 ...selActivitySeine-n1-update-error-validation.xml | 0 ...lActivitySeine-n1-update-warning-validation.xml | 0 .../WeightCategory-n1-create-error-validation.xml | 0 ...WeightCategory-n1-create-warning-validation.xml | 0 .../WeightCategory-n1-update-error-validation.xml | 0 ...WeightCategory-n1-update-warning-validation.xml | 0 .../seine/Wind-n1-create-error-validation.xml | 0 .../seine/Wind-n1-create-warning-validation.xml | 0 .../seine/Wind-n1-update-error-validation.xml | 0 .../seine/Wind-n1-update-warning-validation.xml | 0 .../ActivitySeine-n1-create-error-validation.xml | 0 .../ActivitySeine-n1-create-warning-validation.xml | 0 .../ActivitySeine-n1-update-error-validation.xml | 0 ...e-n1-update-observedSystem-error-validation.xml | 0 ...n1-update-observedSystem-warning-validation.xml | 0 .../ActivitySeine-n1-update-warning-validation.xml | 0 .../FloatingObject-n1-create-error-validation.xml | 0 ...FloatingObject-n1-create-warning-validation.xml | 0 .../FloatingObject-n1-update-error-validation.xml | 0 ...pdate-objectSchoolEstimate-error-validation.xml | 0 ...-transmittingBuoyOperation-error-validation.xml | 0 ...FloatingObject-n1-update-warning-validation.xml | 0 ...UseFeaturesSeine-n1-update-error-validation.xml | 0 .../NonTargetCatch-n1-update-error-validation.xml | 0 ...NonTargetCatch-n1-update-warning-validation.xml | 0 .../NonTargetLength-n1-update-error-validation.xml | 0 ...onTargetLength-n1-update-warning-validation.xml | 0 .../NonTargetSample-n1-update-error-validation.xml | 0 ...tObservedSpecies-n1-update-error-validation.xml | 0 ...ctSchoolEstimate-n1-update-error-validation.xml | 0 ...SchoolEstimate-n1-update-warning-validation.xml | 0 .../seine/Route-n1-create-error-validation.xml | 0 .../seine/Route-n1-create-warning-validation.xml | 0 .../seine/Route-n1-update-error-validation.xml | 0 .../seine/Route-n1-update-warning-validation.xml | 0 .../SchoolEstimate-n1-update-error-validation.xml | 0 .../seine/SetSeine-n1-create-error-validation.xml | 0 .../SetSeine-n1-create-warning-validation.xml | 0 .../seine/SetSeine-n1-update-error-validation.xml | 0 ...e-n1-update-nonTargetCatch-error-validation.xml | 0 ...e-n1-update-schoolEstimate-error-validation.xml | 0 ...eine-n1-update-targetCatch-error-validation.xml | 0 ...-n1-update-targetDiscarded-error-validation.xml | 0 .../SetSeine-n1-update-warning-validation.xml | 0 ...atch-n1-update-targetCatch-error-validation.xml | 0 ...ch-n1-update-targetCatch-warning-validation.xml | 0 ...-n1-update-targetDiscarded-error-validation.xml | 0 ...1-update-targetDiscarded-warning-validation.xml | 0 .../TargetLength-n1-update-error-validation.xml | 0 .../TargetLength-n1-update-warning-validation.xml | 0 .../TargetSample-n1-update-error-validation.xml | 0 ...TransmittingBuoy-n1-update-error-validation.xml | 0 ...ansmittingBuoy-n1-update-warning-validation.xml | 0 .../seine/TripSeine-n1-create-error-validation.xml | 0 .../TripSeine-n1-create-warning-validation.xml | 0 .../seine/TripSeine-n1-update-error-validation.xml | 0 ...1-update-gearUseFeatures-warning-validation.xml | 0 .../TripSeine-n1-update-warning-validation.xml | 0 .../i18n/observe-entities_en_GB.properties | 425 +++++++++++++ .../i18n/observe-entities_es_ES.properties | 424 +++++++++++++ .../i18n/observe-entities_fr_FR.properties | 425 +++++++++++++ .../validation/BeanValidatorDetectorTest.java | 0 .../business/validation/RelationRegexTest.java | 0 .../entities/ActivitySeineSpeedValidatorTest.java | 0 .../seine/Route-testSpeed-error-validation.xml | 0 .../src/test/resources/validators.xml | 0 observe-services-topia/pom.xml | 6 - pom.xml | 2 +- 353 files changed, 1292 insertions(+), 2199 deletions(-) diff --git a/observe-entities-validation/LICENSE.txt b/observe-entities-validation/LICENSE.txt deleted file mode 100644 index 94a9ed0..0000000 --- a/observe-entities-validation/LICENSE.txt +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<http://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<http://www.gnu.org/philosophy/why-not-lgpl.html>. diff --git a/observe-entities-validation/README.txt b/observe-entities-validation/README.txt deleted file mode 100644 index d2e50d3..0000000 --- a/observe-entities-validation/README.txt +++ /dev/null @@ -1,2 +0,0 @@ -To deploy new version of pom: mvn deploy -To install localy: mvn install diff --git a/observe-entities-validation/changelog.txt b/observe-entities-validation/changelog.txt deleted file mode 100644 index 41a027d..0000000 --- a/observe-entities-validation/changelog.txt +++ /dev/null @@ -1,2 +0,0 @@ -0.0.4 chemit - - first release : contient toutes les règles de validation de niveau 1 \ No newline at end of file diff --git a/observe-entities-validation/pom.xml b/observe-entities-validation/pom.xml deleted file mode 100644 index 3697230..0000000 --- a/observe-entities-validation/pom.xml +++ /dev/null @@ -1,156 +0,0 @@ -<?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>5.0-SNAPSHOT</version> - </parent> - - <artifactId>observe-entities-validation</artifactId> - - <name>ObServe :: Entities Validation</name> - <description>ObServe entities validation rules module</description> - - <dependencies> - -  - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>observe-entities</artifactId> - <version>${project.version}</version> - </dependency> -  - - <dependency> - <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - </dependency> - -  - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-utils</artifactId> - </dependency> - - <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-validator</artifactId> - <scope>test</scope> - <classifier>tests</classifier> - </dependency> - - <dependency> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </dependency> - -  - - <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> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </dependency> - - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <resources> - - <resource> - <directory>${project.basedir}/src/main/resources</directory> - <includes> - <include>**/*</include> - </includes> - </resource> - - </resources> - <plugins> - - <plugin> - <groupId>org.nuiton.i18n</groupId> - <artifactId>i18n-maven-plugin</artifactId> - <configuration> - <entries> - <entry> - <specificGoal>parserValidation</specificGoal> - <basedir>${project.basedir}/src/main/resources/</basedir> - <includes> - <param>**/**-validation.xml</param> - </includes> - </entry> - </entries> - </configuration> - <executions> - <execution> - <goals> - <goal>parserJava</goal> - <goal>parserValidation</goal> - <goal>gen</goal> - </goals> - </execution> - </executions> - </plugin> - - </plugins> - </build> - -</project> diff --git a/observe-entities-validation/src/license/THIRD-PARTY.properties b/observe-entities-validation/src/license/THIRD-PARTY.properties deleted file mode 100644 index 1b293a2..0000000 --- a/observe-entities-validation/src/license/THIRD-PARTY.properties +++ /dev/null @@ -1,32 +0,0 @@ -# Generated by org.codehaus.mojo.license.AddThirdPartyMojo -#------------------------------------------------------------------------------- -# Already used licenses in project : -# - Apache License 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 -# - GNU General Public License, Version 2 with the Classpath Exception -# - GNU Lesser General Public License, version 2.1 -# - GNU Library or Lesser General Public License -# - 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 -# - Lesser General Public License (LPGL) -# - Lesser General Public License (LPGL) v 2.1 -# - MIT License -# - MPL 1.1 -# - New BSD License -# - Public Domain -# - The Apache Software License, Version 2.0 -# - The H2 License, Version 1.0 -# - license.txt -#------------------------------------------------------------------------------- -# Please fill the missing licenses for dependencies : -# -# -#Thu Jul 04 14:07:08 CEST 2013 -commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 -dom4j--dom4j--1.6.1=BSD License diff --git a/observe-entities-validation/src/main/resources/i18n/observe-entities-validation_en_GB.properties b/observe-entities-validation/src/main/resources/i18n/observe-entities-validation_en_GB.properties deleted file mode 100644 index e93b311..0000000 --- a/observe-entities-validation/src/main/resources/i18n/observe-entities-validation_en_GB.properties +++ /dev/null @@ -1,425 +0,0 @@ -validator.activity.bound.latitude= -validator.activity.bound.longitude= -validator.activity.bound.seaSurfaceTemperature= -validator.activity.bound.vesselSpeed= -validator.activity.comment.tobig= -validator.activity.desactivated.currentFpaZone= -validator.activity.desactivated.detectionMode= -validator.activity.desactivated.nextFpaZone= -validator.activity.desactivated.observedSystem= -validator.activity.desactivated.previousFpaZone= -validator.activity.desactivated.reasonForNoFishing= -validator.activity.desactivated.surroundingActivity= -validator.activity.desactivated.vesselActivity= -validator.activity.desactivated.wind= -validator.activity.duplicated.time= -validator.activity.invalid.quadrant= -validator.activity.invalid.seaSurfaceTemperature= -validator.activity.invalid.speed= -validator.activity.null.dcp= -validator.activity.null.fpaZone= -validator.activity.null.observedSystem= -validator.activity.null.observedSystemDistance= -validator.activity.null.seaSurfaceTemperature= -validator.activity.null.surroundingActivity= -validator.activity.null.wind= -validator.activity.required.comment.for.currentFpaZone= -validator.activity.required.comment.for.detectionMode= -validator.activity.required.comment.for.fpaZone= -validator.activity.required.comment.for.nextFpaZone= -validator.activity.required.comment.for.observedSystem= -validator.activity.required.comment.for.previousFpaZone= -validator.activity.required.comment.for.reasonForNoFishing= -validator.activity.required.comment.for.vesselActivity= -validator.activity.required.date= -validator.activity.required.latitude= -validator.activity.required.longitude= -validator.activity.required.quadrant= -validator.activity.required.time= -validator.activity.required.vesselActivity= -validator.activityLongline.desactivated.fpaZone= -validator.baitsComposition.bound.individualSize= -validator.baitsComposition.bound.individualWeight= -validator.baitsComposition.bound.proportion= -validator.baitsComposition.desactivated.baitSettingStatus= -validator.baitsComposition.desactivated.baitType= -validator.baitsComposition.required.baitSettingStatus= -validator.baitsComposition.required.baitType= -validator.baitsComposition.required.proportion= -validator.basket.bound.floatline1Length= -validator.basket.bound.floatline2Length= -validator.basket.required.settingIdentifier= -validator.branchline.bound.branchlineLength= -validator.branchline.bound.tracelineLength= -validator.branchline.desactivated.baitHaulingStatus= -validator.branchline.desactivated.baitSettingStatus= -validator.branchline.desactivated.baitType= -validator.branchline.desactivated.hookSize= -validator.branchline.desactivated.hookType= -validator.branchline.desactivated.topType= -validator.branchline.desactivated.tracelineType= -validator.branchline.required.settingIdentifier= -validator.branchline.required.topType= -validator.branchline.required.tracelineType= -validator.branchlinesComposition.bound.length= -validator.branchlinesComposition.bound.proportion= -validator.branchlinesComposition.desactivated.topType= -validator.branchlinesComposition.desactivated.tracelineType= -validator.branchlinesComposition.required.length= -validator.branchlinesComposition.required.proportion= -validator.branchlinesComposition.required.topType= -validator.branchlinesComposition.required.tracelineType= -validator.catchLongline.bound.gonadeWeight= -validator.catchLongline.comment.tobig= -validator.catchLongline.desactivated.catchFateLongline= -validator.catchLongline.desactivated.catchHealthness= -validator.catchLongline.desactivated.discardHealthness= -validator.catchLongline.desactivated.hookPosition= -validator.catchLongline.desactivated.maturityStatus= -validator.catchLongline.desactivated.sex= -validator.catchLongline.desactivated.speciesCatch= -validator.catchLongline.desactivated.stomacFullness= -validator.catchLongline.required.comment.for.speciesCatch= -validator.catchLongline.required.count.when.acquisitionModeIsGrouped= -validator.catchLongline.required.position= -validator.catchLongline.required.speciesCatch= -validator.country.invalid.iso2Code.uniqueKey= -validator.country.invalid.iso3Code.uniqueKey= -validator.country.required.iso2Code= -validator.country.required.iso3Code= -validator.encounter.desactivated.encounterType= -validator.encounter.desactivated.species= -validator.encounter.required.count= -validator.encounter.required.distance= -validator.encounter.required.encounterType= -validator.encounter.required.species= -validator.floatingObject.comment.tobig= -validator.floatingObject.desactivated.objectFate= -validator.floatingObject.desactivated.objectOperation= -validator.floatingObject.desactivated.type= -validator.floatingObject.null.daysAtSeaCount= -validator.floatingObject.positive.daysAtSeaCount= -validator.floatingObject.required.comment.for.balise1= -validator.floatingObject.required.comment.for.balise2= -validator.floatingObject.required.comment.for.objectFate= -validator.floatingObject.required.comment.for.type= -validator.floatingObject.required.objectFate= -validator.floatingObject.required.objectOperation= -validator.floatingObject.required.type= -validator.floatingObject.size.supportVesselName= -validator.floatlinesComposition.bound.length= -validator.floatlinesComposition.bound.proportion= -validator.floatlinesComposition.desactivated.lineType= -validator.floatlinesComposition.required.length= -validator.floatlinesComposition.required.lineType= -validator.floatlinesComposition.required.proportion= -validator.gearCaracteristic.desactivated.gearCaracteristicType= -validator.gearCaracteristic.required.gearCaracteristicType= -validator.gearUseFeature.desactivated.gear= -validator.gearUseFeature.required.gear= -validator.gearUseFeature.required.number= -validator.harbour.desactivated.country= -validator.harbour.null.latitude= -validator.harbour.null.locode= -validator.harbour.null.longitude= -validator.harbour.required.country= -validator.harbour.required.name= -validator.hooksComposition.bound.hookOffset= -validator.hooksComposition.bound.proportion= -validator.hooksComposition.desactivated.hookSize= -validator.hooksComposition.desactivated.hookType= -validator.hooksComposition.required.hookSize= -validator.hooksComposition.required.hookType= -validator.hooksComposition.required.proportion= -validator.lengthWeightParameter.invalid.lengthWeightFormula= -validator.lengthWeightParameter.invalid.uniqueKey= -validator.lengthWeightParameter.invalid.weightLengthFormula= -validator.lengthWeightParameter.null.ocean= -validator.lengthWeightParameter.required.coefficients= -validator.lengthWeightParameter.required.endDate= -validator.lengthWeightParameter.required.lengthWeightFormula= -validator.lengthWeightParameter.required.species= -validator.lengthWeightParameter.required.startDate= -validator.lengthWeightParameter.required.weightLengthFormula= -validator.nonTargetCatch.bound.catchWeight= -validator.nonTargetCatch.bound.meanLength= -validator.nonTargetCatch.bound.meanWeight= -validator.nonTargetCatch.bound.totalCount= -validator.nonTargetCatch.comment.tobig= -validator.nonTargetCatch.desactivated.reasonForDiscard= -validator.nonTargetCatch.desactivated.species= -validator.nonTargetCatch.desactivated.speciesFate= -validator.nonTargetCatch.positive.meanLength= -validator.nonTargetCatch.positive.meanWeight= -validator.nonTargetCatch.required.comment.for.reasonForDiscard= -validator.nonTargetCatch.required.comment.for.speciesFate= -validator.nonTargetCatch.required.species= -validator.nonTargetCatch.required.speciesFate= -validator.nonTargetCatch.required.weightOrNombreEstime= -validator.nonTargetCatch.required.weightOrTailleMoyen= -validator.nonTargetCatch.uniqueKey= -validator.nonTargetSample.bound.length= -validator.nonTargetSample.bound.weight= -validator.nonTargetSample.comment.tobig= -validator.nonTargetSample.desactivated.species= -validator.nonTargetSample.positive.length= -validator.nonTargetSample.positive.weight= -validator.nonTargetSample.required.comment.for.species= -validator.nonTargetSample.required.count= -validator.nonTargetSample.required.gender= -validator.nonTargetSample.required.species= -validator.nonTargetSample.required.taille= -validator.nonTargetSample.required.weight.or.taille= -validator.objectObservedSpecies.desactivated.species= -validator.objectObservedSpecies.desactivated.speciesStatus= -validator.objectObservedSpecies.positive.count= -validator.objectObservedSpecies.required.count= -validator.objectObservedSpecies.required.species= -validator.objectObservedSpecies.required.speciesStatus= -validator.organism.desactivated.country= -validator.organism.null.description= -validator.organism.required.country= -validator.person.desactivated.country= -validator.person.required.country= -validator.person.required.firstName= -validator.person.required.lastName= -validator.program.comment.tobig= -validator.program.desactivated.organism= -validator.program.required.endDate= -validator.program.required.gearType= -validator.program.required.organism= -validator.program.required.startDate= -validator.referentiel.invalid.code.uniqueKey= -validator.referentiel.invalid.uri.uniqueKey= -validator.referentiel.null.uri= -validator.referentiel.required.brandName= -validator.referentiel.required.label1= -validator.referentiel.required.label2= -validator.referentiel.required.label3= -validator.referentiel.status.desactivated= -validator.referentiel.status.required= -validator.referentiel.untranslated.label1= -validator.referentiel.untranslated.label3= -validator.route.activityFinDeVeille.notAvailable= -validator.route.comment.tobig= -validator.route.duplicated.date= -validator.route.invalid.date= -validator.route.invalid.endLogValue.maximum= -validator.route.invalid.endLogValue.minimum= -validator.route.invalid.quadrant= -validator.route.invalid.seaSurfaceTemperature= -validator.route.invalid.speed= -validator.route.invalid.startLogValue= -validator.route.invalid.time= -validator.route.missing.activityFinDeVeille= -validator.route.null.comment= -validator.route.positive.startLogValue= -validator.route.required.date= -validator.route.unclosed.activity= -validator.schoolEstimate.bound.weight= -validator.schoolEstimate.comment.tobig= -validator.schoolEstimate.desactivated.species= -validator.schoolEstimate.required.comment.for.species= -validator.schoolEstimate.required.species= -validator.schoolEstimate.required.weight= -validator.schoolEstimate.species.uniqueKey= -validator.section.required.settingIdentifier= -validator.sensorUsed.desactivated.sensorBrand= -validator.sensorUsed.desactivated.sensorDataFormat= -validator.sensorUsed.desactivated.sensorType= -validator.sensorUsed.null.sensorSerialNo= -validator.sensorUsed.required.sensorType= -validator.set.bound.currentDirection= -validator.set.bound.currentSpeed= -validator.set.bound.delay= -validator.set.bound.maxGearDepth= -validator.set.bound.schoolMeanDepth= -validator.set.bound.schoolThickness= -validator.set.bound.schoolTopDepth= -validator.set.comment.tobig= -validator.set.delay.too.long= -validator.set.desactivated.reasonForNullSet= -validator.set.endDate.after.endPursingDate= -validator.set.endPursingDate.after.date= -validator.set.endPursingTimeStamp.after.startTime= -validator.set.endSetTimeStamp.after.endPursingTimeStamp= -validator.set.null.currentDirection= -validator.set.required.comment.for.reasonForNullSet= -validator.set.size.supportVesselName= -validator.set.startTime.after.time= -validator.setLongline.bad.baitsCompositionProportionSum= -validator.setLongline.bad.branchlinesCompositionProportionSum= -validator.setLongline.bad.floatlinesCompositionProportionSum= -validator.setLongline.bad.hooksCompositionProportionSum= -validator.setLongline.baitsComposition.uniqueKey= -validator.setLongline.bound.basketsPerSectionCount= -validator.setLongline.bound.branchlinesPerBasketCount= -validator.setLongline.bound.haulingEndLatitude= -validator.setLongline.bound.haulingEndLongitude= -validator.setLongline.bound.haulingStartLatitude= -validator.setLongline.bound.haulingStartLongitude= -validator.setLongline.bound.lightsticksPerBasketCount= -validator.setLongline.bound.settingEndLatitude= -validator.setLongline.bound.settingEndLongitude= -validator.setLongline.bound.settingStartLatitude= -validator.setLongline.bound.settingStartLongitude= -validator.setLongline.bound.settingVesselSpeed= -validator.setLongline.bound.shooterSpeed= -validator.setLongline.bound.snapWeight= -validator.setLongline.bound.swivelWeight= -validator.setLongline.bound.timeBetweenHooks= -validator.setLongline.bound.totalBasketsCount= -validator.setLongline.bound.totalHooksCount= -validator.setLongline.bound.totalSectionsCount= -validator.setLongline.branchlinesComposition.uniqueKey= -validator.setLongline.desactivated.lightsticksColor= -validator.setLongline.desactivated.lightsticksType= -validator.setLongline.desactivated.lineType= -validator.setLongline.desactivated.settingShape= -validator.setLongline.duplicated.homeId= -validator.setLongline.duplicated.number= -validator.setLongline.floatlinesComposition.uniqueKey= -validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp= -validator.setLongline.hooksComposition.uniqueKey= -validator.setLongline.invalid.haulingEndQuadrant= -validator.setLongline.invalid.haulingStartQuadrant= -validator.setLongline.invalid.settingEndQuadrant= -validator.setLongline.invalid.settingStartQuadrant= -validator.setLongline.null.homeId= -validator.setLongline.required.basketsPerSectionCount= -validator.setLongline.required.branchlinesPerBasketCount= -validator.setLongline.required.haulingBreaks= -validator.setLongline.required.haulingDirectionSameAsSetting= -validator.setLongline.required.haulingEndLatitude= -validator.setLongline.required.haulingEndLongitude= -validator.setLongline.required.haulingEndQuadrant= -validator.setLongline.required.haulingEndTimeStamp= -validator.setLongline.required.haulingStartLatitude= -validator.setLongline.required.haulingStartLongitude= -validator.setLongline.required.haulingStartQuadrant= -validator.setLongline.required.haulingStartTimeStamp= -validator.setLongline.required.settingEndLatitude= -validator.setLongline.required.settingEndLongitude= -validator.setLongline.required.settingEndQuadrant= -validator.setLongline.required.settingEndTimeStamp= -validator.setLongline.required.settingStartLatitude= -validator.setLongline.required.settingStartLongitude= -validator.setLongline.required.settingStartQuadrant= -validator.setLongline.required.settingStartTimeStamp= -validator.setLongline.required.totalSectionsCount= -validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp= -validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp= -validator.species.desactivated.speciesGroup= -validator.species.invalid.faoCode.uniqueKey= -validator.species.invalid.homeId.uniqueKey= -validator.species.invalid.scientificLabel.uniqueKey= -validator.species.invalid.wormsId= -validator.species.invalid.wormsId.uniqueKey= -validator.species.null.faoCode= -validator.species.null.homeId= -validator.species.required.ocean= -validator.species.required.scientificLabel= -validator.species.required.speciesGroup= -validator.speciesList.null.code= -validator.targetCatch.bound.weight= -validator.targetCatch.comment.tobig= -validator.targetCatch.desactivated.species= -validator.targetCatch.desactivated.weightCategory= -validator.targetCatch.required.species= -validator.targetCatch.required.weight= -validator.targetCatch.required.weightCategory= -validator.targetCatch.required.well= -validator.targetCatch.uniqueKey= -validator.targetDiscarded.bound.weight= -validator.targetDiscarded.comment.tobig= -validator.targetDiscarded.desactivated.reasonForDiscard= -validator.targetDiscarded.desactivated.species= -validator.targetDiscarded.desactivated.weightCategory= -validator.targetDiscarded.required.comment.for.reasonForDiscard= -validator.targetDiscarded.required.reasonForDiscard= -validator.targetDiscarded.required.species= -validator.targetDiscarded.required.weight= -validator.targetDiscarded.required.weightCategory= -validator.targetDiscarded.uniqueKey= -validator.targetLength.bound.length= -validator.targetLength.bound.weight= -validator.targetLength.desactivated.species= -validator.targetLength.positive.length= -validator.targetLength.positive.weight= -validator.targetLength.required.count= -validator.targetLength.required.species= -validator.targetLength.required.taille= -validator.targetLength.required.weight.or.taille= -validator.targetSample.comment.tobig= -validator.targetSample.required.comment.for.species= -validator.tdr.deployementStart.before.fishingStart= -validator.tdr.desactivated.itemHorizontalPosition= -validator.tdr.desactivated.itemVerticalPosition= -validator.tdr.desactivated.sensorBrand= -validator.tdr.fishingEnd.before.deployementEnd= -validator.tdr.fishingStart.before.fishingEnd= -validator.tdr.required.position= -validator.transmittingBuoy.desactivated.country= -validator.transmittingBuoy.desactivated.transmittingBuoyOperation= -validator.transmittingBuoy.desactivated.transmittingBuoyType= -validator.transmittingBuoy.null.code= -validator.transmittingBuoy.required.transmittingBuoyOperation= -validator.transmittingBuoy.required.transmittingBuoyType= -validator.trip.comment.tobig= -validator.trip.desactivated.captain= -validator.trip.desactivated.dataEntryOperator= -validator.trip.desactivated.departureHarbour= -validator.trip.desactivated.landingHarbour= -validator.trip.desactivated.observer= -validator.trip.desactivated.ocean= -validator.trip.desactivated.tripType= -validator.trip.desactivated.vessel= -validator.trip.endDate.after.startDate= -validator.trip.invalid.date= -validator.trip.invalid.endDate= -validator.trip.invalid.formsUrl= -validator.trip.invalid.loch= -validator.trip.invalid.reportsUrl= -validator.trip.invalid.startDate= -validator.trip.null.captain= -validator.trip.null.dataEntryOperator= -validator.trip.null.departureHarbour= -validator.trip.null.gearUseFeature= -validator.trip.null.landingHarbour= -validator.trip.required.comment.for.captain= -validator.trip.required.comment.for.dataEntryOperator= -validator.trip.required.comment.for.departureHarbour= -validator.trip.required.comment.for.landingHarbour= -validator.trip.required.comment.for.observer= -validator.trip.required.comment.for.ocean= -validator.trip.required.comment.for.tripType= -validator.trip.required.comment.for.vessel= -validator.trip.required.departureHarbour= -validator.trip.required.endDate= -validator.trip.required.observer= -validator.trip.required.ocean= -validator.trip.required.startDate= -validator.trip.required.tripType= -validator.trip.required.vessel= -validator.tripLongline.unclosed.activity= -validator.tripSeine.unclosed.route= -validator.vessel.desactivated.flagCountry= -validator.vessel.desactivated.vesselSizeCategory= -validator.vessel.desactivated.vesselType= -validator.vessel.invalid.capacity= -validator.vessel.invalid.fleetCountry= -validator.vessel.invalid.keelCode= -validator.vessel.invalid.length= -validator.vessel.invalid.power= -validator.vessel.invalid.searchMaximum= -validator.vessel.invalid.yearService= -validator.vessel.null.changeDate= -validator.vessel.required.flagCountry= -validator.vessel.required.vesselSizeCategory= -validator.vessel.required.vesselType= -validator.vesselSizeCategory.required.capacityLabel= -validator.vesselSizeCategory.required.gaugeLabel= -validator.weightCategory.desactivated.species= -validator.weightCategory.required.species= -validator.wind.required.speedRange= -validator.wind.required.waveHeight= diff --git a/observe-entities-validation/src/main/resources/i18n/observe-entities-validation_es_ES.properties b/observe-entities-validation/src/main/resources/i18n/observe-entities-validation_es_ES.properties deleted file mode 100644 index 6d938aa..0000000 --- a/observe-entities-validation/src/main/resources/i18n/observe-entities-validation_es_ES.properties +++ /dev/null @@ -1,424 +0,0 @@ -validator.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. -validator.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. -validator.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s y %2$s. -validator.activity.bound.vesselSpeed=La Velocidad del viento estar comprendida entre %1$s y %2$s. -validator.activity.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. -validator.activity.desactivated.currentFpaZone= -validator.activity.desactivated.detectionMode=El mode de detección seleccionado está desactivado. -validator.activity.desactivated.nextFpaZone= -validator.activity.desactivated.observedSystem=Al menos uno de los sistemas observados seleccioinado está desacticado. -validator.activity.desactivated.previousFpaZone= -validator.activity.desactivated.reasonForNoFishing=La razón de no lance seleccionada está desactivada. -validator.activity.desactivated.surroundingActivity=Actividad circundante seleccionada está desactivada. -validator.activity.desactivated.vesselActivity=Actividad del barco seleccionado está desactivada. -validator.activity.desactivated.wind=La fuerza del viento seleccionada está desactivada. -validator.activity.duplicated.time=Ya existe una actividad a esa hora. -validator.activity.invalid.quadrant=El cuadrante no es coherente con el informe del océano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4) -validator.activity.invalid.seaSurfaceTemperature=La temperatura superficial (%1$s) no puede variar mas de 12° con respecto a la temperatura superficial (%2$s) de la actividad anterio %3$s. -validator.activity.invalid.speed=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos. -validator.activity.null.dcp=No se ha introducido objeto flotante. -validator.activity.null.fpaZone= -validator.activity.null.observedSystem=No hay sistema observado seleccionado. -validator.activity.null.observedSystemDistance=No se ha especificado la distancia al sistema observado. -validator.activity.null.seaSurfaceTemperature=No se ha introducido temperatur superficial. -validator.activity.null.surroundingActivity=No hay actividad circundante seleccionada. -validator.activity.null.wind=No se ha seleccionado fuerza del viento. -validator.activity.required.comment.for.currentFpaZone= -validator.activity.required.comment.for.detectionMode=Es necesario un comentario para el modo de detección. -validator.activity.required.comment.for.fpaZone= -validator.activity.required.comment.for.nextFpaZone= -validator.activity.required.comment.for.observedSystem=Es necesario un comentario para uno de los sistemas observados seleccionados. -validator.activity.required.comment.for.previousFpaZone= -validator.activity.required.comment.for.reasonForNoFishing=Es necesario un comentario para la causa de no lance. -validator.activity.required.comment.for.vesselActivity=Es necesario un comentario para la actividad del barco. -validator.activity.required.date= -validator.activity.required.latitude=La latitud debe ser introducida -validator.activity.required.longitude=La longitud debe ser introducida -validator.activity.required.quadrant=Se debe seleccioinar el cuadrante. -validator.activity.required.time=Es necesaria la hora de la observación para la actividad. -validator.activity.required.vesselActivity=Se debe seleccionar la actividad del barco. -validator.activityLongline.desactivated.fpaZone= -validator.baitsComposition.bound.individualSize= -validator.baitsComposition.bound.individualWeight= -validator.baitsComposition.bound.proportion= -validator.baitsComposition.desactivated.baitSettingStatus= -validator.baitsComposition.desactivated.baitType= -validator.baitsComposition.required.baitSettingStatus= -validator.baitsComposition.required.baitType= -validator.baitsComposition.required.proportion= -validator.basket.bound.floatline1Length= -validator.basket.bound.floatline2Length= -validator.basket.required.settingIdentifier= -validator.branchline.bound.branchlineLength= -validator.branchline.bound.tracelineLength= -validator.branchline.desactivated.baitHaulingStatus= -validator.branchline.desactivated.baitSettingStatus= -validator.branchline.desactivated.baitType= -validator.branchline.desactivated.hookSize= -validator.branchline.desactivated.hookType= -validator.branchline.desactivated.topType= -validator.branchline.desactivated.tracelineType= -validator.branchline.required.settingIdentifier= -validator.branchline.required.topType= -validator.branchline.required.tracelineType= -validator.branchlinesComposition.bound.length= -validator.branchlinesComposition.bound.proportion= -validator.branchlinesComposition.desactivated.topType= -validator.branchlinesComposition.desactivated.tracelineType= -validator.branchlinesComposition.required.length= -validator.branchlinesComposition.required.proportion= -validator.branchlinesComposition.required.topType= -validator.branchlinesComposition.required.tracelineType= -validator.catchLongline.bound.gonadeWeight= -validator.catchLongline.comment.tobig= -validator.catchLongline.desactivated.catchFateLongline= -validator.catchLongline.desactivated.catchHealthness= -validator.catchLongline.desactivated.discardHealthness= -validator.catchLongline.desactivated.hookPosition= -validator.catchLongline.desactivated.maturityStatus= -validator.catchLongline.desactivated.sex= -validator.catchLongline.desactivated.speciesCatch= -validator.catchLongline.desactivated.stomacFullness= -validator.catchLongline.required.comment.for.speciesCatch= -validator.catchLongline.required.count.when.acquisitionModeIsGrouped= -validator.catchLongline.required.position= -validator.catchLongline.required.speciesCatch= -validator.country.invalid.iso2Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. -validator.country.invalid.iso3Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. -validator.country.required.iso2Code=Código ISO2 no especificado -validator.country.required.iso3Code=Código ISO3 no especificado. -validator.encounter.desactivated.encounterType= -validator.encounter.desactivated.species= -validator.encounter.required.count= -validator.encounter.required.distance= -validator.encounter.required.encounterType= -validator.encounter.required.species= -validator.floatingObject.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. -validator.floatingObject.desactivated.objectFate=El devenir seleccionado está desactivada. -validator.floatingObject.desactivated.objectOperation=Al menos una de las operaciones seleccionadas está desactivada. -validator.floatingObject.desactivated.type=El tipo de objeto seleccionado está desactivada. -validator.floatingObject.null.daysAtSeaCount=Número de días en el mar no especificado. -validator.floatingObject.positive.daysAtSeaCount=El número de días en el mar es un entero positivo. -validator.floatingObject.required.comment.for.balise1=Se requiere un comentario para la primera baliza (étant donné son type). -validator.floatingObject.required.comment.for.balise2=Se requiere un comentario para la segunda baliza (étant donné son type). -validator.floatingObject.required.comment.for.objectFate=Se requiere un comentario para el devenir. -validator.floatingObject.required.comment.for.type=Se requiere un comentario para el tipo de objeto -validator.floatingObject.required.objectFate=Es recomiendo selecciona un devenir. -validator.floatingObject.required.objectOperation=Es obligatorio selecciona un operación. -validator.floatingObject.required.type=Es obligatorio seleccionar un tipo de objeto. -validator.floatingObject.size.supportVesselName=El count introducido debe tener una longitud inferior a %1$s carácteres. -validator.floatlinesComposition.bound.length= -validator.floatlinesComposition.bound.proportion= -validator.floatlinesComposition.desactivated.lineType= -validator.floatlinesComposition.required.length= -validator.floatlinesComposition.required.lineType= -validator.floatlinesComposition.required.proportion= -validator.gearCaracteristic.desactivated.gearCaracteristicType= -validator.gearCaracteristic.required.gearCaracteristicType= -validator.gearUseFeature.desactivated.gear= -validator.gearUseFeature.required.gear= -validator.gearUseFeature.required.number= -validator.harbour.desactivated.country= -validator.harbour.null.latitude= -validator.harbour.null.locode= -validator.harbour.null.longitude= -validator.harbour.required.country= -validator.harbour.required.name= -validator.hooksComposition.bound.hookOffset= -validator.hooksComposition.bound.proportion= -validator.hooksComposition.desactivated.hookSize= -validator.hooksComposition.desactivated.hookType= -validator.hooksComposition.required.hookSize= -validator.hooksComposition.required.hookType= -validator.hooksComposition.required.proportion= -validator.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no coherente. -validator.lengthWeightParameter.invalid.uniqueKey=Tupla (sexo/océano/especie) debe ser única, la tupla ya se ha usado. -validator.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no coherente. -validator.lengthWeightParameter.null.ocean=No se ha seleccionado océano. -validator.lengthWeightParameter.required.coefficients=Coeficientes no se han especificados. -validator.lengthWeightParameter.required.endDate=Fecha de fin de validez no especificada. -validator.lengthWeightParameter.required.lengthWeightFormula=Relación de peso no especificado. -validator.lengthWeightParameter.required.species=Especie no especificada. -validator.lengthWeightParameter.required.startDate=fecha de comienzo de validez no especificada. -validator.lengthWeightParameter.required.weightLengthFormula=Relación de talla no especificado. -validator.nonTargetCatch.bound.catchWeight=El peso medio estimado debe estar comprendido entre %1$s y %2$s. -validator.nonTargetCatch.bound.meanLength=La talla media para esta especie debe estár comprendida entre %1$s y %2$s. -validator.nonTargetCatch.bound.meanWeight=El peso medio para esta especie estar comprendido entre %1$s y %2$s. -validator.nonTargetCatch.bound.totalCount=El número estimado debe estar comprendido entre %1$s y %2$s. -validator.nonTargetCatch.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. -validator.nonTargetCatch.desactivated.reasonForDiscard=La razón de descarte seleccionada está desactivada. -validator.nonTargetCatch.desactivated.species=La especie seleccionada está desactivada. -validator.nonTargetCatch.desactivated.speciesFate=El objectFate de fauna seleccionado está desactivado. -validator.nonTargetCatch.positive.meanLength=La talla media tiene que ser un entero positivo. -validator.nonTargetCatch.positive.meanWeight=El peso medio debe ser un entero positivo. -validator.nonTargetCatch.required.comment.for.reasonForDiscard=Es necesario un comentario para la razón de descarte seleccionada. -validator.nonTargetCatch.required.comment.for.speciesFate=Es necesario un comentario para el objectFate de la fauna seleccionada. -validator.nonTargetCatch.required.species=Es obligatorio seleccionar una especie de fauna. -validator.nonTargetCatch.required.speciesFate=Es obligatoiro seleccionar un objectFate de fauna. -validator.nonTargetCatch.required.weightOrNombreEstime=Debe seleccionar uno de los dos valores (peso estimado, número estimado). -validator.nonTargetCatch.required.weightOrTailleMoyen=Debe seleccionar uno de los dos valores (peso medio o talla media). -validator.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe ser única. -validator.nonTargetSample.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. -validator.nonTargetSample.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. -validator.nonTargetSample.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. -validator.nonTargetSample.desactivated.species=La especie seleccionada está desactivada. -validator.nonTargetSample.positive.length=La talla debe ser un entero positivo. -validator.nonTargetSample.positive.weight=El peso debe ser un entero positivo. -validator.nonTargetSample.required.comment.for.species=Es necesario un comentario para la especie de la posición %1$s del muestreo. -validator.nonTargetSample.required.count=Es obligatoria especificar el número de grupo de talla. -validator.nonTargetSample.required.gender=Es obligatoria seleccionar un sexo para la especie de fauna. -validator.nonTargetSample.required.species=Es obligatorio seleccionar una especie de fauna. -validator.nonTargetSample.required.taille=Es obligatoria especificar el talla. -validator.nonTargetSample.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. -validator.objectObservedSpecies.desactivated.species=La especie seleccionada está desactivada. -validator.objectObservedSpecies.desactivated.speciesStatus=El estado seleccionado está desactivado. -validator.objectObservedSpecies.positive.count=El número es entero positivo. -validator.objectObservedSpecies.required.count=El número es obligatorio. -validator.objectObservedSpecies.required.species=Es obligatorio seleccionar una especie de fauna. -validator.objectObservedSpecies.required.speciesStatus=Es obligatorio seleccionar un estado de especie. -validator.organism.desactivated.country=El país está desactivado. -validator.organism.null.description=La descripción no se ha especificado. -validator.organism.required.country=No se ha seleccionado país. -validator.person.desactivated.country= -validator.person.required.country= -validator.person.required.firstName=El count del observado es obligatorio. -validator.person.required.lastName=El apellido del observador es obligatorio. -validator.program.comment.tobig=La longitud del campo de comentarios está limitado a 1024 carácteres. -validator.program.desactivated.organism=El organismo seleccionado está desactivado. -validator.program.required.endDate=Fecha de fin de programa no especificada. -validator.program.required.gearType= -validator.program.required.organism=Ningún organismo seleccionado. -validator.program.required.startDate=Fecha de comienzo de programa no especificada. -validator.referentiel.invalid.code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. -validator.referentiel.invalid.uri.uniqueKey=El uri debe ser único, el valor %1$s ya se ha usado. -validator.referentiel.null.uri=Ningún uri especificado. -validator.referentiel.required.brandName= -validator.referentiel.required.label1=Ninguna etiqueta en inglé establecida. -validator.referentiel.required.label2=Ninguna etiqueta en francés establecida. -validator.referentiel.required.label3=Ninguna etiqueta en espaÑol establecida. -validator.referentiel.status.desactivated=El objeto está desactivado (no se puede usar en los datos de los observadores o en los nuevos referenciales). -validator.referentiel.untranslated.label1=La etiqueta en inglés no se ha traducido. -validator.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido. -validator.route.activityFinDeVeille.notAvailable=Existe una actividad de fin de guardia en la ruta. -validator.route.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres. -validator.route.duplicated.date=Ya existe otra ruta en esa fecha. -validator.route.invalid.date=El día de observación debe ser superior o igual a la fecha de comienzo de marea (%1$s). -validator.route.invalid.endLogValue.maximum=La corredera de tarde no puede ser superior en %1$s a la de mañana. -validator.route.invalid.endLogValue.minimum=la corredera de tarde debe ser superior a la de mañana. -validator.route.invalid.quadrant=El cuadrante de la actividad %1$s no es coherente con el océano (%2$s) de la marea (indico \: 1,2, atlántico \: 1, 2, 3, 4) -validator.route.invalid.seaSurfaceTemperature=La temperatura superficial no puede variar más de 12° entre 2 actividades (actividad %1$s incorrecta). -validator.route.invalid.speed=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd). -validator.route.invalid.startLogValue=La corredera de mañana (%1$s) debe ser superior a la de tarde (%2$s) de la routa %3$s. -validator.route.invalid.time=La hora de la observación de la actividad debe ser superior a la de la actividad anterior (actividad %1$s incorrecta). -validator.route.missing.activityFinDeVeille=No hay actividad de fin de guardia definido en la ruta. -validator.route.null.comment=No hay comentario especificado. -validator.route.positive.startLogValue=La corredera de mañana debe ser un entero positivo. -validator.route.required.date=Se debe especificar el día de observación. -validator.route.unclosed.activity=Existe una actividad no cerrada (%1$s). -validator.schoolEstimate.bound.weight=El tonelaje debe estar comprendido entre %1$s y %2$s. -validator.schoolEstimate.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. -validator.schoolEstimate.desactivated.species=La especie seleccionada está desactivada. -validator.schoolEstimate.required.comment.for.species=Es necesario un comentario para la especie de la posición %1$s de la estimación. -validator.schoolEstimate.required.species=Es obligatorio seleccionar una especie de atún. -validator.schoolEstimate.required.weight=Especificar un peso. -validator.schoolEstimate.species.uniqueKey=Las estimaciones de la especie debe ser única. -validator.section.required.settingIdentifier= -validator.sensorUsed.desactivated.sensorBrand= -validator.sensorUsed.desactivated.sensorDataFormat= -validator.sensorUsed.desactivated.sensorType= -validator.sensorUsed.null.sensorSerialNo= -validator.sensorUsed.required.sensorType= -validator.set.bound.currentDirection=La dirección de la corriente debe ser un número comprendido entre %1$s y %2$s. -validator.set.bound.currentSpeed=La velocidad de la corriente debe ser un número comprendido entre %1$s y %2$s -validator.set.bound.delay=La duración entre la hora final del lance y la de final de recogida de la jareta debe ser al menos de %1$s minutos. -validator.set.bound.maxGearDepth=La profundidas debe estar comprendida entre %1$s y %2$s. -validator.set.bound.schoolMeanDepth=La profundidad media debe ser un entero comprendido entre %1$s y %2$s -validator.set.bound.schoolThickness=El espesor del banco debe ser un entero comprendido entre %1$s y %2$s -validator.set.bound.schoolTopDepth=La profundidad superior debe ser un entero comprendido entre %1$s y %2$s. -validator.set.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. -validator.set.delay.too.long=La duración del lance es elevada (máximo %1$s minutos). -validator.set.desactivated.reasonForNullSet=La causa del lanze nulo seleccionada está desactivada. -validator.set.endDate.after.endPursingDate=El día de fin debe ser superior o igual a la dia de final de recogida de la jareta. -validator.set.endPursingDate.after.date=El día de final de recogida de la jareta debe ser superior o igual a la día de observación. -validator.set.endPursingTimeStamp.after.startTime=La hora final de recogida de la jareta debe ser superior o igual a la hora de comienzo. -validator.set.endSetTimeStamp.after.endPursingTimeStamp=La hora de fin debe ser superior o igual a la hora de fin de recogida de la jareta. -validator.set.null.currentDirection=Dirección de la corriente no introducida. -validator.set.required.comment.for.reasonForNullSet=Es necesario un comentario para la causa de lance nulo seleccionado. -validator.set.size.supportVesselName=El count del supply debe tener una longitud inferior a %1$s caracteres. -validator.set.startTime.after.time=La hora de comienzo debe ser superior o igual a la hora de observación. -validator.setLongline.bad.baitsCompositionProportionSum= -validator.setLongline.bad.branchlinesCompositionProportionSum= -validator.setLongline.bad.floatlinesCompositionProportionSum= -validator.setLongline.bad.hooksCompositionProportionSum= -validator.setLongline.baitsComposition.uniqueKey= -validator.setLongline.bound.basketsPerSectionCount= -validator.setLongline.bound.branchlinesPerBasketCount= -validator.setLongline.bound.haulingEndLatitude= -validator.setLongline.bound.haulingEndLongitude= -validator.setLongline.bound.haulingStartLatitude= -validator.setLongline.bound.haulingStartLongitude= -validator.setLongline.bound.lightsticksPerBasketCount= -validator.setLongline.bound.settingEndLatitude= -validator.setLongline.bound.settingEndLongitude= -validator.setLongline.bound.settingStartLatitude= -validator.setLongline.bound.settingStartLongitude= -validator.setLongline.bound.settingVesselSpeed= -validator.setLongline.bound.shooterSpeed= -validator.setLongline.bound.snapWeight= -validator.setLongline.bound.swivelWeight= -validator.setLongline.bound.timeBetweenHooks= -validator.setLongline.bound.totalBasketsCount= -validator.setLongline.bound.totalHooksCount= -validator.setLongline.bound.totalSectionsCount= -validator.setLongline.branchlinesComposition.uniqueKey= -validator.setLongline.desactivated.lightsticksColor= -validator.setLongline.desactivated.lightsticksType= -validator.setLongline.desactivated.lineType= -validator.setLongline.desactivated.settingShape= -validator.setLongline.duplicated.homeId= -validator.setLongline.duplicated.number= -validator.setLongline.floatlinesComposition.uniqueKey= -validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp= -validator.setLongline.hooksComposition.uniqueKey= -validator.setLongline.invalid.haulingEndQuadrant= -validator.setLongline.invalid.haulingStartQuadrant= -validator.setLongline.invalid.settingEndQuadrant= -validator.setLongline.invalid.settingStartQuadrant= -validator.setLongline.null.homeId= -validator.setLongline.required.basketsPerSectionCount= -validator.setLongline.required.branchlinesPerBasketCount= -validator.setLongline.required.haulingBreaks= -validator.setLongline.required.haulingDirectionSameAsSetting= -validator.setLongline.required.haulingEndLatitude= -validator.setLongline.required.haulingEndLongitude= -validator.setLongline.required.haulingEndQuadrant= -validator.setLongline.required.haulingEndTimeStamp= -validator.setLongline.required.haulingStartLatitude= -validator.setLongline.required.haulingStartLongitude= -validator.setLongline.required.haulingStartQuadrant= -validator.setLongline.required.haulingStartTimeStamp= -validator.setLongline.required.settingEndLatitude= -validator.setLongline.required.settingEndLongitude= -validator.setLongline.required.settingEndQuadrant= -validator.setLongline.required.settingEndTimeStamp= -validator.setLongline.required.settingStartLatitude= -validator.setLongline.required.settingStartLongitude= -validator.setLongline.required.settingStartQuadrant= -validator.setLongline.required.settingStartTimeStamp= -validator.setLongline.required.totalSectionsCount= -validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp= -validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp= -validator.species.desactivated.speciesGroup=El grupo de especies seleccionado está desactivado. -validator.species.invalid.faoCode.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. -validator.species.invalid.homeId.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. -validator.species.invalid.scientificLabel.uniqueKey=El count científico debe ser único, el valor %1$s ya ha sido utilizado. -validator.species.invalid.wormsId=Código worms no válido. -validator.species.invalid.wormsId.uniqueKey=El wormsId debe ser único, el valor %1$s ya se ha usado. -validator.species.null.faoCode=Código FAO no introducido. -validator.species.null.homeId=Código 3L no válido. -validator.species.required.ocean= -validator.species.required.scientificLabel=La etiqueta Scientifique no se ha establecido (introduzca xx si no la conoce). -validator.species.required.speciesGroup=No se ha introducido ningún grupo de especie de fauna. -validator.speciesList.null.code=Código no introducido. -validator.targetCatch.bound.weight=El tonelaje debe estar comprendido entre %1$s y %2$s -validator.targetCatch.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. -validator.targetCatch.desactivated.species=La especie seleccionada está desactivada. -validator.targetCatch.desactivated.weightCategory=La categoría de peso seleccionada está desactivada -validator.targetCatch.required.species=Debe seleccionar una especie de atún. -validator.targetCatch.required.weight=No se ha introducido el peso. -validator.targetCatch.required.weightCategory=Se debe seleccionar una categoría de peso. -validator.targetCatch.required.well=No se ha introducido la cuba. -validator.targetCatch.uniqueKey=El par (categoría de peso - cuba) debe ser única. -validator.targetDiscarded.bound.weight=El tonelaje dado está comprendido entre %1$s y %2$s. -validator.targetDiscarded.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres. -validator.targetDiscarded.desactivated.reasonForDiscard=La causa del descarte seleccionada está desactivada. -validator.targetDiscarded.desactivated.species=La especie seleccionada está desactivada. -validator.targetDiscarded.desactivated.weightCategory=La categoría de peso seleccionada está desactivada. -validator.targetDiscarded.required.comment.for.reasonForDiscard=Se requiere un comentario para la causa de descarte. -validator.targetDiscarded.required.reasonForDiscard=Es obligatoria seleccionar una causa del descarte. -validator.targetDiscarded.required.species=Es obligatorio seleccionar una especie de atún. -validator.targetDiscarded.required.weight=El peso es obligatorio. -validator.targetDiscarded.required.weightCategory=Es obligatorio seleccionar una categoría de peso. -validator.targetDiscarded.uniqueKey=El par (categoria - causa del descarte) debe ser única. -validator.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. -validator.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. -validator.targetLength.desactivated.species=La especie seleccionada está desactivada. -validator.targetLength.positive.length=La talla debe ser un entero positivo. -validator.targetLength.positive.weight=El peso debe ser un entero positivo. -validator.targetLength.required.count=Es obligatoria especificar el número de grupo de talla. -validator.targetLength.required.species=Es obligatoria seleccionar una especie de atún. -validator.targetLength.required.taille=Es obligatoria especificar el talla. -validator.targetLength.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. -validator.targetSample.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. -validator.targetSample.required.comment.for.species=Es necesario un comentario para la especie de la posición %1$s del muestreo. -validator.tdr.deployementStart.before.fishingStart= -validator.tdr.desactivated.itemHorizontalPosition= -validator.tdr.desactivated.itemVerticalPosition= -validator.tdr.desactivated.sensorBrand= -validator.tdr.fishingEnd.before.deployementEnd= -validator.tdr.fishingStart.before.fishingEnd= -validator.tdr.required.position= -validator.transmittingBuoy.desactivated.country= -validator.transmittingBuoy.desactivated.transmittingBuoyOperation= -validator.transmittingBuoy.desactivated.transmittingBuoyType= -validator.transmittingBuoy.null.code=El código de baliza no ha sido especificado. -validator.transmittingBuoy.required.transmittingBuoyOperation= -validator.transmittingBuoy.required.transmittingBuoyType= -validator.trip.comment.tobig=La longitud del campo de comentarios está limitado a 1024 carácteres. -validator.trip.desactivated.captain= -validator.trip.desactivated.dataEntryOperator= -validator.trip.desactivated.departureHarbour= -validator.trip.desactivated.landingHarbour= -validator.trip.desactivated.observer= -validator.trip.desactivated.ocean=El oceano seleccionado está desactivado. -validator.trip.desactivated.tripType= -validator.trip.desactivated.vessel=El barco seleccionado está desactivado. -validator.trip.endDate.after.startDate=La fecha de fin de marea debe ser supuerio a la fecha de comienzo. -validator.trip.invalid.date=El día de observación debe ser superior al de una ruta anterior ( la ruta %1$s es incorrecta) -validator.trip.invalid.endDate=La fecha de fin de marea debe ser superior al dia de observación de cada ruta (la ruta %1$s es incorrecta). -validator.trip.invalid.formsUrl=La URL del formulario no es válido. -validator.trip.invalid.loch=La corredera de mañana (%1$s) de la ruta %2$s debe ser superior a la de tarde (%3$s) de la ruta anterior. -validator.trip.invalid.reportsUrl=La URL del informe no es válida. -validator.trip.invalid.startDate=La fecha de comienzo de marea debe ser inferior al día de observación de cualquier ruta (la ruta %1$s es incorrecta). -validator.trip.null.captain= -validator.trip.null.dataEntryOperator= -validator.trip.null.departureHarbour= -validator.trip.null.gearUseFeature= -validator.trip.null.landingHarbour= -validator.trip.required.comment.for.captain= -validator.trip.required.comment.for.dataEntryOperator= -validator.trip.required.comment.for.departureHarbour= -validator.trip.required.comment.for.landingHarbour= -validator.trip.required.comment.for.observer= -validator.trip.required.comment.for.ocean= -validator.trip.required.comment.for.tripType= -validator.trip.required.comment.for.vessel= -validator.trip.required.departureHarbour= -validator.trip.required.endDate=La fecha de fin de marea es obligatoria. -validator.trip.required.observer= -validator.trip.required.ocean=No se ha seleccionado océano. -validator.trip.required.startDate=La fecha de comienzo de marea es obligatoria. -validator.trip.required.tripType= -validator.trip.required.vessel=Es obligatorio seleccionar un barco. -validator.tripLongline.unclosed.activity= -validator.tripSeine.unclosed.route= -validator.vessel.desactivated.flagCountry=la bandera seleccionada está desactivada. -validator.vessel.desactivated.vesselSizeCategory=la capacidad seleccionada está desactivada. -validator.vessel.desactivated.vesselType=La perquería seleccionada está desactivada. -validator.vessel.invalid.capacity=No se ha especificado el año de servicio. -validator.vessel.invalid.fleetCountry=El código de la flota no se ha especificado. -validator.vessel.invalid.keelCode=El código de quilla no se ha especificado. -validator.vessel.invalid.length=Longueur hors tout no se ha especificado. -validator.vessel.invalid.power=Potencia no especificada. -validator.vessel.invalid.searchMaximum=Velocidad máxima no especificada. -validator.vessel.invalid.yearService=No se ha especificado el año de servicio. -validator.vessel.null.changeDate=Fecha de carga no establecida. -validator.vessel.required.flagCountry=No se ha seleccionado la bandera. -validator.vessel.required.vesselSizeCategory=No se ha seleccionado la capacidad. -validator.vessel.required.vesselType=No se ha seleccionado la pesquería. -validator.vesselSizeCategory.required.capacityLabel=La etiqueta «Capacidad» no se ha establecido. -validator.vesselSizeCategory.required.gaugeLabel=La etiqueta «Capacidad00BB no se ha establecido. -validator.weightCategory.desactivated.species=La especie seleccionada está desactivada. -validator.weightCategory.required.species=Ninguna especie seleccionada. -validator.wind.required.speedRange=Etiqueta para la velocidad del viento no especificada. -validator.wind.required.waveHeight=Etiqueta descriptiva para la altura media de las olas no especificada. diff --git a/observe-entities-validation/src/main/resources/i18n/observe-entities-validation_fr_FR.properties b/observe-entities-validation/src/main/resources/i18n/observe-entities-validation_fr_FR.properties deleted file mode 100644 index 958f8e0..0000000 --- a/observe-entities-validation/src/main/resources/i18n/observe-entities-validation_fr_FR.properties +++ /dev/null @@ -1,425 +0,0 @@ -validator.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. -validator.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. -validator.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s et %2$s. -validator.activity.bound.vesselSpeed=La vitesse navire doit être comprise entre %1$s et %2$s. -validator.activity.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.activity.desactivated.currentFpaZone=La zone courante est désactivée. -validator.activity.desactivated.detectionMode=Le mode de détection sélectionné est désactivé. -validator.activity.desactivated.nextFpaZone=La zone pénétrée est désactivée. -validator.activity.desactivated.observedSystem=Au moins un des systèmes observés sélectionné est désactivé. -validator.activity.desactivated.previousFpaZone=La zone quitée est désactivée. -validator.activity.desactivated.reasonForNoFishing=La raison de non coup de senne sélectionnée est désactivée. -validator.activity.desactivated.surroundingActivity=L'activité environnante sélectionnée est désactivée. -validator.activity.desactivated.vesselActivity=L'activité vessel sélectionnée est désactivée. -validator.activity.desactivated.wind=Le vent Beaufort sélectionné est désactivé. -validator.activity.duplicated.time=Il existe déjà une autre activité à cette heure. -validator.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) -validator.activity.invalid.seaSurfaceTemperature=La température surface (%1$s) ne peut pas varier de plus de 12° par rapport à la température surface (%2$s) de l'activité précédente %3$s. -validator.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd -validator.activity.null.dcp=Aucun objet flottant saisi. -validator.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire. -validator.activity.null.observedSystem=Aucun système observé sélectionné. -validator.activity.null.observedSystemDistance=La distance au système observé n'est pas renseignée. -validator.activity.null.seaSurfaceTemperature=Aucune température de surface saisie. -validator.activity.null.surroundingActivity=Aucune activité environnante sélectionné. -validator.activity.null.wind=Aucun vent Beaufort sélectionné. -validator.activity.required.comment.for.currentFpaZone=Un commentaire est requis pour la zone courante. -validator.activity.required.comment.for.detectionMode=Un commentaire est requis pour le mode détection. -validator.activity.required.comment.for.fpaZone=Un commentaire est requis pour la zone. -validator.activity.required.comment.for.nextFpaZone=Un commentaire est requis pour la zone pénétrée. -validator.activity.required.comment.for.observedSystem=Un commentaire est requis pour un des systèmes observés sélectionnés. -validator.activity.required.comment.for.previousFpaZone=Un commentaire est requis pour la zone quitée. -validator.activity.required.comment.for.reasonForNoFishing=Un commentaire est requis pour la raison de non coup de senne. -validator.activity.required.comment.for.vesselActivity=Un commentaire est requis pour l'activité navire. -validator.activity.required.date=La date d'observation de l'activité est obligatoire. -validator.activity.required.latitude=La latitude doit être renseignée. -validator.activity.required.longitude=La longitude doit être renseignée. -validator.activity.required.quadrant=Le quadrant doit être sélectionné. -validator.activity.required.time=L'heure d'observation de l'activité est obligatoire. -validator.activity.required.vesselActivity=L'activité du navire est obligatoire. -validator.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée. -validator.baitsComposition.bound.individualSize=La taille doit être comprise entre %s et %s. -validator.baitsComposition.bound.individualWeight=Le poids doit être comprise entre %s et %s. -validator.baitsComposition.bound.proportion=La proportion doit être comprise entre %s et %s. -validator.baitsComposition.desactivated.baitSettingStatus=Le type d'état sélectionné est désactivée. -validator.baitsComposition.desactivated.baitType=Le type d'appât sélectionné est désactivée. -validator.baitsComposition.required.baitSettingStatus=La sélection d'un état est obligatoire. -validator.baitsComposition.required.baitType=La sélection d'un type est obligatoire. -validator.baitsComposition.required.proportion=Proportion non renseignée. -validator.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. -validator.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.& -validator.basket.required.settingIdentifier=L'identifiant de filage est obligatoire. -validator.branchline.bound.branchlineLength=La longeur avançon doit être comprise entre %1$s et %2$s. -validator.branchline.bound.tracelineLength=La longueur de la partie basse doit être comprise entre %1$s et %2$s. -validator.branchline.desactivated.baitHaulingStatus=L'état d'appât est désactivé. -validator.branchline.desactivated.baitSettingStatus=L'état d'appât est désactivé. -validator.branchline.desactivated.baitType=Le type d'appât est désactivé. -validator.branchline.desactivated.hookSize=La taille d'hameçon est désactivé. -validator.branchline.desactivated.hookType=Le type d'hameçon est désactivé. -validator.branchline.desactivated.topType=Le type est désactivé. -validator.branchline.desactivated.tracelineType=Le type est désactivé. -validator.branchline.required.settingIdentifier=L'identifiant de filage est obligatoire. -validator.branchline.required.topType=La sélection d'un type de partie supérieure est recommandée -validator.branchline.required.tracelineType=La sélection d'un type de bas de ligne est recommandée -validator.branchlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. -validator.branchlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. -validator.branchlinesComposition.desactivated.topType=Le type de partie supérieure de ligne sélectionné est désactivé -validator.branchlinesComposition.desactivated.tracelineType=Le type de bas de ligne sélectionné est désactivé -validator.branchlinesComposition.required.length=Longueur non renseignée. -validator.branchlinesComposition.required.proportion=Proportion non renseignée. -validator.branchlinesComposition.required.topType=La sélection d'un topType est obligatoire. -validator.branchlinesComposition.required.tracelineType=La sélection d'un type de bas de ligne est obligatoire. -validator.catchLongline.bound.gonadeWeight=Le poids doit être compris entre %1$s et %2$s -validator.catchLongline.comment.tobig=Commentaire trop grand (ne doit pas dépasser 1023 caractères). -validator.catchLongline.desactivated.catchFateLongline=Le devenir sélectionné est désactivé. -validator.catchLongline.desactivated.catchHealthness=L'état à la capture sélectionné est désactivé. -validator.catchLongline.desactivated.discardHealthness=L'état au rejet sélectionné est désactivé. -validator.catchLongline.desactivated.hookPosition=La position de l'hameçon sélectionnée est désactivée. -validator.catchLongline.desactivated.maturityStatus=La maturité sexuelle sélectionnée est désactivée. -validator.catchLongline.desactivated.sex=Le sexe sélectionné est désactivé. -validator.catchLongline.desactivated.speciesCatch=L'espèce sélectionnée est désactivée. -validator.catchLongline.desactivated.stomacFullness=L'état de l'estomac sélectionné est désactivé. -validator.catchLongline.required.comment.for.speciesCatch=Un commentaire est requis pour l'espèce sélectionnée. -validator.catchLongline.required.count.when.acquisitionModeIsGrouped=Le nombre est obligatoire en mode groupé. -validator.catchLongline.required.position=Pas de position renseignée sur la palangre. -validator.catchLongline.required.speciesCatch=L'espèce n'est pas renseignée. -validator.country.invalid.iso2Code.uniqueKey=Le code ISO2 n'est pas unique -validator.country.invalid.iso3Code.uniqueKey=Le code ISO3 n'est pas unique -validator.country.required.iso2Code=Code ISO2 non renseigné. -validator.country.required.iso3Code=Code ISO3 non renseigné. -validator.encounter.desactivated.encounterType=Le type de rencontre est désactivé. -validator.encounter.desactivated.species=L'espèce sélectionnée est désactivée. -validator.encounter.required.count=Nombre non renseignée. -validator.encounter.required.distance=Distance non renseignée. -validator.encounter.required.encounterType=La sélection d'un type de rencontre est obligatoire. -validator.encounter.required.species=La sélection d'une espèce est obligatoire. -validator.floatingObject.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.floatingObject.desactivated.objectFate=Le devenir objet sélectionné est désactivé. -validator.floatingObject.desactivated.objectOperation=Au moins une des opérations sélectionnée est désactivée. -validator.floatingObject.desactivated.type=Le type d'objet sélectionné est désactivé. -validator.floatingObject.null.daysAtSeaCount=Nombre de jour à l'eau non renseigné. -validator.floatingObject.positive.daysAtSeaCount=Le nombre de jour à l'eau est un entier positif. -validator.floatingObject.required.comment.for.balise1=Un commentaire est requis pour la première balise (étant donné son type). -validator.floatingObject.required.comment.for.balise2=Un commentaire est requis pour la seconde balise (étant donné son type). -validator.floatingObject.required.comment.for.objectFate=Un commentaire est requis pour le devenir objet. -validator.floatingObject.required.comment.for.type=Un commentaire est requis pour le type d'objet. -validator.floatingObject.required.objectFate=La sélection d'un devenir d'objet est conseillée. -validator.floatingObject.required.objectOperation=La sélection d'une opération d'objet est obligatoire. -validator.floatingObject.required.type=La sélection d'un type d'objet est obligatoire. -validator.floatingObject.size.supportVesselName=Le nom supply doit avoir une taille inférieure à %1$s caractères. -validator.floatlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. -validator.floatlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. -validator.floatlinesComposition.desactivated.lineType=Le type sélectionnée est désactivée. -validator.floatlinesComposition.required.length=Proportion non renseignée. -validator.floatlinesComposition.required.lineType=La sélection d'un type est obligatoire. -validator.floatlinesComposition.required.proportion=Proportion non renseignée. -validator.gearCaracteristic.desactivated.gearCaracteristicType=Le type sélectionnée est désactivée. -validator.gearCaracteristic.required.gearCaracteristicType=Le type sélectionnée est obligatoire. -validator.gearUseFeature.desactivated.gear=L'équipement sélectionné est désactivé. -validator.gearUseFeature.required.gear=L'équipement est obligatoire. -validator.gearUseFeature.required.number=Le nombre est obligatoire. -validator.harbour.desactivated.country=Le pays sélectionné est désactivé. -validator.harbour.null.latitude=La latitude n'est pas renseignée. -validator.harbour.null.locode=Le locode n'est pas renseigné. -validator.harbour.null.longitude=La longitude n'est pas renseignée. -validator.harbour.required.country=La sélection d'un pays est obligatoire. -validator.harbour.required.name=Le nom du port n'est pas renseigné. -validator.hooksComposition.bound.hookOffset=L'offset doit être compris entre %s et %s. -validator.hooksComposition.bound.proportion=La proportion doit être comprise entre %s et %s. -validator.hooksComposition.desactivated.hookSize=La taille d'hameçon sélectionné est désactivée. -validator.hooksComposition.desactivated.hookType=Le type d'hameçon sélectionné est désactivée. -validator.hooksComposition.required.hookSize=La sélection d'une taille d'hameçon est obligatoire. -validator.hooksComposition.required.hookType=La sélection d'un type d'hameçon est obligatoire. -validator.hooksComposition.required.proportion=Proportion non renseignée. -validator.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. -validator.lengthWeightParameter.invalid.uniqueKey=Le tuple (gender/ocean/species/startDate) doit être unique, le tuple est déjà utilisé. -validator.lengthWeightParameter.invalid.weightLengthFormula=La relation taille saisie n'est pas cohérente. -validator.lengthWeightParameter.null.ocean=Aucun océan sélectionné. -validator.lengthWeightParameter.required.coefficients=Les coefficients ne sont pas renseignés. -validator.lengthWeightParameter.required.endDate=Date de fin de validité non renseignée. -validator.lengthWeightParameter.required.lengthWeightFormula=La relation poids n'est pas renseignée. -validator.lengthWeightParameter.required.species=L'espèce n'est pas renseignée. -validator.lengthWeightParameter.required.startDate=date de début de validité non renseignée. -validator.lengthWeightParameter.required.weightLengthFormula=La relation taille n'est pas renseignée. -validator.nonTargetCatch.bound.catchWeight=Le poids estimé doit être compris entre %1$s et %2$s. -validator.nonTargetCatch.bound.meanLength=La taille moyenne pour cette espèce doit être comprise entre %1$s et %2$s. -validator.nonTargetCatch.bound.meanWeight=Le poids moyen pour cette espèce doit être compris entre %1$s et %2$s. -validator.nonTargetCatch.bound.totalCount=Le nombre estimé doit être compris entre %1$s et %2$s. -validator.nonTargetCatch.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.nonTargetCatch.desactivated.reasonForDiscard=La raison rejet sélectionnée est désactivée. -validator.nonTargetCatch.desactivated.species=L'espèce sélectionnée est désactivée. -validator.nonTargetCatch.desactivated.speciesFate=Le devenir faune sélectionné est désactivé. -validator.nonTargetCatch.positive.meanLength=La taille moyenne est un entier strictement positif. -validator.nonTargetCatch.positive.meanWeight=Le poids moyen est un entier strictement positif. -validator.nonTargetCatch.required.comment.for.reasonForDiscard=Un commentaire est requis vu la raison de rejet sélectionnée. -validator.nonTargetCatch.required.comment.for.speciesFate=Un commentaire est requis vu le devenir faune sélectionné. -validator.nonTargetCatch.required.species=La sélection d'une espèce de faune est obligatoire. -validator.nonTargetCatch.required.speciesFate=La sélection d'un devenir faune est obligatoire. -validator.nonTargetCatch.required.weightOrNombreEstime=Une des deux valeurs (poids estimé, nombre estimé) doit être renseignée. -validator.nonTargetCatch.required.weightOrTailleMoyen=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. -validator.nonTargetCatch.uniqueKey=Le couple (espèce - objectFate) doit être unique. -validator.nonTargetSample.bound.length=La taille pour cette espèce doit être comprise entre %1$s et %2$s. -validator.nonTargetSample.bound.weight=Le poids pour cette espèce doit être compris entre %1$s et %2$s. -validator.nonTargetSample.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.nonTargetSample.desactivated.species=L'espèce sélectionnée est désactivée. -validator.nonTargetSample.positive.length=La longueur est un entier strictement positif. -validator.nonTargetSample.positive.weight=Le poids est un entier strictement positif. -validator.nonTargetSample.required.comment.for.species=Un commentaire est requis pour l'espèce de l'entrée à la position %1$s de l'échantillonage. -validator.nonTargetSample.required.count=Le nombre effectif est obligatoire. -validator.nonTargetSample.required.gender=La sélection d'un sexe d'espèce de faune est obligatoire. -validator.nonTargetSample.required.species=La sélection d'une espèce de faune est obligatoire. -validator.nonTargetSample.required.taille=La taille est obligatoire. -validator.nonTargetSample.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. -validator.objectObservedSpecies.desactivated.species=L'espèce sélectionnée est désactivée. -validator.objectObservedSpecies.desactivated.speciesStatus=Le statut espèce sélectionné est désactivé. -validator.objectObservedSpecies.positive.count=Le lastNamebre est un entier strictement positif. -validator.objectObservedSpecies.required.count=Le lastNamebre est obligatoire. -validator.objectObservedSpecies.required.species=La sélection d'une espèce de faune est obligatoire. -validator.objectObservedSpecies.required.speciesStatus=La sélection d'un statut d'espèce de faune est obligatoire. -validator.organism.desactivated.country=Le pays est désactivé. -validator.organism.null.description=La description n'est pas renseignée. -validator.organism.required.country=Aucun pays sélectionné. -validator.person.desactivated.country=La nationalité sélectionnée est désactivée. -validator.person.required.country=La nationalité est obligatoire. -validator.person.required.firstName=Le prénom est obligatoire. -validator.person.required.lastName=Le nom est obligatoire. -validator.program.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.program.desactivated.organism=L'organisme sélectionné est désactivé. -validator.program.required.endDate=Date de fin de programme non renseigné. -validator.program.required.gearType=Aucun type d'engin sélectionné. -validator.program.required.organism=Aucun organisme sélectionné. -validator.program.required.startDate=Date de début de programme non renseigné. -validator.referentiel.invalid.code.uniqueKey=Le code doit être unique, la valeur %1$s est déjà utilisée. -validator.referentiel.invalid.uri.uniqueKey=L'uri doit être unique, la valeur %1$s est déjà utilisée. -validator.referentiel.null.uri=Aucune uri renseignée. -validator.referentiel.required.brandName=Le nom n'est pas renseigné. -validator.referentiel.required.label1=Aucun libellé anglais renseigné. -validator.referentiel.required.label2=Aucun libellé français renseigné. -validator.referentiel.required.label3=Aucun libellé espagnol renseigné. -validator.referentiel.status.desactivated=L'objet est déasactivé (il ne pourra plus être utilisé dans de nouvelles données ou référentiels). -validator.referentiel.status.required=Statut non renseigné. -validator.referentiel.untranslated.label1=Le libellé anglais n'est pas traduit. -validator.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit. -validator.route.activityFinDeVeille.notAvailable=Il existe déjà une activité de fin de veille sur la route -validator.route.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.route.duplicated.date=Il existe déjà une autre route à cette date. -validator.route.invalid.date=Le jour d'observation doit être supérieure ou égale à la date de début de la marée (%1$s). -validator.route.invalid.endLogValue.maximum=Le loch du soir ne peut pas être supérieur de %1$s à celui du matin. -validator.route.invalid.endLogValue.minimum=Le loch du soir doit être strictement supérieur à celui du matin. -validator.route.invalid.quadrant=Le quadrant de l'activity à la position %1$s n'est pas cohérent par rapport à l'océan (%2$s) de la marée (indien \: 1,2, atlantiqe \: 1, 2, 3, 4) -validator.route.invalid.seaSurfaceTemperature=La température surface ne peut pas varier de plus de 12° entre 2 activités (activité de position %1$s incorrecte). -validator.route.invalid.speed=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd). -validator.route.invalid.startLogValue=Le loch du matin (%1$s) doit être supérieur au loch soir (%2$s) de la route %3$s. -validator.route.invalid.time=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente (activité de position %1$s incorrecte). -validator.route.missing.activityFinDeVeille=Aucune activité de fin de veille définie sur la route. -validator.route.null.comment=Aucun commentaire renseigné. -validator.route.positive.startLogValue=Le loch du matin doit être un entier strictement positif. -validator.route.required.date=Le jour d'observation doit être renseigné. -validator.route.unclosed.activity=Il existe une activité non clôturée (%1$s). -validator.schoolEstimate.bound.weight=Le tonnage doit être compris entre %1$s et %2$s. -validator.schoolEstimate.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.schoolEstimate.desactivated.species=L'espèce sélectionnée est désactivée. -validator.schoolEstimate.required.comment.for.species=Un commentaire est requis pour l'espèce de l'entrée à la position %1$s de l'estimation. -validator.schoolEstimate.required.species=La sélection d'une espèce de thon est obligatoire. -validator.schoolEstimate.required.weight=Un des deux poids doit être renseigné. -validator.schoolEstimate.species.uniqueKey=L'espèce est déjà utilisée. -validator.section.required.settingIdentifier=L'identifiant de filage est obligatoire. -validator.sensorUsed.desactivated.sensorBrand=La marque sélectionnée est désactivée. -validator.sensorUsed.desactivated.sensorDataFormat=Le type de format de données sélectionné est désactivé. -validator.sensorUsed.desactivated.sensorType=Le type sélectionné est désactivé. -validator.sensorUsed.null.sensorSerialNo=Le numéro de série n'est pas renseigné. -validator.sensorUsed.required.sensorType=La sélection d'un type est obligatoire. -validator.set.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. -validator.set.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. -validator.set.bound.delay=La durée entre l'heure de fin de calée et l'heure de fin de coulissage doit être d'au moins %1$s minutes. -validator.set.bound.maxGearDepth=La profondeur doit être comprise entre %1$s et %2$s. -validator.set.bound.schoolMeanDepth=La profondeur moyenne doit être un entier compris entre %1$s et %2$s. -validator.set.bound.schoolThickness=L'épaisseur Banc doit être un entier compris entre %1$s et %2$s. -validator.set.bound.schoolTopDepth=La profondeur sommet doit être un entier compris entre %1$s et %2$s. -validator.set.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.set.delay.too.long=La durée de la calée est trop longue (maximum de %1$s minutes). -validator.set.desactivated.reasonForNullSet=La cause coup null sélectionnée est désactivée. -validator.set.endDate.after.endPursingDate=La date de fin doit être supérieure ou égal à la date de fin de coulissage. -validator.set.endPursingDate.after.date=La date de fin de coulissage doit être supérieure ou égal à la date du jour d'observation. -validator.set.endPursingTimeStamp.after.startTime=L'heure de fin de coulissage doit être supérieure ou égal à l'heure de début. -validator.set.endSetTimeStamp.after.endPursingTimeStamp=L'heure de fin doit être supérieure ou égal à l'heure de fin de coulissage. -validator.set.null.currentDirection=Direction courant non saisie. -validator.set.required.comment.for.reasonForNullSet=Un commentaire est requis pour la cause coup nul sélectionnée. -validator.set.size.supportVesselName=Le nom supply doit avoir une taille inférieure à %1$s caractères. -validator.set.startTime.after.time=L'heure de début doit être supérieure ou égal à l'heure d'observation de l'activité. -validator.setLongline.bad.baitsCompositionProportionSum=La somme des proportions d'appâts doit valoir 100. -validator.setLongline.bad.branchlinesCompositionProportionSum=La somme des proportions d'avançons doit valoir 100. -validator.setLongline.bad.floatlinesCompositionProportionSum=La somme des proportions de floatline doit valoir 100. -validator.setLongline.bad.hooksCompositionProportionSum=La somme des proportions d'hameçons doit valoir 100. -validator.setLongline.baitsComposition.uniqueKey=Le tuple (type/état/taille/poids) doit être unique, le tuple est déjà utilisé. -validator.setLongline.bound.basketsPerSectionCount=Le nombre de panier par section doit être compris entre %1$s et %2$s. -validator.setLongline.bound.branchlinesPerBasketCount=Le nombre d'hameçons par panier doit être compris entre %1$s et %2$s. -validator.setLongline.bound.haulingEndLatitude=La latitude de fin de virage doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.haulingEndLongitude=La longitude de fin de virage doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.haulingStartLatitude=La latitude de début de virage doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.haulingStartLongitude=La longitude de début de virage doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.lightsticksPerBasketCount=Le nombre de cyalumes par panier doit être compris entre %1$s et %2$s. -validator.setLongline.bound.settingEndLatitude=La latitude de fin de filage doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.settingEndLongitude=La longitude de fin de filage doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.settingStartLatitude=La latitude de début de filage doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.settingStartLongitude=La longitude de début de filage doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.settingVesselSpeed=La vitesse bateau doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.shooterSpeed=La vitesse de shooter doit être comprise entre %1$s et %2$s. -validator.setLongline.bound.snapWeight=Le poids snap doit être compris entre %1$s et %2$s. -validator.setLongline.bound.swivelWeight=Le poids emerillon doit être compris entre %1$s et %2$s. -validator.setLongline.bound.timeBetweenHooks=Le temps entre hameçons doit être compris entre %1$s et %2$s. -validator.setLongline.bound.totalBasketsCount=Le nombre total de paniers doit être compris entre %1$s et %2$s. -validator.setLongline.bound.totalHooksCount=Le nombre total d'hameçons doit être compris entre %1$s et %2$s. -validator.setLongline.bound.totalSectionsCount=Le nombre total de sections doit être compris entre %1$s et %2$s. -validator.setLongline.branchlinesComposition.uniqueKey=Le tuple (type haut/type bas/taille) doit être unique, le tuple est déjà utilisé. -validator.setLongline.desactivated.lightsticksColor=La couleur de cyalume sélectionné est désactivé. -validator.setLongline.desactivated.lightsticksType=Le type de cyalume sélectionné est désactivé. -validator.setLongline.desactivated.lineType=Le type de ligne sélectionné est désactivé. -validator.setLongline.desactivated.settingShape=Le type de forme sélectionné est désactivé. -validator.setLongline.duplicated.homeId=L'Id métier est déjà utilisé par une autre opération de pêche (%s) -validator.setLongline.duplicated.number=Le numéro est déjà utilisé par une autre opération de pêche (%s) -validator.setLongline.floatlinesComposition.uniqueKey=Le tuple (type/longueur) doit être unique, le tuple est déjà utilisé. -validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp=L'heure de fin de virage doit être supérieure ou égal à l'heure de début de virage. -validator.setLongline.hooksComposition.uniqueKey=Le tuple (type/taille/offset) doit être unique, le tuple est déjà utilisé. -validator.setLongline.invalid.haulingEndQuadrant=Le quadrant de fin de virage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) -validator.setLongline.invalid.haulingStartQuadrant=Le quadrant de début de virage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) -validator.setLongline.invalid.settingEndQuadrant=Le quadrant de fin de filage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) -validator.setLongline.invalid.settingStartQuadrant=Le quadrant de début de filage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) -validator.setLongline.null.homeId=Id métier non renseigné. -validator.setLongline.required.basketsPerSectionCount=Nombre de paniers par section non renseigné. -validator.setLongline.required.branchlinesPerBasketCount=Nombre d'hameçons par panier non renseigné. -validator.setLongline.required.haulingBreaks=Nombre de coupures non renseigné. -validator.setLongline.required.haulingDirectionSameAsSetting=Le champ doit être renseigné. -validator.setLongline.required.haulingEndLatitude=Latitude de fin de virage non renseignée. -validator.setLongline.required.haulingEndLongitude=longitude de fin de virage non renseignée. -validator.setLongline.required.haulingEndQuadrant=Quadrant de fin de virage non renseigné. -validator.setLongline.required.haulingEndTimeStamp=Horodatage de fin de virage non renseigné. -validator.setLongline.required.haulingStartLatitude=Latitude de début de virage non renseignée. -validator.setLongline.required.haulingStartLongitude=longitude de début de virage non renseignée. -validator.setLongline.required.haulingStartQuadrant=Quadrant de début de virage non renseigné. -validator.setLongline.required.haulingStartTimeStamp=Horodatage de début de virage non renseigné. -validator.setLongline.required.settingEndLatitude=Latitude de fin de filage non renseignée. -validator.setLongline.required.settingEndLongitude=longitude de fin de filage non renseignée. -validator.setLongline.required.settingEndQuadrant=Quadrant de fin de filage non renseigné. -validator.setLongline.required.settingEndTimeStamp=Horodatage de fin de filage non renseigné. -validator.setLongline.required.settingStartLatitude=Latitude de début de filage non renseignée. -validator.setLongline.required.settingStartLongitude=longitude de début de filage non renseignée. -validator.setLongline.required.settingStartQuadrant=Quadrant de début de filage non renseigné. -validator.setLongline.required.settingStartTimeStamp=Horodatage de début de filage non renseigné. -validator.setLongline.required.totalSectionsCount=Nombre de sections non renseigné. -validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=L'heure de début de virage doit être supérieure ou égal à l'heure de fin de filage. -validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=L'heure de fin de filage doit être supérieure ou égal à l'heure de début de filage. -validator.species.desactivated.speciesGroup=Le groupe d'espèce sélectionnée est désactivé. -validator.species.invalid.faoCode.uniqueKey=Le codeFAO doit être unique, la valeur %1$s est déjà utilisée. -validator.species.invalid.homeId.uniqueKey=Le code3l doit être unique, la valeur %1$s est déjà utilisée. -validator.species.invalid.scientificLabel.uniqueKey=Le libellé scientifique doit être unique, la valeur %1$s est déjà utilisée. -validator.species.invalid.wormsId=Le code worms n'est pas valide. -validator.species.invalid.wormsId.uniqueKey=Le wormsId doit être unique, la valeur %1$s est déjà utilisée. -validator.species.null.faoCode=Le code FAO n'est pas renseigné. -validator.species.null.homeId=Le code 3L n'est pas renseigné. -validator.species.required.ocean=Aucun océan sélectionné. -validator.species.required.scientificLabel=Le libellé scientifique n'est pas renseigné (mettre xx si non connu). -validator.species.required.speciesGroup=Aucun groupe d'espèce faune renseigné. -validator.speciesList.null.code=Le code n'est pas renseigné. -validator.targetCatch.bound.weight=Le tonnage doit être compris entre %1$s et %2$s -validator.targetCatch.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.targetCatch.desactivated.species=L'espèce sélectionnée est désactivée. -validator.targetCatch.desactivated.weightCategory=La catégorie poids sélectionnée est désactivée. -validator.targetCatch.required.species=La sélection d'une espèce de thon est obligatoire. -validator.targetCatch.required.weight=Le poids n'est pas renseigné. -validator.targetCatch.required.weightCategory=La sélection d'une catégorie poids est obligatoire. -validator.targetCatch.required.well=La cuve n'est pas renseignée. -validator.targetCatch.uniqueKey=Le couple (catégorie poids - well) doit être unique. -validator.targetDiscarded.bound.weight=Le tonnage doit être compris entre %1$s et %2$s. -validator.targetDiscarded.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.targetDiscarded.desactivated.reasonForDiscard=La raison rejet sélectionnée est désactivée. -validator.targetDiscarded.desactivated.species=L'espèce sélectionnée est désactivée. -validator.targetDiscarded.desactivated.weightCategory=La catégorie poids sélectionnée est désactivée. -validator.targetDiscarded.required.comment.for.reasonForDiscard=un commentaire est requis pour le raison rejet du rejet. -validator.targetDiscarded.required.reasonForDiscard=La sélection d'une raison de rejet est obligatoire. -validator.targetDiscarded.required.species=La sélection d'une espèce de thon est obligatoire. -validator.targetDiscarded.required.weight=Le poids est obligatoire. -validator.targetDiscarded.required.weightCategory=La sélection d'une catégorie poids est obligatoire. -validator.targetDiscarded.uniqueKey=Le couple (catégorie - raison rejet) doit être unique. -validator.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s. -validator.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s. -validator.targetLength.desactivated.species=L'espèce sélectionnée est désactivée. -validator.targetLength.positive.length=La longueur est un entier strictement positif. -validator.targetLength.positive.weight=Le poids est un entier strictement positif. -validator.targetLength.required.count=Le nombre effectif est obligatoire. -validator.targetLength.required.species=La sélection d'une espèce de thon est obligatoire. -validator.targetLength.required.taille=La taille est obligatoire. -validator.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. -validator.targetSample.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.targetSample.required.comment.for.species=Un commentaire est requis pour l'espèce de l'entrée à la position %1$s de l'échantillonage. -validator.tdr.deployementStart.before.fishingStart=L'horodatage de début de pêche doit être après le début de celui de début de déploiement. -validator.tdr.desactivated.itemHorizontalPosition=La position sur la ligne sélectionnée est désactivée. -validator.tdr.desactivated.itemVerticalPosition=La position verticale sélectionnée est désactivée. -validator.tdr.desactivated.sensorBrand=La marque sélectionnée est déasactivée. -validator.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. -validator.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche. -validator.tdr.required.position=Pas de position renseignée sur la palangre. -validator.transmittingBuoy.desactivated.country=Le pays sélectionné est désactivé. -validator.transmittingBuoy.desactivated.transmittingBuoyOperation=L'operation balise sélectionnée est désactivée. -validator.transmittingBuoy.desactivated.transmittingBuoyType=Le type de balise sélectionné est désactivé. -validator.transmittingBuoy.null.code=Le code de la balise n'est pas renseigné. -validator.transmittingBuoy.required.transmittingBuoyOperation=La sélection d'une opération sur balise est obligatoire. -validator.transmittingBuoy.required.transmittingBuoyType=La sélection d'une type de balise est obligatoire. -validator.trip.comment.tobig=La taille du commentaire est limitée à 1024 caractères. -validator.trip.desactivated.captain=Le capitaine sélectionné est désactivé. -validator.trip.desactivated.dataEntryOperator=Le saisisseur sélectionné est désactivé. -validator.trip.desactivated.departureHarbour=Le port de départ sélectionné est désactivé. -validator.trip.desactivated.landingHarbour=Le port d'arrivée sélectionné est désactivé. -validator.trip.desactivated.observer=L'observateur sélectionné est désactivé. -validator.trip.desactivated.ocean=L'ocean sélectionné est désactivé. -validator.trip.desactivated.tripType=Le type de marée est désactivé. -validator.trip.desactivated.vessel=Le bateau sélectionné est désactivée. -validator.trip.endDate.after.startDate=La date de fin de marée doit être supérieure à sa date de début. -validator.trip.invalid.date=Le jour d'observation doit être supérieure à celui d'une route précédente. (la route à la position %1$s est incorrecte). -validator.trip.invalid.endDate=La date de fin de marée doit être supérieure au jour d'observation de chaque route. (la route à la position %1$s est incorrecte). -validator.trip.invalid.formsUrl=L'url du formulaire n'est pas valide. -validator.trip.invalid.loch=Le loch du matin (%1$s) de la route %2$s doit être supérieur au loch soir (%3$s) de la route précédente. -validator.trip.invalid.reportsUrl=L'url du rapport n'est pas valide. -validator.trip.invalid.startDate=La date de début de marée doit être inférieure au jour d'observation de chaque route. (la route à la position %1$s est incorrecte). -validator.trip.null.captain=Pas de capitaine sélectionné. -validator.trip.null.dataEntryOperator=Pas de saisisseur sélectionné. -validator.trip.null.departureHarbour=Pas de port de départ sélectionné. -validator.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). -validator.trip.null.landingHarbour=Pas de port d'arrivée sélectionné. -validator.trip.required.comment.for.captain=Un commentaire est requis pour le captiaine sélectionné. -validator.trip.required.comment.for.dataEntryOperator=Un commentaire est requis pour le saisisseur sélectionné. -validator.trip.required.comment.for.departureHarbour=Un commentaire est requis pour le port de départ sélectionné. -validator.trip.required.comment.for.landingHarbour=Un commentaire est requis pour le port d'arrivée sélectionné. -validator.trip.required.comment.for.observer=Un commentaire est requis pour l'observateur sélectionné. -validator.trip.required.comment.for.ocean=Un commentaire est requis pour l'ocean sélectionné. -validator.trip.required.comment.for.tripType=Un commentaire est requis pour le type de marée sélectionné. -validator.trip.required.comment.for.vessel=Un commentaire est requis pour le navire sélectionné. -validator.trip.required.departureHarbour=La sélection d'un port de départ est obligatoire. -validator.trip.required.endDate=La date de fin de marée est obligatoire. -validator.trip.required.observer=La sélection d'un observateur est obligatoire. -validator.trip.required.ocean=La sélection d'un océan est obligatoire. -validator.trip.required.startDate=La date de début est obligatoire. -validator.trip.required.tripType=Le type de marée est obligatoire. -validator.trip.required.vessel=La sélection d'un bateau est obligatoire. -validator.tripLongline.unclosed.activity=Il existe une activité non clôturée (%1$s). -validator.tripSeine.unclosed.route=Il existe une route non clôturée (%1$s). -validator.vessel.desactivated.flagCountry=Le pavillon sélectionné est désactivée. -validator.vessel.desactivated.vesselSizeCategory=La jauge sélectionnée est désactivée. -validator.vessel.desactivated.vesselType=La pêcherie sélectionnée est désactivée. -validator.vessel.invalid.capacity=Année de mise en service non renseignée. -validator.vessel.invalid.fleetCountry=Code Flotte non renseigné. -validator.vessel.invalid.keelCode=Code Quille non renseigné. -validator.vessel.invalid.length=Longueur hors tout non renseignée. -validator.vessel.invalid.power=Puissance non renseignée. -validator.vessel.invalid.searchMaximum=Vitesse maximale non renseignée. -validator.vessel.invalid.yearService=Année de mise en service non renseignée. -validator.vessel.null.changeDate=Date chargement non renseignée. -validator.vessel.required.flagCountry=Aucun pavillon renseigné. -validator.vessel.required.vesselSizeCategory=Aucune jauge sélectionnée. -validator.vessel.required.vesselType=Aucune pêcherie renseignée. -validator.vesselSizeCategory.required.capacityLabel=Le libellé Capacité n'est pas renseigné. -validator.vesselSizeCategory.required.gaugeLabel=Le libellé Jauge n'est pas renseigné. -validator.weightCategory.desactivated.species=L'espèce sélectionnée est désactivée. -validator.weightCategory.required.species=Aucune espèce sélectionnée. -validator.wind.required.speedRange=Libellé vitesse vent non renseigné. -validator.wind.required.waveHeight=Libellé descriptif hauteur moyenne vagues non renseigné. diff --git a/observe-entities-validation/src/test/resources/log4j.properties b/observe-entities-validation/src/test/resources/log4j.properties deleted file mode 100644 index 996fb7e..0000000 --- a/observe-entities-validation/src/test/resources/log4j.properties +++ /dev/null @@ -1,52 +0,0 @@ -### -# #%L -# ObServe :: Validation -# %% -# 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 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% -### -############################################################################### -# *##% -# ObServe :: Validation -# Copyright (C) 2008 - 2010 IRD, Codelutin -# -# 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 Lesser 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>. -# ##%* -############################################################################### -# 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] (%F:%L) %M - %m%n - -#log4j.appender.stdout.layout.ConversionPattern=%%c=%c %%C=%C %%d=%d %%F=%F %%l=%l %%L=%L %%m=%m %%M=%M %%p=%p %%r=%r %%t=%t %%x=%x %%X=%X -# package level -log4j.logger.fr.ird.observe=INFO -log4j.logger.jaxx.runtime.validator=INFO diff --git a/observe-entities/pom.xml b/observe-entities/pom.xml index 4068b05..597cc7d 100644 --- a/observe-entities/pom.xml +++ b/observe-entities/pom.xml @@ -108,6 +108,16 @@ <artifactId>hibernate-core</artifactId> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + </dependency> + + <dependency> + <groupId>org.apache.struts.xwork</groupId> + <artifactId>xwork-core</artifactId> + </dependency> +  <dependency> <groupId>junit</groupId> @@ -135,6 +145,13 @@ <scope>test</scope> </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-validator</artifactId> + <scope>test</scope> + <classifier>tests</classifier> + </dependency> + </dependencies> <build> diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionFieldExpressionValidator2.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/CollectionUniqueKeyValidator2.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionUniqueKeyValidator2.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/CollectionUniqueKeyValidator2.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/CollectionUniqueKeyValidator2.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/ObserveCollectionUniqueKeyValidator.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/AbstractEspeceFieldValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/AbstractEspeceFieldValidator.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/AbstractEspeceFieldValidator.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/AbstractEspeceFieldValidator.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivityFinDeVeilleExistsValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/ActivityFinDeVeilleExistsValidator.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivityFinDeVeilleExistsValidator.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/ActivityFinDeVeilleExistsValidator.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySimpleSpeedValidator.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/ActivitySpeedValidator.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueHomeIdValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueHomeIdValidator.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueHomeIdValidator.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueHomeIdValidator.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueNumberValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueNumberValidator.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueNumberValidator.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/SetLonglineUniqueNumberValidator.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesLengthFieldValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesLengthFieldValidator.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesLengthFieldValidator.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesLengthFieldValidator.java diff --git a/observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesWeightFieldValidator.java b/observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesWeightFieldValidator.java similarity index 100% rename from observe-entities-validation/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesWeightFieldValidator.java rename to observe-entities/src/main/java/fr/ird/observe/validation/validator/entities/SpeciesWeightFieldValidator.java diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-encounter-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-encounter-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-encounter-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-encounter-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-sensorUsed-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-sensorUsed-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-sensorUsed-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-sensorUsed-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/ActivityLongline-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/BaitsComposition-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Basket-n1-update-table-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Basket-n1-update-table-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Basket-n1-update-table-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Basket-n1-update-table-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-catchLongline-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-catchLongline-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-catchLongline-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-catchLongline-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-table-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-table-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-table-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-table-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Branchline-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/BranchlinesComposition-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/CatchLongline-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Encounter-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/FloatlinesComposition-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/GearUseFeaturesLongline-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/HooksComposition-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Section-n1-update-table-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Section-n1-update-table-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Section-n1-update-table-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Section-n1-update-table-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SensorUsed-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-baitsComposition-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-baitsComposition-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-baitsComposition-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-baitsComposition-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-branchlinesComposition-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-branchlinesComposition-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-branchlinesComposition-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-branchlinesComposition-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-floatlinesComposition-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-floatlinesComposition-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-floatlinesComposition-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-floatlinesComposition-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-globalComposition-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-globalComposition-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-globalComposition-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-globalComposition-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-hooksComposition-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-hooksComposition-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-hooksComposition-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-hooksComposition-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/SetLongline-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/Tdr-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/longline/TripLongline-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Country-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/FpaZone-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Gear-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristic-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/GearCaracteristicType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Harbour-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/LengthWeightParameter-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Ocean-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Organism-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Person-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Program-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Sex-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Species-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesGroup-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/SpeciesList-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/Vessel-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselSizeCategory-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/VesselType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitHaulingStatus-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitSettingStatus-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/BaitType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/CatchFateLongline-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/EncounterType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/Healthness-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookPosition-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookSize-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/HookType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemHorizontalPosition-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/ItemVerticalPosition-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksColor-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LightsticksType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/LineType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MaturityStatus-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/MitigationType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorBrand-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorDataFormat-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SensorType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SettingShape-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/SizeMeasureType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/StomacFullness-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/TripType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/VesselActivityLongline-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/longline/WeightMeasureType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/DetectionMode-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectFate-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectOperation-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObjectType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ObservedSystem-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForDiscard-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNoFishing-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/ReasonForNullSet-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesFate-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SpeciesStatus-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/SurroundingActivity-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyOperation-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/TransmittingBuoyType-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/VesselActivitySeine-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/WeightCategory-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/referentiel/seine/Wind-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-observedSystem-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/ActivitySeine-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-objectSchoolEstimate-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-objectSchoolEstimate-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-objectSchoolEstimate-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-objectSchoolEstimate-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-transmittingBuoyOperation-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-transmittingBuoyOperation-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-transmittingBuoyOperation-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-transmittingBuoyOperation-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/FloatingObject-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/GearUseFeaturesSeine-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetCatch-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetLength-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/NonTargetSample-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/ObjectObservedSpecies-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/ObjectSchoolEstimate-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/Route-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/Route-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/SchoolEstimate-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-nonTargetCatch-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-nonTargetCatch-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-nonTargetCatch-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-nonTargetCatch-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-schoolEstimate-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-schoolEstimate-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-schoolEstimate-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-schoolEstimate-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetCatch-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetCatch-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetCatch-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetCatch-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetDiscarded-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetDiscarded-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetDiscarded-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-targetDiscarded-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/SetSeine-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetCatch-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetCatch-n1-update-targetDiscarded-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetLength-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetSample-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetSample-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TargetSample-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TargetSample-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TransmittingBuoy-n1-update-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-create-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-error-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-error-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-error-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-error-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-gearUseFeatures-warning-validation.xml diff --git a/observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml b/observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml similarity index 100% rename from observe-entities-validation/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml rename to observe-entities/src/main/resources/fr/ird/observe/entities/seine/TripSeine-n1-update-warning-validation.xml diff --git a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties index 05833ca..536b512 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_en_GB.properties @@ -35,3 +35,428 @@ observe.typeTransmittingBuoyOperation.pose=Posing observe.typeTransmittingBuoyOperation.recupere=Grab observe.typeTransmittingBuoyOperation.recupere.et.change=Grab and change observe.typeTransmittingBuoyOperation.visite=Visit +validator.activity.bound.latitude= +validator.activity.bound.longitude= +validator.activity.bound.seaSurfaceTemperature= +validator.activity.bound.vesselSpeed= +validator.activity.comment.tobig= +validator.activity.desactivated.currentFpaZone= +validator.activity.desactivated.detectionMode= +validator.activity.desactivated.nextFpaZone= +validator.activity.desactivated.observedSystem= +validator.activity.desactivated.previousFpaZone= +validator.activity.desactivated.reasonForNoFishing= +validator.activity.desactivated.surroundingActivity= +validator.activity.desactivated.vesselActivity= +validator.activity.desactivated.wind= +validator.activity.duplicated.time= +validator.activity.invalid.quadrant= +validator.activity.invalid.seaSurfaceTemperature= +validator.activity.invalid.speed= +validator.activity.null.dcp= +validator.activity.null.fpaZone= +validator.activity.null.observedSystem= +validator.activity.null.observedSystemDistance= +validator.activity.null.seaSurfaceTemperature= +validator.activity.null.surroundingActivity= +validator.activity.null.wind= +validator.activity.required.comment.for.currentFpaZone= +validator.activity.required.comment.for.detectionMode= +validator.activity.required.comment.for.fpaZone= +validator.activity.required.comment.for.nextFpaZone= +validator.activity.required.comment.for.observedSystem= +validator.activity.required.comment.for.previousFpaZone= +validator.activity.required.comment.for.reasonForNoFishing= +validator.activity.required.comment.for.vesselActivity= +validator.activity.required.date= +validator.activity.required.latitude= +validator.activity.required.longitude= +validator.activity.required.quadrant= +validator.activity.required.time= +validator.activity.required.vesselActivity= +validator.activityLongline.desactivated.fpaZone= +validator.baitsComposition.bound.individualSize= +validator.baitsComposition.bound.individualWeight= +validator.baitsComposition.bound.proportion= +validator.baitsComposition.desactivated.baitSettingStatus= +validator.baitsComposition.desactivated.baitType= +validator.baitsComposition.required.baitSettingStatus= +validator.baitsComposition.required.baitType= +validator.baitsComposition.required.proportion= +validator.basket.bound.floatline1Length= +validator.basket.bound.floatline2Length= +validator.basket.required.settingIdentifier= +validator.branchline.bound.branchlineLength= +validator.branchline.bound.tracelineLength= +validator.branchline.desactivated.baitHaulingStatus= +validator.branchline.desactivated.baitSettingStatus= +validator.branchline.desactivated.baitType= +validator.branchline.desactivated.hookSize= +validator.branchline.desactivated.hookType= +validator.branchline.desactivated.topType= +validator.branchline.desactivated.tracelineType= +validator.branchline.required.settingIdentifier= +validator.branchline.required.topType= +validator.branchline.required.tracelineType= +validator.branchlinesComposition.bound.length= +validator.branchlinesComposition.bound.proportion= +validator.branchlinesComposition.desactivated.topType= +validator.branchlinesComposition.desactivated.tracelineType= +validator.branchlinesComposition.required.length= +validator.branchlinesComposition.required.proportion= +validator.branchlinesComposition.required.topType= +validator.branchlinesComposition.required.tracelineType= +validator.catchLongline.bound.gonadeWeight= +validator.catchLongline.comment.tobig= +validator.catchLongline.desactivated.catchFateLongline= +validator.catchLongline.desactivated.catchHealthness= +validator.catchLongline.desactivated.discardHealthness= +validator.catchLongline.desactivated.hookPosition= +validator.catchLongline.desactivated.maturityStatus= +validator.catchLongline.desactivated.sex= +validator.catchLongline.desactivated.speciesCatch= +validator.catchLongline.desactivated.stomacFullness= +validator.catchLongline.required.comment.for.speciesCatch= +validator.catchLongline.required.count.when.acquisitionModeIsGrouped= +validator.catchLongline.required.position= +validator.catchLongline.required.speciesCatch= +validator.country.invalid.iso2Code.uniqueKey= +validator.country.invalid.iso3Code.uniqueKey= +validator.country.required.iso2Code= +validator.country.required.iso3Code= +validator.encounter.desactivated.encounterType= +validator.encounter.desactivated.species= +validator.encounter.required.count= +validator.encounter.required.distance= +validator.encounter.required.encounterType= +validator.encounter.required.species= +validator.floatingObject.comment.tobig= +validator.floatingObject.desactivated.objectFate= +validator.floatingObject.desactivated.objectOperation= +validator.floatingObject.desactivated.type= +validator.floatingObject.null.daysAtSeaCount= +validator.floatingObject.positive.daysAtSeaCount= +validator.floatingObject.required.comment.for.balise1= +validator.floatingObject.required.comment.for.balise2= +validator.floatingObject.required.comment.for.objectFate= +validator.floatingObject.required.comment.for.type= +validator.floatingObject.required.objectFate= +validator.floatingObject.required.objectOperation= +validator.floatingObject.required.type= +validator.floatingObject.size.supportVesselName= +validator.floatlinesComposition.bound.length= +validator.floatlinesComposition.bound.proportion= +validator.floatlinesComposition.desactivated.lineType= +validator.floatlinesComposition.required.length= +validator.floatlinesComposition.required.lineType= +validator.floatlinesComposition.required.proportion= +validator.gearCaracteristic.desactivated.gearCaracteristicType= +validator.gearCaracteristic.required.gearCaracteristicType= +validator.gearUseFeature.desactivated.gear= +validator.gearUseFeature.required.gear= +validator.gearUseFeature.required.number= +validator.harbour.desactivated.country= +validator.harbour.null.latitude= +validator.harbour.null.locode= +validator.harbour.null.longitude= +validator.harbour.required.country= +validator.harbour.required.name= +validator.hooksComposition.bound.hookOffset= +validator.hooksComposition.bound.proportion= +validator.hooksComposition.desactivated.hookSize= +validator.hooksComposition.desactivated.hookType= +validator.hooksComposition.required.hookSize= +validator.hooksComposition.required.hookType= +validator.hooksComposition.required.proportion= +validator.lengthWeightParameter.invalid.lengthWeightFormula= +validator.lengthWeightParameter.invalid.uniqueKey= +validator.lengthWeightParameter.invalid.weightLengthFormula= +validator.lengthWeightParameter.null.ocean= +validator.lengthWeightParameter.required.coefficients= +validator.lengthWeightParameter.required.endDate= +validator.lengthWeightParameter.required.lengthWeightFormula= +validator.lengthWeightParameter.required.species= +validator.lengthWeightParameter.required.startDate= +validator.lengthWeightParameter.required.weightLengthFormula= +validator.nonTargetCatch.bound.catchWeight= +validator.nonTargetCatch.bound.meanLength= +validator.nonTargetCatch.bound.meanWeight= +validator.nonTargetCatch.bound.totalCount= +validator.nonTargetCatch.comment.tobig= +validator.nonTargetCatch.desactivated.reasonForDiscard= +validator.nonTargetCatch.desactivated.species= +validator.nonTargetCatch.desactivated.speciesFate= +validator.nonTargetCatch.positive.meanLength= +validator.nonTargetCatch.positive.meanWeight= +validator.nonTargetCatch.required.comment.for.reasonForDiscard= +validator.nonTargetCatch.required.comment.for.speciesFate= +validator.nonTargetCatch.required.species= +validator.nonTargetCatch.required.speciesFate= +validator.nonTargetCatch.required.weightOrNombreEstime= +validator.nonTargetCatch.required.weightOrTailleMoyen= +validator.nonTargetCatch.uniqueKey= +validator.nonTargetSample.bound.length= +validator.nonTargetSample.bound.weight= +validator.nonTargetSample.comment.tobig= +validator.nonTargetSample.desactivated.species= +validator.nonTargetSample.positive.length= +validator.nonTargetSample.positive.weight= +validator.nonTargetSample.required.comment.for.species= +validator.nonTargetSample.required.count= +validator.nonTargetSample.required.gender= +validator.nonTargetSample.required.species= +validator.nonTargetSample.required.taille= +validator.nonTargetSample.required.weight.or.taille= +validator.objectObservedSpecies.desactivated.species= +validator.objectObservedSpecies.desactivated.speciesStatus= +validator.objectObservedSpecies.positive.count= +validator.objectObservedSpecies.required.count= +validator.objectObservedSpecies.required.species= +validator.objectObservedSpecies.required.speciesStatus= +validator.organism.desactivated.country= +validator.organism.null.description= +validator.organism.required.country= +validator.person.desactivated.country= +validator.person.required.country= +validator.person.required.firstName= +validator.person.required.lastName= +validator.program.comment.tobig= +validator.program.desactivated.organism= +validator.program.required.endDate= +validator.program.required.gearType= +validator.program.required.organism= +validator.program.required.startDate= +validator.referentiel.invalid.code.uniqueKey= +validator.referentiel.invalid.uri.uniqueKey= +validator.referentiel.null.uri= +validator.referentiel.required.brandName= +validator.referentiel.required.label1= +validator.referentiel.required.label2= +validator.referentiel.required.label3= +validator.referentiel.status.desactivated= +validator.referentiel.status.required= +validator.referentiel.untranslated.label1= +validator.referentiel.untranslated.label3= +validator.route.activityFinDeVeille.notAvailable= +validator.route.comment.tobig= +validator.route.duplicated.date= +validator.route.invalid.date= +validator.route.invalid.endLogValue.maximum= +validator.route.invalid.endLogValue.minimum= +validator.route.invalid.quadrant= +validator.route.invalid.seaSurfaceTemperature= +validator.route.invalid.speed= +validator.route.invalid.startLogValue= +validator.route.invalid.time= +validator.route.missing.activityFinDeVeille= +validator.route.null.comment= +validator.route.positive.startLogValue= +validator.route.required.date= +validator.route.unclosed.activity= +validator.schoolEstimate.bound.weight= +validator.schoolEstimate.comment.tobig= +validator.schoolEstimate.desactivated.species= +validator.schoolEstimate.required.comment.for.species= +validator.schoolEstimate.required.species= +validator.schoolEstimate.required.weight= +validator.schoolEstimate.species.uniqueKey= +validator.section.required.settingIdentifier= +validator.sensorUsed.desactivated.sensorBrand= +validator.sensorUsed.desactivated.sensorDataFormat= +validator.sensorUsed.desactivated.sensorType= +validator.sensorUsed.null.sensorSerialNo= +validator.sensorUsed.required.sensorType= +validator.set.bound.currentDirection= +validator.set.bound.currentSpeed= +validator.set.bound.delay= +validator.set.bound.maxGearDepth= +validator.set.bound.schoolMeanDepth= +validator.set.bound.schoolThickness= +validator.set.bound.schoolTopDepth= +validator.set.comment.tobig= +validator.set.delay.too.long= +validator.set.desactivated.reasonForNullSet= +validator.set.endDate.after.endPursingDate= +validator.set.endPursingDate.after.date= +validator.set.endPursingTimeStamp.after.startTime= +validator.set.endSetTimeStamp.after.endPursingTimeStamp= +validator.set.null.currentDirection= +validator.set.required.comment.for.reasonForNullSet= +validator.set.size.supportVesselName= +validator.set.startTime.after.time= +validator.setLongline.bad.baitsCompositionProportionSum= +validator.setLongline.bad.branchlinesCompositionProportionSum= +validator.setLongline.bad.floatlinesCompositionProportionSum= +validator.setLongline.bad.hooksCompositionProportionSum= +validator.setLongline.baitsComposition.uniqueKey= +validator.setLongline.bound.basketsPerSectionCount= +validator.setLongline.bound.branchlinesPerBasketCount= +validator.setLongline.bound.haulingEndLatitude= +validator.setLongline.bound.haulingEndLongitude= +validator.setLongline.bound.haulingStartLatitude= +validator.setLongline.bound.haulingStartLongitude= +validator.setLongline.bound.lightsticksPerBasketCount= +validator.setLongline.bound.settingEndLatitude= +validator.setLongline.bound.settingEndLongitude= +validator.setLongline.bound.settingStartLatitude= +validator.setLongline.bound.settingStartLongitude= +validator.setLongline.bound.settingVesselSpeed= +validator.setLongline.bound.shooterSpeed= +validator.setLongline.bound.snapWeight= +validator.setLongline.bound.swivelWeight= +validator.setLongline.bound.timeBetweenHooks= +validator.setLongline.bound.totalBasketsCount= +validator.setLongline.bound.totalHooksCount= +validator.setLongline.bound.totalSectionsCount= +validator.setLongline.branchlinesComposition.uniqueKey= +validator.setLongline.desactivated.lightsticksColor= +validator.setLongline.desactivated.lightsticksType= +validator.setLongline.desactivated.lineType= +validator.setLongline.desactivated.settingShape= +validator.setLongline.duplicated.homeId= +validator.setLongline.duplicated.number= +validator.setLongline.floatlinesComposition.uniqueKey= +validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp= +validator.setLongline.hooksComposition.uniqueKey= +validator.setLongline.invalid.haulingEndQuadrant= +validator.setLongline.invalid.haulingStartQuadrant= +validator.setLongline.invalid.settingEndQuadrant= +validator.setLongline.invalid.settingStartQuadrant= +validator.setLongline.null.homeId= +validator.setLongline.required.basketsPerSectionCount= +validator.setLongline.required.branchlinesPerBasketCount= +validator.setLongline.required.haulingBreaks= +validator.setLongline.required.haulingDirectionSameAsSetting= +validator.setLongline.required.haulingEndLatitude= +validator.setLongline.required.haulingEndLongitude= +validator.setLongline.required.haulingEndQuadrant= +validator.setLongline.required.haulingEndTimeStamp= +validator.setLongline.required.haulingStartLatitude= +validator.setLongline.required.haulingStartLongitude= +validator.setLongline.required.haulingStartQuadrant= +validator.setLongline.required.haulingStartTimeStamp= +validator.setLongline.required.settingEndLatitude= +validator.setLongline.required.settingEndLongitude= +validator.setLongline.required.settingEndQuadrant= +validator.setLongline.required.settingEndTimeStamp= +validator.setLongline.required.settingStartLatitude= +validator.setLongline.required.settingStartLongitude= +validator.setLongline.required.settingStartQuadrant= +validator.setLongline.required.settingStartTimeStamp= +validator.setLongline.required.totalSectionsCount= +validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp= +validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp= +validator.species.desactivated.speciesGroup= +validator.species.invalid.faoCode.uniqueKey= +validator.species.invalid.homeId.uniqueKey= +validator.species.invalid.scientificLabel.uniqueKey= +validator.species.invalid.wormsId= +validator.species.invalid.wormsId.uniqueKey= +validator.species.null.faoCode= +validator.species.null.homeId= +validator.species.required.ocean= +validator.species.required.scientificLabel= +validator.species.required.speciesGroup= +validator.speciesList.null.code= +validator.targetCatch.bound.weight= +validator.targetCatch.comment.tobig= +validator.targetCatch.desactivated.species= +validator.targetCatch.desactivated.weightCategory= +validator.targetCatch.required.species= +validator.targetCatch.required.weight= +validator.targetCatch.required.weightCategory= +validator.targetCatch.required.well= +validator.targetCatch.uniqueKey= +validator.targetDiscarded.bound.weight= +validator.targetDiscarded.comment.tobig= +validator.targetDiscarded.desactivated.reasonForDiscard= +validator.targetDiscarded.desactivated.species= +validator.targetDiscarded.desactivated.weightCategory= +validator.targetDiscarded.required.comment.for.reasonForDiscard= +validator.targetDiscarded.required.reasonForDiscard= +validator.targetDiscarded.required.species= +validator.targetDiscarded.required.weight= +validator.targetDiscarded.required.weightCategory= +validator.targetDiscarded.uniqueKey= +validator.targetLength.bound.length= +validator.targetLength.bound.weight= +validator.targetLength.desactivated.species= +validator.targetLength.positive.length= +validator.targetLength.positive.weight= +validator.targetLength.required.count= +validator.targetLength.required.species= +validator.targetLength.required.taille= +validator.targetLength.required.weight.or.taille= +validator.targetSample.comment.tobig= +validator.targetSample.required.comment.for.species= +validator.tdr.deployementStart.before.fishingStart= +validator.tdr.desactivated.itemHorizontalPosition= +validator.tdr.desactivated.itemVerticalPosition= +validator.tdr.desactivated.sensorBrand= +validator.tdr.fishingEnd.before.deployementEnd= +validator.tdr.fishingStart.before.fishingEnd= +validator.tdr.required.position= +validator.transmittingBuoy.desactivated.country= +validator.transmittingBuoy.desactivated.transmittingBuoyOperation= +validator.transmittingBuoy.desactivated.transmittingBuoyType= +validator.transmittingBuoy.null.code= +validator.transmittingBuoy.required.transmittingBuoyOperation= +validator.transmittingBuoy.required.transmittingBuoyType= +validator.trip.comment.tobig= +validator.trip.desactivated.captain= +validator.trip.desactivated.dataEntryOperator= +validator.trip.desactivated.departureHarbour= +validator.trip.desactivated.landingHarbour= +validator.trip.desactivated.observer= +validator.trip.desactivated.ocean= +validator.trip.desactivated.tripType= +validator.trip.desactivated.vessel= +validator.trip.endDate.after.startDate= +validator.trip.invalid.date= +validator.trip.invalid.endDate= +validator.trip.invalid.formsUrl= +validator.trip.invalid.loch= +validator.trip.invalid.reportsUrl= +validator.trip.invalid.startDate= +validator.trip.null.captain= +validator.trip.null.dataEntryOperator= +validator.trip.null.departureHarbour= +validator.trip.null.gearUseFeature= +validator.trip.null.landingHarbour= +validator.trip.required.comment.for.captain= +validator.trip.required.comment.for.dataEntryOperator= +validator.trip.required.comment.for.departureHarbour= +validator.trip.required.comment.for.landingHarbour= +validator.trip.required.comment.for.observer= +validator.trip.required.comment.for.ocean= +validator.trip.required.comment.for.tripType= +validator.trip.required.comment.for.vessel= +validator.trip.required.departureHarbour= +validator.trip.required.endDate= +validator.trip.required.observer= +validator.trip.required.ocean= +validator.trip.required.startDate= +validator.trip.required.tripType= +validator.trip.required.vessel= +validator.tripLongline.unclosed.activity= +validator.tripSeine.unclosed.route= +validator.vessel.desactivated.flagCountry= +validator.vessel.desactivated.vesselSizeCategory= +validator.vessel.desactivated.vesselType= +validator.vessel.invalid.capacity= +validator.vessel.invalid.fleetCountry= +validator.vessel.invalid.keelCode= +validator.vessel.invalid.length= +validator.vessel.invalid.power= +validator.vessel.invalid.searchMaximum= +validator.vessel.invalid.yearService= +validator.vessel.null.changeDate= +validator.vessel.required.flagCountry= +validator.vessel.required.vesselSizeCategory= +validator.vessel.required.vesselType= +validator.vesselSizeCategory.required.capacityLabel= +validator.vesselSizeCategory.required.gaugeLabel= +validator.weightCategory.desactivated.species= +validator.weightCategory.required.species= +validator.wind.required.speedRange= +validator.wind.required.waveHeight= diff --git a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties index dec12ff..e84fb35 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_es_ES.properties @@ -35,3 +35,427 @@ observe.typeTransmittingBuoyOperation.pose=Colocación de nueva baliza observe.typeTransmittingBuoyOperation.recupere=Recogida de baliza sin regreso al agua observe.typeTransmittingBuoyOperation.recupere.et.change=Recuperación y colocación de una nueva baliza observe.typeTransmittingBuoyOperation.visite=Visita a la baliza +validator.activity.bound.latitude=La latitud dada debe estar comprendida entre %1$s y %2$s. +validator.activity.bound.longitude=La longitud dada debe estar comprendida entre %1$s y %2$s. +validator.activity.bound.seaSurfaceTemperature=La temperatura debe estar comprendida entre %1$s y %2$s. +validator.activity.bound.vesselSpeed=La Velocidad del viento estar comprendida entre %1$s y %2$s. +validator.activity.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.activity.desactivated.currentFpaZone= +validator.activity.desactivated.detectionMode=El mode de detección seleccionado está desactivado. +validator.activity.desactivated.nextFpaZone= +validator.activity.desactivated.observedSystem=Al menos uno de los sistemas observados seleccioinado está desacticado. +validator.activity.desactivated.previousFpaZone= +validator.activity.desactivated.reasonForNoFishing=La razón de no lance seleccionada está desactivada. +validator.activity.desactivated.surroundingActivity=Actividad circundante seleccionada está desactivada. +validator.activity.desactivated.vesselActivity=Actividad del barco seleccionado está desactivada. +validator.activity.desactivated.wind=La fuerza del viento seleccionada está desactivada. +validator.activity.duplicated.time=Ya existe una actividad a esa hora. +validator.activity.invalid.quadrant=El cuadrante no es coherente con el informe del océano (%1$s) de la marea (indico \: 1,2, atlantico \: 1, 2, 3, 4) +validator.activity.invalid.seaSurfaceTemperature=La temperatura superficial (%1$s) no puede variar mas de 12° con respecto a la temperatura superficial (%2$s) de la actividad anterio %3$s. +validator.activity.invalid.speed=La velocidad de la actividad actual es %s nudos, mientras que la velocidad máxima es %s nudos. +validator.activity.null.dcp=No se ha introducido objeto flotante. +validator.activity.null.fpaZone= +validator.activity.null.observedSystem=No hay sistema observado seleccionado. +validator.activity.null.observedSystemDistance=No se ha especificado la distancia al sistema observado. +validator.activity.null.seaSurfaceTemperature=No se ha introducido temperatur superficial. +validator.activity.null.surroundingActivity=No hay actividad circundante seleccionada. +validator.activity.null.wind=No se ha seleccionado fuerza del viento. +validator.activity.required.comment.for.currentFpaZone= +validator.activity.required.comment.for.detectionMode=Es necesario un comentario para el modo de detección. +validator.activity.required.comment.for.fpaZone= +validator.activity.required.comment.for.nextFpaZone= +validator.activity.required.comment.for.observedSystem=Es necesario un comentario para uno de los sistemas observados seleccionados. +validator.activity.required.comment.for.previousFpaZone= +validator.activity.required.comment.for.reasonForNoFishing=Es necesario un comentario para la causa de no lance. +validator.activity.required.comment.for.vesselActivity=Es necesario un comentario para la actividad del barco. +validator.activity.required.date= +validator.activity.required.latitude=La latitud debe ser introducida +validator.activity.required.longitude=La longitud debe ser introducida +validator.activity.required.quadrant=Se debe seleccioinar el cuadrante. +validator.activity.required.time=Es necesaria la hora de la observación para la actividad. +validator.activity.required.vesselActivity=Se debe seleccionar la actividad del barco. +validator.activityLongline.desactivated.fpaZone= +validator.baitsComposition.bound.individualSize= +validator.baitsComposition.bound.individualWeight= +validator.baitsComposition.bound.proportion= +validator.baitsComposition.desactivated.baitSettingStatus= +validator.baitsComposition.desactivated.baitType= +validator.baitsComposition.required.baitSettingStatus= +validator.baitsComposition.required.baitType= +validator.baitsComposition.required.proportion= +validator.basket.bound.floatline1Length= +validator.basket.bound.floatline2Length= +validator.basket.required.settingIdentifier= +validator.branchline.bound.branchlineLength= +validator.branchline.bound.tracelineLength= +validator.branchline.desactivated.baitHaulingStatus= +validator.branchline.desactivated.baitSettingStatus= +validator.branchline.desactivated.baitType= +validator.branchline.desactivated.hookSize= +validator.branchline.desactivated.hookType= +validator.branchline.desactivated.topType= +validator.branchline.desactivated.tracelineType= +validator.branchline.required.settingIdentifier= +validator.branchline.required.topType= +validator.branchline.required.tracelineType= +validator.branchlinesComposition.bound.length= +validator.branchlinesComposition.bound.proportion= +validator.branchlinesComposition.desactivated.topType= +validator.branchlinesComposition.desactivated.tracelineType= +validator.branchlinesComposition.required.length= +validator.branchlinesComposition.required.proportion= +validator.branchlinesComposition.required.topType= +validator.branchlinesComposition.required.tracelineType= +validator.catchLongline.bound.gonadeWeight= +validator.catchLongline.comment.tobig= +validator.catchLongline.desactivated.catchFateLongline= +validator.catchLongline.desactivated.catchHealthness= +validator.catchLongline.desactivated.discardHealthness= +validator.catchLongline.desactivated.hookPosition= +validator.catchLongline.desactivated.maturityStatus= +validator.catchLongline.desactivated.sex= +validator.catchLongline.desactivated.speciesCatch= +validator.catchLongline.desactivated.stomacFullness= +validator.catchLongline.required.comment.for.speciesCatch= +validator.catchLongline.required.count.when.acquisitionModeIsGrouped= +validator.catchLongline.required.position= +validator.catchLongline.required.speciesCatch= +validator.country.invalid.iso2Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.country.invalid.iso3Code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.country.required.iso2Code=Código ISO2 no especificado +validator.country.required.iso3Code=Código ISO3 no especificado. +validator.encounter.desactivated.encounterType= +validator.encounter.desactivated.species= +validator.encounter.required.count= +validator.encounter.required.distance= +validator.encounter.required.encounterType= +validator.encounter.required.species= +validator.floatingObject.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.floatingObject.desactivated.objectFate=El devenir seleccionado está desactivada. +validator.floatingObject.desactivated.objectOperation=Al menos una de las operaciones seleccionadas está desactivada. +validator.floatingObject.desactivated.type=El tipo de objeto seleccionado está desactivada. +validator.floatingObject.null.daysAtSeaCount=Número de días en el mar no especificado. +validator.floatingObject.positive.daysAtSeaCount=El número de días en el mar es un entero positivo. +validator.floatingObject.required.comment.for.balise1=Se requiere un comentario para la primera baliza (étant donné son type). +validator.floatingObject.required.comment.for.balise2=Se requiere un comentario para la segunda baliza (étant donné son type). +validator.floatingObject.required.comment.for.objectFate=Se requiere un comentario para el devenir. +validator.floatingObject.required.comment.for.type=Se requiere un comentario para el tipo de objeto +validator.floatingObject.required.objectFate=Es recomiendo selecciona un devenir. +validator.floatingObject.required.objectOperation=Es obligatorio selecciona un operación. +validator.floatingObject.required.type=Es obligatorio seleccionar un tipo de objeto. +validator.floatingObject.size.supportVesselName=El count introducido debe tener una longitud inferior a %1$s carácteres. +validator.floatlinesComposition.bound.length= +validator.floatlinesComposition.bound.proportion= +validator.floatlinesComposition.desactivated.lineType= +validator.floatlinesComposition.required.length= +validator.floatlinesComposition.required.lineType= +validator.floatlinesComposition.required.proportion= +validator.gearCaracteristic.desactivated.gearCaracteristicType= +validator.gearCaracteristic.required.gearCaracteristicType= +validator.gearUseFeature.desactivated.gear= +validator.gearUseFeature.required.gear= +validator.gearUseFeature.required.number= +validator.harbour.desactivated.country= +validator.harbour.null.latitude= +validator.harbour.null.locode= +validator.harbour.null.longitude= +validator.harbour.required.country= +validator.harbour.required.name= +validator.hooksComposition.bound.hookOffset= +validator.hooksComposition.bound.proportion= +validator.hooksComposition.desactivated.hookSize= +validator.hooksComposition.desactivated.hookType= +validator.hooksComposition.required.hookSize= +validator.hooksComposition.required.hookType= +validator.hooksComposition.required.proportion= +validator.lengthWeightParameter.invalid.lengthWeightFormula=Relación de peso introducida no coherente. +validator.lengthWeightParameter.invalid.uniqueKey=Tupla (sexo/océano/especie) debe ser única, la tupla ya se ha usado. +validator.lengthWeightParameter.invalid.weightLengthFormula=Relación de talla introducida no coherente. +validator.lengthWeightParameter.null.ocean=No se ha seleccionado océano. +validator.lengthWeightParameter.required.coefficients=Coeficientes no se han especificados. +validator.lengthWeightParameter.required.endDate=Fecha de fin de validez no especificada. +validator.lengthWeightParameter.required.lengthWeightFormula=Relación de peso no especificado. +validator.lengthWeightParameter.required.species=Especie no especificada. +validator.lengthWeightParameter.required.startDate=fecha de comienzo de validez no especificada. +validator.lengthWeightParameter.required.weightLengthFormula=Relación de talla no especificado. +validator.nonTargetCatch.bound.catchWeight=El peso medio estimado debe estar comprendido entre %1$s y %2$s. +validator.nonTargetCatch.bound.meanLength=La talla media para esta especie debe estár comprendida entre %1$s y %2$s. +validator.nonTargetCatch.bound.meanWeight=El peso medio para esta especie estar comprendido entre %1$s y %2$s. +validator.nonTargetCatch.bound.totalCount=El número estimado debe estar comprendido entre %1$s y %2$s. +validator.nonTargetCatch.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.nonTargetCatch.desactivated.reasonForDiscard=La razón de descarte seleccionada está desactivada. +validator.nonTargetCatch.desactivated.species=La especie seleccionada está desactivada. +validator.nonTargetCatch.desactivated.speciesFate=El objectFate de fauna seleccionado está desactivado. +validator.nonTargetCatch.positive.meanLength=La talla media tiene que ser un entero positivo. +validator.nonTargetCatch.positive.meanWeight=El peso medio debe ser un entero positivo. +validator.nonTargetCatch.required.comment.for.reasonForDiscard=Es necesario un comentario para la razón de descarte seleccionada. +validator.nonTargetCatch.required.comment.for.speciesFate=Es necesario un comentario para el objectFate de la fauna seleccionada. +validator.nonTargetCatch.required.species=Es obligatorio seleccionar una especie de fauna. +validator.nonTargetCatch.required.speciesFate=Es obligatoiro seleccionar un objectFate de fauna. +validator.nonTargetCatch.required.weightOrNombreEstime=Debe seleccionar uno de los dos valores (peso estimado, número estimado). +validator.nonTargetCatch.required.weightOrTailleMoyen=Debe seleccionar uno de los dos valores (peso medio o talla media). +validator.nonTargetCatch.uniqueKey=El par (especie - objectFate) debe ser única. +validator.nonTargetSample.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. +validator.nonTargetSample.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. +validator.nonTargetSample.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.nonTargetSample.desactivated.species=La especie seleccionada está desactivada. +validator.nonTargetSample.positive.length=La talla debe ser un entero positivo. +validator.nonTargetSample.positive.weight=El peso debe ser un entero positivo. +validator.nonTargetSample.required.comment.for.species=Es necesario un comentario para la especie de la posición %1$s del muestreo. +validator.nonTargetSample.required.count=Es obligatoria especificar el número de grupo de talla. +validator.nonTargetSample.required.gender=Es obligatoria seleccionar un sexo para la especie de fauna. +validator.nonTargetSample.required.species=Es obligatorio seleccionar una especie de fauna. +validator.nonTargetSample.required.taille=Es obligatoria especificar el talla. +validator.nonTargetSample.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. +validator.objectObservedSpecies.desactivated.species=La especie seleccionada está desactivada. +validator.objectObservedSpecies.desactivated.speciesStatus=El estado seleccionado está desactivado. +validator.objectObservedSpecies.positive.count=El número es entero positivo. +validator.objectObservedSpecies.required.count=El número es obligatorio. +validator.objectObservedSpecies.required.species=Es obligatorio seleccionar una especie de fauna. +validator.objectObservedSpecies.required.speciesStatus=Es obligatorio seleccionar un estado de especie. +validator.organism.desactivated.country=El país está desactivado. +validator.organism.null.description=La descripción no se ha especificado. +validator.organism.required.country=No se ha seleccionado país. +validator.person.desactivated.country= +validator.person.required.country= +validator.person.required.firstName=El count del observado es obligatorio. +validator.person.required.lastName=El apellido del observador es obligatorio. +validator.program.comment.tobig=La longitud del campo de comentarios está limitado a 1024 carácteres. +validator.program.desactivated.organism=El organismo seleccionado está desactivado. +validator.program.required.endDate=Fecha de fin de programa no especificada. +validator.program.required.gearType= +validator.program.required.organism=Ningún organismo seleccionado. +validator.program.required.startDate=Fecha de comienzo de programa no especificada. +validator.referentiel.invalid.code.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.referentiel.invalid.uri.uniqueKey=El uri debe ser único, el valor %1$s ya se ha usado. +validator.referentiel.null.uri=Ningún uri especificado. +validator.referentiel.required.brandName= +validator.referentiel.required.label1=Ninguna etiqueta en inglé establecida. +validator.referentiel.required.label2=Ninguna etiqueta en francés establecida. +validator.referentiel.required.label3=Ninguna etiqueta en espaÑol establecida. +validator.referentiel.status.desactivated=El objeto está desactivado (no se puede usar en los datos de los observadores o en los nuevos referenciales). +validator.referentiel.untranslated.label1=La etiqueta en inglés no se ha traducido. +validator.referentiel.untranslated.label3=La etiqueta en espaÑol no se ha traducido. +validator.route.activityFinDeVeille.notAvailable=Existe una actividad de fin de guardia en la ruta. +validator.route.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres. +validator.route.duplicated.date=Ya existe otra ruta en esa fecha. +validator.route.invalid.date=El día de observación debe ser superior o igual a la fecha de comienzo de marea (%1$s). +validator.route.invalid.endLogValue.maximum=La corredera de tarde no puede ser superior en %1$s a la de mañana. +validator.route.invalid.endLogValue.minimum=la corredera de tarde debe ser superior a la de mañana. +validator.route.invalid.quadrant=El cuadrante de la actividad %1$s no es coherente con el océano (%2$s) de la marea (indico \: 1,2, atlántico \: 1, 2, 3, 4) +validator.route.invalid.seaSurfaceTemperature=La temperatura superficial no puede variar más de 12° entre 2 actividades (actividad %1$s incorrecta). +validator.route.invalid.speed=la velocidad entre dos actividades no debe sobrepasar %1$s nd, (actividad %2$s incorrecta, velocidad \: %3$s nd). +validator.route.invalid.startLogValue=La corredera de mañana (%1$s) debe ser superior a la de tarde (%2$s) de la routa %3$s. +validator.route.invalid.time=La hora de la observación de la actividad debe ser superior a la de la actividad anterior (actividad %1$s incorrecta). +validator.route.missing.activityFinDeVeille=No hay actividad de fin de guardia definido en la ruta. +validator.route.null.comment=No hay comentario especificado. +validator.route.positive.startLogValue=La corredera de mañana debe ser un entero positivo. +validator.route.required.date=Se debe especificar el día de observación. +validator.route.unclosed.activity=Existe una actividad no cerrada (%1$s). +validator.schoolEstimate.bound.weight=El tonelaje debe estar comprendido entre %1$s y %2$s. +validator.schoolEstimate.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.schoolEstimate.desactivated.species=La especie seleccionada está desactivada. +validator.schoolEstimate.required.comment.for.species=Es necesario un comentario para la especie de la posición %1$s de la estimación. +validator.schoolEstimate.required.species=Es obligatorio seleccionar una especie de atún. +validator.schoolEstimate.required.weight=Especificar un peso. +validator.schoolEstimate.species.uniqueKey=Las estimaciones de la especie debe ser única. +validator.section.required.settingIdentifier= +validator.sensorUsed.desactivated.sensorBrand= +validator.sensorUsed.desactivated.sensorDataFormat= +validator.sensorUsed.desactivated.sensorType= +validator.sensorUsed.null.sensorSerialNo= +validator.sensorUsed.required.sensorType= +validator.set.bound.currentDirection=La dirección de la corriente debe ser un número comprendido entre %1$s y %2$s. +validator.set.bound.currentSpeed=La velocidad de la corriente debe ser un número comprendido entre %1$s y %2$s +validator.set.bound.delay=La duración entre la hora final del lance y la de final de recogida de la jareta debe ser al menos de %1$s minutos. +validator.set.bound.maxGearDepth=La profundidas debe estar comprendida entre %1$s y %2$s. +validator.set.bound.schoolMeanDepth=La profundidad media debe ser un entero comprendido entre %1$s y %2$s +validator.set.bound.schoolThickness=El espesor del banco debe ser un entero comprendido entre %1$s y %2$s +validator.set.bound.schoolTopDepth=La profundidad superior debe ser un entero comprendido entre %1$s y %2$s. +validator.set.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.set.delay.too.long=La duración del lance es elevada (máximo %1$s minutos). +validator.set.desactivated.reasonForNullSet=La causa del lanze nulo seleccionada está desactivada. +validator.set.endDate.after.endPursingDate=El día de fin debe ser superior o igual a la dia de final de recogida de la jareta. +validator.set.endPursingDate.after.date=El día de final de recogida de la jareta debe ser superior o igual a la día de observación. +validator.set.endPursingTimeStamp.after.startTime=La hora final de recogida de la jareta debe ser superior o igual a la hora de comienzo. +validator.set.endSetTimeStamp.after.endPursingTimeStamp=La hora de fin debe ser superior o igual a la hora de fin de recogida de la jareta. +validator.set.null.currentDirection=Dirección de la corriente no introducida. +validator.set.required.comment.for.reasonForNullSet=Es necesario un comentario para la causa de lance nulo seleccionado. +validator.set.size.supportVesselName=El count del supply debe tener una longitud inferior a %1$s caracteres. +validator.set.startTime.after.time=La hora de comienzo debe ser superior o igual a la hora de observación. +validator.setLongline.bad.baitsCompositionProportionSum= +validator.setLongline.bad.branchlinesCompositionProportionSum= +validator.setLongline.bad.floatlinesCompositionProportionSum= +validator.setLongline.bad.hooksCompositionProportionSum= +validator.setLongline.baitsComposition.uniqueKey= +validator.setLongline.bound.basketsPerSectionCount= +validator.setLongline.bound.branchlinesPerBasketCount= +validator.setLongline.bound.haulingEndLatitude= +validator.setLongline.bound.haulingEndLongitude= +validator.setLongline.bound.haulingStartLatitude= +validator.setLongline.bound.haulingStartLongitude= +validator.setLongline.bound.lightsticksPerBasketCount= +validator.setLongline.bound.settingEndLatitude= +validator.setLongline.bound.settingEndLongitude= +validator.setLongline.bound.settingStartLatitude= +validator.setLongline.bound.settingStartLongitude= +validator.setLongline.bound.settingVesselSpeed= +validator.setLongline.bound.shooterSpeed= +validator.setLongline.bound.snapWeight= +validator.setLongline.bound.swivelWeight= +validator.setLongline.bound.timeBetweenHooks= +validator.setLongline.bound.totalBasketsCount= +validator.setLongline.bound.totalHooksCount= +validator.setLongline.bound.totalSectionsCount= +validator.setLongline.branchlinesComposition.uniqueKey= +validator.setLongline.desactivated.lightsticksColor= +validator.setLongline.desactivated.lightsticksType= +validator.setLongline.desactivated.lineType= +validator.setLongline.desactivated.settingShape= +validator.setLongline.duplicated.homeId= +validator.setLongline.duplicated.number= +validator.setLongline.floatlinesComposition.uniqueKey= +validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp= +validator.setLongline.hooksComposition.uniqueKey= +validator.setLongline.invalid.haulingEndQuadrant= +validator.setLongline.invalid.haulingStartQuadrant= +validator.setLongline.invalid.settingEndQuadrant= +validator.setLongline.invalid.settingStartQuadrant= +validator.setLongline.null.homeId= +validator.setLongline.required.basketsPerSectionCount= +validator.setLongline.required.branchlinesPerBasketCount= +validator.setLongline.required.haulingBreaks= +validator.setLongline.required.haulingDirectionSameAsSetting= +validator.setLongline.required.haulingEndLatitude= +validator.setLongline.required.haulingEndLongitude= +validator.setLongline.required.haulingEndQuadrant= +validator.setLongline.required.haulingEndTimeStamp= +validator.setLongline.required.haulingStartLatitude= +validator.setLongline.required.haulingStartLongitude= +validator.setLongline.required.haulingStartQuadrant= +validator.setLongline.required.haulingStartTimeStamp= +validator.setLongline.required.settingEndLatitude= +validator.setLongline.required.settingEndLongitude= +validator.setLongline.required.settingEndQuadrant= +validator.setLongline.required.settingEndTimeStamp= +validator.setLongline.required.settingStartLatitude= +validator.setLongline.required.settingStartLongitude= +validator.setLongline.required.settingStartQuadrant= +validator.setLongline.required.settingStartTimeStamp= +validator.setLongline.required.totalSectionsCount= +validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp= +validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp= +validator.species.desactivated.speciesGroup=El grupo de especies seleccionado está desactivado. +validator.species.invalid.faoCode.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.species.invalid.homeId.uniqueKey=El código debe ser único, el valor %1$s ya se ha usado. +validator.species.invalid.scientificLabel.uniqueKey=El count científico debe ser único, el valor %1$s ya ha sido utilizado. +validator.species.invalid.wormsId=Código worms no válido. +validator.species.invalid.wormsId.uniqueKey=El wormsId debe ser único, el valor %1$s ya se ha usado. +validator.species.null.faoCode=Código FAO no introducido. +validator.species.null.homeId=Código 3L no válido. +validator.species.required.ocean= +validator.species.required.scientificLabel=La etiqueta Scientifique no se ha establecido (introduzca xx si no la conoce). +validator.species.required.speciesGroup=No se ha introducido ningún grupo de especie de fauna. +validator.speciesList.null.code=Código no introducido. +validator.targetCatch.bound.weight=El tonelaje debe estar comprendido entre %1$s y %2$s +validator.targetCatch.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.targetCatch.desactivated.species=La especie seleccionada está desactivada. +validator.targetCatch.desactivated.weightCategory=La categoría de peso seleccionada está desactivada +validator.targetCatch.required.species=Debe seleccionar una especie de atún. +validator.targetCatch.required.weight=No se ha introducido el peso. +validator.targetCatch.required.weightCategory=Se debe seleccionar una categoría de peso. +validator.targetCatch.required.well=No se ha introducido la cuba. +validator.targetCatch.uniqueKey=El par (categoría de peso - cuba) debe ser única. +validator.targetDiscarded.bound.weight=El tonelaje dado está comprendido entre %1$s y %2$s. +validator.targetDiscarded.comment.tobig=La longitud del campo de comentarios está limitada a 1024 caracteres. +validator.targetDiscarded.desactivated.reasonForDiscard=La causa del descarte seleccionada está desactivada. +validator.targetDiscarded.desactivated.species=La especie seleccionada está desactivada. +validator.targetDiscarded.desactivated.weightCategory=La categoría de peso seleccionada está desactivada. +validator.targetDiscarded.required.comment.for.reasonForDiscard=Se requiere un comentario para la causa de descarte. +validator.targetDiscarded.required.reasonForDiscard=Es obligatoria seleccionar una causa del descarte. +validator.targetDiscarded.required.species=Es obligatorio seleccionar una especie de atún. +validator.targetDiscarded.required.weight=El peso es obligatorio. +validator.targetDiscarded.required.weightCategory=Es obligatorio seleccionar una categoría de peso. +validator.targetDiscarded.uniqueKey=El par (categoria - causa del descarte) debe ser única. +validator.targetLength.bound.length=La talla para esta especie debe estar comprendida entre %1$s y %2$s. +validator.targetLength.bound.weight=La peso para esta especie debe estar comprendida entre %1$s y %2$s. +validator.targetLength.desactivated.species=La especie seleccionada está desactivada. +validator.targetLength.positive.length=La talla debe ser un entero positivo. +validator.targetLength.positive.weight=El peso debe ser un entero positivo. +validator.targetLength.required.count=Es obligatoria especificar el número de grupo de talla. +validator.targetLength.required.species=Es obligatoria seleccionar una especie de atún. +validator.targetLength.required.taille=Es obligatoria especificar el talla. +validator.targetLength.required.weight.or.taille=Al menos uno de los valores (talla/peso) debe ser rellenado. +validator.targetSample.comment.tobig=La longitud del campo comentarios está limitada a 1024 carácteres. +validator.targetSample.required.comment.for.species=Es necesario un comentario para la especie de la posición %1$s del muestreo. +validator.tdr.deployementStart.before.fishingStart= +validator.tdr.desactivated.itemHorizontalPosition= +validator.tdr.desactivated.itemVerticalPosition= +validator.tdr.desactivated.sensorBrand= +validator.tdr.fishingEnd.before.deployementEnd= +validator.tdr.fishingStart.before.fishingEnd= +validator.tdr.required.position= +validator.transmittingBuoy.desactivated.country= +validator.transmittingBuoy.desactivated.transmittingBuoyOperation= +validator.transmittingBuoy.desactivated.transmittingBuoyType= +validator.transmittingBuoy.null.code=El código de baliza no ha sido especificado. +validator.transmittingBuoy.required.transmittingBuoyOperation= +validator.transmittingBuoy.required.transmittingBuoyType= +validator.trip.comment.tobig=La longitud del campo de comentarios está limitado a 1024 carácteres. +validator.trip.desactivated.captain= +validator.trip.desactivated.dataEntryOperator= +validator.trip.desactivated.departureHarbour= +validator.trip.desactivated.landingHarbour= +validator.trip.desactivated.observer= +validator.trip.desactivated.ocean=El oceano seleccionado está desactivado. +validator.trip.desactivated.tripType= +validator.trip.desactivated.vessel=El barco seleccionado está desactivado. +validator.trip.endDate.after.startDate=La fecha de fin de marea debe ser supuerio a la fecha de comienzo. +validator.trip.invalid.date=El día de observación debe ser superior al de una ruta anterior ( la ruta %1$s es incorrecta) +validator.trip.invalid.endDate=La fecha de fin de marea debe ser superior al dia de observación de cada ruta (la ruta %1$s es incorrecta). +validator.trip.invalid.formsUrl=La URL del formulario no es válido. +validator.trip.invalid.loch=La corredera de mañana (%1$s) de la ruta %2$s debe ser superior a la de tarde (%3$s) de la ruta anterior. +validator.trip.invalid.reportsUrl=La URL del informe no es válida. +validator.trip.invalid.startDate=La fecha de comienzo de marea debe ser inferior al día de observación de cualquier ruta (la ruta %1$s es incorrecta). +validator.trip.null.captain= +validator.trip.null.dataEntryOperator= +validator.trip.null.departureHarbour= +validator.trip.null.gearUseFeature= +validator.trip.null.landingHarbour= +validator.trip.required.comment.for.captain= +validator.trip.required.comment.for.dataEntryOperator= +validator.trip.required.comment.for.departureHarbour= +validator.trip.required.comment.for.landingHarbour= +validator.trip.required.comment.for.observer= +validator.trip.required.comment.for.ocean= +validator.trip.required.comment.for.tripType= +validator.trip.required.comment.for.vessel= +validator.trip.required.departureHarbour= +validator.trip.required.endDate=La fecha de fin de marea es obligatoria. +validator.trip.required.observer= +validator.trip.required.ocean=No se ha seleccionado océano. +validator.trip.required.startDate=La fecha de comienzo de marea es obligatoria. +validator.trip.required.tripType= +validator.trip.required.vessel=Es obligatorio seleccionar un barco. +validator.tripLongline.unclosed.activity= +validator.tripSeine.unclosed.route= +validator.vessel.desactivated.flagCountry=la bandera seleccionada está desactivada. +validator.vessel.desactivated.vesselSizeCategory=la capacidad seleccionada está desactivada. +validator.vessel.desactivated.vesselType=La perquería seleccionada está desactivada. +validator.vessel.invalid.capacity=No se ha especificado el año de servicio. +validator.vessel.invalid.fleetCountry=El código de la flota no se ha especificado. +validator.vessel.invalid.keelCode=El código de quilla no se ha especificado. +validator.vessel.invalid.length=Longueur hors tout no se ha especificado. +validator.vessel.invalid.power=Potencia no especificada. +validator.vessel.invalid.searchMaximum=Velocidad máxima no especificada. +validator.vessel.invalid.yearService=No se ha especificado el año de servicio. +validator.vessel.null.changeDate=Fecha de carga no establecida. +validator.vessel.required.flagCountry=No se ha seleccionado la bandera. +validator.vessel.required.vesselSizeCategory=No se ha seleccionado la capacidad. +validator.vessel.required.vesselType=No se ha seleccionado la pesquería. +validator.vesselSizeCategory.required.capacityLabel=La etiqueta «Capacidad» no se ha establecido. +validator.vesselSizeCategory.required.gaugeLabel=La etiqueta «Capacidad00BB no se ha establecido. +validator.weightCategory.desactivated.species=La especie seleccionada está desactivada. +validator.weightCategory.required.species=Ninguna especie seleccionada. +validator.wind.required.speedRange=Etiqueta para la velocidad del viento no especificada. +validator.wind.required.waveHeight=Etiqueta descriptiva para la altura media de las olas no especificada. diff --git a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties index 0c8bb72..bae4b7e 100644 --- a/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties +++ b/observe-entities/src/main/resources/i18n/observe-entities_fr_FR.properties @@ -35,3 +35,428 @@ observe.typeTransmittingBuoyOperation.pose=Pose d'une nouvelle balise observe.typeTransmittingBuoyOperation.recupere=Récupération d'une balise sans remise à l'eau observe.typeTransmittingBuoyOperation.recupere.et.change=Récupération et pose d'une nouvelle balise observe.typeTransmittingBuoyOperation.visite=Simple visite de la balise +validator.activity.bound.latitude=La latitude doit être comprise entre %1$s et %2$s. +validator.activity.bound.longitude=La longitude doit être comprise entre %1$s et %2$s. +validator.activity.bound.seaSurfaceTemperature=La température doit être comprise entre %1$s et %2$s. +validator.activity.bound.vesselSpeed=La vitesse navire doit être comprise entre %1$s et %2$s. +validator.activity.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.activity.desactivated.currentFpaZone=La zone courante est désactivée. +validator.activity.desactivated.detectionMode=Le mode de détection sélectionné est désactivé. +validator.activity.desactivated.nextFpaZone=La zone pénétrée est désactivée. +validator.activity.desactivated.observedSystem=Au moins un des systèmes observés sélectionné est désactivé. +validator.activity.desactivated.previousFpaZone=La zone quitée est désactivée. +validator.activity.desactivated.reasonForNoFishing=La raison de non coup de senne sélectionnée est désactivée. +validator.activity.desactivated.surroundingActivity=L'activité environnante sélectionnée est désactivée. +validator.activity.desactivated.vesselActivity=L'activité vessel sélectionnée est désactivée. +validator.activity.desactivated.wind=Le vent Beaufort sélectionné est désactivé. +validator.activity.duplicated.time=Il existe déjà une autre activité à cette heure. +validator.activity.invalid.quadrant=Le quadrant n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.activity.invalid.seaSurfaceTemperature=La température surface (%1$s) ne peut pas varier de plus de 12° par rapport à la température surface (%2$s) de l'activité précédente %3$s. +validator.activity.invalid.speed=La vitesse de l'activité courante est de %s nd, alors que la vitesse maximale autorisée est %s nd +validator.activity.null.dcp=Aucun objet flottant saisi. +validator.activity.null.fpaZone=La sélection d'une zone FPA est obligatoire. +validator.activity.null.observedSystem=Aucun système observé sélectionné. +validator.activity.null.observedSystemDistance=La distance au système observé n'est pas renseignée. +validator.activity.null.seaSurfaceTemperature=Aucune température de surface saisie. +validator.activity.null.surroundingActivity=Aucune activité environnante sélectionné. +validator.activity.null.wind=Aucun vent Beaufort sélectionné. +validator.activity.required.comment.for.currentFpaZone=Un commentaire est requis pour la zone courante. +validator.activity.required.comment.for.detectionMode=Un commentaire est requis pour le mode détection. +validator.activity.required.comment.for.fpaZone=Un commentaire est requis pour la zone. +validator.activity.required.comment.for.nextFpaZone=Un commentaire est requis pour la zone pénétrée. +validator.activity.required.comment.for.observedSystem=Un commentaire est requis pour un des systèmes observés sélectionnés. +validator.activity.required.comment.for.previousFpaZone=Un commentaire est requis pour la zone quitée. +validator.activity.required.comment.for.reasonForNoFishing=Un commentaire est requis pour la raison de non coup de senne. +validator.activity.required.comment.for.vesselActivity=Un commentaire est requis pour l'activité navire. +validator.activity.required.date=La date d'observation de l'activité est obligatoire. +validator.activity.required.latitude=La latitude doit être renseignée. +validator.activity.required.longitude=La longitude doit être renseignée. +validator.activity.required.quadrant=Le quadrant doit être sélectionné. +validator.activity.required.time=L'heure d'observation de l'activité est obligatoire. +validator.activity.required.vesselActivity=L'activité du navire est obligatoire. +validator.activityLongline.desactivated.fpaZone=La zone FPA sélectionnée est désactivée. +validator.baitsComposition.bound.individualSize=La taille doit être comprise entre %s et %s. +validator.baitsComposition.bound.individualWeight=Le poids doit être comprise entre %s et %s. +validator.baitsComposition.bound.proportion=La proportion doit être comprise entre %s et %s. +validator.baitsComposition.desactivated.baitSettingStatus=Le type d'état sélectionné est désactivée. +validator.baitsComposition.desactivated.baitType=Le type d'appât sélectionné est désactivée. +validator.baitsComposition.required.baitSettingStatus=La sélection d'un état est obligatoire. +validator.baitsComposition.required.baitType=La sélection d'un type est obligatoire. +validator.baitsComposition.required.proportion=Proportion non renseignée. +validator.basket.bound.floatline1Length=La longueur d'orin 1 être comprise entre %1$s et %2$s. +validator.basket.bound.floatline2Length=La longueur d'orin 1 être comprise entre %1$s et %2$s.& +validator.basket.required.settingIdentifier=L'identifiant de filage est obligatoire. +validator.branchline.bound.branchlineLength=La longeur avançon doit être comprise entre %1$s et %2$s. +validator.branchline.bound.tracelineLength=La longueur de la partie basse doit être comprise entre %1$s et %2$s. +validator.branchline.desactivated.baitHaulingStatus=L'état d'appât est désactivé. +validator.branchline.desactivated.baitSettingStatus=L'état d'appât est désactivé. +validator.branchline.desactivated.baitType=Le type d'appât est désactivé. +validator.branchline.desactivated.hookSize=La taille d'hameçon est désactivé. +validator.branchline.desactivated.hookType=Le type d'hameçon est désactivé. +validator.branchline.desactivated.topType=Le type est désactivé. +validator.branchline.desactivated.tracelineType=Le type est désactivé. +validator.branchline.required.settingIdentifier=L'identifiant de filage est obligatoire. +validator.branchline.required.topType=La sélection d'un type de partie supérieure est recommandée +validator.branchline.required.tracelineType=La sélection d'un type de bas de ligne est recommandée +validator.branchlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. +validator.branchlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. +validator.branchlinesComposition.desactivated.topType=Le type de partie supérieure de ligne sélectionné est désactivé +validator.branchlinesComposition.desactivated.tracelineType=Le type de bas de ligne sélectionné est désactivé +validator.branchlinesComposition.required.length=Longueur non renseignée. +validator.branchlinesComposition.required.proportion=Proportion non renseignée. +validator.branchlinesComposition.required.topType=La sélection d'un topType est obligatoire. +validator.branchlinesComposition.required.tracelineType=La sélection d'un type de bas de ligne est obligatoire. +validator.catchLongline.bound.gonadeWeight=Le poids doit être compris entre %1$s et %2$s +validator.catchLongline.comment.tobig=Commentaire trop grand (ne doit pas dépasser 1023 caractères). +validator.catchLongline.desactivated.catchFateLongline=Le devenir sélectionné est désactivé. +validator.catchLongline.desactivated.catchHealthness=L'état à la capture sélectionné est désactivé. +validator.catchLongline.desactivated.discardHealthness=L'état au rejet sélectionné est désactivé. +validator.catchLongline.desactivated.hookPosition=La position de l'hameçon sélectionnée est désactivée. +validator.catchLongline.desactivated.maturityStatus=La maturité sexuelle sélectionnée est désactivée. +validator.catchLongline.desactivated.sex=Le sexe sélectionné est désactivé. +validator.catchLongline.desactivated.speciesCatch=L'espèce sélectionnée est désactivée. +validator.catchLongline.desactivated.stomacFullness=L'état de l'estomac sélectionné est désactivé. +validator.catchLongline.required.comment.for.speciesCatch=Un commentaire est requis pour l'espèce sélectionnée. +validator.catchLongline.required.count.when.acquisitionModeIsGrouped=Le nombre est obligatoire en mode groupé. +validator.catchLongline.required.position=Pas de position renseignée sur la palangre. +validator.catchLongline.required.speciesCatch=L'espèce n'est pas renseignée. +validator.country.invalid.iso2Code.uniqueKey=Le code ISO2 n'est pas unique +validator.country.invalid.iso3Code.uniqueKey=Le code ISO3 n'est pas unique +validator.country.required.iso2Code=Code ISO2 non renseigné. +validator.country.required.iso3Code=Code ISO3 non renseigné. +validator.encounter.desactivated.encounterType=Le type de rencontre est désactivé. +validator.encounter.desactivated.species=L'espèce sélectionnée est désactivée. +validator.encounter.required.count=Nombre non renseignée. +validator.encounter.required.distance=Distance non renseignée. +validator.encounter.required.encounterType=La sélection d'un type de rencontre est obligatoire. +validator.encounter.required.species=La sélection d'une espèce est obligatoire. +validator.floatingObject.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.floatingObject.desactivated.objectFate=Le devenir objet sélectionné est désactivé. +validator.floatingObject.desactivated.objectOperation=Au moins une des opérations sélectionnée est désactivée. +validator.floatingObject.desactivated.type=Le type d'objet sélectionné est désactivé. +validator.floatingObject.null.daysAtSeaCount=Nombre de jour à l'eau non renseigné. +validator.floatingObject.positive.daysAtSeaCount=Le nombre de jour à l'eau est un entier positif. +validator.floatingObject.required.comment.for.balise1=Un commentaire est requis pour la première balise (étant donné son type). +validator.floatingObject.required.comment.for.balise2=Un commentaire est requis pour la seconde balise (étant donné son type). +validator.floatingObject.required.comment.for.objectFate=Un commentaire est requis pour le devenir objet. +validator.floatingObject.required.comment.for.type=Un commentaire est requis pour le type d'objet. +validator.floatingObject.required.objectFate=La sélection d'un devenir d'objet est conseillée. +validator.floatingObject.required.objectOperation=La sélection d'une opération d'objet est obligatoire. +validator.floatingObject.required.type=La sélection d'un type d'objet est obligatoire. +validator.floatingObject.size.supportVesselName=Le nom supply doit avoir une taille inférieure à %1$s caractères. +validator.floatlinesComposition.bound.length=La longueur doit être comprise entre %s et %s. +validator.floatlinesComposition.bound.proportion=La proportion doit être comprise entre %s et %s. +validator.floatlinesComposition.desactivated.lineType=Le type sélectionnée est désactivée. +validator.floatlinesComposition.required.length=Proportion non renseignée. +validator.floatlinesComposition.required.lineType=La sélection d'un type est obligatoire. +validator.floatlinesComposition.required.proportion=Proportion non renseignée. +validator.gearCaracteristic.desactivated.gearCaracteristicType=Le type sélectionnée est désactivée. +validator.gearCaracteristic.required.gearCaracteristicType=Le type sélectionnée est obligatoire. +validator.gearUseFeature.desactivated.gear=L'équipement sélectionné est désactivé. +validator.gearUseFeature.required.gear=L'équipement est obligatoire. +validator.gearUseFeature.required.number=Le nombre est obligatoire. +validator.harbour.desactivated.country=Le pays sélectionné est désactivé. +validator.harbour.null.latitude=La latitude n'est pas renseignée. +validator.harbour.null.locode=Le locode n'est pas renseigné. +validator.harbour.null.longitude=La longitude n'est pas renseignée. +validator.harbour.required.country=La sélection d'un pays est obligatoire. +validator.harbour.required.name=Le nom du port n'est pas renseigné. +validator.hooksComposition.bound.hookOffset=L'offset doit être compris entre %s et %s. +validator.hooksComposition.bound.proportion=La proportion doit être comprise entre %s et %s. +validator.hooksComposition.desactivated.hookSize=La taille d'hameçon sélectionné est désactivée. +validator.hooksComposition.desactivated.hookType=Le type d'hameçon sélectionné est désactivée. +validator.hooksComposition.required.hookSize=La sélection d'une taille d'hameçon est obligatoire. +validator.hooksComposition.required.hookType=La sélection d'un type d'hameçon est obligatoire. +validator.hooksComposition.required.proportion=Proportion non renseignée. +validator.lengthWeightParameter.invalid.lengthWeightFormula=La relation poids saisie n'est pas cohérente. +validator.lengthWeightParameter.invalid.uniqueKey=Le tuple (gender/ocean/species/startDate) doit être unique, le tuple est déjà utilisé. +validator.lengthWeightParameter.invalid.weightLengthFormula=La relation taille saisie n'est pas cohérente. +validator.lengthWeightParameter.null.ocean=Aucun océan sélectionné. +validator.lengthWeightParameter.required.coefficients=Les coefficients ne sont pas renseignés. +validator.lengthWeightParameter.required.endDate=Date de fin de validité non renseignée. +validator.lengthWeightParameter.required.lengthWeightFormula=La relation poids n'est pas renseignée. +validator.lengthWeightParameter.required.species=L'espèce n'est pas renseignée. +validator.lengthWeightParameter.required.startDate=date de début de validité non renseignée. +validator.lengthWeightParameter.required.weightLengthFormula=La relation taille n'est pas renseignée. +validator.nonTargetCatch.bound.catchWeight=Le poids estimé doit être compris entre %1$s et %2$s. +validator.nonTargetCatch.bound.meanLength=La taille moyenne pour cette espèce doit être comprise entre %1$s et %2$s. +validator.nonTargetCatch.bound.meanWeight=Le poids moyen pour cette espèce doit être compris entre %1$s et %2$s. +validator.nonTargetCatch.bound.totalCount=Le nombre estimé doit être compris entre %1$s et %2$s. +validator.nonTargetCatch.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.nonTargetCatch.desactivated.reasonForDiscard=La raison rejet sélectionnée est désactivée. +validator.nonTargetCatch.desactivated.species=L'espèce sélectionnée est désactivée. +validator.nonTargetCatch.desactivated.speciesFate=Le devenir faune sélectionné est désactivé. +validator.nonTargetCatch.positive.meanLength=La taille moyenne est un entier strictement positif. +validator.nonTargetCatch.positive.meanWeight=Le poids moyen est un entier strictement positif. +validator.nonTargetCatch.required.comment.for.reasonForDiscard=Un commentaire est requis vu la raison de rejet sélectionnée. +validator.nonTargetCatch.required.comment.for.speciesFate=Un commentaire est requis vu le devenir faune sélectionné. +validator.nonTargetCatch.required.species=La sélection d'une espèce de faune est obligatoire. +validator.nonTargetCatch.required.speciesFate=La sélection d'un devenir faune est obligatoire. +validator.nonTargetCatch.required.weightOrNombreEstime=Une des deux valeurs (poids estimé, nombre estimé) doit être renseignée. +validator.nonTargetCatch.required.weightOrTailleMoyen=Une des deux valeurs (poids moyen ou taille moyenne) devrait être renseignée. +validator.nonTargetCatch.uniqueKey=Le couple (espèce - objectFate) doit être unique. +validator.nonTargetSample.bound.length=La taille pour cette espèce doit être comprise entre %1$s et %2$s. +validator.nonTargetSample.bound.weight=Le poids pour cette espèce doit être compris entre %1$s et %2$s. +validator.nonTargetSample.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.nonTargetSample.desactivated.species=L'espèce sélectionnée est désactivée. +validator.nonTargetSample.positive.length=La longueur est un entier strictement positif. +validator.nonTargetSample.positive.weight=Le poids est un entier strictement positif. +validator.nonTargetSample.required.comment.for.species=Un commentaire est requis pour l'espèce de l'entrée à la position %1$s de l'échantillonage. +validator.nonTargetSample.required.count=Le nombre effectif est obligatoire. +validator.nonTargetSample.required.gender=La sélection d'un sexe d'espèce de faune est obligatoire. +validator.nonTargetSample.required.species=La sélection d'une espèce de faune est obligatoire. +validator.nonTargetSample.required.taille=La taille est obligatoire. +validator.nonTargetSample.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. +validator.objectObservedSpecies.desactivated.species=L'espèce sélectionnée est désactivée. +validator.objectObservedSpecies.desactivated.speciesStatus=Le statut espèce sélectionné est désactivé. +validator.objectObservedSpecies.positive.count=Le lastNamebre est un entier strictement positif. +validator.objectObservedSpecies.required.count=Le lastNamebre est obligatoire. +validator.objectObservedSpecies.required.species=La sélection d'une espèce de faune est obligatoire. +validator.objectObservedSpecies.required.speciesStatus=La sélection d'un statut d'espèce de faune est obligatoire. +validator.organism.desactivated.country=Le pays est désactivé. +validator.organism.null.description=La description n'est pas renseignée. +validator.organism.required.country=Aucun pays sélectionné. +validator.person.desactivated.country=La nationalité sélectionnée est désactivée. +validator.person.required.country=La nationalité est obligatoire. +validator.person.required.firstName=Le prénom est obligatoire. +validator.person.required.lastName=Le nom est obligatoire. +validator.program.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.program.desactivated.organism=L'organisme sélectionné est désactivé. +validator.program.required.endDate=Date de fin de programme non renseigné. +validator.program.required.gearType=Aucun type d'engin sélectionné. +validator.program.required.organism=Aucun organisme sélectionné. +validator.program.required.startDate=Date de début de programme non renseigné. +validator.referentiel.invalid.code.uniqueKey=Le code doit être unique, la valeur %1$s est déjà utilisée. +validator.referentiel.invalid.uri.uniqueKey=L'uri doit être unique, la valeur %1$s est déjà utilisée. +validator.referentiel.null.uri=Aucune uri renseignée. +validator.referentiel.required.brandName=Le nom n'est pas renseigné. +validator.referentiel.required.label1=Aucun libellé anglais renseigné. +validator.referentiel.required.label2=Aucun libellé français renseigné. +validator.referentiel.required.label3=Aucun libellé espagnol renseigné. +validator.referentiel.status.desactivated=L'objet est déasactivé (il ne pourra plus être utilisé dans de nouvelles données ou référentiels). +validator.referentiel.status.required=Statut non renseigné. +validator.referentiel.untranslated.label1=Le libellé anglais n'est pas traduit. +validator.referentiel.untranslated.label3=Le libellé espagnol n'est pas traduit. +validator.route.activityFinDeVeille.notAvailable=Il existe déjà une activité de fin de veille sur la route +validator.route.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.route.duplicated.date=Il existe déjà une autre route à cette date. +validator.route.invalid.date=Le jour d'observation doit être supérieure ou égale à la date de début de la marée (%1$s). +validator.route.invalid.endLogValue.maximum=Le loch du soir ne peut pas être supérieur de %1$s à celui du matin. +validator.route.invalid.endLogValue.minimum=Le loch du soir doit être strictement supérieur à celui du matin. +validator.route.invalid.quadrant=Le quadrant de l'activity à la position %1$s n'est pas cohérent par rapport à l'océan (%2$s) de la marée (indien \: 1,2, atlantiqe \: 1, 2, 3, 4) +validator.route.invalid.seaSurfaceTemperature=La température surface ne peut pas varier de plus de 12° entre 2 activités (activité de position %1$s incorrecte). +validator.route.invalid.speed=La vitesse entre deux activités ne doit pas dépasser %1$s nd, (l'activité %2$s a une vitesse de %3$s nd). +validator.route.invalid.startLogValue=Le loch du matin (%1$s) doit être supérieur au loch soir (%2$s) de la route %3$s. +validator.route.invalid.time=L'heure d'observation d'une activité doit être supérieure à celle de l'activité précédente (activité de position %1$s incorrecte). +validator.route.missing.activityFinDeVeille=Aucune activité de fin de veille définie sur la route. +validator.route.null.comment=Aucun commentaire renseigné. +validator.route.positive.startLogValue=Le loch du matin doit être un entier strictement positif. +validator.route.required.date=Le jour d'observation doit être renseigné. +validator.route.unclosed.activity=Il existe une activité non clôturée (%1$s). +validator.schoolEstimate.bound.weight=Le tonnage doit être compris entre %1$s et %2$s. +validator.schoolEstimate.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.schoolEstimate.desactivated.species=L'espèce sélectionnée est désactivée. +validator.schoolEstimate.required.comment.for.species=Un commentaire est requis pour l'espèce de l'entrée à la position %1$s de l'estimation. +validator.schoolEstimate.required.species=La sélection d'une espèce de thon est obligatoire. +validator.schoolEstimate.required.weight=Un des deux poids doit être renseigné. +validator.schoolEstimate.species.uniqueKey=L'espèce est déjà utilisée. +validator.section.required.settingIdentifier=L'identifiant de filage est obligatoire. +validator.sensorUsed.desactivated.sensorBrand=La marque sélectionnée est désactivée. +validator.sensorUsed.desactivated.sensorDataFormat=Le type de format de données sélectionné est désactivé. +validator.sensorUsed.desactivated.sensorType=Le type sélectionné est désactivé. +validator.sensorUsed.null.sensorSerialNo=Le numéro de série n'est pas renseigné. +validator.sensorUsed.required.sensorType=La sélection d'un type est obligatoire. +validator.set.bound.currentDirection=La direction courant doit être un entier compris entre %1$s et %2$s. +validator.set.bound.currentSpeed=La vitesse courant (en nd) doit être un nombre compris entre %1$s et %2$s. +validator.set.bound.delay=La durée entre l'heure de fin de calée et l'heure de fin de coulissage doit être d'au moins %1$s minutes. +validator.set.bound.maxGearDepth=La profondeur doit être comprise entre %1$s et %2$s. +validator.set.bound.schoolMeanDepth=La profondeur moyenne doit être un entier compris entre %1$s et %2$s. +validator.set.bound.schoolThickness=L'épaisseur Banc doit être un entier compris entre %1$s et %2$s. +validator.set.bound.schoolTopDepth=La profondeur sommet doit être un entier compris entre %1$s et %2$s. +validator.set.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.set.delay.too.long=La durée de la calée est trop longue (maximum de %1$s minutes). +validator.set.desactivated.reasonForNullSet=La cause coup null sélectionnée est désactivée. +validator.set.endDate.after.endPursingDate=La date de fin doit être supérieure ou égal à la date de fin de coulissage. +validator.set.endPursingDate.after.date=La date de fin de coulissage doit être supérieure ou égal à la date du jour d'observation. +validator.set.endPursingTimeStamp.after.startTime=L'heure de fin de coulissage doit être supérieure ou égal à l'heure de début. +validator.set.endSetTimeStamp.after.endPursingTimeStamp=L'heure de fin doit être supérieure ou égal à l'heure de fin de coulissage. +validator.set.null.currentDirection=Direction courant non saisie. +validator.set.required.comment.for.reasonForNullSet=Un commentaire est requis pour la cause coup nul sélectionnée. +validator.set.size.supportVesselName=Le nom supply doit avoir une taille inférieure à %1$s caractères. +validator.set.startTime.after.time=L'heure de début doit être supérieure ou égal à l'heure d'observation de l'activité. +validator.setLongline.bad.baitsCompositionProportionSum=La somme des proportions d'appâts doit valoir 100. +validator.setLongline.bad.branchlinesCompositionProportionSum=La somme des proportions d'avançons doit valoir 100. +validator.setLongline.bad.floatlinesCompositionProportionSum=La somme des proportions de floatline doit valoir 100. +validator.setLongline.bad.hooksCompositionProportionSum=La somme des proportions d'hameçons doit valoir 100. +validator.setLongline.baitsComposition.uniqueKey=Le tuple (type/état/taille/poids) doit être unique, le tuple est déjà utilisé. +validator.setLongline.bound.basketsPerSectionCount=Le nombre de panier par section doit être compris entre %1$s et %2$s. +validator.setLongline.bound.branchlinesPerBasketCount=Le nombre d'hameçons par panier doit être compris entre %1$s et %2$s. +validator.setLongline.bound.haulingEndLatitude=La latitude de fin de virage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.haulingEndLongitude=La longitude de fin de virage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.haulingStartLatitude=La latitude de début de virage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.haulingStartLongitude=La longitude de début de virage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.lightsticksPerBasketCount=Le nombre de cyalumes par panier doit être compris entre %1$s et %2$s. +validator.setLongline.bound.settingEndLatitude=La latitude de fin de filage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.settingEndLongitude=La longitude de fin de filage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.settingStartLatitude=La latitude de début de filage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.settingStartLongitude=La longitude de début de filage doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.settingVesselSpeed=La vitesse bateau doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.shooterSpeed=La vitesse de shooter doit être comprise entre %1$s et %2$s. +validator.setLongline.bound.snapWeight=Le poids snap doit être compris entre %1$s et %2$s. +validator.setLongline.bound.swivelWeight=Le poids emerillon doit être compris entre %1$s et %2$s. +validator.setLongline.bound.timeBetweenHooks=Le temps entre hameçons doit être compris entre %1$s et %2$s. +validator.setLongline.bound.totalBasketsCount=Le nombre total de paniers doit être compris entre %1$s et %2$s. +validator.setLongline.bound.totalHooksCount=Le nombre total d'hameçons doit être compris entre %1$s et %2$s. +validator.setLongline.bound.totalSectionsCount=Le nombre total de sections doit être compris entre %1$s et %2$s. +validator.setLongline.branchlinesComposition.uniqueKey=Le tuple (type haut/type bas/taille) doit être unique, le tuple est déjà utilisé. +validator.setLongline.desactivated.lightsticksColor=La couleur de cyalume sélectionné est désactivé. +validator.setLongline.desactivated.lightsticksType=Le type de cyalume sélectionné est désactivé. +validator.setLongline.desactivated.lineType=Le type de ligne sélectionné est désactivé. +validator.setLongline.desactivated.settingShape=Le type de forme sélectionné est désactivé. +validator.setLongline.duplicated.homeId=L'Id métier est déjà utilisé par une autre opération de pêche (%s) +validator.setLongline.duplicated.number=Le numéro est déjà utilisé par une autre opération de pêche (%s) +validator.setLongline.floatlinesComposition.uniqueKey=Le tuple (type/longueur) doit être unique, le tuple est déjà utilisé. +validator.setLongline.haulingStartTimeStamp.before.haulingEndTimeStamp=L'heure de fin de virage doit être supérieure ou égal à l'heure de début de virage. +validator.setLongline.hooksComposition.uniqueKey=Le tuple (type/taille/offset) doit être unique, le tuple est déjà utilisé. +validator.setLongline.invalid.haulingEndQuadrant=Le quadrant de fin de virage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.setLongline.invalid.haulingStartQuadrant=Le quadrant de début de virage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.setLongline.invalid.settingEndQuadrant=Le quadrant de fin de filage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.setLongline.invalid.settingStartQuadrant=Le quadrant de début de filage n'est pas cohérent par rapport à l'océan (%1$s) de la marée (indien \: 1,2, atlantique \: 1, 2, 3, 4) +validator.setLongline.null.homeId=Id métier non renseigné. +validator.setLongline.required.basketsPerSectionCount=Nombre de paniers par section non renseigné. +validator.setLongline.required.branchlinesPerBasketCount=Nombre d'hameçons par panier non renseigné. +validator.setLongline.required.haulingBreaks=Nombre de coupures non renseigné. +validator.setLongline.required.haulingDirectionSameAsSetting=Le champ doit être renseigné. +validator.setLongline.required.haulingEndLatitude=Latitude de fin de virage non renseignée. +validator.setLongline.required.haulingEndLongitude=longitude de fin de virage non renseignée. +validator.setLongline.required.haulingEndQuadrant=Quadrant de fin de virage non renseigné. +validator.setLongline.required.haulingEndTimeStamp=Horodatage de fin de virage non renseigné. +validator.setLongline.required.haulingStartLatitude=Latitude de début de virage non renseignée. +validator.setLongline.required.haulingStartLongitude=longitude de début de virage non renseignée. +validator.setLongline.required.haulingStartQuadrant=Quadrant de début de virage non renseigné. +validator.setLongline.required.haulingStartTimeStamp=Horodatage de début de virage non renseigné. +validator.setLongline.required.settingEndLatitude=Latitude de fin de filage non renseignée. +validator.setLongline.required.settingEndLongitude=longitude de fin de filage non renseignée. +validator.setLongline.required.settingEndQuadrant=Quadrant de fin de filage non renseigné. +validator.setLongline.required.settingEndTimeStamp=Horodatage de fin de filage non renseigné. +validator.setLongline.required.settingStartLatitude=Latitude de début de filage non renseignée. +validator.setLongline.required.settingStartLongitude=longitude de début de filage non renseignée. +validator.setLongline.required.settingStartQuadrant=Quadrant de début de filage non renseigné. +validator.setLongline.required.settingStartTimeStamp=Horodatage de début de filage non renseigné. +validator.setLongline.required.totalSectionsCount=Nombre de sections non renseigné. +validator.setLongline.settingEndTimeStamp.before.haulingStartTimeStamp=L'heure de début de virage doit être supérieure ou égal à l'heure de fin de filage. +validator.setLongline.settingStartTimeStamp.before.settingEndTimeStamp=L'heure de fin de filage doit être supérieure ou égal à l'heure de début de filage. +validator.species.desactivated.speciesGroup=Le groupe d'espèce sélectionnée est désactivé. +validator.species.invalid.faoCode.uniqueKey=Le codeFAO doit être unique, la valeur %1$s est déjà utilisée. +validator.species.invalid.homeId.uniqueKey=Le code3l doit être unique, la valeur %1$s est déjà utilisée. +validator.species.invalid.scientificLabel.uniqueKey=Le libellé scientifique doit être unique, la valeur %1$s est déjà utilisée. +validator.species.invalid.wormsId=Le code worms n'est pas valide. +validator.species.invalid.wormsId.uniqueKey=Le wormsId doit être unique, la valeur %1$s est déjà utilisée. +validator.species.null.faoCode=Le code FAO n'est pas renseigné. +validator.species.null.homeId=Le code 3L n'est pas renseigné. +validator.species.required.ocean=Aucun océan sélectionné. +validator.species.required.scientificLabel=Le libellé scientifique n'est pas renseigné (mettre xx si non connu). +validator.species.required.speciesGroup=Aucun groupe d'espèce faune renseigné. +validator.speciesList.null.code=Le code n'est pas renseigné. +validator.targetCatch.bound.weight=Le tonnage doit être compris entre %1$s et %2$s +validator.targetCatch.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.targetCatch.desactivated.species=L'espèce sélectionnée est désactivée. +validator.targetCatch.desactivated.weightCategory=La catégorie poids sélectionnée est désactivée. +validator.targetCatch.required.species=La sélection d'une espèce de thon est obligatoire. +validator.targetCatch.required.weight=Le poids n'est pas renseigné. +validator.targetCatch.required.weightCategory=La sélection d'une catégorie poids est obligatoire. +validator.targetCatch.required.well=La cuve n'est pas renseignée. +validator.targetCatch.uniqueKey=Le couple (catégorie poids - well) doit être unique. +validator.targetDiscarded.bound.weight=Le tonnage doit être compris entre %1$s et %2$s. +validator.targetDiscarded.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.targetDiscarded.desactivated.reasonForDiscard=La raison rejet sélectionnée est désactivée. +validator.targetDiscarded.desactivated.species=L'espèce sélectionnée est désactivée. +validator.targetDiscarded.desactivated.weightCategory=La catégorie poids sélectionnée est désactivée. +validator.targetDiscarded.required.comment.for.reasonForDiscard=un commentaire est requis pour le raison rejet du rejet. +validator.targetDiscarded.required.reasonForDiscard=La sélection d'une raison de rejet est obligatoire. +validator.targetDiscarded.required.species=La sélection d'une espèce de thon est obligatoire. +validator.targetDiscarded.required.weight=Le poids est obligatoire. +validator.targetDiscarded.required.weightCategory=La sélection d'une catégorie poids est obligatoire. +validator.targetDiscarded.uniqueKey=Le couple (catégorie - raison rejet) doit être unique. +validator.targetLength.bound.length=La longueur pour cette espèce doit être comprise entre %1$s et %2$s. +validator.targetLength.bound.weight=Le poids individuel de l'échantillon doit être compris entre %1$s et %2$s. +validator.targetLength.desactivated.species=L'espèce sélectionnée est désactivée. +validator.targetLength.positive.length=La longueur est un entier strictement positif. +validator.targetLength.positive.weight=Le poids est un entier strictement positif. +validator.targetLength.required.count=Le nombre effectif est obligatoire. +validator.targetLength.required.species=La sélection d'une espèce de thon est obligatoire. +validator.targetLength.required.taille=La taille est obligatoire. +validator.targetLength.required.weight.or.taille=Au moins une des valeurs (taille / poids) doit être renseignée. +validator.targetSample.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.targetSample.required.comment.for.species=Un commentaire est requis pour l'espèce de l'entrée à la position %1$s de l'échantillonage. +validator.tdr.deployementStart.before.fishingStart=L'horodatage de début de pêche doit être après le début de celui de début de déploiement. +validator.tdr.desactivated.itemHorizontalPosition=La position sur la ligne sélectionnée est désactivée. +validator.tdr.desactivated.itemVerticalPosition=La position verticale sélectionnée est désactivée. +validator.tdr.desactivated.sensorBrand=La marque sélectionnée est déasactivée. +validator.tdr.fishingEnd.before.deployementEnd=L'horodatage de fin de déploiement doit être après le début de celui de fin de pêche. +validator.tdr.fishingStart.before.fishingEnd=L'horodatage de fin de pêche doit être après le début de celui de début de pêche. +validator.tdr.required.position=Pas de position renseignée sur la palangre. +validator.transmittingBuoy.desactivated.country=Le pays sélectionné est désactivé. +validator.transmittingBuoy.desactivated.transmittingBuoyOperation=L'operation balise sélectionnée est désactivée. +validator.transmittingBuoy.desactivated.transmittingBuoyType=Le type de balise sélectionné est désactivé. +validator.transmittingBuoy.null.code=Le code de la balise n'est pas renseigné. +validator.transmittingBuoy.required.transmittingBuoyOperation=La sélection d'une opération sur balise est obligatoire. +validator.transmittingBuoy.required.transmittingBuoyType=La sélection d'une type de balise est obligatoire. +validator.trip.comment.tobig=La taille du commentaire est limitée à 1024 caractères. +validator.trip.desactivated.captain=Le capitaine sélectionné est désactivé. +validator.trip.desactivated.dataEntryOperator=Le saisisseur sélectionné est désactivé. +validator.trip.desactivated.departureHarbour=Le port de départ sélectionné est désactivé. +validator.trip.desactivated.landingHarbour=Le port d'arrivée sélectionné est désactivé. +validator.trip.desactivated.observer=L'observateur sélectionné est désactivé. +validator.trip.desactivated.ocean=L'ocean sélectionné est désactivé. +validator.trip.desactivated.tripType=Le type de marée est désactivé. +validator.trip.desactivated.vessel=Le bateau sélectionné est désactivée. +validator.trip.endDate.after.startDate=La date de fin de marée doit être supérieure à sa date de début. +validator.trip.invalid.date=Le jour d'observation doit être supérieure à celui d'une route précédente. (la route à la position %1$s est incorrecte). +validator.trip.invalid.endDate=La date de fin de marée doit être supérieure au jour d'observation de chaque route. (la route à la position %1$s est incorrecte). +validator.trip.invalid.formsUrl=L'url du formulaire n'est pas valide. +validator.trip.invalid.loch=Le loch du matin (%1$s) de la route %2$s doit être supérieur au loch soir (%3$s) de la route précédente. +validator.trip.invalid.reportsUrl=L'url du rapport n'est pas valide. +validator.trip.invalid.startDate=La date de début de marée doit être inférieure au jour d'observation de chaque route. (la route à la position %1$s est incorrecte). +validator.trip.null.captain=Pas de capitaine sélectionné. +validator.trip.null.dataEntryOperator=Pas de saisisseur sélectionné. +validator.trip.null.departureHarbour=Pas de port de départ sélectionné. +validator.trip.null.gearUseFeature=Vous n'avez pas saisi d'équipement (Senne conseillée). +validator.trip.null.landingHarbour=Pas de port d'arrivée sélectionné. +validator.trip.required.comment.for.captain=Un commentaire est requis pour le captiaine sélectionné. +validator.trip.required.comment.for.dataEntryOperator=Un commentaire est requis pour le saisisseur sélectionné. +validator.trip.required.comment.for.departureHarbour=Un commentaire est requis pour le port de départ sélectionné. +validator.trip.required.comment.for.landingHarbour=Un commentaire est requis pour le port d'arrivée sélectionné. +validator.trip.required.comment.for.observer=Un commentaire est requis pour l'observateur sélectionné. +validator.trip.required.comment.for.ocean=Un commentaire est requis pour l'ocean sélectionné. +validator.trip.required.comment.for.tripType=Un commentaire est requis pour le type de marée sélectionné. +validator.trip.required.comment.for.vessel=Un commentaire est requis pour le navire sélectionné. +validator.trip.required.departureHarbour=La sélection d'un port de départ est obligatoire. +validator.trip.required.endDate=La date de fin de marée est obligatoire. +validator.trip.required.observer=La sélection d'un observateur est obligatoire. +validator.trip.required.ocean=La sélection d'un océan est obligatoire. +validator.trip.required.startDate=La date de début est obligatoire. +validator.trip.required.tripType=Le type de marée est obligatoire. +validator.trip.required.vessel=La sélection d'un bateau est obligatoire. +validator.tripLongline.unclosed.activity=Il existe une activité non clôturée (%1$s). +validator.tripSeine.unclosed.route=Il existe une route non clôturée (%1$s). +validator.vessel.desactivated.flagCountry=Le pavillon sélectionné est désactivée. +validator.vessel.desactivated.vesselSizeCategory=La jauge sélectionnée est désactivée. +validator.vessel.desactivated.vesselType=La pêcherie sélectionnée est désactivée. +validator.vessel.invalid.capacity=Année de mise en service non renseignée. +validator.vessel.invalid.fleetCountry=Code Flotte non renseigné. +validator.vessel.invalid.keelCode=Code Quille non renseigné. +validator.vessel.invalid.length=Longueur hors tout non renseignée. +validator.vessel.invalid.power=Puissance non renseignée. +validator.vessel.invalid.searchMaximum=Vitesse maximale non renseignée. +validator.vessel.invalid.yearService=Année de mise en service non renseignée. +validator.vessel.null.changeDate=Date chargement non renseignée. +validator.vessel.required.flagCountry=Aucun pavillon renseigné. +validator.vessel.required.vesselSizeCategory=Aucune jauge sélectionnée. +validator.vessel.required.vesselType=Aucune pêcherie renseignée. +validator.vesselSizeCategory.required.capacityLabel=Le libellé Capacité n'est pas renseigné. +validator.vesselSizeCategory.required.gaugeLabel=Le libellé Jauge n'est pas renseigné. +validator.weightCategory.desactivated.species=L'espèce sélectionnée est désactivée. +validator.weightCategory.required.species=Aucune espèce sélectionnée. +validator.wind.required.speedRange=Libellé vitesse vent non renseigné. +validator.wind.required.waveHeight=Libellé descriptif hauteur moyenne vagues non renseigné. diff --git a/observe-entities-validation/src/test/java/fr/ird/observe/business/validation/BeanValidatorDetectorTest.java b/observe-entities/src/test/java/fr/ird/observe/business/validation/BeanValidatorDetectorTest.java similarity index 100% rename from observe-entities-validation/src/test/java/fr/ird/observe/business/validation/BeanValidatorDetectorTest.java rename to observe-entities/src/test/java/fr/ird/observe/business/validation/BeanValidatorDetectorTest.java diff --git a/observe-entities-validation/src/test/java/fr/ird/observe/business/validation/RelationRegexTest.java b/observe-entities/src/test/java/fr/ird/observe/business/validation/RelationRegexTest.java similarity index 100% rename from observe-entities-validation/src/test/java/fr/ird/observe/business/validation/RelationRegexTest.java rename to observe-entities/src/test/java/fr/ird/observe/business/validation/RelationRegexTest.java diff --git a/observe-entities-validation/src/test/java/fr/ird/observe/validation/validator/entities/ActivitySeineSpeedValidatorTest.java b/observe-entities/src/test/java/fr/ird/observe/validation/validator/entities/ActivitySeineSpeedValidatorTest.java similarity index 100% rename from observe-entities-validation/src/test/java/fr/ird/observe/validation/validator/entities/ActivitySeineSpeedValidatorTest.java rename to observe-entities/src/test/java/fr/ird/observe/validation/validator/entities/ActivitySeineSpeedValidatorTest.java diff --git a/observe-entities-validation/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml b/observe-entities/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml similarity index 100% rename from observe-entities-validation/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml rename to observe-entities/src/test/resources/fr/ird/observe/entities/seine/Route-testSpeed-error-validation.xml diff --git a/observe-entities-validation/src/test/resources/validators.xml b/observe-entities/src/test/resources/validators.xml similarity index 100% rename from observe-entities-validation/src/test/resources/validators.xml rename to observe-entities/src/test/resources/validators.xml diff --git a/observe-services-topia/pom.xml b/observe-services-topia/pom.xml index 0c1fb99..cf5ded9 100644 --- a/observe-services-topia/pom.xml +++ b/observe-services-topia/pom.xml @@ -45,12 +45,6 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>observe-entities-validation</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>observe-test-data</artifactId> <version>${project.version}</version> <scope>test</scope> diff --git a/pom.xml b/pom.xml index b7f2f63..188d937 100644 --- a/pom.xml +++ b/pom.xml @@ -87,7 +87,7 @@ <module>observe-test-data</module> <module>observe-entities</module>  - <module>observe-entities-validation</module> +  <module>observe-services-configuration-topia</module> <module>observe-services-topia</module> <module>observe-services-configuration-rest</module> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch develop updated (72efaab -> d5d5d55)
by codelutin.com scm 09 Jan '16

09 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 72efaab Retour sur develop pour de nouvelles aventures... Merge branch 'feature/refactor_reference' into develop new 28f6a27 Mise à jour du driver postgresql new 67e1841 o Revue de la gestion des migrations pour la version 5.0 : chaque script de migration a une version, la 5.à aggrègera toutes les versions intermédiaires o Renommage de ReferenceEntity en ObserveReferentialEntity o Introduction de ObserveEntity et ObserveDataEntity o Début de suppression du code sur les FollowedEntity o Revue de l'api de test (so weak, so lame :( avec un héritage très douteux) o Écriture d'un test pour effectuer les migrations facilement des bases de [...] new 87c65fe Correction de la génération du mapping hibernate new 472642a Generation des bases de test pour la version 5.0-2 new 3a106d4 Amélioration de l'API de tests new 7b92724 Revue bis de la configuration des tests new e744c95 Ajout d'une table globale des dates de dernières mises à jour (utilisé pour les suppressions) (See #7470) new 2fd2971 Changement du niveau de log new d6fcd2b Ajout de la talbe LastupdateDate dans la synchronisation du référentiel new 8bd2466 Mise en place de la mise à jour de la date de dernière mise à jour lors de la sauvegarde ou suppression d'une entité (il faudra bien repasser sur chaque appel, car il me semble que cela n'est pas bien géré partout) (See #7470) new cde7c09 Utilisation de la dernière version du modèle de persistence new a97c28b Suppression d'un test inutile new e0e0eac Faire fonctionner les tests de suppression (mais ajout d'un fixme) new 8679f9c Amélioration du code de mise à jour new 6662c85 Renommage méthode de test new 824f7a2 Ajout de la base de test pour longline (migrée en plus de 3heures...) + utilisation (enfin) des bases à jour pour les tests new 46beb5b Amélioration de l'exception de concurrence new b6804fd o Introduction ObserveEntity et ObserveDataEntity o Mise en place de la date de dernière mise à jour sur toutes les entités o Alignement du code pour les dto o Optionmisation des dépendences new a736d26 Refactor des binders new 1fc64bb Implantation efficace de réplication de données new 4747da5 Ajout de fixtures new 026b9a6 Ajout d'un tes de replication de données new cec9b0b Correction de base de référentiels new 18717f0 Ajout d'une base vide pour les tests new 6100451 Utilisation du service topia pour la réplication new d051db8 Ajout de fixtures new 2eb350b Ajout de tests pour la réplication de données ng new 9cb09ec Configuration du nouveau service de réplication new f9c2470 Ajout méthode pour compter le nombre d'éléments d'une table new ca8daea Debut de correction de la javadoc new 49444e3 Ajout de la réplication au niveau du topia application context + suppression autoMigrate configuration new c361698 Ajout d'un nouveau service pour produire les script sql new 0221de9 Fix third parties new 87cbe4e Utilisation du nouveau moteur de requete sql de topia new cde7980 clean code new 22aa205 Ne plus utiliser l'ancien moteur de réplication de topia new 1f07a4c Rendre Closeable DataSourceService et bien fermer la base commune après sa création (cela était fait avant en utilisant la commande restore de H2) new d5d5d55 Retour sur develop, mais le ticket n'est pas fini (il faut voir dans les ui comment bien utiliser la date de dernière mise à jour) Merge branch 'feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour' into develop The 38 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d5d5d5536ec3a5ba35f9e90c321a997add449af7 Merge: 72efaab 1f07a4c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 09:19:39 2016 +0100 Retour sur develop, mais le ticket n'est pas fini (il faut voir dans les ui comment bien utiliser la date de dernière mise à jour) Merge branch 'feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour' into develop commit 1f07a4c195abc5e6b20cec85163eb12d3367b3f5 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 09:13:03 2016 +0100 Rendre Closeable DataSourceService et bien fermer la base commune après sa création (cela était fait avant en utilisant la commande restore de H2) commit 22aa205b2ad54e7bb850844a48c5dcdc2d0a1097 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Jan 9 08:41:46 2016 +0100 Ne plus utiliser l'ancien moteur de réplication de topia commit cde7980fbe0fa80be9fa07015fc82e4111c2058b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Jan 8 20:03:08 2016 +0100 clean code commit 87cbe4e32bd581aabc64f64326c76062b18d7aba Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jan 5 08:50:47 2016 +0100 Utilisation du nouveau moteur de requete sql de topia commit 0221de9898135cac654b8552c4f09ed1507c0999 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 4 17:23:52 2016 +0100 Fix third parties commit c36169804dabc1098efa1fa1d531fda9e8649f3d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 31 19:38:23 2015 +0100 Ajout d'un nouveau service pour produire les script sql commit 49444e38a2741dee5ab6e59af942cf9566f8fb0d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Thu Dec 31 19:36:45 2015 +0100 Ajout de la réplication au niveau du topia application context + suppression autoMigrate configuration commit ca8daeafc9b350b6e51f97a7b90d4ffa49f267da Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 30 17:01:14 2015 +0100 Debut de correction de la javadoc commit f9c2470d6a7255d15537049b35d38d80c6700dd1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 30 16:58:24 2015 +0100 Ajout méthode pour compter le nombre d'éléments d'une table commit 9cb09ecd322da00eaf7f18f37178930dc3925fd1 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 30 16:57:47 2015 +0100 Configuration du nouveau service de réplication commit 2eb350bde3c37e483d1827358f77102a34b16114 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 30 16:54:37 2015 +0100 Ajout de tests pour la réplication de données ng commit d051db817aea147d3f3497a9bc59a6af456aab75 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 30 16:54:05 2015 +0100 Ajout de fixtures commit 610045103383d7119aefebc690178f2a012fabc2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Wed Dec 30 16:53:25 2015 +0100 Utilisation du service topia pour la réplication commit 18717f0908d797e50d855b50938a78f465b8a7bc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Dec 29 21:48:48 2015 +0100 Ajout d'une base vide pour les tests commit cec9b0be626a0cb4ae451b3aa4714c4849584571 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Dec 29 21:48:02 2015 +0100 Correction de base de référentiels commit 026b9a6b880b3776b33e313f3795d4d454162905 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Dec 29 01:18:50 2015 +0100 Ajout d'un tes de replication de données commit 4747da54faf040e78ac3f464c1368c97cee26f7b Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Dec 29 01:18:28 2015 +0100 Ajout de fixtures commit 1fc64bb2d669887492e84bf983ef42a192da667c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Dec 29 01:14:58 2015 +0100 Implantation efficace de réplication de données commit a736d267ac97730bbf50c8436cd1569a552144b2 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Dec 27 22:27:27 2015 +0100 Refactor des binders commit b6804fd6cf50bff2d7d2287b8a0cda6fda6933be Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Dec 27 19:15:32 2015 +0100 o Introduction ObserveEntity et ObserveDataEntity o Mise en place de la date de dernière mise à jour sur toutes les entités o Alignement du code pour les dto o Optionmisation des dépendences commit 46beb5bc612fcfc15db8ebff5e20a4ee04cf6e93 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Dec 27 10:58:00 2015 +0100 Amélioration de l'exception de concurrence commit 824f7a2b3025a183e80e74deea3db4b737a526fe Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sun Dec 27 09:50:54 2015 +0100 Ajout de la base de test pour longline (migrée en plus de 3heures...) + utilisation (enfin) des bases à jour pour les tests commit 6662c85160020e6cd75049709eec1d20cbc6ee92 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 15:20:25 2015 +0100 Renommage méthode de test commit 8679f9c2dc89e1e15cd1edde92f3c3f34e155f1a Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 15:18:45 2015 +0100 Amélioration du code de mise à jour commit e0e0eacaa0c7b4edecbab50ad5540c487682d9bc Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 15:17:11 2015 +0100 Faire fonctionner les tests de suppression (mais ajout d'un fixme) commit a97c28b20462334daaab8e5efedb97d4d2f9102e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 15:16:19 2015 +0100 Suppression d'un test inutile commit cde7c09f0c3fb2bbb5b40e67a8f0eb873bc90e07 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 14:48:49 2015 +0100 Utilisation de la dernière version du modèle de persistence commit 8bd2466f6556559993b76de3f465460b4434c15d Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 14:48:08 2015 +0100 Mise en place de la mise à jour de la date de dernière mise à jour lors de la sauvegarde ou suppression d'une entité (il faudra bien repasser sur chaque appel, car il me semble que cela n'est pas bien géré partout) (See #7470) commit d6fcd2b1510741359981deec9793dd24eb23caed Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 14:46:46 2015 +0100 Ajout de la talbe LastupdateDate dans la synchronisation du référentiel commit 2fd2971d1f984d1d85e3bd239c5e4b89090824c7 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 12:48:54 2015 +0100 Changement du niveau de log commit e744c95114d9d273575e4215ae0aedf091047608 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 12:48:32 2015 +0100 Ajout d'une table globale des dates de dernières mises à jour (utilisé pour les suppressions) (See #7470) commit 7b927249b2d1d04bbaf4bdf1772b2c2ecc636e11 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 12:01:41 2015 +0100 Revue bis de la configuration des tests commit 3a106d48370fa5e957bf5b255fb7c3d753f65d7c Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 11:29:30 2015 +0100 Amélioration de l'API de tests commit 472642ac26abbb1cddfa7cfc412e51f318abed3e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 11:28:49 2015 +0100 Generation des bases de test pour la version 5.0-2 commit 87c65feab17e6f8e491da90456cb4d86fd2febef Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Sat Dec 26 11:27:14 2015 +0100 Correction de la génération du mapping hibernate commit 67e18410e41275b3e4296a196efc7c9b57a8ef0e Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 25 23:25:03 2015 +0100 o Revue de la gestion des migrations pour la version 5.0 : chaque script de migration a une version, la 5.à aggrègera toutes les versions intermédiaires o Renommage de ReferenceEntity en ObserveReferentialEntity o Introduction de ObserveEntity et ObserveDataEntity o Début de suppression du code sur les FollowedEntity o Revue de l'api de test (so weak, so lame :( avec un héritage très douteux) o Écriture d'un test pour effectuer les migrations facilement des bases de test (heu faire les migrations à chaque fois qu'on a besoin d'une base pour les test... so L-A-M-E) commit 28f6a271df7b03b34a75b4d3b3e018cded9ecc0f Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Fri Dec 25 18:38:58 2015 +0100 Mise à jour du driver postgresql Summary of changes: .../src/license/THIRD-PARTY.properties | 63 +- .../java/fr/ird/observe/ObserveActionExecutor.java | 2 +- .../main/java/fr/ird/observe/ObserveCLAction.java | 2 +- .../main/java/fr/ird/observe/ObserveRunner.java | 4 +- .../observe/ObserveSwingApplicationContext.java | 6 +- .../ObserveSwingApplicationConfig.java | 2 +- .../fr/ird/observe/db/ObserveSwingDataSource.java | 5 + .../ird/observe/db/constants/DataContextType.java | 2 +- .../src/main/java/fr/ird/observe/ui/UIHelper.java | 6 +- .../java/fr/ird/observe/ui/admin/AdminStep.java | 2 +- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 6 +- .../fr/ird/observe/ui/admin/AdminUIHandler.java | 2 +- .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 2 +- .../observe/ui/admin/save/SaveLocalUIHandler.java | 6 +- .../ird/observe/ui/content/ContentUIHandler.java | 2 +- .../ui/content/ref/ContentReferenceUIHandler.java | 4 +- .../ui/content/table/ContentTableModel.java | 12 +- .../ui/content/table/ContentTableUIModel.java | 8 +- .../impl/longline/CatchLonglineUIHandler.java | 2 +- .../longline/GearUseFeaturesLonglineUIModel.java | 2 +- .../impl/seine/GearUseFeaturesSeineUIModel.java | 2 +- .../impl/seine/ModeSaisieEchantillonEnum.java | 4 +- .../ird/observe/ui/storage/ObstunaAdminAction.java | 6 +- .../ird/observe/ui/storage/StorageUIHandler.java | 21 +- .../ird/observe/ui/storage/StorageUILauncher.java | 4 +- .../fr/ird/observe/ui/storage/StorageUIModel.java | 7 +- .../ui/tree/AbstractObserveTreeCellRenderer.java | 2 +- .../ui/tree/DataSelectionTreeSelectionModel.java | 14 +- .../java/fr/ird/observe/ui/tree/ObserveNode.java | 2 +- .../fr/ird/observe/ui/tree/ObserveTreeHelper.java | 6 +- .../fr/ird/observe/ui/util/FloatConverter.java | 2 +- .../fr/ird/observe/ui/util/SpringUtilities.java | 8 +- .../ird/observe/validation/ValidationService.java | 2 +- .../dto/AbstractEspeceFieldDtoValidator.java | 8 +- .../dto/ActivityFinDeVeilleExistsDtoValidator.java | 12 +- .../dto/ActivitySimpleSpeedDtoValidator.java | 6 +- .../validator/dto/ActivitySpeedDtoValidator.java | 6 +- .../web/ObserveWebApplicationListener.java | 2 +- .../web/controller/ObserveWebMotionController.java | 2 +- .../DataSourceDumpProducerServiceController.java | 29 - .../entities/AbstractEspeceFieldValidator.java | 8 +- .../ActivityFinDeVeilleExistsValidator.java | 12 +- .../entities/ActivitySimpleSpeedValidator.java | 6 +- .../validator/entities/ActivitySpeedValidator.java | 6 +- observe-entities/pom.xml | 5 +- .../fr/ird/observe/AbstractObserveTopiaDao.java | 44 +- .../observe/ObserveTopiaApplicationContext.java | 351 +++++++++-- .../observe/ObserveTopiaConfigurationFactory.java | 24 +- .../observe/ObserveTopiaPersistenceContext.java | 83 ++- .../java/fr/ird/observe/entities/Activity.java | 2 +- .../java/fr/ird/observe/entities/Entities.java | 37 +- .../observe/entities/LastUpdateDateTopiaDao.java | 9 + .../java/fr/ird/observe/entities/ObserveSet.java | 2 +- .../main/java/fr/ird/observe/entities/Trip.java | 2 +- .../fr/ird/observe/entities/gps/GPSRouteImpl.java | 8 +- .../fr/ird/observe/entities/gps/GpsPoints.java | 12 +- .../migration/AbstractDataSourceMigration.java | 13 +- .../DataSourceMigrationForVersion_3_1.java | 2 +- .../DataSourceMigrationForVersion_5_0.java | 3 +- .../DataSourceMigrationForVersion_5_0_1.java | 8 +- ...va => DataSourceMigrationForVersion_5_0_2.java} | 12 +- ...va => DataSourceMigrationForVersion_5_0_3.java} | 14 +- .../referentiel/I18nReferenceEntities.java | 4 +- .../referentiel/LengthWeightParameters.java | 8 +- ...tities.java => ObserveReferentialEntities.java} | 26 +- ...Impl.java => ObserveReferentialEntityImpl.java} | 2 +- .../ird/observe/entities/referentiel/Programs.java | 2 +- .../ird/observe/entities/seine/ActivitySeines.java | 4 +- .../observe/entities/seine/NonTargetCatchImpl.java | 2 +- .../db/{5.0 => 5.0-1}/remove_open_field-H2.sql | 10 +- .../db/{5.0 => 5.0-1}/remove_open_field-PG.sql | 10 +- .../db/5.0-2/add_lastUpdateDate_field-H2.sql | 676 +++++++++++++++++++++ .../db/5.0-2/add_lastUpdateDate_field-PG.sql | 676 +++++++++++++++++++++ .../db/5.0-3/add_lastUpdateDate_table-H2.sql | 106 ++++ .../db/5.0-3/add_lastUpdateDate_table-PG.sql | 106 ++++ .../db/5.0.1/add_lastUpdate_field_2-H2.sql | 2 - .../db/5.0.1/add_lastUpdate_field_2-PG.sql | 2 - .../resources/db/5.0/add_lastUpdate_field-H2.sql | 153 ----- .../resources/db/5.0/add_lastUpdate_field-PG.sql | 154 ----- .../src/main/xmi/observe-common.properties | 1 + observe-entities/src/main/xmi/observe-common.zargo | Bin 37617 -> 37603 bytes .../src/main/xmi/observe-longline.zargo | Bin 96937 -> 93586 bytes observe-entities/src/main/xmi/observe-seine.zargo | Bin 85015 -> 84567 bytes .../ObserveTopiaApplicationContextTest.java | 20 +- .../service/ConcurrentModificationException.java | 31 +- .../service/DataSourceDumpProducerService.java | 41 -- .../services/service/DataSourceService.java | 4 +- .../services/service/SqlScriptProducerRequest.java | 74 +++ .../services/service/SqlScriptProducerService.java | 19 + observe-services-configuration-api/pom.xml | 5 - observe-services-configuration-rest/pom.xml | 26 - ...bserveDataSourceConfigurationRestConstants.java | 4 +- .../src/test/resources/log4j.properties | 32 - observe-services-configuration-topia/pom.xml | 48 -- .../src/test/resources/log4j.properties | 32 - .../observe/services/dto/AbstractReference.java | 12 + .../fr/ird/observe/services/dto/DataReference.java | 3 +- .../observe/services/dto/FollowedUpdateDto.java | 14 - .../java/fr/ird/observe/services/dto/IdDto.java | 5 +- .../services/dto/constants/ReferentialLocale.java | 4 +- .../services/dto/referential/ReferentialDto.java | 12 +- .../services/dto/referential/ReferentialDtos.java | 6 +- .../observe/services/dto/result/SaveResultDto.java | 5 +- .../services/dto/result/SaveResultDtos.java | 4 +- .../dto/result/TripChildSaveResultDtos.java | 12 + .../fr/ird/observe/util/gps/GPSFileReader.java | 10 +- .../java/fr/ird/observe/util/gps/GPSRouteImpl.java | 8 +- .../java/fr/ird/observe/util/gps/GPSService.java | 12 +- .../java/fr/ird/observe/util/gps/GpsPoints.java | 12 +- .../src/main/xmi/observe-services-dto-common.zargo | Bin 43178 -> 42022 bytes .../main/xmi/observe-services-dto-longline.zargo | Bin 64908 -> 63930 bytes .../src/main/xmi/observe-services-dto-seine.zargo | Bin 60150 -> 59464 bytes .../report/AbstractReportServiceRestTest.java | 4 +- observe-services-topia/pom.xml | 13 +- .../observe/services/ReplicationServiceImpl.java | 4 +- .../referential/ReferentialServiceImpl.java | 8 +- .../ird/observe/services/ObserveServiceTopia.java | 448 +++++--------- .../ObserveTopiaApplicationContextFactory.java | 3 - .../ird/observe/services/binder/BinderEngine.java | 54 +- .../services/binder/BinderEngineInitializer.java | 32 +- .../ird/observe/services/binder/BinderSupport.java | 14 +- .../binder/data/ActivityLonglineBinder.java | 9 +- .../data/ActivityLonglineEncouterDtoBinder.java | 8 +- .../data/ActivityLonglineSensorUsedDtoBinder.java | 8 +- .../binder/data/ActivityLonglineStubDtoBinder.java | 4 +- .../services/binder/data/ActivitySeineBinder.java | 9 +- .../data/ActivitySeineObservedSystemDtoBinder.java | 8 +- .../binder/data/ActivitySeineStubDtoBinder.java | 4 +- .../binder/data/BaitsCompositionBinder.java | 4 +- .../observe/services/binder/data/BasketBinder.java | 4 +- .../services/binder/data/BranchlineBinder.java | 6 +- .../binder/data/BranchlinesCompositionBinder.java | 4 +- .../services/binder/data/CatchLonglineBinder.java | 6 +- .../services/binder/data/DataBinderSupport.java | 38 +- .../services/binder/data/EncounterBinder.java | 5 +- .../services/binder/data/FloatingObjectBinder.java | 6 +- .../FloatingObjectObservedSpeciesDtoBinder.java | 6 +- .../FloatingObjectSchoolEstimateDtoBinder.java | 6 +- .../FloatingObjectTransmittingBuoyDtoBinder.java | 6 +- .../binder/data/FloatlinesCompositionBinder.java | 4 +- .../binder/data/GearUseFeaturesLonglineBinder.java | 6 +- .../GearUseFeaturesMeasurementLonglineBinder.java | 4 +- .../GearUseFeaturesMeasurementSeineBinder.java | 4 +- .../binder/data/GearUseFeaturesSeineBinder.java | 6 +- .../binder/data/HooksCompositionBinder.java | 4 +- .../services/binder/data/NonTargetCatchBinder.java | 6 +- .../binder/data/NonTargetLengthBinder.java | 4 +- .../binder/data/NonTargetSampleBinder.java | 6 +- .../binder/data/ObjectObservedSpeciesBinder.java | 6 +- .../binder/data/ObjectSchoolEstimateBinder.java | 4 +- .../observe/services/binder/data/RouteBinder.java | 12 +- .../services/binder/data/RouteStubDtoBinder.java | 4 +- .../services/binder/data/SchoolEstimateBinder.java | 4 +- .../services/binder/data/SectionBinder.java | 4 +- .../services/binder/data/SensorUsedBinder.java | 4 +- .../services/binder/data/SetLonglineBinder.java | 12 +- .../binder/data/SetLonglineCatchDtoBinder.java | 6 +- .../SetLonglineDetailCompositionDtoBinder.java | 6 +- .../SetLonglineGlobalCompositionDtoBinder.java | 8 +- .../binder/data/SetLonglineStubDtoBinder.java | 2 +- .../binder/data/SetLonglineTdrDtoBinder.java | 6 +- .../services/binder/data/SetSeineBinder.java | 12 +- .../data/SetSeineNonTargetCatchDtoBinder.java | 4 +- .../data/SetSeineSchoolEstimateDtoBinder.java | 8 +- .../binder/data/SetSeineTargetCatchDtoBinder.java | 6 +- .../services/binder/data/SizeMeasureBinder.java | 4 +- .../services/binder/data/TargetCatchBinder.java | 6 +- .../services/binder/data/TargetLengthBinder.java | 4 +- .../services/binder/data/TargetSampleBinder.java | 6 +- .../observe/services/binder/data/TdrBinder.java | 4 +- .../binder/data/TransmittingBuoyBinder.java | 4 +- .../binder/data/TripLonglineActivityDtoBinder.java | 4 +- .../services/binder/data/TripLonglineBinder.java | 8 +- .../binder/data/TripLonglineGearUseDtoBinder.java | 6 +- .../services/binder/data/TripSeineBinder.java | 8 +- .../binder/data/TripSeineGearUseDtoBinder.java | 6 +- .../services/binder/data/WeightMeasureBinder.java | 4 +- .../referential/ReferentialBinderSupport.java | 22 +- .../observe/services/entity/EntitiesExtractor.java | 4 +- .../services/entity/EntitiesSetFactory.java | 32 +- .../entity/SpeciesListEntitiesExtractor.java | 4 +- .../DataSourceDumpProducerServiceTopia.java | 150 ----- .../services/service/DataSourceServiceTopia.java | 98 ++- .../services/service/ReferentialServiceTopia.java | 48 +- .../service/SqlScriptProducerServiceTopia.java | 145 +++++ .../service/actions/report/ReportServiceTopia.java | 18 +- .../GenerateValidatorDescriptorsFileTool.java | 19 +- .../actions/validate/ValidateServiceTopia.java | 23 +- .../ActivityLongLineEncouterServiceTopia.java | 9 +- .../ActivityLongLineSensorUsedServiceTopia.java | 9 +- .../longline/ActivityLonglineServiceTopia.java | 13 +- .../service/longline/BranchlineServiceTopia.java | 9 +- .../longline/SetLonglineCatchServiceTopia.java | 9 +- .../SetLonglineDetailCompositionServiceTopia.java | 7 +- .../SetLonglineGlobalCompositionServiceTopia.java | 9 +- .../service/longline/SetLonglineServiceTopia.java | 7 +- .../services/service/longline/TdrServiceTopia.java | 9 +- .../longline/TripLonglineGearUseServiceTopia.java | 7 +- .../service/longline/TripLonglineServiceTopia.java | 9 +- .../ActivitySeineObservedSystemServiceTopia.java | 9 +- .../service/seine/ActivitySeineServiceTopia.java | 11 +- .../service/seine/FloatingObjectServiceTopia.java | 8 +- .../service/seine/NonTargetCatchServiceTopia.java | 6 +- .../service/seine/NonTargetSampleServiceTopia.java | 6 +- .../seine/ObjectObservedSpeciesServiceTopia.java | 9 +- .../seine/ObjectSchoolEstimateServiceTopia.java | 9 +- .../services/service/seine/RouteServiceTopia.java | 15 +- .../service/seine/SchoolEstimateServiceTopia.java | 6 +- .../service/seine/SetSeineServiceTopia.java | 5 +- .../service/seine/TargetCatchServiceTopia.java | 6 +- .../service/seine/TargetSampleServiceTopia.java | 6 +- .../TransmittingBuoyOperationServiceTopia.java | 9 +- .../seine/TripSeineGearUseServiceTopia.java | 13 +- .../service/seine/TripSeineServiceTopia.java | 9 +- .../referentiel/LengthWeightParemetersTest.java | 20 +- .../replication/ReplicateReferentialsTest.java | 32 + .../entities/replication/ReplicateTestSupport.java | 108 ++++ .../replication/ReplicateTripLonglineTest.java | 65 ++ .../replication/ReplicateTripSeineTest.java | 62 ++ .../services/ApplicationContextResource.java | 217 ++++--- .../ird/observe/services/DataSourceResource.java | 203 ++++--- .../services/ObserveServiceContextTopiaTaiste.java | 2 +- .../services/binder/BinderEngineMetadataTest.java | 49 +- .../observe/services/binder/BinderEngineTest.java | 29 +- .../services/service/AbstractServiceTopiaTest.java | 155 +---- .../DataSourceDumpProducerServiceTopiaTest.java | 85 --- .../service/DataSourceServiceTopiaTest.java | 43 +- .../services/service/MigrateTestsDatabases.java | 94 +++ .../service/ReferentialServiceTopiaTest.java | 37 +- .../service/SqlScriptProducerServiceTopiaTest.java | 81 +++ .../ConsolidateDataServiceTopiaTest.java | 23 +- .../report/AbstractReportServiceTopiaTest.java | 28 +- .../report/ReportSetByAssociation2Test.java | 50 -- .../actions/validate/ValidateServiceTopiaTest.java | 26 +- ...tLonglineDetailCompositionServiceTopiaTest.java | 35 +- .../service/seine/RouteServiceTopiaTest.java | 27 +- .../seine/TargetSampleServiceTopiaTest.java | 22 +- .../seine/TripSeineGearUseServiceTopiaTest.java | 37 +- .../service/seine/TripSeineServiceTopiaTest.java | 104 ++-- .../src/test/resources/log4j.properties | 2 + observe-test-data/pom.xml | 28 +- .../java/fr/ird/observe/test/DatabaseName.java | 13 + .../java/fr/ird/observe/test/ObserveFixtures.java | 311 ++++++++++ .../main/java/fr/ird/observe/test/TestHelper.java | 61 +- .../test/spi/CopyDatabaseConfiguration.java | 17 + .../test/spi/DatabaseNameConfiguration.java | 21 + .../test/spi/DatabaseVersionConfiguration.java | 19 + .../resources/db/5.0-3/dataForTestLongline.sql.gz | Bin 0 -> 1579146 bytes .../resources/db/5.0-3/dataForTestSeine.sql.gz | Bin 0 -> 439122 bytes .../src/main/resources/db/5.0-3/empty.sql.gz | Bin 0 -> 7858 bytes .../src/main/resources/db/5.0-3/referentiel.sql.gz | Bin 0 -> 162896 bytes .../main/resources/db/5.0/dataForTestSeine.sql.gz | Bin 0 -> 438481 bytes .../src/main/resources/db/5.0/referentiel.sql.gz | Bin 0 -> 142316 bytes pom.xml | 11 +- 254 files changed, 4523 insertions(+), 2665 deletions(-) delete mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/DataSourceDumpProducerServiceController.java create mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/LastUpdateDateTopiaDao.java copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_5_0_1.java => DataSourceMigrationForVersion_5_0_2.java} (86%) copy observe-entities/src/main/java/fr/ird/observe/entities/migration/versions/{DataSourceMigrationForVersion_5_0_1.java => DataSourceMigrationForVersion_5_0_3.java} (84%) rename observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{ReferenceEntities.java => ObserveReferentialEntities.java} (76%) rename observe-entities/src/main/java/fr/ird/observe/entities/referentiel/{ReferenceEntityImpl.java => ObserveReferentialEntityImpl.java} (92%) rename observe-entities/src/main/resources/db/{5.0 => 5.0-1}/remove_open_field-H2.sql (71%) rename observe-entities/src/main/resources/db/{5.0 => 5.0-1}/remove_open_field-PG.sql (71%) create mode 100644 observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-H2.sql create mode 100644 observe-entities/src/main/resources/db/5.0-2/add_lastUpdateDate_field-PG.sql create mode 100644 observe-entities/src/main/resources/db/5.0-3/add_lastUpdateDate_table-H2.sql create mode 100644 observe-entities/src/main/resources/db/5.0-3/add_lastUpdateDate_table-PG.sql delete mode 100644 observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-H2.sql delete mode 100644 observe-entities/src/main/resources/db/5.0.1/add_lastUpdate_field_2-PG.sql delete mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-H2.sql delete mode 100644 observe-entities/src/main/resources/db/5.0/add_lastUpdate_field-PG.sql delete mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/DataSourceDumpProducerService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/SqlScriptProducerService.java delete mode 100644 observe-services-configuration-rest/src/test/resources/log4j.properties delete mode 100644 observe-services-configuration-topia/src/test/resources/log4j.properties delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/FollowedUpdateDto.java create mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/result/TripChildSaveResultDtos.java delete mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopia.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopia.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateReferentialsTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTestSupport.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripLonglineTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/entities/replication/ReplicateTripSeineTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/DataSourceDumpProducerServiceTopiaTest.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/MigrateTestsDatabases.java create mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/SqlScriptProducerServiceTopiaTest.java delete mode 100644 observe-services-topia/src/test/java/fr/ird/observe/services/service/actions/report/ReportSetByAssociation2Test.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/DatabaseName.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/ObserveFixtures.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/spi/CopyDatabaseConfiguration.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseNameConfiguration.java create mode 100644 observe-test-data/src/main/java/fr/ird/observe/test/spi/DatabaseVersionConfiguration.java create mode 100644 observe-test-data/src/main/resources/db/5.0-3/dataForTestLongline.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0-3/dataForTestSeine.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0-3/empty.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0-3/referentiel.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0/dataForTestSeine.sql.gz create mode 100644 observe-test-data/src/main/resources/db/5.0/referentiel.sql.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 38

branch feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour deleted (was 87cbe4e)
by codelutin.com scm 09 Jan '16

09 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour in repository tutti. See http://git.codelutin.com/tutti.git was 87cbe4e Utilisation du nouveau moteur de requete sql de topia This change permanently discards the following revisions: discards 87cbe4e Utilisation du nouveau moteur de requete sql de topia discards 0221de9 Fix third parties discards c361698 Ajout d'un nouveau service pour produire les script sql discards 49444e3 Ajout de la réplication au niveau du topia application context + suppression autoMigrate configuration discards ca8daea Debut de correction de la javadoc discards f9c2470 Ajout méthode pour compter le nombre d'éléments d'une table discards 9cb09ec Configuration du nouveau service de réplication discards 2eb350b Ajout de tests pour la réplication de données ng discards d051db8 Ajout de fixtures discards 6100451 Utilisation du service topia pour la réplication discards 18717f0 Ajout d'une base vide pour les tests discards cec9b0b Correction de base de référentiels discards 026b9a6 Ajout d'un tes de replication de données discards 4747da5 Ajout de fixtures discards 1fc64bb Implantation efficace de réplication de données discards a736d26 Refactor des binders discards b6804fd o Introduction ObserveEntity et ObserveDataEntity o Mise en place de la date de dernière mise à jour sur toutes les entités o Alignement du code pour les dto o Optionmisation des dépendences discards 46beb5b Amélioration de l'exception de concurrence discards 824f7a2 Ajout de la base de test pour longline (migrée en plus de 3heures...) + utilisation (enfin) des bases à jour pour les tests discards 6662c85 Renommage méthode de test discards 8679f9c Amélioration du code de mise à jour discards e0e0eac Faire fonctionner les tests de suppression (mais ajout d'un fixme) discards a97c28b Suppression d'un test inutile discards cde7c09 Utilisation de la dernière version du modèle de persistence discards 8bd2466 Mise en place de la mise à jour de la date de dernière mise à jour lors de la sauvegarde ou suppression d'une entité (il faudra bien repasser sur chaque appel, car il me semble que cela n'est pas bien géré partout) (See #7470) discards d6fcd2b Ajout de la talbe LastupdateDate dans la synchronisation du référentiel discards 2fd2971 Changement du niveau de log discards e744c95 Ajout d'une table globale des dates de dernières mises à jour (utilisé pour les suppressions) (See #7470) discards 7b92724 Revue bis de la configuration des tests discards 3a106d4 Amélioration de l'API de tests discards 472642a Generation des bases de test pour la version 5.0-2 discards 87c65fe Correction de la génération du mapping hibernate discards 67e1841 o Revue de la gestion des migrations pour la version 5.0 : chaque script de migration a une version, la 5.à aggrègera toutes les versions intermédiaires o Renommage de ReferenceEntity en ObserveReferentialEntity o Introduction de ObserveEntity et ObserveDataEntity o Début de suppression du code sur les FollowedEntity o Revue de l'api de test (so weak, so lame :( avec un héritage très douteux) o Écriture d'un test pour effectuer les migrations facilement des bases de [...] discards 28f6a27 Mise à jour du driver postgresql -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 0

branch feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour updated (c361698 -> 87cbe4e)
by codelutin.com scm 05 Jan '16

05 Jan '16

This is an automated email from the git hooks/post-receive script. New change to branch feature/7470_mise_en_place_de_la_date_de_derniere_mise_a_jour in repository tutti. See http://git.codelutin.com/tutti.git from c361698 Ajout d'un nouveau service pour produire les script sql new 0221de9 Fix third parties new 87cbe4e Utilisation du nouveau moteur de requete sql de topia The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 87cbe4e32bd581aabc64f64326c76062b18d7aba Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Tue Jan 5 08:50:47 2016 +0100 Utilisation du nouveau moteur de requete sql de topia commit 0221de9898135cac654b8552c4f09ed1507c0999 Author: Tony CHEMIT <chemit(a)codelutin.com> Date: Mon Jan 4 17:23:52 2016 +0100 Fix third parties Summary of changes: .../src/license/THIRD-PARTY.properties | 63 ++-- observe-entities/pom.xml | 5 + .../observe/ObserveTopiaApplicationContext.java | 342 ++++++++++++++++----- .../observe/ObserveTopiaConfigurationFactory.java | 4 +- .../java/fr/ird/observe/entities/Entities.java | 16 +- .../fr/ird/observe/entities/SqlDatabaseType.java | 26 -- .../replication/ObserveReplicationTables.java | 169 ---------- .../ObserveTopiaApplicationContextTest.java | 19 ++ .../services/service/SqlScriptProducerRequest.java | 16 +- observe-services-topia/pom.xml | 4 + .../service/SqlScriptProducerServiceTopia.java | 115 ++++--- .../replication/ReplicateReferentialsTest.java | 22 +- .../entities/replication/ReplicateTestSupport.java | 70 ++--- .../replication/ReplicateTripLonglineTest.java | 62 ++-- .../replication/ReplicateTripSeineTest.java | 63 ++-- .../service/SqlScriptProducerServiceTopiaTest.java | 4 +- .../src/test/resources/log4j.properties | 2 +- pom.xml | 6 + 18 files changed, 523 insertions(+), 485 deletions(-) delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/SqlDatabaseType.java delete mode 100644 observe-entities/src/main/java/fr/ird/observe/entities/replication/ObserveReplicationTables.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm(a)codelutin.com>.

1 2