branch develop updated (e0ab45e -> 3da4e96)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git from e0ab45e On peut de nouveau faire des releases \oo/ Merge branch 'feature/fix_nightly_build' into develop adds 9c06667 ajout du service d'action pour l'export de données observateur (see #7677). adds d04373c Début de réécriture des services de recopie de marées (See #7677) new f35a96c Ne plus remonter les références vers les marées exportées (See #7677) new efc6fe2 Revue du code dans l'ui pour exporter les marées (See #7677) new d8da72d Ajout du service Rest (See #7677) new ddfd3bc Remove bullshit code (See #7677) new 3da4e96 Fixes #7677 \oo/ Merge branch 'feature/7677-VerifActionExport' into develop 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 3da4e961e9af4959e7ae2ef3346ad68e4b65f52c Merge: e0ab45e ddfd3bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 13:03:51 2016 +0200 Fixes #7677 \oo/ Merge branch 'feature/7677-VerifActionExport' into develop commit ddfd3bc2c30669e9e3a76354b3722b74aeb26b5b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 13:02:56 2016 +0200 Remove bullshit code (See #7677) commit d8da72d52bb3bdcf3cf56fc3eb907c946d32bda3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 13:00:10 2016 +0200 Ajout du service Rest (See #7677) commit efc6fe2a35cb292dda3349cb2988fa59b2a3751d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 12:56:08 2016 +0200 Revue du code dans l'ui pour exporter les marées (See #7677) commit f35a96cd189d0e5cc203973e36150e6280fd625c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 12:55:43 2016 +0200 Ne plus remonter les références vers les marées exportées (See #7677) Summary of changes: .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 45 ------ .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 +- .../fr/ird/observe/ui/admin/export/ExportUI.jaxx | 15 +- .../observe/ui/admin/export/ExportUIHandler.java | 156 ++++++++++----------- .../controller/v1/DataSourceServiceController.java | 6 - .../export/ReplicateTripServicecontroller.java | 30 ++++ .../services/service/DataSourceService.java | 9 -- .../actions/export/ReplicateTripService.java | 27 ++++ .../export/ReplicateTripsExportRequest.java | 77 ++++++++++ .../actions/export/ReplicateTripsExportResult.java | 78 +++++++++++ .../actions/export/ReplicateTripsImportResult.java | 68 +++++++++ .../fr/ird/observe/services/dto/ImportDataDto.java | 60 -------- .../services/service/DataSourceServiceTopia.java | 12 -- .../actions/export/ReplicateTripServiceTopia.java | 93 ++++++++++++ 14 files changed, 455 insertions(+), 224 deletions(-) create mode 100644 observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/export/ReplicateTripServicecontroller.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripService.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportRequest.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsExportResult.java create mode 100644 observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java delete mode 100644 observe-services-model/src/main/java/fr/ird/observe/services/dto/ImportDataDto.java create mode 100644 observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripServiceTopia.java -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit f35a96cd189d0e5cc203973e36150e6280fd625c Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 12:55:43 2016 +0200 Ne plus remonter les références vers les marées exportées (See #7677) --- .../actions/export/ReplicateTripsImportResult.java | 17 ++++++++--------- .../actions/export/ReplicateTripServiceTopia.java | 16 ++-------------- 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java index 881648f..3cc83a2 100644 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java +++ b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripsImportResult.java @@ -1,7 +1,6 @@ package fr.ird.observe.services.service.actions.export; import com.google.common.collect.ImmutableSet; -import fr.ird.observe.services.dto.DataReference; import java.util.Iterator; @@ -23,8 +22,8 @@ public class ReplicateTripsImportResult implements Iterable<ReplicateTripsImport private final ImmutableSet.Builder<ReplicateTripImportResult> trips = ImmutableSet.builder(); - public ExportTripsResultBuilder addTripResult(DataReference tripReference, boolean deleted) { - trips.add(new ReplicateTripImportResult(tripReference, deleted)); + public ExportTripsResultBuilder addTripResult(String tripId, boolean deleted) { + trips.add(new ReplicateTripImportResult(tripId, deleted)); return this; } @@ -37,17 +36,17 @@ public class ReplicateTripsImportResult implements Iterable<ReplicateTripsImport public static class ReplicateTripImportResult { - private final DataReference tripReference; + private final String tripId; private final boolean deleted; - public ReplicateTripImportResult(DataReference tripReference, boolean deleted) { - this.tripReference = tripReference; + public ReplicateTripImportResult(String tripId, boolean deleted) { + this.tripId = tripId; this.deleted = deleted; } - public DataReference getTripReference() { - return tripReference; + public String getTripId() { + return tripId; } public boolean isDeleted() { @@ -62,7 +61,7 @@ public class ReplicateTripsImportResult implements Iterable<ReplicateTripsImport public Iterator<ReplicateTripImportResult> iterator() { return trips.iterator(); } - + private ReplicateTripsImportResult(ImmutableSet<ReplicateTripImportResult> trips) { this.trips = trips; } diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripServiceTopia.java index 261bfc5..023ede4 100644 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripServiceTopia.java +++ b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/export/ReplicateTripServiceTopia.java @@ -2,12 +2,8 @@ package fr.ird.observe.services.service.actions.export; import com.google.common.collect.ImmutableSet; import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.entities.Trip; import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.binder.BinderEngine; -import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.dto.IdDtos; -import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.service.SqlScriptProducerRequest; import fr.ird.observe.services.service.SqlScriptProducerService; import fr.ird.observe.services.service.longline.TripLonglineService; @@ -57,8 +53,6 @@ public class ReplicateTripServiceTopia extends ObserveServiceTopia implements Re String tripId = importTripRequest.getRequest().getTripId(); boolean deleteBeforeImport = importTripRequest.getRequest().isDeleteBeforeImport(); - Trip trip; - if (IdDtos.isTripSeineId(tripId)) { // deleted = tripSeineService.exists(tripId); @@ -70,9 +64,6 @@ public class ReplicateTripServiceTopia extends ObserveServiceTopia implements Re } - topiaApplicationContext.executeSqlStatements(importTripRequest.getSqlContent()); - - trip = loadEntity(TripLonglineDto.class, tripId); } else if (IdDtos.isTripLonglineId(tripId)) { @@ -85,16 +76,13 @@ public class ReplicateTripServiceTopia extends ObserveServiceTopia implements Re } - topiaApplicationContext.executeSqlStatements(importTripRequest.getSqlContent()); - - trip = loadEntity(TripLonglineDto.class, tripId); } else { throw new IllegalStateException("Can't come here!"); } - DataReference tripReference = BinderEngine.get().transformEntityToDataReferenceDto(getReferentialLocale(), trip); + topiaApplicationContext.executeSqlStatements(importTripRequest.getSqlContent()); - resultBuilder.addTripResult(tripReference, deleteBeforeImport); + resultBuilder.addTripResult(tripId, deleteBeforeImport); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit efc6fe2a35cb292dda3349cb2988fa59b2a3751d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 12:56:08 2016 +0200 Revue du code dans l'ui pour exporter les marées (See #7677) --- .../observe/ui/admin/export/ExportUIHandler.java | 83 +++++++++++++--------- 1 file changed, 49 insertions(+), 34 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java index 13ade10..605a4de 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/export/ExportUIHandler.java @@ -21,18 +21,21 @@ */ package fr.ird.observe.ui.admin.export; -import com.google.common.collect.Lists; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Maps; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.dto.DataReference; -import fr.ird.observe.services.dto.actions.replicate.ReplicateTrip; import fr.ird.observe.services.dto.longline.TripLonglineDto; import fr.ird.observe.services.dto.referential.ProgramDto; import fr.ird.observe.services.dto.seine.TripSeineDto; import fr.ird.observe.services.service.BabModelVersionException; import fr.ird.observe.services.service.DatabaseConnexionNotAuthorizedException; import fr.ird.observe.services.service.DatabaseNotFoundException; -import fr.ird.observe.services.service.actions.replicate.ReplicateService; -import fr.ird.observe.services.service.actions.replicate.ReplicateTripResult; +import fr.ird.observe.services.service.actions.export.ReplicateTripService; +import fr.ird.observe.services.service.actions.export.ReplicateTripsExportRequest; +import fr.ird.observe.services.service.actions.export.ReplicateTripsExportResult; +import fr.ird.observe.services.service.actions.export.ReplicateTripsImportResult; import fr.ird.observe.ui.DecoratorService; import fr.ird.observe.ui.UIHelper; import fr.ird.observe.ui.admin.AdminStep; @@ -56,7 +59,6 @@ import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.util.Date; import java.util.List; -import java.util.stream.Collectors; import static org.nuiton.i18n.I18n.n; import static org.nuiton.i18n.I18n.t; @@ -245,20 +247,17 @@ public class ExportUIHandler extends AdminTabUIHandler { ExportModel stepModel = model.getExportModel(); // on filtre les marées sélectionnées pour export - List<String> tripId = stepModel.getSelectedTrips() - .stream() - .map(TripEntry::getTrip) - .map(DataReference::getId) - .collect(Collectors.toList()); + List<TripEntry> selectedTripEntries = stepModel.getSelectedTrips(); - List<ReplicateTripResult> results = replicateData(stepModel.getSource(), stepModel.getCentralSource(), tripId); + ReplicateTripsImportResult results = replicateData(stepModel.getSource(), stepModel.getCentralSource(), selectedTripEntries); - for (ReplicateTripResult result : results) { + ImmutableMap<String, TripEntry> tripEntriesById = Maps.uniqueIndex(selectedTripEntries, tripEntry -> tripEntry.getTrip().getId()); - TripEntry tripEntry = stepModel.getSelectedTrips() - .stream() - .filter(t -> result.getTripId().equals(t.getTrip().getId())) - .findFirst().get(); + for (ReplicateTripsImportResult.ReplicateTripImportResult result : results) { + + String tripId = result.getTripId(); + + TripEntry tripEntry = tripEntriesById.get(tripId); String tripDecorated = stepModel.decorate(tripEntry.getTrip()); String programDecorated = stepModel.decorate(tripEntry.getProgram()); @@ -266,17 +265,15 @@ public class ExportUIHandler extends AdminTabUIHandler { if (result.isDeleted()) { if (log.isInfoEnabled()) { - log.info(tripId + " -- " + t("observe.message.exportData.delete.remote.maree", tripDecorated, programDecorated)); + log.info(tripId + " → " + t("observe.message.exportData.delete.remote.maree", tripDecorated, programDecorated)); } sendMessage(t("observe.message.exportData.delete.remote.maree", tripDecorated, programDecorated)); } - if (result.isDuplicated()) { - if (log.isInfoEnabled()) { - log.info(tripId + " -- " + t("observe.message.exportData.replicate.maree", tripDecorated, programDecorated)); - } - sendMessage(t("observe.message.exportData.replicate.maree", tripDecorated, programDecorated)); + if (log.isInfoEnabled()) { + log.info(tripId + " → " + t("observe.message.exportData.replicate.maree", tripDecorated, programDecorated)); } + sendMessage(t("observe.message.exportData.replicate.maree", tripDecorated, programDecorated)); } @@ -285,33 +282,51 @@ public class ExportUIHandler extends AdminTabUIHandler { return WizardState.SUCCESSED; } - private List<ReplicateTripResult> replicateData(ObserveSwingDataSource source, - ObserveSwingDataSource target, - List<String> tripIds) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { + private ReplicateTripsImportResult replicateData(ObserveSwingDataSource source, + ObserveSwingDataSource target, + List<TripEntry> tripEntries) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { - List<ReplicateTripResult> results = Lists.newArrayList(); + Preconditions.checkState(CollectionUtils.isNotEmpty(tripEntries)); - if (CollectionUtils.isNotEmpty(tripIds)) { + ReplicateTripsExportRequest.ExportTripsRequestBuilder requestBuilder = ReplicateTripsExportRequest.builder(); - openSource(source); + for (TripEntry tripEntry : tripEntries) { + + requestBuilder.addTripToReplicate(tripEntry.getTrip().getId(), tripEntry.isExist()); + + } - ReplicateService sourceReplicateService = source.newService(ReplicateService.class); + ReplicateTripsExportRequest request = requestBuilder.build(); - List<ReplicateTrip> replicateTrips = sourceReplicateService.exportTrips(tripIds); + ReplicateTripsExportResult tripExportResults; + + try { + + openSource(source); + ReplicateTripService sourceReplicateService = source.newService(ReplicateTripService.class); + tripExportResults = sourceReplicateService.exportTrips(request); + + } finally { source.close(); - openSource(target); + } + + ReplicateTripsImportResult result; - ReplicateService targetReplicateService = target.newService(ReplicateService.class); + try { + + openSource(target); + ReplicateTripService targetReplicateService = target.newService(ReplicateTripService.class); + result = targetReplicateService.importTrips(tripExportResults); - results = targetReplicateService.importTrips(replicateTrips); + } finally { target.close(); } - return results; + return result; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit d8da72d52bb3bdcf3cf56fc3eb907c946d32bda3 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 13:00:10 2016 +0200 Ajout du service Rest (See #7677) --- .../export/ReplicateTripServicecontroller.java | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/export/ReplicateTripServicecontroller.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/export/ReplicateTripServicecontroller.java new file mode 100644 index 0000000..33301ec --- /dev/null +++ b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/export/ReplicateTripServicecontroller.java @@ -0,0 +1,30 @@ +package fr.ird.observe.application.web.controller.v1.actions.export; + +import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; +import fr.ird.observe.services.service.actions.export.ReplicateTripService; +import fr.ird.observe.services.service.actions.export.ReplicateTripsExportRequest; +import fr.ird.observe.services.service.actions.export.ReplicateTripsExportResult; +import fr.ird.observe.services.service.actions.export.ReplicateTripsImportResult; + +/** + * Created on 20/07/16. + * + * @author Tony Chemit - chemit@codelutin.com + */ +public class ReplicateTripServicecontroller extends ObserveAuthenticatedServiceControllerSupport<ReplicateTripService> implements ReplicateTripService { + + public ReplicateTripServicecontroller() { + super(ReplicateTripService.class); + } + + @Override + public ReplicateTripsExportResult exportTrips(ReplicateTripsExportRequest exportRequest) { + return getAuthenticatedService().exportTrips(exportRequest); + } + + @Override + public ReplicateTripsImportResult importTrips(ReplicateTripsExportResult importRequest) { + return getAuthenticatedService().importTrips(importRequest); + } + +} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit ddfd3bc2c30669e9e3a76354b3722b74aeb26b5b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 13:02:56 2016 +0200 Remove bullshit code (See #7677) --- .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 37 -------- .../replicate/ReplicateServiceController.java | 28 ------ .../actions/replicate/ReplicateService.java | 27 ------ .../actions/replicate/ReplicateTripResult.java | 31 ------- .../dto/actions/replicate/ReplicateTrip.java | 25 ------ .../actions/replicate/ReplicateServiceTopia.java | 99 ---------------------- 6 files changed, 247 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java index 5176bf4..b367945 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/admin/AdminTabUIHandler.java @@ -112,43 +112,6 @@ public class AdminTabUIHandler { return WizardState.FAILED; } -// protected List<ReplicateTripResult> replicateData(ObserveSwingDataSource source, -// ObserveSwingDataSource target, -// List<String> tripIds) throws DatabaseNotFoundException, BabModelVersionException, DatabaseConnexionNotAuthorizedException { -// -// List<ReplicateTripResult> results = Lists.newArrayList(); -// -// if (CollectionUtils.isNotEmpty(tripIds)) { -// -// openSource(source); -// -// ReplicateService sourceReplicateService = source.newService(ReplicateService.class); -// -// List<ReplicateTrip> replicateTrips = sourceReplicateService.exportTrips(tripIds); -// -// source.close(); -// -// openSource(target); -// -// ReplicateService targetReplicateService = target.newService(ReplicateService.class); -// -// results = targetReplicateService.importTrips(replicateTrips); -// -// target.close(); -// -// } -// -// return results; -// -// } - -// protected void replicateReferentiel(ObserveSwingDataSource source, -// ObserveSwingDataSource target) { -// -// //FIXME -//// getReplicationService().replicateReferentiel(source, target); -// } - public void initTabUI(AdminUI ui, AdminTabUI tabUI) { parentUI = ui; diff --git a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/replicate/ReplicateServiceController.java b/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/replicate/ReplicateServiceController.java deleted file mode 100644 index d000c72..0000000 --- a/observe-application-web/src/main/java/fr/ird/observe/application/web/controller/v1/actions/replicate/ReplicateServiceController.java +++ /dev/null @@ -1,28 +0,0 @@ -package fr.ird.observe.application.web.controller.v1.actions.replicate; - -import fr.ird.observe.application.web.controller.v1.ObserveAuthenticatedServiceControllerSupport; -import fr.ird.observe.services.dto.actions.replicate.ReplicateTrip; -import fr.ird.observe.services.service.actions.replicate.ReplicateService; -import fr.ird.observe.services.service.actions.replicate.ReplicateTripResult; - -import java.util.List; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ReplicateServiceController extends ObserveAuthenticatedServiceControllerSupport<ReplicateService> implements ReplicateService{ - - public ReplicateServiceController() { - super(ReplicateService.class); - } - - @Override - public List<ReplicateTrip> exportTrips(List<String> tripIds) { - return getAuthenticatedService().exportTrips(tripIds); - } - - @Override - public List<ReplicateTripResult> importTrips(List<ReplicateTrip> replicateTrips) { - return getAuthenticatedService().importTrips(replicateTrips); - } -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/replicate/ReplicateService.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/replicate/ReplicateService.java deleted file mode 100644 index a4284c0..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/replicate/ReplicateService.java +++ /dev/null @@ -1,27 +0,0 @@ -package fr.ird.observe.services.service.actions.replicate; - -import fr.ird.observe.services.ObserveService; -import fr.ird.observe.services.dto.actions.replicate.ReplicateTrip; -import fr.ird.observe.services.spi.PostRequest; -import fr.ird.observe.services.spi.ReadDataPermission; -import fr.ird.observe.services.spi.ReadReferentialPermission; -import fr.ird.observe.services.spi.WriteDataPermission; - -import java.util.List; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public interface ReplicateService extends ObserveService { - - @ReadDataPermission - @ReadReferentialPermission - @PostRequest - List<ReplicateTrip> exportTrips(List<String> tripIds); - - @WriteDataPermission - @ReadReferentialPermission - @PostRequest - List<ReplicateTripResult> importTrips(List<ReplicateTrip> replicateTrips); - -} diff --git a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/replicate/ReplicateTripResult.java b/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/replicate/ReplicateTripResult.java deleted file mode 100644 index ba4f01d..0000000 --- a/observe-services-api/src/main/java/fr/ird/observe/services/service/actions/replicate/ReplicateTripResult.java +++ /dev/null @@ -1,31 +0,0 @@ -package fr.ird.observe.services.service.actions.replicate; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ReplicateTripResult { - - protected final String tripId; - - protected final boolean deleted; - - protected final boolean duplicated; - - public ReplicateTripResult(String tripId, boolean deleted, boolean duplicated) { - this.tripId = tripId; - this.deleted = deleted; - this.duplicated = duplicated; - } - - public String getTripId() { - return tripId; - } - - public boolean isDeleted() { - return deleted; - } - - public boolean isDuplicated() { - return duplicated; - } -} diff --git a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/replicate/ReplicateTrip.java b/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/replicate/ReplicateTrip.java deleted file mode 100644 index 391742a..0000000 --- a/observe-services-model/src/main/java/fr/ird/observe/services/dto/actions/replicate/ReplicateTrip.java +++ /dev/null @@ -1,25 +0,0 @@ -package fr.ird.observe.services.dto.actions.replicate; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ReplicateTrip { - - protected final String tripId; - - protected final byte[] tripContent; - - public ReplicateTrip(String tripId, byte[] tripContent) { - this.tripId = tripId; - this.tripContent = tripContent; - } - - public String getTripId() { - return tripId; - } - - public byte[] getTripContent() { - return tripContent; - } - -} diff --git a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/replicate/ReplicateServiceTopia.java b/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/replicate/ReplicateServiceTopia.java deleted file mode 100644 index 92741be..0000000 --- a/observe-services-topia/src/main/java/fr/ird/observe/services/service/actions/replicate/ReplicateServiceTopia.java +++ /dev/null @@ -1,99 +0,0 @@ -package fr.ird.observe.services.service.actions.replicate; - -import com.google.common.collect.ImmutableSet; -import fr.ird.observe.ObserveTopiaApplicationContext; -import fr.ird.observe.services.ObserveServiceTopia; -import fr.ird.observe.services.dto.IdDtos; -import fr.ird.observe.services.dto.actions.replicate.ReplicateTrip; -import fr.ird.observe.services.service.SqlScriptProducerRequest; -import fr.ird.observe.services.service.SqlScriptProducerService; -import fr.ird.observe.services.service.longline.TripLonglineService; -import fr.ird.observe.services.service.seine.TripSeineService; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.List; -import java.util.stream.Collectors; - -/** - * @author Sylvain Bavencoff - bavencoff@codelutin.com - */ -public class ReplicateServiceTopia extends ObserveServiceTopia implements ReplicateService { - - private static final Log log = LogFactory.getLog(ReplicateServiceTopia.class); - - @Override - public List<ReplicateTrip> exportTrips(List<String> tripIds) { - if (log.isTraceEnabled()) { - log.trace("exportTrips([" + tripIds.stream().collect(Collectors.joining(", ")) + "])"); - } - - return tripIds - .stream() - .map(this::exportTrip) - .collect(Collectors.toList()); - } - - protected ReplicateTrip exportTrip(String tripId) { - - SqlScriptProducerService dumpProducerService = serviceContext.newService(SqlScriptProducerService.class); - - SqlScriptProducerRequest request = SqlScriptProducerRequest.forPostgres().addDataIds(ImmutableSet.of(tripId)); - - byte[] tripContent = dumpProducerService.produceSqlScript(request); - - return new ReplicateTrip(tripId, tripContent); - - } - - @Override - public List<ReplicateTripResult> importTrips(List<ReplicateTrip> replicateTrips) { - if (log.isTraceEnabled()) { - log.trace("exportTrips([" + replicateTrips.stream().map(ReplicateTrip::getTripId).collect(Collectors.joining(", ")) + "])"); - } - - return replicateTrips - .stream() - .map(this::importTrip) - .collect(Collectors.toList()); - } - - protected ReplicateTripResult importTrip(ReplicateTrip replicateTrip) { - - String tripId = replicateTrip.getTripId(); - - boolean deleted = false; - - boolean duplicated = false; - - if (IdDtos.isTripSeineId(tripId)) { - - TripSeineService tripSeineService = serviceContext.newService(TripSeineService.class); - - deleted = tripSeineService.exists(tripId); - - if (deleted) { - tripSeineService.delete(tripId); - } - - } else if (IdDtos.isTripLonglineId(tripId)) { - - TripLonglineService tripLonglineService = serviceContext.newService(TripLonglineService.class); - - deleted = tripLonglineService.exists(tripId); - - if (deleted) { - tripLonglineService.delete(tripId); - } - - } - - ObserveTopiaApplicationContext topiaApplicationContext = serviceContext.getTopiaApplicationContext(); - topiaApplicationContext.executeSqlStatements(replicateTrip.getTripContent()); - - duplicated = true; - - return new ReplicateTripResult(tripId, deleted, duplicated); - - } -} -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 3da4e961e9af4959e7ae2ef3346ad68e4b65f52c Merge: e0ab45e ddfd3bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jul 20 13:03:51 2016 +0200 Fixes #7677 \oo/ Merge branch 'feature/7677-VerifActionExport' into develop .../fr/ird/observe/ui/admin/AdminTabUIHandler.java | 45 ------ .../java/fr/ird/observe/ui/admin/AdminUIModel.java | 3 +- .../fr/ird/observe/ui/admin/export/ExportUI.jaxx | 15 +- .../observe/ui/admin/export/ExportUIHandler.java | 156 ++++++++++----------- .../controller/v1/DataSourceServiceController.java | 6 - .../export/ReplicateTripServicecontroller.java | 30 ++++ .../services/service/DataSourceService.java | 9 -- .../actions/export/ReplicateTripService.java | 27 ++++ .../export/ReplicateTripsExportRequest.java | 77 ++++++++++ .../actions/export/ReplicateTripsExportResult.java | 78 +++++++++++ .../actions/export/ReplicateTripsImportResult.java | 68 +++++++++ .../fr/ird/observe/services/dto/ImportDataDto.java | 60 -------- .../services/service/DataSourceServiceTopia.java | 12 -- .../actions/export/ReplicateTripServiceTopia.java | 93 ++++++++++++ 14 files changed, 455 insertions(+), 224 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm