This is an automated email from the ASF dual-hosted git repository. garydgregory pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/commons-lang.git
commit 08f6de4de5b922f5994130461a8532a231539b29 Author: Gary Gregory <[email protected]> AuthorDate: Sat Jul 25 08:12:17 2026 -0400 Merge if statements with the same return value. --- .../commons/lang3/builder/EqualsBuilder.java | 104 ++++----------------- 1 file changed, 19 insertions(+), 85 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java index 4a7f09a0b..0f726f518 100644 --- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java @@ -415,17 +415,10 @@ public EqualsBuilder append(final boolean lhs, final boolean rhs) { * @return {@code this} instance. */ public EqualsBuilder append(final boolean[] lhs, final boolean[] rhs) { - if (!isEquals) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null || rhs == null) { - setEquals(false); + if (!isEquals || lhs == rhs) { return this; } - if (lhs.length != rhs.length) { + if (lhs == null || rhs == null || lhs.length != rhs.length) { setEquals(false); return this; } @@ -460,17 +453,10 @@ public EqualsBuilder append(final byte lhs, final byte rhs) { * @return {@code this} instance. */ public EqualsBuilder append(final byte[] lhs, final byte[] rhs) { - if (!isEquals) { + if (!isEquals || lhs == rhs) { return this; } - if (lhs == rhs) { - return this; - } - if (lhs == null || rhs == null) { - setEquals(false); - return this; - } - if (lhs.length != rhs.length) { + if (lhs == null || rhs == null || lhs.length != rhs.length) { setEquals(false); return this; } @@ -505,17 +491,10 @@ public EqualsBuilder append(final char lhs, final char rhs) { * @return {@code this} instance. */ public EqualsBuilder append(final char[] lhs, final char[] rhs) { - if (!isEquals) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null || rhs == null) { - setEquals(false); + if (!isEquals || lhs == rhs) { return this; } - if (lhs.length != rhs.length) { + if (lhs == null || rhs == null || lhs.length != rhs.length) { setEquals(false); return this; } @@ -556,17 +535,10 @@ public EqualsBuilder append(final double lhs, final double rhs) { * @return {@code this} instance. */ public EqualsBuilder append(final double[] lhs, final double[] rhs) { - if (!isEquals) { + if (!isEquals || lhs == rhs) { return this; } - if (lhs == rhs) { - return this; - } - if (lhs == null || rhs == null) { - setEquals(false); - return this; - } - if (lhs.length != rhs.length) { + if (lhs == null || rhs == null || lhs.length != rhs.length) { setEquals(false); return this; } @@ -607,17 +579,10 @@ public EqualsBuilder append(final float lhs, final float rhs) { * @return {@code this} instance. */ public EqualsBuilder append(final float[] lhs, final float[] rhs) { - if (!isEquals) { + if (!isEquals || lhs == rhs) { return this; } - if (lhs == rhs) { - return this; - } - if (lhs == null || rhs == null) { - setEquals(false); - return this; - } - if (lhs.length != rhs.length) { + if (lhs == null || rhs == null || lhs.length != rhs.length) { setEquals(false); return this; } @@ -652,17 +617,10 @@ public EqualsBuilder append(final int lhs, final int rhs) { * @return {@code this} instance. */ public EqualsBuilder append(final int[] lhs, final int[] rhs) { - if (!isEquals) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null || rhs == null) { - setEquals(false); + if (!isEquals || lhs == rhs) { return this; } - if (lhs.length != rhs.length) { + if (lhs == null || rhs == null || lhs.length != rhs.length) { setEquals(false); return this; } @@ -699,17 +657,10 @@ public EqualsBuilder append(final long lhs, final long rhs) { * @return {@code this} instance. */ public EqualsBuilder append(final long[] lhs, final long[] rhs) { - if (!isEquals) { + if (!isEquals || lhs == rhs) { return this; } - if (lhs == rhs) { - return this; - } - if (lhs == null || rhs == null) { - setEquals(false); - return this; - } - if (lhs.length != rhs.length) { + if (lhs == null || rhs == null || lhs.length != rhs.length) { setEquals(false); return this; } @@ -731,10 +682,7 @@ public EqualsBuilder append(final long[] lhs, final long[] rhs) { * @return {@code this} instance. */ public EqualsBuilder append(final Object lhs, final Object rhs) { - if (!isEquals) { - return this; - } - if (lhs == rhs) { + if (!isEquals || lhs == rhs) { return this; } if (lhs == null || rhs == null) { @@ -777,11 +725,7 @@ public EqualsBuilder append(final Object[] lhs, final Object[] rhs) { if (lhs == rhs) { return this; } - if (lhs == null || rhs == null) { - setEquals(false); - return this; - } - if (lhs.length != rhs.length) { + if (lhs == null || rhs == null || lhs.length != rhs.length) { setEquals(false); return this; } @@ -819,17 +763,10 @@ public EqualsBuilder append(final short lhs, final short rhs) { * @return {@code this} instance. */ public EqualsBuilder append(final short[] lhs, final short[] rhs) { - if (!isEquals) { - return this; - } - if (lhs == rhs) { - return this; - } - if (lhs == null || rhs == null) { - setEquals(false); + if (!isEquals || lhs == rhs) { return this; } - if (lhs.length != rhs.length) { + if (lhs == null || rhs == null || lhs.length != rhs.length) { setEquals(false); return this; } @@ -940,10 +877,7 @@ public boolean isEquals() { * @return {@code this} instance. */ public EqualsBuilder reflectionAppend(final Object lhs, final Object rhs) { - if (!isEquals) { - return this; - } - if (lhs == rhs) { + if (!isEquals || lhs == rhs) { return this; } if (lhs == null || rhs == null) {
