From d7f8dcedfa7b5719011fd14b620b045b4dcac9af Mon Sep 17 00:00:00 2001 From: Isira Seneviratne <31027858+Isira-Seneviratne@users.noreply.github.com> Date: Mon, 20 Apr 2020 14:10:39 +0000 Subject: [PATCH 1/2] Simplify null checks in Pair.hashCode() using Objects.hashCode(). (#517) --- src/main/java/org/apache/commons/lang3/tuple/Pair.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/tuple/Pair.java b/src/main/java/org/apache/commons/lang3/tuple/Pair.java index 62889bd8d..32c5d9af0 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/Pair.java +++ b/src/main/java/org/apache/commons/lang3/tuple/Pair.java @@ -207,8 +207,7 @@ public R getValue() { @Override public int hashCode() { // see Map.Entry API specification - return (getKey() == null ? 0 : getKey().hashCode()) ^ - (getValue() == null ? 0 : getValue().hashCode()); + return Objects.hashCode(getKey()) ^ Objects.hashCode(getValue()); } /** From c7ab53f9e34be876309e835f981db69920f79cdc Mon Sep 17 00:00:00 2001 From: Isira Seneviratne <31027858+Isira-Seneviratne@users.noreply.github.com> Date: Mon, 20 Apr 2020 20:43:46 +0000 Subject: [PATCH 2/2] Simplify null checks in Triple.hashCode() using Objects.hashCode(). (#516) --- src/main/java/org/apache/commons/lang3/tuple/Triple.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/apache/commons/lang3/tuple/Triple.java b/src/main/java/org/apache/commons/lang3/tuple/Triple.java index c52fd67bd..e44dbc27d 100644 --- a/src/main/java/org/apache/commons/lang3/tuple/Triple.java +++ b/src/main/java/org/apache/commons/lang3/tuple/Triple.java @@ -171,9 +171,7 @@ public boolean equals(final Object obj) { */ @Override public int hashCode() { - return (getLeft() == null ? 0 : getLeft().hashCode()) ^ - (getMiddle() == null ? 0 : getMiddle().hashCode()) ^ - (getRight() == null ? 0 : getRight().hashCode()); + return Objects.hashCode(getLeft()) ^ Objects.hashCode(getMiddle()) ^ Objects.hashCode(getRight()); } /**