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