diff --git a/src/main/java/org/apache/commons/lang3/ImmutablePair.java b/src/main/java/org/apache/commons/lang3/ImmutablePair.java index 0c7a8480a..2772ef862 100644 --- a/src/main/java/org/apache/commons/lang3/ImmutablePair.java +++ b/src/main/java/org/apache/commons/lang3/ImmutablePair.java @@ -75,7 +75,7 @@ public ImmutablePair(L left, R right) { * {@inheritDoc} */ @Override - public L getLeftElement() { + public L getLeft() { return left; } @@ -83,7 +83,7 @@ public L getLeftElement() { * {@inheritDoc} */ @Override - public R getRightElement() { + public R getRight() { return right; } diff --git a/src/main/java/org/apache/commons/lang3/MutablePair.java b/src/main/java/org/apache/commons/lang3/MutablePair.java index ae5c34185..685f2c037 100644 --- a/src/main/java/org/apache/commons/lang3/MutablePair.java +++ b/src/main/java/org/apache/commons/lang3/MutablePair.java @@ -77,7 +77,7 @@ public MutablePair(L left, R right) { * {@inheritDoc} */ @Override - public L getLeftElement() { + public L getLeft() { return left; } @@ -94,7 +94,7 @@ public void setLeftElement(L left) { * {@inheritDoc} */ @Override - public R getRightElement() { + public R getRight() { return right; } @@ -115,7 +115,7 @@ public void setRightElement(R right) { * @return the old value for the right element */ public R setValue(R value) { - R result = getRightElement(); + R result = getRight(); setRightElement(value); return result; } diff --git a/src/main/java/org/apache/commons/lang3/Pair.java b/src/main/java/org/apache/commons/lang3/Pair.java index 068da6f96..5747e356a 100644 --- a/src/main/java/org/apache/commons/lang3/Pair.java +++ b/src/main/java/org/apache/commons/lang3/Pair.java @@ -70,7 +70,7 @@ public static Pair of(L left, R right) { * * @return the left element, may be null */ - public abstract L getLeftElement(); + public abstract L getLeft(); /** *

Gets the right element from this pair.

@@ -79,7 +79,7 @@ public static Pair of(L left, R right) { * * @return the right element, may be null */ - public abstract R getRightElement(); + public abstract R getRight(); /** *

Gets the key from this pair.

@@ -90,7 +90,7 @@ public static Pair of(L left, R right) { * @return the left element as the key, may be null */ public final L getKey() { - return getLeftElement(); + return getLeft(); } /** @@ -102,7 +102,7 @@ public final L getKey() { * @return the right element as the value, may be null */ public R getValue() { - return getRightElement(); + return getRight(); } //----------------------------------------------------------------------- @@ -114,8 +114,8 @@ public R getValue() { * @return negative if this is less, zero if equal, positive if greater */ public int compareTo(Pair other) { - return new CompareToBuilder().append(getLeftElement(), other.getLeftElement()) - .append(getRightElement(), other.getRightElement()).toComparison(); + return new CompareToBuilder().append(getLeft(), other.getLeft()) + .append(getRight(), other.getRight()).toComparison(); } /** @@ -174,6 +174,6 @@ public String toString() { * @return a string for this object */ public String toString(String format) { - return String.format(format, getClass().getSimpleName(), getLeftElement(), getRightElement()); + return String.format(format, getClass().getSimpleName(), getLeft(), getRight()); } } 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 fef4e8621..2a9fe77b7 100644 --- a/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java +++ b/src/main/java/org/apache/commons/lang3/builder/EqualsBuilder.java @@ -153,7 +153,7 @@ static Pair getRegisterPair(Object lhs, Object rhs) { static boolean isRegistered(Object lhs, Object rhs) { Set> registry = getRegistry(); Pair pair = getRegisterPair(lhs, rhs); - Pair swappedPair = Pair.of(pair.getLeftElement(), pair.getRightElement()); + Pair swappedPair = Pair.of(pair.getLeft(), pair.getRight()); return registry != null && (registry.contains(pair) || registry.contains(swappedPair)); diff --git a/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java b/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java index e70b0c056..37b35e4c3 100644 --- a/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java +++ b/src/test/java/org/apache/commons/lang3/ImmutablePairTest.java @@ -38,28 +38,28 @@ public class ImmutablePairTest { public void testBasic() throws Exception { ImmutablePair pair = new ImmutablePair(0, "foo"); assertEquals(0, pair.left.intValue()); - assertEquals(0, pair.getLeftElement().intValue()); + assertEquals(0, pair.getLeft().intValue()); assertEquals("foo", pair.right); - assertEquals("foo", pair.getRightElement()); + assertEquals("foo", pair.getRight()); ImmutablePair pair2 = new ImmutablePair(null, "bar"); assertNull(pair2.left); - assertNull(pair2.getLeftElement()); + assertNull(pair2.getLeft()); assertEquals("bar", pair2.right); - assertEquals("bar", pair2.getRightElement()); + assertEquals("bar", pair2.getRight()); } @Test public void testPairOf() throws Exception { ImmutablePair pair = ImmutablePair.of(0, "foo"); assertEquals(0, pair.left.intValue()); - assertEquals(0, pair.getLeftElement().intValue()); + assertEquals(0, pair.getLeft().intValue()); assertEquals("foo", pair.right); - assertEquals("foo", pair.getRightElement()); + assertEquals("foo", pair.getRight()); ImmutablePair pair2 = ImmutablePair.of(null, "bar"); assertNull(pair2.left); - assertNull(pair2.getLeftElement()); + assertNull(pair2.getLeft()); assertEquals("bar", pair2.right); - assertEquals("bar", pair2.getRightElement()); + assertEquals("bar", pair2.getRight()); } @Test diff --git a/src/test/java/org/apache/commons/lang3/MutablePairTest.java b/src/test/java/org/apache/commons/lang3/MutablePairTest.java index a09d206ba..7943ca2dc 100644 --- a/src/test/java/org/apache/commons/lang3/MutablePairTest.java +++ b/src/test/java/org/apache/commons/lang3/MutablePairTest.java @@ -37,18 +37,18 @@ public class MutablePairTest { @Test public void testBasic() throws Exception { MutablePair pair = new MutablePair(0, "foo"); - assertEquals(0, pair.getLeftElement().intValue()); - assertEquals("foo", pair.getRightElement()); + assertEquals(0, pair.getLeft().intValue()); + assertEquals("foo", pair.getRight()); MutablePair pair2 = new MutablePair(null, "bar"); - assertNull(pair2.getLeftElement()); - assertEquals("bar", pair2.getRightElement()); + assertNull(pair2.getLeft()); + assertEquals("bar", pair2.getRight()); } @Test public void testDefault() throws Exception { MutablePair pair = new MutablePair(); - assertNull(pair.getLeftElement()); - assertNull(pair.getRightElement()); + assertNull(pair.getLeft()); + assertNull(pair.getRight()); } @Test @@ -56,18 +56,18 @@ public void testMutate() throws Exception { MutablePair pair = new MutablePair(0, "foo"); pair.setLeftElement(42); pair.setRightElement("bar"); - assertEquals(42, pair.getLeftElement().intValue()); - assertEquals("bar", pair.getRightElement()); + assertEquals(42, pair.getLeft().intValue()); + assertEquals("bar", pair.getRight()); } @Test public void testPairOf() throws Exception { MutablePair pair = MutablePair.of(0, "foo"); - assertEquals(0, pair.getLeftElement().intValue()); - assertEquals("foo", pair.getRightElement()); + assertEquals(0, pair.getLeft().intValue()); + assertEquals("foo", pair.getRight()); MutablePair pair2 = MutablePair.of(null, "bar"); - assertNull(pair2.getLeftElement()); - assertEquals("bar", pair2.getRightElement()); + assertNull(pair2.getLeft()); + assertEquals("bar", pair2.getRight()); } @Test