0001616: Configuration of transforms has been said to "Give me more h…

…eadaches than a rap concert." Simplify configuration.
JumpMind · Aug 6, 2014 · 637a022 · 637a022
1 parent f6afe32
commit 637a022
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/TransformColumn.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/TransformColumn.java
@@ -185,7 +185,7 @@ public boolean equals(Object obj) {
                 transformType.equals(tc.transformType) &&
                 StringUtils.equals(transformExpression, tc.transformExpression) &&
                 includeOn == tc.includeOn &&
-                StringUtils.equals(lastUpdateBy, tc.lastUpdateBy) ) {
+                StringUtils.equals(lastUpdateBy, tc.lastUpdateBy) && transformOrder == tc.transformOrder) {
             return true;
         } else {
             return false;
@@ -210,7 +210,20 @@ public TransformColumn clone() {
     }
 
     public int compareTo(TransformColumn o) {
-        return new Integer(transformOrder).compareTo(new Integer(o.transformOrder));
+        //return new Integer(transformOrder).compareTo(new Integer(o.transformOrder));
+        TransformColumn tc = o;
+        if (tc != null &&
+                StringUtils.equals(sourceColumnName, tc.sourceColumnName) &&
+                StringUtils.equals(targetColumnName, tc.targetColumnName) &&
+                pk == tc.pk &&
+                transformType.equals(tc.transformType) &&
+                StringUtils.equals(transformExpression, tc.transformExpression) &&
+                includeOn == tc.includeOn &&
+                StringUtils.equals(lastUpdateBy, tc.lastUpdateBy) && transformOrder == tc.transformOrder) {
+            return 0;
+        } else {
+            return -1;
+        }
     }
 
 }