Remove EqualsBuilder HashCodeBuilder usages

Signed-off-by: Bob Du <[email protected]>
jenkinsci · May 8, 2024 · bd0068b · bd0068b
1 parent 9965b3a
commit bd0068b
Show file tree

Hide file tree

Showing 25 changed files with 124 additions and 211 deletions.
diff --git a/src/main/java/net/sf/ezmorph/array/BooleanArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/BooleanArrayMorpher.java
@@ -17,10 +17,9 @@
 package net.sf.ezmorph.array;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.primitive.BooleanMorpher;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to a boolean[].
@@ -57,12 +56,10 @@ public boolean equals(Object obj) {
         }
 
         BooleanArrayMorpher other = (BooleanArrayMorpher) obj;
-        EqualsBuilder builder = new EqualsBuilder();
         if (isUseDefault() && other.isUseDefault()) {
-            builder.append(getDefaultValue(), other.getDefaultValue());
-            return builder.isEquals();
+            return Objects.equals(getDefaultValue(), other.getDefaultValue());
         } else if (!isUseDefault() && !other.isUseDefault()) {
-            return builder.isEquals();
+            return true;
         } else {
             return false;
         }
@@ -74,11 +71,10 @@ public boolean getDefaultValue() {
 
     @Override
     public int hashCode() {
-        HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
-            builder.append(getDefaultValue());
+            return Objects.hashCode(getDefaultValue());
         }
-        return builder.toHashCode();
+        return 17;
     }
 
     @Override

diff --git a/src/main/java/net/sf/ezmorph/array/BooleanObjectArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/BooleanObjectArrayMorpher.java
@@ -17,10 +17,9 @@
 package net.sf.ezmorph.array;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.primitive.BooleanMorpher;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to a Boolean[].
@@ -57,12 +56,10 @@ public boolean equals(Object obj) {
         }
 
         BooleanObjectArrayMorpher other = (BooleanObjectArrayMorpher) obj;
-        EqualsBuilder builder = new EqualsBuilder();
         if (isUseDefault() && other.isUseDefault()) {
-            builder.append(getDefaultValue(), other.getDefaultValue());
-            return builder.isEquals();
+            return Objects.equals(getDefaultValue(), other.getDefaultValue());
         } else if (!isUseDefault() && !other.isUseDefault()) {
-            return builder.isEquals();
+            return true;
         } else {
             return false;
         }
@@ -74,11 +71,10 @@ public Boolean getDefaultValue() {
 
     @Override
     public int hashCode() {
-        HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
-            builder.append(getDefaultValue());
+            return Objects.hashCode(getDefaultValue());
         }
-        return builder.toHashCode();
+        return 17;
     }
 
     @Override

diff --git a/src/main/java/net/sf/ezmorph/array/ByteArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/ByteArrayMorpher.java
@@ -17,10 +17,9 @@
 package net.sf.ezmorph.array;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.primitive.ByteMorpher;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to a byte[].
@@ -57,12 +56,10 @@ public boolean equals(Object obj) {
         }
 
         ByteArrayMorpher other = (ByteArrayMorpher) obj;
-        EqualsBuilder builder = new EqualsBuilder();
         if (isUseDefault() && other.isUseDefault()) {
-            builder.append(getDefaultValue(), other.getDefaultValue());
-            return builder.isEquals();
+            return Objects.equals(getDefaultValue(), other.getDefaultValue());
         } else if (!isUseDefault() && !other.isUseDefault()) {
-            return builder.isEquals();
+            return true;
         } else {
             return false;
         }
@@ -74,11 +71,10 @@ public byte getDefaultValue() {
 
     @Override
     public int hashCode() {
-        HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
-            builder.append(getDefaultValue());
+            return Objects.hashCode(getDefaultValue());
         }
-        return builder.toHashCode();
+        return 17;
     }
 
     @Override

diff --git a/src/main/java/net/sf/ezmorph/array/CharArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/CharArrayMorpher.java
@@ -17,10 +17,9 @@
 package net.sf.ezmorph.array;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.primitive.CharMorpher;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to a char[].
@@ -57,12 +56,10 @@ public boolean equals(Object obj) {
         }
 
         CharArrayMorpher other = (CharArrayMorpher) obj;
-        EqualsBuilder builder = new EqualsBuilder();
         if (isUseDefault() && other.isUseDefault()) {
-            builder.append(getDefaultValue(), other.getDefaultValue());
-            return builder.isEquals();
+            return Objects.equals(getDefaultValue(), other.getDefaultValue());
         } else if (!isUseDefault() && !other.isUseDefault()) {
-            return builder.isEquals();
+            return true;
         } else {
             return false;
         }
@@ -77,11 +74,10 @@ public char getDefaultValue() {
 
     @Override
     public int hashCode() {
-        HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
-            builder.append(getDefaultValue());
+            return Objects.hashCode(getDefaultValue());
         }
-        return builder.toHashCode();
+        return 17;
     }
 
     @Override

diff --git a/src/main/java/net/sf/ezmorph/array/CharacterObjectArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/CharacterObjectArrayMorpher.java
@@ -17,10 +17,9 @@
 package net.sf.ezmorph.array;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.primitive.CharMorpher;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to a Character[].
@@ -57,12 +56,10 @@ public boolean equals(Object obj) {
         }
 
         CharacterObjectArrayMorpher other = (CharacterObjectArrayMorpher) obj;
-        EqualsBuilder builder = new EqualsBuilder();
         if (isUseDefault() && other.isUseDefault()) {
-            builder.append(getDefaultValue(), other.getDefaultValue());
-            return builder.isEquals();
+            return Objects.equals(getDefaultValue(), other.getDefaultValue());
         } else if (!isUseDefault() && !other.isUseDefault()) {
-            return builder.isEquals();
+            return true;
         } else {
             return false;
         }
@@ -74,11 +71,10 @@ public Character getDefaultValue() {
 
     @Override
     public int hashCode() {
-        HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
-            builder.append(getDefaultValue());
+            return Objects.hashCode(getDefaultValue());
         }
-        return builder.toHashCode();
+        return 17;
     }
 
     @Override

diff --git a/src/main/java/net/sf/ezmorph/array/DoubleArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/DoubleArrayMorpher.java
@@ -17,10 +17,9 @@
 package net.sf.ezmorph.array;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.primitive.DoubleMorpher;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to a double[].
@@ -57,12 +56,10 @@ public boolean equals(Object obj) {
         }
 
         DoubleArrayMorpher other = (DoubleArrayMorpher) obj;
-        EqualsBuilder builder = new EqualsBuilder();
         if (isUseDefault() && other.isUseDefault()) {
-            builder.append(getDefaultValue(), other.getDefaultValue());
-            return builder.isEquals();
+            return Objects.equals(getDefaultValue(), other.getDefaultValue());
         } else if (!isUseDefault() && !other.isUseDefault()) {
-            return builder.isEquals();
+            return true;
         } else {
             return false;
         }
@@ -77,11 +74,10 @@ public double getDefaultValue() {
 
     @Override
     public int hashCode() {
-        HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
-            builder.append(getDefaultValue());
+            return Objects.hashCode(getDefaultValue());
         }
-        return builder.toHashCode();
+        return 17;
     }
 
     @Override

diff --git a/src/main/java/net/sf/ezmorph/array/FloatArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/FloatArrayMorpher.java
@@ -17,10 +17,9 @@
 package net.sf.ezmorph.array;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.primitive.FloatMorpher;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to a float[].
@@ -57,12 +56,10 @@ public boolean equals(Object obj) {
         }
 
         FloatArrayMorpher other = (FloatArrayMorpher) obj;
-        EqualsBuilder builder = new EqualsBuilder();
         if (isUseDefault() && other.isUseDefault()) {
-            builder.append(getDefaultValue(), other.getDefaultValue());
-            return builder.isEquals();
+            return Objects.equals(getDefaultValue(), other.getDefaultValue());
         } else if (!isUseDefault() && !other.isUseDefault()) {
-            return builder.isEquals();
+            return true;
         } else {
             return false;
         }
@@ -77,11 +74,10 @@ public float getDefaultValue() {
 
     @Override
     public int hashCode() {
-        HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
-            builder.append(getDefaultValue());
+            return Objects.hashCode(getDefaultValue());
         }
-        return builder.toHashCode();
+        return 17;
     }
 
     @Override

diff --git a/src/main/java/net/sf/ezmorph/array/IntArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/IntArrayMorpher.java
@@ -17,10 +17,9 @@
 package net.sf.ezmorph.array;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.primitive.IntMorpher;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to a int[].
@@ -57,12 +56,10 @@ public boolean equals(Object obj) {
         }
 
         IntArrayMorpher other = (IntArrayMorpher) obj;
-        EqualsBuilder builder = new EqualsBuilder();
         if (isUseDefault() && other.isUseDefault()) {
-            builder.append(getDefaultValue(), other.getDefaultValue());
-            return builder.isEquals();
+            return Objects.equals(getDefaultValue(), other.getDefaultValue());
         } else if (!isUseDefault() && !other.isUseDefault()) {
-            return builder.isEquals();
+            return true;
         } else {
             return false;
         }
@@ -77,11 +74,10 @@ public int getDefaultValue() {
 
     @Override
     public int hashCode() {
-        HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
-            builder.append(getDefaultValue());
+            return Objects.hashCode(getDefaultValue());
         }
-        return builder.toHashCode();
+        return 17;
     }
 
     @Override

diff --git a/src/main/java/net/sf/ezmorph/array/LongArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/LongArrayMorpher.java
@@ -17,10 +17,9 @@
 package net.sf.ezmorph.array;
 
 import java.lang.reflect.Array;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.primitive.LongMorpher;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to a long[].
@@ -57,12 +56,10 @@ public boolean equals(Object obj) {
         }
 
         LongArrayMorpher other = (LongArrayMorpher) obj;
-        EqualsBuilder builder = new EqualsBuilder();
         if (isUseDefault() && other.isUseDefault()) {
-            builder.append(getDefaultValue(), other.getDefaultValue());
-            return builder.isEquals();
+            return Objects.equals(getDefaultValue(), other.getDefaultValue());
         } else if (!isUseDefault() && !other.isUseDefault()) {
-            return builder.isEquals();
+            return true;
         } else {
             return false;
         }
@@ -77,11 +74,10 @@ public long getDefaultValue() {
 
     @Override
     public int hashCode() {
-        HashCodeBuilder builder = new HashCodeBuilder();
         if (isUseDefault()) {
-            builder.append(getDefaultValue());
+            return Objects.hashCode(getDefaultValue());
         }
-        return builder.toHashCode();
+        return 17;
     }
 
     @Override

diff --git a/src/main/java/net/sf/ezmorph/array/ObjectArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/ObjectArrayMorpher.java
@@ -18,9 +18,9 @@
 
 import java.lang.reflect.Array;
 import java.lang.reflect.Method;
+import java.util.Objects;
 import net.sf.ezmorph.MorphException;
 import net.sf.ezmorph.Morpher;
-import org.apache.commons.lang.builder.HashCodeBuilder;
 
 /**
  * Morphs an array to another array using a Morpher.
@@ -65,7 +65,7 @@ public boolean equals(Object obj) {
 
     @Override
     public int hashCode() {
-        return new HashCodeBuilder().append(morpher).toHashCode();
+        return Objects.hashCode(morpher);
     }
 
     @Override