From bd0068b8b9985978b0b7dc7f606c30742a20ec3d Mon Sep 17 00:00:00 2001 From: Bob Du Date: Wed, 8 May 2024 17:09:05 +0800 Subject: [PATCH] Remove EqualsBuilder HashCodeBuilder usages Signed-off-by: Bob Du --- .../net/sf/ezmorph/array/BooleanArrayMorpher.java | 14 +++++--------- .../ezmorph/array/BooleanObjectArrayMorpher.java | 14 +++++--------- .../net/sf/ezmorph/array/ByteArrayMorpher.java | 14 +++++--------- .../net/sf/ezmorph/array/CharArrayMorpher.java | 14 +++++--------- .../array/CharacterObjectArrayMorpher.java | 14 +++++--------- .../net/sf/ezmorph/array/DoubleArrayMorpher.java | 14 +++++--------- .../net/sf/ezmorph/array/FloatArrayMorpher.java | 14 +++++--------- .../net/sf/ezmorph/array/IntArrayMorpher.java | 14 +++++--------- .../net/sf/ezmorph/array/LongArrayMorpher.java | 14 +++++--------- .../net/sf/ezmorph/array/ObjectArrayMorpher.java | 4 ++-- .../net/sf/ezmorph/array/ShortArrayMorpher.java | 14 +++++--------- .../net/sf/ezmorph/object/BigDecimalMorpher.java | 14 +++++--------- .../net/sf/ezmorph/object/BigIntegerMorpher.java | 14 +++++--------- .../sf/ezmorph/object/BooleanObjectMorpher.java | 14 +++++--------- .../sf/ezmorph/object/CharacterObjectMorpher.java | 14 +++++--------- .../net/sf/ezmorph/object/MapToDateMorpher.java | 14 +++++--------- .../net/sf/ezmorph/object/ObjectListMorpher.java | 4 ++-- .../net/sf/ezmorph/primitive/BooleanMorpher.java | 15 ++++++--------- .../net/sf/ezmorph/primitive/ByteMorpher.java | 15 ++++++--------- .../net/sf/ezmorph/primitive/CharMorpher.java | 15 ++++++--------- .../net/sf/ezmorph/primitive/DoubleMorpher.java | 15 ++++++--------- .../net/sf/ezmorph/primitive/FloatMorpher.java | 14 +++++--------- .../java/net/sf/ezmorph/primitive/IntMorpher.java | 14 +++++--------- .../net/sf/ezmorph/primitive/LongMorpher.java | 14 +++++--------- .../net/sf/ezmorph/primitive/ShortMorpher.java | 15 ++++++--------- 25 files changed, 124 insertions(+), 211 deletions(-) diff --git a/src/main/java/net/sf/ezmorph/array/BooleanArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/BooleanArrayMorpher.java index dd192ad..4a0d356 100644 --- 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 index 3e58262..8bd9b6e 100644 --- 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 index 4655245..ecf21b7 100644 --- 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 index 04d4032..cdda72b 100644 --- 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 index fd3c7b1..71c8e45 100644 --- 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 index a9cd4a5..7df7e19 100644 --- 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 index d9cd4d1..c4c65b7 100644 --- 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 index cf6f8a3..e48cb8c 100644 --- 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 index 712082e..5ad2234 100644 --- 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 index 2d9df1f..b16a236 100644 --- 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 diff --git a/src/main/java/net/sf/ezmorph/array/ShortArrayMorpher.java b/src/main/java/net/sf/ezmorph/array/ShortArrayMorpher.java index 642bb51..d4cc8ec 100644 --- a/src/main/java/net/sf/ezmorph/array/ShortArrayMorpher.java +++ b/src/main/java/net/sf/ezmorph/array/ShortArrayMorpher.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.ShortMorpher; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Morphs an array to a short[]. @@ -57,12 +56,10 @@ public boolean equals(Object obj) { } ShortArrayMorpher other = (ShortArrayMorpher) 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 short 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/object/BigDecimalMorpher.java b/src/main/java/net/sf/ezmorph/object/BigDecimalMorpher.java index 47a70a6..37a411f 100644 --- a/src/main/java/net/sf/ezmorph/object/BigDecimalMorpher.java +++ b/src/main/java/net/sf/ezmorph/object/BigDecimalMorpher.java @@ -18,9 +18,8 @@ import java.math.BigDecimal; import java.math.BigInteger; +import java.util.Objects; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Morphs to a BigDecimal. @@ -56,12 +55,10 @@ public boolean equals(Object obj) { } BigDecimalMorpher other = (BigDecimalMorpher) 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; } @@ -76,11 +73,10 @@ public BigDecimal 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/object/BigIntegerMorpher.java b/src/main/java/net/sf/ezmorph/object/BigIntegerMorpher.java index 47fb486..6fedb45 100644 --- a/src/main/java/net/sf/ezmorph/object/BigIntegerMorpher.java +++ b/src/main/java/net/sf/ezmorph/object/BigIntegerMorpher.java @@ -19,9 +19,8 @@ import java.math.BigDecimal; import java.math.BigInteger; import java.util.Locale; +import java.util.Objects; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Morphs to a BigInteger. @@ -57,12 +56,10 @@ public boolean equals(Object obj) { } BigIntegerMorpher other = (BigIntegerMorpher) 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 BigInteger 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/object/BooleanObjectMorpher.java b/src/main/java/net/sf/ezmorph/object/BooleanObjectMorpher.java index 754a5c1..03fedfd 100644 --- a/src/main/java/net/sf/ezmorph/object/BooleanObjectMorpher.java +++ b/src/main/java/net/sf/ezmorph/object/BooleanObjectMorpher.java @@ -16,9 +16,8 @@ package net.sf.ezmorph.object; +import java.util.Objects; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Morphs to a Boolean. @@ -54,12 +53,10 @@ public boolean equals(Object obj) { } BooleanObjectMorpher other = (BooleanObjectMorpher) 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/object/CharacterObjectMorpher.java b/src/main/java/net/sf/ezmorph/object/CharacterObjectMorpher.java index 3bacb08..6fb383e 100644 --- a/src/main/java/net/sf/ezmorph/object/CharacterObjectMorpher.java +++ b/src/main/java/net/sf/ezmorph/object/CharacterObjectMorpher.java @@ -16,9 +16,8 @@ package net.sf.ezmorph.object; +import java.util.Objects; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Morphs to a Character. @@ -54,12 +53,10 @@ public boolean equals(Object obj) { } CharacterObjectMorpher other = (CharacterObjectMorpher) 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/object/MapToDateMorpher.java b/src/main/java/net/sf/ezmorph/object/MapToDateMorpher.java index 5af5359..41b9d53 100644 --- a/src/main/java/net/sf/ezmorph/object/MapToDateMorpher.java +++ b/src/main/java/net/sf/ezmorph/object/MapToDateMorpher.java @@ -19,9 +19,8 @@ import java.util.Calendar; import java.util.Date; import java.util.Map; +import java.util.Objects; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Morphs a Map into a Date.
@@ -58,12 +57,10 @@ public boolean equals(Object obj) { } MapToDateMorpher other = (MapToDateMorpher) 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; } @@ -78,11 +75,10 @@ public Date 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/object/ObjectListMorpher.java b/src/main/java/net/sf/ezmorph/object/ObjectListMorpher.java index 2cf05fa..ef12015 100644 --- a/src/main/java/net/sf/ezmorph/object/ObjectListMorpher.java +++ b/src/main/java/net/sf/ezmorph/object/ObjectListMorpher.java @@ -20,9 +20,9 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; +import java.util.Objects; import net.sf.ezmorph.MorphException; import net.sf.ezmorph.Morpher; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Morphs a List to another List using a Morpher. @@ -71,7 +71,7 @@ public boolean equals(Object obj) { @Override public int hashCode() { - return new HashCodeBuilder().append(morpher).toHashCode(); + return Objects.hashCode(morpher); } @Override diff --git a/src/main/java/net/sf/ezmorph/primitive/BooleanMorpher.java b/src/main/java/net/sf/ezmorph/primitive/BooleanMorpher.java index 4e77d02..5393575 100644 --- a/src/main/java/net/sf/ezmorph/primitive/BooleanMorpher.java +++ b/src/main/java/net/sf/ezmorph/primitive/BooleanMorpher.java @@ -17,8 +17,8 @@ package net.sf.ezmorph.primitive; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; + +import java.util.Objects; /** * Morphs to a boolean. @@ -54,12 +54,10 @@ public boolean equals(Object obj) { } BooleanMorpher other = (BooleanMorpher) 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 +72,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; } /** diff --git a/src/main/java/net/sf/ezmorph/primitive/ByteMorpher.java b/src/main/java/net/sf/ezmorph/primitive/ByteMorpher.java index 673aed6..70df462 100644 --- a/src/main/java/net/sf/ezmorph/primitive/ByteMorpher.java +++ b/src/main/java/net/sf/ezmorph/primitive/ByteMorpher.java @@ -17,8 +17,8 @@ package net.sf.ezmorph.primitive; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; + +import java.util.Objects; /** * Morphs to a byte. @@ -54,12 +54,10 @@ public boolean equals(Object obj) { } ByteMorpher other = (ByteMorpher) 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 +72,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; } /** diff --git a/src/main/java/net/sf/ezmorph/primitive/CharMorpher.java b/src/main/java/net/sf/ezmorph/primitive/CharMorpher.java index c46949d..b35c12d 100644 --- a/src/main/java/net/sf/ezmorph/primitive/CharMorpher.java +++ b/src/main/java/net/sf/ezmorph/primitive/CharMorpher.java @@ -17,8 +17,8 @@ package net.sf.ezmorph.primitive; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; + +import java.util.Objects; /** * Morphs to a char. @@ -54,12 +54,10 @@ public boolean equals(Object obj) { } CharMorpher other = (CharMorpher) 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 +72,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; } /** diff --git a/src/main/java/net/sf/ezmorph/primitive/DoubleMorpher.java b/src/main/java/net/sf/ezmorph/primitive/DoubleMorpher.java index 05a158a..0e84e00 100644 --- a/src/main/java/net/sf/ezmorph/primitive/DoubleMorpher.java +++ b/src/main/java/net/sf/ezmorph/primitive/DoubleMorpher.java @@ -17,8 +17,8 @@ package net.sf.ezmorph.primitive; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; + +import java.util.Objects; /** * Morphs to a double. @@ -54,12 +54,10 @@ public boolean equals(Object obj) { } DoubleMorpher other = (DoubleMorpher) 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 +72,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; } /** diff --git a/src/main/java/net/sf/ezmorph/primitive/FloatMorpher.java b/src/main/java/net/sf/ezmorph/primitive/FloatMorpher.java index 3441d4e..5be9254 100644 --- a/src/main/java/net/sf/ezmorph/primitive/FloatMorpher.java +++ b/src/main/java/net/sf/ezmorph/primitive/FloatMorpher.java @@ -16,9 +16,8 @@ package net.sf.ezmorph.primitive; +import java.util.Objects; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Moprhs to a float. @@ -54,12 +53,10 @@ public boolean equals(Object obj) { } FloatMorpher other = (FloatMorpher) 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 float getDefaultValue() { @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); if (isUseDefault()) { - builder.append(getDefaultValue()); + return Objects.hashCode(getDefaultValue()); } - return builder.toHashCode(); + return 17; } /** diff --git a/src/main/java/net/sf/ezmorph/primitive/IntMorpher.java b/src/main/java/net/sf/ezmorph/primitive/IntMorpher.java index e859fb3..91d7195 100644 --- a/src/main/java/net/sf/ezmorph/primitive/IntMorpher.java +++ b/src/main/java/net/sf/ezmorph/primitive/IntMorpher.java @@ -16,9 +16,8 @@ package net.sf.ezmorph.primitive; +import java.util.Objects; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Morphs to an int. @@ -54,12 +53,10 @@ public boolean equals(Object obj) { } IntMorpher other = (IntMorpher) 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 int getDefaultValue() { @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); if (isUseDefault()) { - builder.append(getDefaultValue()); + return Objects.hashCode(getDefaultValue()); } - return builder.toHashCode(); + return 17; } /** diff --git a/src/main/java/net/sf/ezmorph/primitive/LongMorpher.java b/src/main/java/net/sf/ezmorph/primitive/LongMorpher.java index 1d91e36..b81c831 100644 --- a/src/main/java/net/sf/ezmorph/primitive/LongMorpher.java +++ b/src/main/java/net/sf/ezmorph/primitive/LongMorpher.java @@ -16,9 +16,8 @@ package net.sf.ezmorph.primitive; +import java.util.Objects; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; /** * Morphs to a long. @@ -54,12 +53,10 @@ public boolean equals(Object obj) { } LongMorpher other = (LongMorpher) 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 long getDefaultValue() { @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); if (isUseDefault()) { - builder.append(getDefaultValue()); + return Objects.hashCode(getDefaultValue()); } - return builder.toHashCode(); + return 17; } /** diff --git a/src/main/java/net/sf/ezmorph/primitive/ShortMorpher.java b/src/main/java/net/sf/ezmorph/primitive/ShortMorpher.java index 70e5b4c..982ace3 100644 --- a/src/main/java/net/sf/ezmorph/primitive/ShortMorpher.java +++ b/src/main/java/net/sf/ezmorph/primitive/ShortMorpher.java @@ -16,8 +16,8 @@ package net.sf.ezmorph.primitive; import net.sf.ezmorph.MorphException; -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; + +import java.util.Objects; /** * Morphs to a short. @@ -53,12 +53,10 @@ public boolean equals(Object obj) { } ShortMorpher other = (ShortMorpher) 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; } @@ -73,11 +71,10 @@ public short getDefaultValue() { @Override public int hashCode() { - HashCodeBuilder builder = new HashCodeBuilder(); if (isUseDefault()) { - builder.append(getDefaultValue()); + return Objects.hashCode(getDefaultValue()); } - return builder.toHashCode(); + return 17; } /**