0006403: Prevented transform column editor on Configure Transforms sc…

…reen from getting into a state where a column cannot be deselected

symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/TransformColumn.java

@@ -22,8 +22,6 @@
 
 import java.util.Date;
 
-import org.apache.commons.lang3.StringUtils;
-
 public class TransformColumn implements Comparable<TransformColumn>, Cloneable {
     public enum IncludeOnType {
         INSERT, UPDATE, DELETE, ALL;
@@ -190,32 +188,38 @@ public int hashCode() {
         final int prime = 31;
         int result = 1;
         result = prime * result + ((includeOn == null) ? 0 : includeOn.hashCode());
-        result = prime * result + ((lastUpdateBy == null) ? 0 : lastUpdateBy.hashCode());
-        result = prime * result + (pk ? 1231 : 1237);
-        result = prime * result + ((sourceColumnName == null) ? 0 : sourceColumnName.hashCode());
         result = prime * result + ((targetColumnName == null) ? 0 : targetColumnName.hashCode());
-        result = prime * result + ((transformExpression == null) ? 0 : transformExpression.hashCode());
-        result = prime * result + transformOrder;
-        result = prime * result + ((transformType == null) ? 0 : transformType.hashCode());
+        result = prime * result + ((transformId == null) ? 0 : transformId.hashCode());
         return result;
     }
 
     @Override
     public boolean equals(Object obj) {
-        if (obj instanceof TransformColumn) {
-            TransformColumn tc = (TransformColumn) obj;
-            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 true;
+        if (this == obj) {
+            return true;
+        }
+        if (!(obj instanceof TransformColumn)) {
+            return false;
+        }
+        TransformColumn other = (TransformColumn) obj;
+        if (includeOn != other.includeOn) {
+            return false;
+        }
+        if (targetColumnName == null) {
+            if (other.targetColumnName != null) {
+                return false;
+            }
+        } else if (!targetColumnName.equals(other.targetColumnName)) {
+            return false;
+        }
+        if (transformId == null) {
+            if (other.transformId != null) {
+                return false;
             }
+        } else if (!transformId.equals(other.transformId)) {
+            return false;
         }
-        return false;
+        return true;
     }
 
     @Override