This is an automated email from the git hooks/post-receive script. New change to branch feature/8170 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from 355c51f Revue des import (utilisation java 7 API + reformat code) new a736122 Ajout d'un checkFile pour chaque importFile new a65f2e7 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) new a6987a6 Utilisation du nouveu service d'import de données dans les actions d'ui The 3 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 a6987a619a7a77540db9db3760cac8aea323beb7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Mar 26 14:00:48 2016 +0100 Utilisation du nouveu service d'import de données dans les actions d'ui commit a65f2e791ef3d8b9cd6d5b82c813db2f3f2f03d8 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Mar 26 14:00:13 2016 +0100 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) commit a73612211f351b96cc0167bb0ae1b31a1512837a Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Mar 26 13:58:47 2016 +0100 Ajout d'un checkFile pour chaque importFile Summary of changes: ....java => MigrationCallBackForVersion3_900.java} | 22 +- ...migration.workingDb.MigrationCallBackForVersion | 3 +- ...tFile-entity.sql => 3.900-0-add-check-file.sql} | 4 +- .../3.900-0-add-check-file.sql} | 4 +- echobase-domain/src/main/xmi/echobase.properties | 5 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 89705 -> 89758 bytes .../services/service/UserDbPersistenceService.java | 30 +- ...ception.java => DuplicatedSampleException.java} | 10 +- .../service/importdata/ImportDataFileResult.java | 149 +++++ .../service/importdata/ImportDataResult.java | 38 ++ .../service/importdata/ImportDataService.java | 510 +++++++++++++++++ ...ommonImportService.java => MissionService.java} | 48 +- ...ava => NoTransitFoundBetweenDateException.java} | 6 +- .../AbstractImportAction.java} | 343 +++++------- .../importdata/actions/AcousticImportAction.java | 616 +++++++++++++++++++++ .../actions/BiometrySampleImportAction.java | 136 +++++ .../actions/CommonTransectImportAction.java | 121 ++++ .../actions/CommonTransitImportAction.java | 100 ++++ .../actions/CommonVoyageImportAction.java | 100 ++++ .../actions/GearMetadataImportAction.java | 100 ++++ .../importdata/actions/OperationImportAction.java | 104 ++++ .../actions/OperationMetadataImportAction.java | 94 ++++ .../actions/RegionAssociationImportAction.java | 84 +++ .../importdata/actions/RegionImportAction.java | 118 ++++ ...EchotypeAndSpeciesCategoryCellImportAction.java | 134 +++++ .../ResultsEsduByEchotypeCellImportAction.java | 118 ++++ ...sEsduSpeciesAndAgeCategoryCellImportAction.java | 138 +++++ ...EsduSpeciesAndSizeCategoryCellImportAction.java | 140 +++++ .../actions/ResultsMapFishCellImportAction.java | 194 +++++++ .../actions/ResultsMapOtherCellImportAction.java | 168 ++++++ .../actions/ResultsRegionImportAction.java | 126 +++++ .../actions/ResultsVoyageEchotypeImportAction.java | 128 +++++ .../ResultsVoyageLengthAgeKeyImportAction.java | 95 ++++ .../ResultsVoyageLengthWeightKeyImportAction.java | 109 ++++ .../importdata/actions/SubSampleImportAction.java | 151 +++++ .../actions/TotalSampleImportAction.java | 162 ++++++ .../importdata/AbstractImportDataServiceIT.java | 28 +- .../importdata/AcousticImportServiceIT.java | 2 +- .../service/importdata/CatchesImportServiceIT.java | 8 +- .../importdata/CommonAllImportServiceIT.java | 4 +- .../importdata/CommonTransectImportServiceIT.java | 4 +- .../importdata/CommonTransitImportServiceIT.java | 4 +- .../importdata/CommonVoyageImportServiceIT.java | 4 +- .../importdata/OperationImportServiceIT.java | 2 +- .../importdata/ResultsEsduCellImportServiceIT.java | 8 +- .../ResultsMapFishCellImportServiceIT.java | 2 +- .../ResultsMapOtherCellImportServiceIT.java | 2 +- .../ResultsRegionCellImportServiceIT.java | 2 +- .../importdata/ResultsVoyageImportServiceIT.java | 8 +- .../removedata/AbstractRemoveDataServiceTest.java | 42 +- .../actions/importData/AbstractLaunchImport.java | 16 +- .../ui/actions/importData/CreateMission.java | 6 +- .../actions/importData/LaunchAcousticImport.java | 12 +- .../ui/actions/importData/LaunchCatchesImport.java | 12 +- .../ui/actions/importData/LaunchCommonImport.java | 12 +- .../actions/importData/LaunchOperationImport.java | 12 +- .../ui/actions/importData/LaunchResultsImport.java | 13 +- 57 files changed, 4237 insertions(+), 374 deletions(-) copy echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/{MigrationCallBackForVersion2_6_1.java => MigrationCallBackForVersion3_900.java} (72%) copy echobase-domain/src/main/resources/migration/workingDb/h2/{2.7.2-1-add-importFile-entity.sql => 3.900-0-add-check-file.sql} (68%) copy echobase-domain/src/main/resources/migration/workingDb/{h2/2.7.2-1-add-importFile-entity.sql => pg/3.900-0-add-check-file.sql} (68%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{NoVoyageToImportException.java => DuplicatedSampleException.java} (64%) 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 copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{CommonImportService.java => MissionService.java} (57%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{TransitNotFoundException.java => NoTransitFoundBetweenDateException.java} (77%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{AbstractImportDataService.java => actions/AbstractImportAction.java} (50%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/AcousticImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/BiometrySampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/CommonTransectImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/CommonTransitImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/CommonVoyageImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/GearMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/OperationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/OperationMetadataImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/RegionAssociationImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/RegionImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduByEchotypeCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduSpeciesAndAgeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsEsduSpeciesAndSizeCategoryCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsMapFishCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsMapOtherCellImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsRegionImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsVoyageEchotypeImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsVoyageLengthAgeKeyImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/ResultsVoyageLengthWeightKeyImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/SubSampleImportAction.java create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/TotalSampleImportAction.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.