Merge pull request #169 from InCadence/167

#167 Deduplication Operation
InCadence · Mar 29, 2019 · f3c8fad · f3c8fad
2 parents 8020938 + a415379
commit f3c8fad
Show file tree

Hide file tree

Showing 14 changed files with 742 additions and 127 deletions.
diff --git a/...i/src/main/java/com/incadencecorp/coalesce/synchronizer/api/common/AbstractOperation.java b/...i/src/main/java/com/incadencecorp/coalesce/synchronizer/api/common/AbstractOperation.java
@@ -246,16 +246,13 @@ private List<T> createTasks() throws CoalesceException
 
                     for (String[] subset : subsets)
                     {
-                        for (ICoalescePersistor target : targets)
-                        {
-                            T task = createTask();
-                            task.setParameters(parameters);
-                            task.setSource(source);
-                            task.setRowset(rowset);
-                            task.setSubset(subset);
-                            task.setTarget(target);
-                            tasks.add(task);
-                        }
+                        T task = createTask();
+                        task.setParameters(parameters);
+                        task.setSource(source);
+                        task.setRowset(rowset);
+                        task.setSubset(subset);
+                        task.setTarget(targets);
+                        tasks.add(task);
                     }
 
                 }

diff --git a/...c/main/java/com/incadencecorp/coalesce/synchronizer/api/common/AbstractOperationTask.java b/...c/main/java/com/incadencecorp/coalesce/synchronizer/api/common/AbstractOperationTask.java
@@ -18,6 +18,7 @@
 package com.incadencecorp.coalesce.synchronizer.api.common;
 
 import com.incadencecorp.coalesce.common.exceptions.CoalescePersistorException;
+import com.incadencecorp.coalesce.framework.datamodel.CoalesceEntity;
 import com.incadencecorp.coalesce.framework.persistance.ICoalescePersistor;
 
 import javax.sql.rowset.CachedRowSet;
@@ -34,7 +35,7 @@
 public abstract class AbstractOperationTask implements Callable<Boolean> {
 
     protected ICoalescePersistor source;
-    protected ICoalescePersistor target;
+    protected ICoalescePersistor[] targets;
     protected Map<String, String> params = new HashMap<>();
     protected String keys[];
     protected CachedRowSet rowset;
@@ -68,11 +69,11 @@ public final void setSource(ICoalescePersistor source)
     /**
      * Sets the target that the results of this operation should be stored.
      *
-     * @param target of this operation
+     * @param targets of this operation
      */
-    public final void setTarget(ICoalescePersistor target)
+    public final void setTarget(ICoalescePersistor[] targets)
     {
-        this.target = target;
+        this.targets = targets;
     }
 
     /**
@@ -112,6 +113,23 @@ public String[] getErrorSubset()
         return getSubset();
     }
 
+    /**
+     * Calls {@link ICoalescePersistor#saveEntity(boolean, CoalesceEntity...)} on each target.
+     *
+     * @see ICoalescePersistor#saveEntity(boolean, CoalesceEntity...)
+     */
+    protected boolean saveWork(boolean allowRemoval, CoalesceEntity... entities) throws CoalescePersistorException
+    {
+        boolean result = true;
+
+        for (ICoalescePersistor target : targets)
+        {
+            result = result && target.saveEntity(allowRemoval, entities);
+        }
+
+        return result;
+    }
+
     protected abstract Boolean doWork(String[] keys, CachedRowSet rowset) throws CoalescePersistorException;
 
 }
diff --git a/...er/api/src/main/java/com/incadencecorp/coalesce/synchronizer/api/common/AbstractScan.java b/...er/api/src/main/java/com/incadencecorp/coalesce/synchronizer/api/common/AbstractScan.java
@@ -17,6 +17,7 @@
 
 package com.incadencecorp.coalesce.synchronizer.api.common;
 
+import com.incadencecorp.coalesce.api.CoalesceErrors;
 import com.incadencecorp.coalesce.common.exceptions.CoalesceException;
 import com.incadencecorp.coalesce.common.helpers.StringHelper;
 import com.incadencecorp.coalesce.framework.CoalesceComponentImpl;
@@ -32,7 +33,11 @@
 import org.slf4j.LoggerFactory;
 
 import javax.sql.rowset.CachedRowSet;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
 /**
  * Abstract implementation to be used as the base of all scanner

diff --git a/...src/test/java/com/incadencecorp/coalesce/synchronizer/api/common/mocks/MockOperation.java b/...src/test/java/com/incadencecorp/coalesce/synchronizer/api/common/mocks/MockOperation.java
@@ -17,21 +17,20 @@
 
 package com.incadencecorp.coalesce.synchronizer.api.common.mocks;
 
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.sql.rowset.CachedRowSet;
-
 import com.incadencecorp.coalesce.common.exceptions.CoalescePersistorException;
 import com.incadencecorp.coalesce.common.helpers.StringHelper;
 import com.incadencecorp.coalesce.framework.datamodel.CoalesceEntity;
 import com.incadencecorp.coalesce.search.factory.CoalescePropertyFactory;
 import com.incadencecorp.coalesce.synchronizer.api.common.AbstractOperation;
 import com.incadencecorp.coalesce.synchronizer.api.common.AbstractOperationTask;
 
+import javax.sql.rowset.CachedRowSet;
+import java.util.HashSet;
+import java.util.Set;
+
 /**
  * Mock Operation Implementation
- * 
+ *
  * @author n78554
  */
 public class MockOperation extends AbstractOperation<AbstractOperationTask> {
@@ -40,7 +39,7 @@ public class MockOperation extends AbstractOperation<AbstractOperationTask> {
 
     /**
      * Sets the title which will be set by this operation on each entity.
-     * 
+     *
      * @param title
      */
     public void setTitle(String title)
@@ -58,24 +57,20 @@ protected Boolean doWork(String[] keys, CachedRowSet rowset) throws CoalescePers
             {
                 if (!StringHelper.isNullOrEmpty(title))
                 {
-                    for (String key : keys)
+                    // Change Title
+                    CoalesceEntity[] entities = source.getEntity(keys);
+
+                    for (CoalesceEntity entity : entities)
                     {
-                        // Change Title
-                        CoalesceEntity[] entities = source.getEntity(key);
-
-                        for (CoalesceEntity entity : entities)
-                        {
-                            entity.setTitle(title);
-                            target.saveEntity(false, entity);
-                        }
+                        entity.setTitle(title);
                     }
+
+                    return saveWork(false, entities);
                 }
                 else
                 {
                     throw new CoalescePersistorException("Failed", null);
                 }
-
-                return true;
             }
 
         };

diff --git a/...in/java/com/incadencecorp/coalesce/synchronizer/service/operations/CopyOperationImpl.java b/...in/java/com/incadencecorp/coalesce/synchronizer/service/operations/CopyOperationImpl.java
@@ -72,7 +72,7 @@ protected Boolean doWork(String[] keys, CachedRowSet rowset) throws CoalescePers
                 // Copy to Targets
                 if (LOGGER.isDebugEnabled())
                 {
-                    LOGGER.debug("Processing {} key(s) for {}", entities.length, target.getClass().getName());
+                    LOGGER.debug("Processing {} key(s)", entities.length);
                     LOGGER.trace("Details:");
 
                     for (CoalesceEntity entity : entities)
@@ -82,7 +82,7 @@ protected Boolean doWork(String[] keys, CachedRowSet rowset) throws CoalescePers
 
                 }
 
-                target.saveEntity(false, entities);
+                saveWork(false, entities);
 
                 return true;
             }