From cfdc3f767c0063224622af168e78c6b2d2c77388 Mon Sep 17 00:00:00 2001
From: pascalschumacher <pascalschumacher@gmx.net>
Date: Fri, 28 Oct 2016 18:33:40 +0200
Subject: [PATCH] LANG-1279: Update Java requirement from Java 6 to 7

replace usage of deprecated ObjectUtils#equals with Objects#equals
---
 .../commons/lang3/concurrent/ConstantInitializer.java    | 5 ++---
 .../java/org/apache/commons/lang3/reflect/TypeUtils.java | 4 ++--
 src/main/java/org/apache/commons/lang3/tuple/Pair.java   | 7 +++----
 src/main/java/org/apache/commons/lang3/tuple/Triple.java | 9 ++++-----
 4 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java b/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java
index 7d5e4fc62..4c6bc3e34 100644
--- a/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java
+++ b/src/main/java/org/apache/commons/lang3/concurrent/ConstantInitializer.java
@@ -16,7 +16,7 @@
  */
 package org.apache.commons.lang3.concurrent;
 
-import org.apache.commons.lang3.ObjectUtils;
+import java.util.Objects;
 
 /**
  * <p>
@@ -100,7 +100,6 @@ public int hashCode() {
      * @param obj the object to compare to
      * @return a flag whether the objects are equal
      */
-    @SuppressWarnings( "deprecation" ) // ObjectUtils.equals(Object, Object) has been deprecated in 3.2
     @Override
     public boolean equals(final Object obj) {
         if (this == obj) {
@@ -111,7 +110,7 @@ public boolean equals(final Object obj) {
         }
 
         final ConstantInitializer<?> c = (ConstantInitializer<?>) obj;
-        return ObjectUtils.equals(getObject(), c.getObject());
+        return Objects.equals(getObject(), c.getObject());
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
index ad032e8f0..93f80de5e 100644
--- a/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
+++ b/src/main/java/org/apache/commons/lang3/reflect/TypeUtils.java
@@ -29,6 +29,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import org.apache.commons.lang3.ArrayUtils;
@@ -1570,9 +1571,8 @@ public static GenericArrayType genericArrayType(final Type componentType) {
      * @return boolean
      * @since 3.2
      */
-    @SuppressWarnings( "deprecation" )  // ObjectUtils.equals(Object, Object) has been deprecated in 3.2
     public static boolean equals(final Type t1, final Type t2) {
-        if (ObjectUtils.equals(t1, t2)) {
+        if (Objects.equals(t1, t2)) {
             return true;
         }
         if (t1 instanceof ParameterizedType) {
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 94b421c2c..de9517000 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/Pair.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/Pair.java
@@ -18,8 +18,8 @@
 
 import java.io.Serializable;
 import java.util.Map;
+import java.util.Objects;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.builder.CompareToBuilder;
 
 /**
@@ -124,7 +124,6 @@ public int compareTo(final Pair<L, R> other) {
      * @param obj  the object to compare to, null returns false
      * @return true if the elements of the pair are equal
      */
-    @SuppressWarnings( "deprecation" ) // ObjectUtils.equals(Object, Object) has been deprecated in 3.2
     @Override
     public boolean equals(final Object obj) {
         if (obj == this) {
@@ -132,8 +131,8 @@ public boolean equals(final Object obj) {
         }
         if (obj instanceof Map.Entry<?, ?>) {
             final Map.Entry<?, ?> other = (Map.Entry<?, ?>) obj;
-            return ObjectUtils.equals(getKey(), other.getKey())
-                    && ObjectUtils.equals(getValue(), other.getValue());
+            return Objects.equals(getKey(), other.getKey())
+                    && Objects.equals(getValue(), other.getValue());
         }
         return false;
     }
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 8e98160e7..2f4041e92 100644
--- a/src/main/java/org/apache/commons/lang3/tuple/Triple.java
+++ b/src/main/java/org/apache/commons/lang3/tuple/Triple.java
@@ -17,8 +17,8 @@
 package org.apache.commons.lang3.tuple;
 
 import java.io.Serializable;
+import java.util.Objects;
 
-import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.builder.CompareToBuilder;
 
 /**
@@ -104,7 +104,6 @@ public int compareTo(final Triple<L, M, R> other) {
      * @param obj  the object to compare to, null returns false
      * @return true if the elements of the triple are equal
      */
-    @SuppressWarnings( "deprecation" ) // ObjectUtils.equals(Object, Object) has been deprecated in 3.2
     @Override
     public boolean equals(final Object obj) {
         if (obj == this) {
@@ -112,9 +111,9 @@ public boolean equals(final Object obj) {
         }
         if (obj instanceof Triple<?, ?, ?>) {
             final Triple<?, ?, ?> other = (Triple<?, ?, ?>) obj;
-            return ObjectUtils.equals(getLeft(), other.getLeft())
-                && ObjectUtils.equals(getMiddle(), other.getMiddle())
-                && ObjectUtils.equals(getRight(), other.getRight());
+            return Objects.equals(getLeft(), other.getLeft())
+                && Objects.equals(getMiddle(), other.getMiddle())
+                && Objects.equals(getRight(), other.getRight());
         }
         return false;
     }