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>.