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 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 No new revisions were added by this update. Summary of changes: .../echobase/entities/ImportFileIdTopiaDao.java | 37 ++++++++ .../echobase/entities/ImportFileImpl.hbm.xml | 22 ----- .../ifremer/echobase/entities/ImportFileImpl.java | 30 ------ .../echobase/entities/ImportFileTopiaDao.java | 17 ++++ .../ifremer/echobase/entities/ImportLogImpl.java | 35 ------- .../echobase/entities/ImportLogTopiaDao.java | 16 ++++ .../WorkingDbMigrationCallBackForVersion3_900.java | 6 +- .../WorkingDbMigrationCallBackForVersion3_901.java | 13 +-- .../WorkingDbMigrationCallBackForVersion3_902.java | 33 ------- .../workingDb/3.901-0-clean-importLog-table.sql | 2 + .../3.901-2-drop-importLog_importId-table.sql | 1 - .../3.901-3-drop-importLog-voyageId-notNull.sql | 1 - ...3.902-0-fix-types.sql => 3.900-0-fix-types.sql} | 0 .../h2/3.901-0-add-importFile_importId-table.sql | 2 - .../3.901-1-add-importFile-importText-column.sql | 1 - .../h2/3.901-1-upgrade-importFile-table.sql | 10 ++ .../workingDb/pg/3.900-0-add-check-file.sql | 21 ----- ...3.902-0-fix-types.sql => 3.900-0-fix-types.sql} | 0 .../pg/3.901-0-add-importFile_importId-table.sql | 2 - .../3.901-1-add-importFile-importText-column.sql | 1 - .../3.901-1-upgrade-importFile-table.sql} | 11 ++- echobase-domain/src/main/xmi/echobase.properties | 10 +- echobase-domain/src/main/xmi/echobase.zargo | Bin 90261 -> 90396 bytes .../services/service/UserDbPersistenceService.java | 53 +++++++++++ .../service/importdata/ImportDataFileResult.java | 22 ++++- .../actions/ImportDataActionSupport.java | 104 +++++++++++++-------- .../actions/VoyageAcousticsImportAction.java | 13 ++- .../VoyageCatchesBiometrySampleImportAction.java | 16 ++-- .../VoyageCatchesImportDataActionSupport.java | 4 +- .../VoyageCatchesSubSampleImportAction.java | 11 ++- .../VoyageCatchesTotalSampleImportAction.java | 12 +-- .../actions/VoyageCommonsTransectImportAction.java | 9 +- .../actions/VoyageCommonsTransitImportAction.java | 11 +-- .../actions/VoyageCommonsVoyageImportAction.java | 9 +- .../VoyageOperationsGearMetadataImportAction.java | 12 ++- .../VoyageOperationsOperationImportAction.java | 10 +- ...ageOperationsOperationMetadataImportAction.java | 12 +-- .../VoyageResultsCellImportDataActionSupport.java | 11 +-- ...oyageResultsEsduByEchotypeCellImportAction.java | 2 +- .../VoyageResultsImportDataActionSupport.java | 2 +- .../VoyageResultsMapFishCellImportAction.java | 10 +- .../VoyageResultsMapOtherCellImportAction.java | 7 +- ...VoyageResultsRegionAssociationImportAction.java | 3 +- .../actions/VoyageResultsRegionImportAction.java | 9 +- .../VoyageResultsVoyageEchotypeImportAction.java | 5 +- ...oyageResultsVoyageLengthAgeKeyImportAction.java | 6 +- ...geResultsVoyageLengthWeightKeyImportAction.java | 6 +- .../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 +- .../importdata/AbstractImportDataServiceIT.java | 2 +- .../removedata/AbstractRemoveDataServiceTest.java | 4 +- 64 files changed, 397 insertions(+), 323 deletions(-) create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileIdTopiaDao.java delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileImpl.hbm.xml delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportFileTopiaDao.java delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogImpl.java create mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/entities/ImportLogTopiaDao.java delete mode 100644 echobase-domain/src/main/java/fr/ifremer/echobase/persistence/migration/workingDb/WorkingDbMigrationCallBackForVersion3_902.java create mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.901-0-clean-importLog-table.sql delete mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.901-2-drop-importLog_importId-table.sql delete mode 100644 echobase-domain/src/main/resources/migration/workingDb/3.901-3-drop-importLog-voyageId-notNull.sql rename echobase-domain/src/main/resources/migration/workingDb/h2/{3.902-0-fix-types.sql => 3.900-0-fix-types.sql} (100%) delete mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.901-0-add-importFile_importId-table.sql delete mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.901-1-add-importFile-importText-column.sql create mode 100644 echobase-domain/src/main/resources/migration/workingDb/h2/3.901-1-upgrade-importFile-table.sql delete mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.900-0-add-check-file.sql rename echobase-domain/src/main/resources/migration/workingDb/pg/{3.902-0-fix-types.sql => 3.900-0-fix-types.sql} (100%) delete mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.901-0-add-importFile_importId-table.sql delete mode 100644 echobase-domain/src/main/resources/migration/workingDb/pg/3.901-1-add-importFile-importText-column.sql rename echobase-domain/src/main/resources/migration/workingDb/{h2/3.900-0-add-check-file.sql => pg/3.901-1-upgrade-importFile-table.sql} (50%) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.