[Echobase-commits] branch feature/#8171 updated (cdce953 -> d361a1a)

This is an automated email from the git hooks/post-receive script. New change to branch feature/#8171 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git omits cdce953 Create the migration omits 41e21bb Forget channelId omits aadc504 Add missing decorators omits 211f806 Rename comment to comments omits a35a117 Finish modification for the model with tagValues and declaration omits 10edeab Correct model omits 4aafd84 Modify model following #8171 adds 9d7bc43 Revue des import (utilisation java 7 API + reformat code) adds 180efed Ajout d'un checkFile pour chaque importFile adds 4bee302 Mise en place d'une nouvelle API d'action d'import (pour traiter chaque import de fichier unitairement et non plus via des méthodes de services), du coup on ne va plus utiliser qu'un seul service d'import (grosse simplification) adds 7ae11a6 Utilisation du nouveu service d'import de données dans les actions d'ui adds bd5e973 Suppression des anciens services et code d'import de données + ajout de nouveaux tests d'import adds dabf6f2 Debut de mise en place d'un export lors de l'import adds fa7d5ee Suppression du domaine de tout ce qui concerne les csv (on retrouve ça partie service) adds f3e7527 Optimisation des dépendances adds e8afecd Renommages, mise en place context d'import adds 7a14695 Renommages, mise en place context d'import (impacts dans les actions d'ui) adds 1419ef0 Ajout du répertoire temporaire dans la configuration adds 7c656ce Début d'implantation de l'export adds 93c294d Début de revue des tests pour intégrer les exports adds a7b1555 Les imports commons voyage passent \o/ adds 66bf442 Amélioration des tests d'import adds 69acea5 Utilisation des bons contrats adds 0f4984b Import Catches total sample works adds ce6c788 Add toString on some entities adds eb33334 Can collect imported sample data adds 36cf27f Remove units column from subsample import in import data adds 9058bd7 Add test import database with total sample inside it adds 6f20743 Sub sample import ok \o/ (See #8170) adds 1bb6729 Improve import data tests adds 4ecf78f Biometry sample import ok \o/ (See #8170) adds 3f18980 rename catches csv java classes adds 8f50973 rename commons csv java classes adds 7556b75 Operations import ok \o/ (See #8170) adds 7e4b605 Fix voyage commons bootstrap dbs adds c3a5fa4 Upgrade test import databases adds 34e6272 fix test results adds cb7b7bf Normalize test names + readd ITs :) adds e217345 Add more toString on entities adds 0b3c385 Add predicate to filter cell data adds 70be163 Fix i18n adds 7a80a3b Prise en compte de la nullité d'un résultat lors de l'export adds 8853358 Prise en compte de la nullité de la qualité d'un résultat lors de l'export adds 0be21ef Region import ok \o/ (See #8170) adds b83fd76 Can collect ids when creatin data cell adds 4c6cb1e Rename voyage region import data classes adds f0a5293 Pouvoir récupérer une espèces adds a50e450 Voyage result import ok \o/ (See #8170) adds 6dfb6f7 Add a ageCategory formatter (can be null) adds 701e59e Add method to get Category from his id adds f6d1265 Voyage map import ok \o/ (See #8170) adds 4a24404 Ajout colonne voyage sur import esdu echotype + fichier plus petit pour les tests adds cc92359 Correction de la clef du cache de category adds e745628 Ajout d'un cache AgeCategory et SizeCategory adds 67b20c4 Revue de l'api pour les imports de résults + début des imports de résultats esdu adds 54e7e16 Voyage result esdu import ok (except for some categories meaning) \o/ (See #8170) adds d149ffb Revue des l'import des résultats adds 068e186 Renommage classes d'imports de résultats d'esdu adds 8196c52 Ne pas importer deux fois les esdu manquantes adds 61958bc Plus le meme nombre de resultats importés sur les regions :() adds d94f407 Improve toString on entities adds c4142af Revue des bases acoustiques à importer adds 7ef2203 Voyage acoustic import ok \o/ (See #8170) adds 2ed230f Review tests again and again adds fcd8746 Suppression classe de teste inutile adds dc5b98f Add some check on ageCategory/sizeCategory meaning while importing them adds 00414e4 i18n adds d283902 Fix import files adds c491979 Nettoyage des tag values + migration topia 3.0 adds 5df9496 Amélioration du site technique adds 75be19e up to topia and eugene snapshots adds b71258e USe new Version package adds 19d87d6 move migration files adds 5eb7c02 Improve logs adds abdc624 Review importLog model (make imported ids depends on his ImportFile + add lineNumber of each imported id) adds 8a9e58a Update migration test databases adds 2ef8fdd Add nice methods on ImportFile adds e09f24d Review import data cinematic, creating import log before do the math in order to be able to reuse imported ids from database to build the checked import file adds 0262d40 Update remove data api, but tests are not ok since test databases are to be rebuild :( adds a67b9e3 Add voyage id to importlog when created adds 0d299f5 Add normal resources to be included adds c61b1a4 Improve code adds c58fcaa Fix created importLog for remove data tests adds 5a12aa1 Use ToPIA 3 configuration adds 02c9fae move H2Dialect (nothing to do in root package) adds 5191cb5 Improve migration design (use Reflections to get possible migration) + make it works with ToPIA 3 adds 85a38c9 Use truth adds 59fd870 Use new API adds 1d25f66 clean code and do some method rename adds f168873 Fix H2 dialect and fix also test databases adds 6349f59 Fix abstract dao ? adds 4097786 Reformat code adds 0991c68 Use ToPIA persistence context close adds da6bb29 Utilisation nuitonWeb 1.17 pour être compatible avec ToPIA 3 adds 034ec06 La version 3.902 permet de lancer enfin echobase avec topia 3 sur tout type de base adds cfe3cd7 Introduction au final d'une vrai entité pour conserver chaque id importer (sinon on ne peut pas assurer l'ordre (la map n'est pas suffisante) + revue de la migration adds a53094d Utilisation de cet nouvel API ImortFileId dans les imports et suppression d'import adds 35ec2cf Retour sur la version 3.901 adds a29df6b Retour sur develop (le modèle est stabilisé restera à effectuer les optimisations pour la génértion des fichiers d'export)" Merge branch 'feature/8170' into develop new f173e5d Finish modification for the model with tagValues and declaration new e2e9340 Rename comment to comments new b294a5f Add missing decorators new d4bd7c5 Create the migration new d361a1a Merge ImportfileId model + fix develop merge This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (cdce953) \ N -- N -- N refs/heads/feature/#8171 (d361a1a) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 5 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 d361a1ab7b266a1c1ca5ea3400e4701b548f8016 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 29 10:01:02 2016 +0200 Merge ImportfileId model + fix develop merge commit d4bd7c5e71fa02549c99bda33f9979b0fb11e0a2 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 16:29:31 2016 +0200 Create the migration commit b294a5f271236eb476bd71c96f8cd7c8831014e2 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:33:05 2016 +0200 Add missing decorators commit e2e934017c462984e42413b631335c83823749bb Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:32:42 2016 +0200 Rename comment to comments commit f173e5de241436bbc4be848ec575745f7ec0cd8c Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Wed Apr 27 14:05:14 2016 +0200 Finish modification for the model with tagValues and declaration Summary of changes: echobase-domain/pom.xml | 65 +- .../echobase/config/EchoBaseConfiguration.java | 8 + .../config/EchoBaseConfigurationOption.java | 4 + .../fr/ifremer/echobase/csv/EchoBaseCsvUtil.java | 175 ---- .../fr/ifremer/echobase/entities/DriverType.java | 21 +- .../EchoBaseInternalTopiaApplicationContext.java | 72 ++ .../EchoBaseUserTopiaApplicationContext.java | 92 ++- .../echobase/entities/EchoBaseUserTopiaDao.java | 6 +- .../echobase/{ => entities}/FixedH2Dialect.java | 22 +- .../echobase/entities/ImportFileIdTopiaDao.java | 37 + .../echobase/entities/ImportFileTopiaDao.java | 17 + .../echobase/entities/ImportLogTopiaDao.java | 16 + .../ifremer/echobase/entities/data/CellImpl.java | 12 +- .../echobase/entities/data/CellTopiaDao.java | 6 - .../ifremer/echobase/entities/data/DataImpl.java | 18 + .../fr/ifremer/echobase/entities/data/Datas.java | 41 + .../echobase/entities/data/OperationImpl.java | 22 +- .../echobase/entities/data/SampleDataImpl.java | 18 + .../echobase/entities/data/SampleDatas.java | 19 + .../ifremer/echobase/entities/data/SampleImpl.java | 18 + .../echobase/entities/references/CellTypeImpl.java | 15 +- .../entities/references/DataMetadataImpl.java | 13 +- .../echobase/entities/references/GearImpl.java | 17 + .../entities/references/SampleDataTypeImpl.java | 17 +- .../entities/references/SampleTypeImpl.java | 10 + .../echobase/persistence/EchoBaseEntityHelper.java | 100 +-- .../EchobaseTopiaApplicationContexts.java | 233 ------ .../EchoBaseMigrationCallBackResolver.java | 63 +- .../MigrationCallBackForVersionSupport.java | 75 ++ .../migration/MigrationCallbackSupport.java | 24 + ... InternalDbMigrationCallBackForVersion2_2.java} | 25 +- ...ernalDbMigrationCallBackForVersionSupport.java} | 25 +- .../InternalDbMigrationCallback.java} | 18 +- ...> WorkingDbMigrationCallBackForVersion2_2.java} | 8 +- ...WorkingDbMigrationCallBackForVersion2_5_1.java} | 10 +- ...> WorkingDbMigrationCallBackForVersion2_6.java} | 16 +- ...WorkingDbMigrationCallBackForVersion2_6_1.java} | 12 +- ...WorkingDbMigrationCallBackForVersion2_7_2.java} | 12 +- ...WorkingDbMigrationCallBackForVersion3_900.java} | 36 +- .../WorkingDbMigrationCallBackForVersion3_901.java | 38 + ...rkingDbMigrationCallBackForVersionSupport.java} | 62 +- ...l.java => WorkingDbMigrationCallbackForH2.java} | 14 +- ...> WorkingDbMigrationCallbackForPostgresql.java} | 14 +- ...igration.internalDb.MigrationCallBackForVersion | 1 - ...migration.workingDb.MigrationCallBackForVersion | 5 - .../main/resources/echobase-internaldb.properties | 41 - .../main/resources/echobase-workingdb.properties | 41 - .../i18n/echobase-domain_en_GB.properties | 1 + .../i18n/echobase-domain_fr_FR.properties | 1 + .../workingDb/3.901-0-clean-importLog-table.sql | 2 + .../migration/workingDb/h2/3.900-0-fix-types.sql | 56 ++ .../h2/3.901-1-upgrade-importFile-table.sql | 10 + .../{ => pg}/2.5.1-0-postgis-structure.sql | 0 .../workingDb/{ => pg}/2.5.1-1-postgis-view.sql | 0 .../workingDb/{ => pg}/2.6-0-postgis-view.sql | 0 .../{ => pg}/2.6.1-0-postgis-structure.sql | 0 .../workingDb/{ => pg}/2.7.2-0-postgis-view.sql | 0 .../migration/workingDb/pg/3.900-0-fix-types.sql | 56 ++ .../3.901-1-upgrade-importFile-table.sql} | 13 +- .../src/main/xmi/echobase-internal.properties | 5 +- echobase-domain/src/main/xmi/echobase.properties | 20 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 97541 -> 98247 bytes .../echobase/persistence/EchoBaseDbMetaTest.java | 2 +- echobase-services/pom.xml | 2 +- .../echobase/services/csv/BatchCsvExport.java | 100 +++ .../fr/ifremer/echobase/services/csv/CellAble.java | 22 + .../echobase/services/csv/CellValueFormatter.java | 115 +++ .../echobase/services}/csv/CellValueParser.java | 29 +- .../echobase/services}/csv/ChainValueParser.java | 13 +- .../echobase/services/csv/EchoBaseCsvUtil.java | 347 ++++++++ .../ifremer/echobase/services/csv/ResultAble.java | 23 + .../services/csv/ResultValueFormatter.java | 37 +- .../echobase/services/csv/ResultValueGetter.java | 29 + .../echobase/services}/csv/ResultValueParser.java | 9 +- .../echobase/services/csv/ResultValueSetter.java | 17 + .../services/csv/ValueFormatterByFunction.java | 24 + .../echobase/services/service/DbEditorService.java | 2 +- .../services/service/UserDbPersistenceService.java | 258 ++++-- .../EmbeddedApplicationService.java | 5 +- .../service/exportCoser/IndicatorExportModel.java | 2 +- .../exportCoser/RawDataCatchExportModel.java | 2 +- .../exportCoser/RawDataSizeExportModel.java | 4 +- .../exportCoser/RawDataStrataExportModel.java | 2 +- .../service/exportCoser/SpeciesExportModel.java | 2 +- .../service/exportquery/ExportQueryCsvModel.java | 2 +- .../importdata/AbstractImportDataService.java | 452 ---------- .../service/importdata/AcousticImportResult.java | 57 -- .../service/importdata/AcousticImportService.java | 778 ------------------ .../service/importdata/AgeCategoryCache.java | 53 ++ .../service/importdata/CatchesImportService.java | 535 ------------ .../service/importdata/CommonAllImportService.java | 67 -- .../importdata/CommonTransectImportService.java | 158 ---- .../importdata/CommonTransitImportService.java | 123 --- .../importdata/CommonVoyageImportService.java | 133 --- ...ion.java => DataMetadataNotFoundException.java} | 13 +- ...ception.java => DuplicatedSampleException.java} | 16 +- .../importdata/EchoBaseCsvFileImportResult.java | 60 -- ...=> ElementaryCellWithoutDepthEndException.java} | 13 +- ...ception.java => EsduCellNotFoundException.java} | 15 +- ...va => EsduCellWithDepthEndFilledException.java} | 13 +- .../service/importdata/ImportDataFileResult.java | 164 ++++ .../service/importdata/ImportDataResult.java | 45 + .../service/importdata/ImportDataService.java | 382 +++++++++ .../service/importdata/ImportException.java | 4 +- .../MismatchAgeCategoryMeaningException.java | 19 + .../MismatchSizeCategoryMeaningException.java | 19 + ...ommonImportService.java => MissionService.java} | 53 +- ...va => MoreThanOnceVoyageToImportException.java} | 12 +- ...ava => NoTransitFoundBetweenDateException.java} | 14 +- ...ception.java => NoVoyageToImportException.java} | 12 +- .../service/importdata/OperationImportService.java | 284 ------- .../service/importdata/ResultCategoryCache.java | 93 +++ .../importdata/ResultsEsduCellImportService.java | 500 ----------- .../service/importdata/ResultsImportService.java | 131 --- .../ResultsMapFishCellImportService.java | 231 ------ .../ResultsMapOtherCellImportService.java | 204 ----- .../importdata/ResultsRegionCellImportService.java | 315 ------- .../ResultsVoyageImportAlreadyExistException.java | 8 +- .../importdata/ResultsVoyageImportService.java | 345 -------- .../service/importdata/SizeCategoryCache.java | 53 ++ .../service/importdata/SpeciesCategoryCache.java | 82 ++ ...ception.java => TransectNotFoundException.java} | 15 +- ...xception.java => TransitNotFoundException.java} | 14 +- .../actions/ImportDataActionSupport.java | 441 ++++++++++ .../actions/VoyageAcousticsImportAction.java | 915 +++++++++++++++++++++ .../VoyageAcousticsImportDataActionSupport.java | 18 + .../VoyageCatchesBiometrySampleImportAction.java | 157 ++++ .../VoyageCatchesImportDataActionSupport.java | 61 ++ .../VoyageCatchesSubSampleImportAction.java | 338 ++++++++ .../VoyageCatchesTotalSampleImportAction.java | 229 ++++++ .../VoyageCommonsImportDataActionSupport.java | 18 + .../actions/VoyageCommonsTransectImportAction.java | 127 +++ .../actions/VoyageCommonsTransitImportAction.java | 110 +++ .../actions/VoyageCommonsVoyageImportAction.java | 122 +++ .../VoyageOperationsGearMetadataImportAction.java | 115 +++ .../VoyageOperationsImportDataActionSupport.java | 18 + .../VoyageOperationsOperationImportAction.java | 121 +++ ...ageOperationsOperationMetadataImportAction.java | 114 +++ .../VoyageResultsCellImportDataActionSupport.java | 142 ++++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 51 ++ ...oyageResultsEsduByEchotypeCellImportAction.java | 47 ++ ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 59 ++ ...EsduSpeciesAndSizeCategoryCellImportAction.java | 63 ++ .../VoyageResultsImportDataActionSupport.java | 69 ++ .../VoyageResultsMapFishCellImportAction.java | 231 ++++++ .../VoyageResultsMapOtherCellImportAction.java | 199 +++++ ...VoyageResultsRegionAssociationImportAction.java | 105 +++ .../actions/VoyageResultsRegionImportAction.java | 167 ++++ .../VoyageResultsRegionResultsImportAction.java | 189 +++++ .../VoyageResultsVoyageEchotypeImportAction.java | 144 ++++ ...oyageResultsVoyageLengthAgeKeyImportAction.java | 96 +++ ...geResultsVoyageLengthWeightKeyImportAction.java | 105 +++ .../ImportDataConfigurationSupport.java} | 33 +- .../VoyageAcousticsImportConfiguration.java} | 31 +- .../VoyageCatchesImportConfiguration.java} | 21 +- .../VoyageCommonsImportConfiguration.java} | 38 +- .../VoyageImportDataConfigurationSupport.java} | 18 +- .../VoyageOperationsImportConfiguration.java} | 19 +- .../VoyageResultsImportConfiguration.java} | 95 +-- .../contexts/ImportDataContextSupport.java | 270 ++++++ .../contexts/VoyageAcousticsImportDataContext.java | 21 + .../contexts/VoyageCatchesImportDataContext.java | 122 +++ .../contexts/VoyageCommonsImportDataContext.java | 21 + .../contexts/VoyageImportDataContextSupport.java | 121 +++ .../VoyageOperationsImportDataContext.java | 21 + .../contexts/VoyageResultsImportDataContext.java | 214 +++++ .../importdata/csv/AcousticImportModel.java | 136 --- .../importdata/csv/BiometrySampleImportModel.java | 60 -- .../csv/EchoBaseImportExportModelSupport.java | 51 ++ .../importdata/csv/EchotypeImportModel.java | 58 -- ...ultByEchotypeAndSpeciesCategoryImportModel.java | 88 -- .../csv/EsduResultByEchotypeImportModel.java | 79 -- ...duResultBySpeciesAndAgeCategoryImportModel.java | 83 -- ...uResultBySpeciesAndSizeCategoryImportModel.java | 83 -- .../csv/GearMetadataValueImportModel.java | 62 -- .../importdata/csv/LengthAgeKeyImportModel.java | 60 -- .../importdata/csv/LengthWeightKeyImportModel.java | 60 -- .../service/importdata/csv/MapCellImportModel.java | 125 --- .../importdata/csv/OperationImportModel.java | 65 -- .../csv/OperationMetadataValueImportModel.java | 57 -- .../csv/RegionCellAssociationImportModel.java | 53 -- .../importdata/csv/RegionCellImportModel.java | 58 -- .../csv/RegionCellResultImportModel.java | 84 -- .../importdata/csv/SubSampleImportModel.java | 70 -- .../importdata/csv/TotalSampleImportModel.java | 63 -- .../importdata/csv/TransectImportModel.java | 74 -- .../service/importdata/csv/TransitImportModel.java | 53 -- .../csv/VoyageAcousticImportExportModel.java | 223 +++++ ...ImportRow.java => VoyageAcousticImportRow.java} | 93 ++- ...yageCatchesBiometrySampleImportExportModel.java | 71 ++ ...a => VoyageCatchesBiometrySampleImportRow.java} | 44 +- .../VoyageCatchesSubSampleImportExportModel.java | 87 ++ ...w.java => VoyageCatchesSubSampleImportRow.java} | 46 +- .../VoyageCatchesTotalSampleImportExportModel.java | 78 ++ ...java => VoyageCatchesTotalSampleImportRow.java} | 39 +- .../VoyageCommonsTransectImportExportModel.java | 92 +++ ...ow.java => VoyageCommonsTransectImportRow.java} | 120 ++- .../csv/VoyageCommonsTransitImportExportModel.java | 70 ++ ...Row.java => VoyageCommonsTransitImportRow.java} | 50 +- .../csv/VoyageCommonsVoyageImportExportModel.java | 68 ++ .../service/importdata/csv/VoyageImportModel.java | 49 -- ...erationsGearMetadataValueImportExportModel.java | 72 ++ ...oyageOperationsGearMetadataValueImportRow.java} | 36 +- ...VoyageOperationsOperationImportExportModel.java | 84 ++ ...ava => VoyageOperationsOperationImportRow.java} | 67 +- ...onsOperationMetadataValueImportExportModel.java | 68 ++ ...OperationsOperationMetadataValueImportRow.java} | 40 +- ...chotypeAndSpeciesCategoryImportExportModel.java | 93 +++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 73 +- ...yageResultsEsduByEchotypeImportExportModel.java | 83 ++ ...a => VoyageResultsEsduByEchotypeImportRow.java} | 53 +- ...duBySpeciesAndAgeCategoryImportExportModel.java | 91 ++ ...sultsEsduBySpeciesAndAgeCategoryImportRow.java} | 81 +- ...uBySpeciesAndSizeCategoryImportExportModel.java | 93 +++ ...ultsEsduBySpeciesAndSizeCategoryImportRow.java} | 81 +- .../VoyageResultsMapFishCellImportExportModel.java | 114 +++ ...java => VoyageResultsMapFishCellImportRow.java} | 127 +-- ...VoyageResultsMapOtherCellImportExportModel.java | 99 +++ ...ava => VoyageResultsMapOtherCellImportRow.java} | 131 ++- ...ultsRegionCellAssociationImportExportModel.java | 68 ++ ...yageResultsRegionCellAssociationImportRow.java} | 32 +- .../VoyageResultsRegionCellImportExportModel.java | 71 ++ ....java => VoyageResultsRegionCellImportRow.java} | 56 +- ...geResultsRegionCellResultImportExportModel.java | 93 +++ ...=> VoyageResultsRegionCellResultImportRow.java} | 79 +- ...yageResultsVoyageEchotypeImportExportModel.java | 73 ++ ...a => VoyageResultsVoyageEchotypeImportRow.java} | 44 +- ...ResultsVoyageLengthAgeKeyImportExportModel.java | 76 ++ ... VoyageResultsVoyageLengthAgeKeyImportRow.java} | 46 +- ...ultsVoyageLengthWeightKeyImportExportModel.java | 77 ++ ...yageResultsVoyageLengthWeightKeyImportRow.java} | 42 +- .../importdb/strategy/FreeImportDbStrategy.java | 13 +- .../service/removedata/RemoveDataService.java | 24 +- .../strategy/AbstractRemoveDataStrategy.java | 34 +- .../strategy/AcousticRemoveDataStrategy.java | 2 +- .../strategy/CatchesRemoveDataStrategy.java | 2 +- .../strategy/CommonAllRemoveDataStrategy.java | 2 +- .../strategy/CommonTransectRemoveDataStrategy.java | 2 +- .../strategy/CommonTransitRemoveDataStrategy.java | 2 +- .../strategy/CommonVoyageRemoveDataStrategy.java | 2 +- .../strategy/LegacyVoyageRemoveDataStrategy.java | 2 +- .../strategy/OperationRemoveDataStrategy.java | 2 +- .../strategy/ResultEsduRemoveDataStrategy.java | 2 +- .../strategy/ResultMapFishRemoveDataStrategy.java | 2 +- .../strategy/ResultMapOtherRemoveDataStrategy.java | 2 +- .../strategy/ResultRegionRemoveDataStrategy.java | 2 +- .../strategy/ResultVoyageRemoveDataStrategy.java | 2 +- .../i18n/echobase-services_en_GB.properties | 5 + .../i18n/echobase-services_fr_FR.properties | 5 + .../echobase/services/EchoBaseServiceFixtures.java | 30 +- .../services/EchoBaseTestServiceSupport.java | 169 +--- .../services/FakeEchoBaseServiceContext.java | 73 +- .../fr/ifremer/echobase/services/FixCellsIT.java | 23 +- .../echobase/services/ImportDataFixtures.java | 132 +++ .../services/MigrateImportDataDatabasesIT.java | 129 +++ .../EmbeddedApplicationServiceIT.java | 4 +- .../exportCoser/ExportCoserServiceTest.java | 3 +- .../service/exportdb/ExportDbServiceTest.java | 4 +- .../importdata/AbstractImportDataServiceIT.java | 236 +++--- .../service/importdata/CatchesImportServiceIT.java | 160 ---- .../importdata/CommonAllImportServiceIT.java | 92 --- .../importdata/CommonTransectImportServiceIT.java | 82 -- .../importdata/CommonTransitImportServiceIT.java | 87 -- .../importdata/CommonVoyageImportServiceIT.java | 83 -- .../importdata/OperationImportServiceIT.java | 83 -- .../importdata/ResultsEsduCellImportServiceIT.java | 191 ----- .../ResultsMapFishCellImportServiceIT.java | 80 -- .../ResultsMapOtherCellImportServiceIT.java | 79 -- .../ResultsRegionCellImportServiceIT.java | 92 --- .../importdata/ResultsVoyageImportServiceIT.java | 162 ---- ...eIT.java => VoyageAcousticImportServiceIT.java} | 73 +- .../VoyageCatchesAllImportServiceIT.java | 94 +++ .../VoyageCatchesImportServiceITSupport.java | 55 ++ ...geCatchesOnlyBiometrySampleImportServiceIT.java | 67 ++ .../VoyageCatchesOnlySubSampleImportServiceIT.java | 67 ++ ...oyageCatchesOnlyTotalSampleImportServiceIT.java | 67 ++ .../VoyageCommonsAllImportServiceIT.java | 98 +++ .../VoyageCommonsImportServiceITSupport.java | 53 ++ .../VoyageCommonsOnlyTransectImportServiceIT.java | 93 +++ .../VoyageCommonsOnlyTransitImportServiceIT.java | 93 +++ .../VoyageCommonsOnlyVoyageImportServiceIT.java | 82 ++ .../importdata/VoyageOperationImportServiceIT.java | 92 +++ ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 84 ++ ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 81 ++ ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 91 ++ ...lOnlySpeciesAndSizeCategoryImportServiceIT.java | 91 ++ .../VoyageResultsImportServiceITSupport.java | 51 ++ .../VoyageResultsMapFishCellImportServiceIT.java | 77 ++ .../VoyageResultsMapOtherCellImportServiceIT.java | 75 ++ .../VoyageResultsRegionCellImportServiceIT.java | 103 +++ .../VoyageResultsVoyageImportServiceIT.java | 88 ++ ...geResultsVoyageOnlyEchotypeImportServiceIT.java | 68 ++ ...sultsVoyageOnlyLengthAgeKeyImportServiceIT.java | 68 ++ ...tsVoyageOnlyLengthWeightKeyImportServiceIT.java | 68 ++ .../removedata/AbstractRemoveDataServiceTest.java | 112 ++- .../resources/import-data/acoustic/movies.csv.gz | Bin 596169 -> 596169 bytes .../import-data/acoustic/movies_small.csv.gz | Bin 0 -> 6141 bytes .../resources/import-data/catches/subsample.csv.gz | Bin 931 -> 920 bytes .../import-data/catches/subsample_all.csv.gz | Bin 23572 -> 22400 bytes .../echobase-catches-and-voyage-result.h2.db.gz | Bin 705722 -> 632318 bytes .../import-data/echobase-catches.h2.db.gz | Bin 662677 -> 594894 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 178638 -> 183714 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 129028 -> 136848 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 0 -> 602363 bytes .../import-data/echobase-operation.h2.db.gz | Bin 324421 -> 328618 bytes .../import-data/result/esdu/byEchotype.csv.gz | Bin 73537 -> 73195 bytes .../esdu/byEchotypeAndSpeciesCategory.csv.gz | Bin 547091 -> 547121 bytes .../esdu/byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2042 bytes .../result/esdu/byEchotype_small.csv.gz | Bin 0 -> 2802 bytes .../result/esdu/bySpeciesAndAgeCategory.csv.gz | Bin 141033 -> 141214 bytes .../esdu/bySpeciesAndAgeCategory_small.csv.gz | Bin 0 -> 2379 bytes .../result/esdu/bySpeciesAndSizeCategory.csv.gz | Bin 707226 -> 709007 bytes .../esdu/bySpeciesAndSizeCategory_small.csv.gz | Bin 0 -> 2544 bytes .../result/region/regionAssociations_small.csv.gz | Bin 0 -> 296 bytes echobase-ui/pom.xml | 15 +- .../echobase/ui/EchoBaseApplicationContext.java | 9 +- .../fr/ifremer/echobase/ui/EchoBaseSession.java | 5 +- .../echobase/ui/actions/dbeditor/GetEntities.java | 3 +- .../importData/AbstractConfigureImport.java | 4 +- .../actions/importData/AbstractLaunchImport.java | 19 +- .../importData/ConfigureAcousticImport.java | 12 +- .../actions/importData/ConfigureCatchesImport.java | 12 +- .../actions/importData/ConfigureCommonImport.java | 20 +- .../importData/ConfigureOperationImport.java | 12 +- .../actions/importData/ConfigureResultsImport.java | 12 +- .../ui/actions/importData/CreateMission.java | 6 +- .../importData/GetDataProcessingsForVoyage.java | 5 +- .../actions/importData/LaunchAcousticImport.java | 15 +- .../ui/actions/importData/LaunchCatchesImport.java | 15 +- .../ui/actions/importData/LaunchCommonImport.java | 15 +- .../actions/importData/LaunchOperationImport.java | 15 +- .../ui/actions/importData/LaunchResultsImport.java | 16 +- .../echobase/ui/actions/workingDb/Connect.java | 4 +- .../ui/actions/workingDb/CreatePostgresDb.java | 10 +- pom.xml | 34 +- src/site/site_fr.xml | 6 + 336 files changed, 13962 insertions(+), 9236 deletions(-) delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/csv/EchoBaseCsvUtil.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/EchoBaseInternalTopiaApplicationContext.java rename echobase-domain/src/main/java/fr/ifremer/echobase/{ => entities}/FixedH2Dialect.java (75%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/DataImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/Datas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleDataImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleDatas.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/data/SampleImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/references/GearImpl.java delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchobaseTopiaApplicationContexts.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/MigrationCallBackForVersionSupport.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/MigrationCallbackSupport.java rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/{MigrationCallBackForVersion2_2.java => InternalDbMigrationCallBackForVersion2_2.java} (95%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/{MigrationCallBackForVersion.java => InternalDbMigrationCallBackForVersionSupport.java} (63%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/{workingDb/MigrationCallBackForVersionPostgresql.java => internalDb/InternalDbMigrationCallback.java} (65%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_2.java => WorkingDbMigrationCallBackForVersion2_2.java} (91%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_5_1.java => WorkingDbMigrationCallBackForVersion2_5_1.java} (84%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_6.java => WorkingDbMigrationCallBackForVersion2_6.java} (95%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_6_1.java => WorkingDbMigrationCallBackForVersion2_6_1.java} (87%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_7_2.java => WorkingDbMigrationCallBackForVersion2_7_2.java} (89%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallback.java => WorkingDbMigrationCallBackForVersion3_900.java} (50%) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_901.java rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion.java => WorkingDbMigrationCallBackForVersionSupport.java} (58%) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersionPostgresql.java => WorkingDbMigrationCallbackForH2.java} (69%) rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersionPostgresql.java => WorkingDbMigrationCallbackForPostgresql.java} (68%) delete mode 100644 echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.internalDb.MigrationCallBackForVersion delete mode 100644 echobase-domain/src/main/resources/META-INF/services/fr.ifremer.echobase.persistence.migration.workingDb.MigrationCallBackForVersion delete mode 100644 echobase-domain/src/main/resources/echobase-internaldb.properties delete mode 100644 echobase-domain/src/main/resources/echobase-workingdb.properties create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.901-0-clean-importLog-table.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.900-0-fix-types.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.901-1-upgrade-importFile-table.sql rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.5.1-0-postgis-structure.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.5.1-1-postgis-view.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.6-0-postgis-view.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.6.1-0-postgis-structure.sql (100%) rename echobase-domain/src/main/resources/migration/workingDb/{ => pg}/2.7.2-0-postgis-view.sql (100%) create mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.900-0-fix-types.sql copy echobase-domain/src/main/resources/migration/workingDb/{h2/2.7.2-1-add-importFile-entity.sql => pg/3.901-1-upgrade-importFile-table.sql} (50%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/BatchCsvExport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellAble.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/CellValueFormatter.java rename {echobase-domain/src/main/java/fr/ifremer/echobase => echobase-services/src/main/java/fr/ifremer/echobase/services}/csv/CellValueParser.java (76%) rename {echobase-domain/src/main/java/fr/ifremer/echobase => echobase-services/src/main/java/fr/ifremer/echobase/services}/csv/ChainValueParser.java (86%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/EchoBaseCsvUtil.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultAble.java rename echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/internalDb/MigrationCallback.java => echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultValueFormatter.java (50%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultValueGetter.java rename {echobase-domain/src/main/java/fr/ifremer/echobase => echobase-services/src/main/java/fr/ifremer/echobase/services}/csv/ResultValueParser.java (90%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ResultValueSetter.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/csv/ValueFormatterByFunction.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportResult.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AgeCategoryCache.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CatchesImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportService.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DataMetadataNotFoundException.java} (70%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => DuplicatedSampleException.java} (57%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/EchoBaseCsvFileImportResult.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => ElementaryCellWithoutDepthEndException.java} (66%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => EsduCellNotFoundException.java} (61%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => EsduCellWithDepthEndFilledException.java} (67%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataFileResult.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataResult.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ImportDataService.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchAgeCategoryMeaningException.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/MismatchSizeCategoryMeaningException.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CommonImportService.java => MissionService.java} (55%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => MoreThanOnceVoyageToImportException.java} (74%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => NoTransitFoundBetweenDateException.java} (65%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => NoVoyageToImportException.java} (76%) delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/OperationImportService.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultCategoryCache.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportService.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportService.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/SizeCategoryCache.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/SpeciesCategoryCache.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => TransectNotFoundException.java} (64%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => TransitNotFoundException.java} (68%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageAcousticsImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesBiometrySampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesSubSampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCatchesTotalSampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsTransectImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsTransitImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageCommonsVoyageImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsGearMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageOperationsOperationMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsCellImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduByEchotypeCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndAgeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsEsduSpeciesAndSizeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsImportDataActionSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapFishCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsMapOtherCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionAssociationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsRegionResultsImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageEchotypeImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthAgeKeyImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/VoyageResultsVoyageLengthWeightKeyImportAction.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{AbstractImportConfiguration.java => configurations/ImportDataConfigurationSupport.java} (70%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{AcousticImportConfiguration.java => configurations/VoyageAcousticsImportConfiguration.java} (95%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CatchesImportConfiguration.java => configurations/VoyageCatchesImportConfiguration.java} (74%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CommonImportConfiguration.java => configurations/VoyageCommonsImportConfiguration.java} (89%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/{exportquery/ExportQueryNameAlreadyExistException.java => importdata/configurations/VoyageImportDataConfigurationSupport.java} (66%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{OperationImportConfiguration.java => configurations/VoyageOperationsImportConfiguration.java} (71%) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsImportConfiguration.java => configurations/VoyageResultsImportConfiguration.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/ImportDataContextSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageAcousticsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageCatchesImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageCommonsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageImportDataContextSupport.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageOperationsImportDataContext.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/contexts/VoyageResultsImportDataContext.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/AcousticImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/BiometrySampleImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchoBaseImportExportModelSupport.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EchotypeImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultByEchotypeImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/GearMetadataValueImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthAgeKeyImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/LengthWeightKeyImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MapCellImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/OperationMetadataValueImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellAssociationImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/RegionCellResultImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/SubSampleImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TotalSampleImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransectImportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/TransitImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageAcousticImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{AcousticImportRow.java => VoyageAcousticImportRow.java} (70%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesBiometrySampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{BiometrySampleImportRow.java => VoyageCatchesBiometrySampleImportRow.java} (69%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesSubSampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{SubSampleImportRow.java => VoyageCatchesSubSampleImportRow.java} (80%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCatchesTotalSampleImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TotalSampleImportRow.java => VoyageCatchesTotalSampleImportRow.java} (77%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransectImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransectImportRow.java => VoyageCommonsTransectImportRow.java} (54%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsTransitImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{TransitImportRow.java => VoyageCommonsTransitImportRow.java} (67%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageCommonsVoyageImportExportModel.java delete mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageImportModel.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageOperationsGearMetadataValueImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{GearMetadataValueImportRow.java => VoyageOperationsGearMetadataValueImportRow.java} (65%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageOperationsOperationImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{OperationImportRow.java => VoyageOperationsOperationImportRow.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageOperationsOperationMetadataValueImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{OperationMetadataValueImportRow.java => VoyageOperationsOperationMetadataValueImportRow.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeAndSpeciesCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{RegionCellResultImportRow.java => VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java} (72%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduByEchotypeImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultByEchotypeImportRow.java => VoyageResultsEsduByEchotypeImportRow.java} (69%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndAgeCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultBySpeciesAndAgeCategoryImportRow.java => VoyageResultsEsduBySpeciesAndAgeCategoryImportRow.java} (68%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsEsduBySpeciesAndSizeCategoryImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultBySpeciesAndSizeCategoryImportRow.java => VoyageResultsEsduBySpeciesAndSizeCategoryImportRow.java} (68%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsMapFishCellImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MapCellImportRow.java => VoyageResultsMapFishCellImportRow.java} (81%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsMapOtherCellImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{MapCellImportRow.java => VoyageResultsMapOtherCellImportRow.java} (74%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellAssociationImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{RegionCellAssociationImportRow.java => VoyageResultsRegionCellAssociationImportRow.java} (75%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{RegionCellImportRow.java => VoyageResultsRegionCellImportRow.java} (70%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsRegionCellResultImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EsduResultByEchotypeAndSpeciesCategoryImportRow.java => VoyageResultsRegionCellResultImportRow.java} (64%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageEchotypeImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{EchotypeImportRow.java => VoyageResultsVoyageEchotypeImportRow.java} (63%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageLengthAgeKeyImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{LengthAgeKeyImportRow.java => VoyageResultsVoyageLengthAgeKeyImportRow.java} (65%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/VoyageResultsVoyageLengthWeightKeyImportExportModel.java rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{LengthWeightKeyImportRow.java => VoyageResultsVoyageLengthWeightKeyImportRow.java} (68%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDataFixtures.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/MigrateImportDataDatabasesIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CatchesImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonAllImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransectImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonTransitImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/CommonVoyageImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/OperationImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsEsduCellImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapFishCellImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsMapOtherCellImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsRegionCellImportServiceIT.java delete mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/ResultsVoyageImportServiceIT.java rename echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{AcousticImportServiceIT.java => VoyageAcousticImportServiceIT.java} (54%) create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesAllImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesImportServiceITSupport.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesOnlyBiometrySampleImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesOnlySubSampleImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCatchesOnlyTotalSampleImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsAllImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsImportServiceITSupport.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsOnlyTransectImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsOnlyTransitImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageCommonsOnlyVoyageImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageOperationImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlySpeciesAndAgeCategoryImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsEsduCellOnlySpeciesAndSizeCategoryImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsImportServiceITSupport.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapFishCellImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsMapOtherCellImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsRegionCellImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageOnlyEchotypeImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageOnlyLengthAgeKeyImportServiceIT.java create mode 100644 echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/VoyageResultsVoyageOnlyLengthWeightKeyImportServiceIT.java create mode 100644 echobase-services/src/test/resources/import-data/acoustic/movies_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/echobase-operation-total-samples.h2.db.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotypeAndSpeciesCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/byEchotype_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndAgeCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/esdu/bySpeciesAndSizeCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/region/regionAssociations_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.