From ccff8becb039a96902b5a3de2ef407d6b926db17 Mon Sep 17 00:00:00 2001 From: Axel Uhl Date: Tue, 11 Mar 2014 21:41:04 +0100 Subject: [PATCH] suggestion for a fix to bug 1845. MasterDataImportTest still all green --- .../src/com/sap/sailing/server/RacingEventService.java | 4 ---- .../sap/sailing/server/impl/RacingEventServiceImpl.java | 7 ------- .../sap/sailing/server/masterdata/MasterDataImporter.java | 2 -- 3 files changed, 13 deletions(-) diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java index e97949f86e0..78ac1524d28 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/RacingEventService.java @@ -59,7 +59,6 @@ import com.sap.sailing.domain.tracking.TrackedRegattaRegistry; import com.sap.sailing.domain.tracking.TrackerManager; import com.sap.sailing.domain.tracking.WindStore; import com.sap.sailing.server.masterdata.DataImportLockWithProgress; -import com.sap.sailing.server.operationaltransformation.ImportMasterDataOperation; /** * An OSGi service that can be used to track boat races using a TracTrac connector that pushes @@ -528,7 +527,4 @@ public interface RacingEventService extends TrackedRegattaRegistry, RegattaFetch void setDataImportDeleteProgressFromMapTimerWithReplication(UUID importOperationId); void setDataImportDeleteProgressFromMapTimerWithoutReplication(UUID importOperationId); - - void replicateDataImportOperation(ImportMasterDataOperation op); - } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java index 77f9360b192..80febd7432b 100755 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/impl/RacingEventServiceImpl.java @@ -134,7 +134,6 @@ import com.sap.sailing.server.operationaltransformation.CreateOrUpdateDataImport import com.sap.sailing.server.operationaltransformation.CreateOrUpdateDeviceConfiguration; import com.sap.sailing.server.operationaltransformation.CreateTrackedRace; import com.sap.sailing.server.operationaltransformation.DataImportFailed; -import com.sap.sailing.server.operationaltransformation.ImportMasterDataOperation; import com.sap.sailing.server.operationaltransformation.RecordCompetitorGPSFix; import com.sap.sailing.server.operationaltransformation.RecordMarkGPSFix; import com.sap.sailing.server.operationaltransformation.RecordWindFix; @@ -2298,10 +2297,4 @@ public class RacingEventServiceImpl implements RacingEventServiceWithTestSupport public void setDataImportDeleteProgressFromMapTimerWithoutReplication(UUID importOperationId) { dataImportLock.setDeleteFromMapTimer(importOperationId); } - - @Override - public void replicateDataImportOperation(ImportMasterDataOperation op) { - replicate(op); - } - } diff --git a/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/MasterDataImporter.java b/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/MasterDataImporter.java index fbe423d6987..d4c22b78ebb 100644 --- a/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/MasterDataImporter.java +++ b/java/com.sap.sailing.server/src/com/sap/sailing/server/masterdata/MasterDataImporter.java @@ -64,9 +64,7 @@ public class MasterDataImporter { creationCount, baseDomainFactory); creationCount = racingEventService.apply(op); - racingEventService.replicateDataImportOperation(op); racingEventService.mediaTracksImported(topLevelMasterData.getAllMediaTracks(), override); - return creationCount; }