From 9cf2568f2429ad84469a09f2480effc47c0467ec Mon Sep 17 00:00:00 2001 From: namannigam Date: Thu, 10 Aug 2017 08:45:27 +0530 Subject: [PATCH 1/2] SwappedPair constructed as Pair.of(rhs,lhs) --- .../apache/commons/lang3/builder/EqualsBuilder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 4e24bc5248c..252843c4559 100644 --- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java @@ -16,6 +16,10 @@ */ package org.apache.commons.lang3.builder; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ClassUtils; +import org.apache.commons.lang3.tuple.Pair; + import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -23,10 +27,6 @@ import java.util.HashSet; import java.util.Set; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.ClassUtils; -import org.apache.commons.lang3.tuple.Pair; - /** *

Assists in implementing {@link Object#equals(Object)} methods.

* @@ -157,7 +157,7 @@ static Pair getRegisterPair(final Object lhs, final Object rhs) { static boolean isRegistered(final Object lhs, final Object rhs) { final Set> registry = getRegistry(); final Pair pair = getRegisterPair(lhs, rhs); - final Pair swappedPair = Pair.of(pair.getLeft(), pair.getRight()); + final Pair swappedPair = Pair.of(pair.getRight(), pair.getLeft()); return registry != null && (registry.contains(pair) || registry.contains(swappedPair)); From 17bb505f2ab99f61b9fe99fb549df3dbdda957ff Mon Sep 17 00:00:00 2001 From: namannigam Date: Thu, 10 Aug 2017 08:49:37 +0530 Subject: [PATCH 2/2] Revert import format --- .../org/apache/commons/lang3/builder/EqualsBuilder.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 252843c4559..d2cf7c7fb5e 100644 --- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java @@ -16,10 +16,6 @@ */ package org.apache.commons.lang3.builder; -import org.apache.commons.lang3.ArrayUtils; -import org.apache.commons.lang3.ClassUtils; -import org.apache.commons.lang3.tuple.Pair; - import java.lang.reflect.AccessibleObject; import java.lang.reflect.Field; import java.lang.reflect.Modifier; @@ -27,6 +23,10 @@ import java.util.HashSet; import java.util.Set; +import org.apache.commons.lang3.ArrayUtils; +import org.apache.commons.lang3.ClassUtils; +import org.apache.commons.lang3.tuple.Pair; + /** *

Assists in implementing {@link Object#equals(Object)} methods.

*