This is an automated email from the git hooks/post-receive script. New change to branch feature/8180 in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from bcee297 Create service for echotype import for mooring new 2b736c0 Create service for esdu results import for mooring new e81e229 Create remove strategy for esdu results import for mooring new cd9fa27 Migrate database to introduce echotype for the mooring 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 cd9fa2708c04a16365c869f2c679e4a3068a70d8 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jul 4 17:14:17 2016 +0200 Migrate database to introduce echotype for the mooring commit e81e229cc4769cdd4e3b812bad0dd72140a14b2f Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jul 4 17:11:36 2016 +0200 Create remove strategy for esdu results import for mooring commit 2b736c089116319e8f1345c25b9e99b75779c23e Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Mon Jul 4 16:55:07 2016 +0200 Create service for esdu results import for mooring Summary of changes: .../services/service/UserDbPersistenceService.java | 4 +- .../service/importdata/ImportDataService.java | 66 ++++++++++----- ...ava => ResultsImportAlreadyExistException.java} | 6 +- ...MooringResultsCellImportDataActionSupport.java} | 18 ++-- ...chotypeAndSpeciesCategoryCellImportAction.java} | 33 ++++---- ...ringResultsEsduByEchotypeCellImportAction.java} | 31 +++---- ...oyageResultsEsduByEchotypeCellImportAction.java | 1 - ...chotypeAndSpeciesCategoryImportExportModel.java | 94 +++++++++++++++++++++ ...EsduByEchotypeAndSpeciesCategoryImportRow.java} | 27 +++--- ...ringResultsEsduByEchotypeImportExportModel.java | 83 ++++++++++++++++++ ... => MooringResultsEsduByEchotypeImportRow.java} | 31 +++---- .../service/removedata/RemoveDataService.java | 4 +- ...va => MooringResultEsduRemoveDataStrategy.java} | 17 ++-- .../i18n/echobase-services_en_GB.properties | 1 + .../i18n/echobase-services_fr_FR.properties | 1 + .../echobase/services/ImportDataFixtures.java | 12 +++ .../services/MigrateImportDataDatabasesIT.java | 5 ++ .../importdata/AbstractImportDataServiceIT.java | 30 +++++-- ...EchotypeAndSpeciesCategoryImportServiceIT.java} | 35 ++++---- ...esultsEsduCellOnlyEchotypeImportServiceIT.java} | 33 +++++--- ...AndSpeciesCategoryAndLengthImportServiceIT.java | 2 +- ...ciesCategoryAndLength_SmallImportServiceIT.java | 2 +- ...yEchotypeAndSpeciesCategoryImportServiceIT.java | 2 +- ...ResultsEsduCellOnlyEchotypeImportServiceIT.java | 2 +- ...llOnlySpeciesAndAgeCategoryImportServiceIT.java | 2 +- .../VoyageResultsRegionCellImportServiceIT.java | 2 +- ...VoyageResultsRegionCell_AllImportServiceIT.java | 2 +- .../removedata/AbstractRemoveDataServiceTest.java | 33 +++++++- .../MooringAcousticRemoveDataServiceTest.java | 4 +- .../removedata/MooringRemoveDataServiceTest.java | 4 +- ...=> MooringResultEsduRemoveDataServiceTest.java} | 15 ++-- .../MooringResultsRemoveDataServiceTest.java | 4 +- .../echobase-catches-and-voyage-result.h2.db.gz | Bin 990799 -> 991130 bytes .../import-data/echobase-catches.h2.db.gz | Bin 924599 -> 924955 bytes .../import-data/echobase-commonData.h2.db.gz | Bin 369853 -> 370149 bytes .../import-data/echobase-mooring-results.h2.db.gz | Bin 0 -> 930474 bytes .../import-data/echobase-mooring.h2.db.gz | Bin 925009 -> 925371 bytes .../resources/import-data/echobase-nodata.h2.db.gz | Bin 318391 -> 318631 bytes .../echobase-operation-total-samples.h2.db.gz | Bin 784879 -> 785190 bytes .../import-data/echobase-operation.h2.db.gz | Bin 507688 -> 508067 bytes .../byEchotypeAndSpeciesCategory_small.csv.gz | Bin 0 -> 2038 bytes .../result/mooring-esdu/byEchotype_small.csv.gz | Bin 0 -> 2798 bytes 42 files changed, 439 insertions(+), 167 deletions(-) rename echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/{ResultsVoyageImportAlreadyExistException.java => ResultsImportAlreadyExistException.java} (82%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsCellImportDataActionSupport.java => MooringResultsCellImportDataActionSupport.java} (64%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsRegionResultsImportAction.java => MooringResultsEsduByEchotypeAndSpeciesCategoryCellImportAction.java} (53%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/actions/{VoyageResultsEsduByEchotypeCellImportAction.java => MooringResultsEsduByEchotypeCellImportAction.java} (51%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeAndSpeciesCategoryImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeAndSpeciesCategoryImportRow.java => MooringResultsEsduByEchotypeAndSpeciesCategoryImportRow.java} (80%) create mode 100644 echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/MooringResultsEsduByEchotypeImportExportModel.java copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/csv/{VoyageResultsEsduByEchotypeImportRow.java => MooringResultsEsduByEchotypeImportRow.java} (74%) copy echobase-services/src/main/java/fr/ifremer/echobase/services/service/removedata/strategy/{ResultEsduRemoveDataStrategy.java => MooringResultEsduRemoveDataStrategy.java} (79%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeAndSpeciesCategoryImportServiceIT.java} (65%) copy echobase-services/src/test/java/fr/ifremer/echobase/services/service/importdata/{VoyageResultsEsduCellOnlyEchotypeImportServiceIT.java => MooringResultsEsduCellOnlyEchotypeImportServiceIT.java} (63%) copy echobase-services/src/test/java/fr/ifremer/echobase/ui/actions/removedata/{MooringResultsRemoveDataServiceTest.java => MooringResultEsduRemoveDataServiceTest.java} (76%) create mode 100644 echobase-services/src/test/resources/import-data/echobase-mooring-results.h2.db.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotypeAndSpeciesCategory_small.csv.gz create mode 100644 echobase-services/src/test/resources/import-data/result/mooring-esdu/byEchotype_small.csv.gz -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.