Use Objects.equals() to simplify the Object.equals() implementationsupstream-master

11 files changed, 21 insertions, 72 deletions

diff --git a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
index da615889e..6c92f9540 100644
--- a/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/ar/ArArchiveEntry.java
@@ -147,10 +147,7 @@ public class ArArchiveEntry implements ArchiveEntry {
             return false;
         }
         final ArArchiveEntry other = (ArArchiveEntry) obj;
-        if (name == null) {
-            return other.name == null;
-        }
-        return name.equals(other.name);
+        return Objects.equals(name, other.name);
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
index 3b73f7e82..164e3de60 100644
--- a/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
+++ b/src/main/java/org/apache/commons/compress/archivers/cpio/CpioArchiveEntry.java
@@ -428,10 +428,7 @@ public class CpioArchiveEntry implements CpioConstants, ArchiveEntry {
             return false;
         }
         final CpioArchiveEntry other = (CpioArchiveEntry) obj;
-        if (name == null) {
-            return other.name == null;
-        }
-        return name.equals(other.name);
+        return Objects.equals(name, other.name);
     }
 
     /**
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java
index 89ece2909..438ae59c2 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/IcTuple.java
@@ -18,6 +18,7 @@ package org.apache.commons.compress.harmony.unpack200;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * An IcTuple is the set of information that describes an inner class.
@@ -106,20 +107,10 @@ public class IcTuple {
         if (object == null || object.getClass() != this.getClass()) {
             return false;
         }
-        final IcTuple compareTuple = (IcTuple) object;
-
-        if (!nullSafeEquals(this.C, compareTuple.C)) {
-            return false;
-        }
-
-        if (!nullSafeEquals(this.C2, compareTuple.C2)) {
-            return false;
-        }
-
-        if (!nullSafeEquals(this.N, compareTuple.N)) {
-            return false;
-        }
-        return true;
+        final IcTuple other = (IcTuple) object;
+        return Objects.equals(C, other.C)
+                && Objects.equals(C2, other.C2)
+                && Objects.equals(N, other.N);
     }
 
     private void generateHashCode() {
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
index 5d0401826..a0b796caf 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/Attribute.java
@@ -52,10 +52,7 @@ public abstract class Attribute extends ClassFileEntry {
             return false;
         }
         final Attribute other = (Attribute) obj;
-        if (!Objects.equals(attributeName, other.attributeName)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(attributeName, other.attributeName);
     }
 
     protected CPUTF8 getAttributeName() {
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
index 793058a6e..356e89ef3 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPConstant.java
@@ -50,10 +50,7 @@ public abstract class CPConstant extends ConstantPoolEntry {
             return false;
         }
         final CPConstant other = (CPConstant) obj;
-        if (!Objects.equals(value, other.value)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(value, other.value);
     }
 
     protected Object getValue() {
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
index 802f620d8..423ebf117 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPFieldRef.java
@@ -52,13 +52,8 @@ public class CPFieldRef extends ConstantPoolEntry {
             return false;
         }
         final CPFieldRef other = (CPFieldRef) obj;
-        if (!Objects.equals(className, other.className)) {
-            return false;
-        }
-        if (!Objects.equals(nameAndType, other.nameAndType)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(className, other.className)
+                && Objects.equals(nameAndType, other.nameAndType);
     }
 
     private void generateHashCode() {
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
index ecc8a91f9..bd71c6f64 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPMember.java
@@ -75,19 +75,10 @@ public class CPMember extends ClassFileEntry {
             return false;
         }
         final CPMember other = (CPMember) obj;
-        if (!attributes.equals(other.attributes)) {
-            return false;
-        }
-        if (!descriptor.equals(other.descriptor)) {
-            return false;
-        }
-        if (flags != other.flags) {
-            return false;
-        }
-        if (!name.equals(other.name)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(attributes, other.attributes)
+                && Objects.equals(descriptor, other.descriptor)
+                && flags == other.flags
+                && Objects.equals(name, other.name);
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
index 0fc6c49a3..c5247bd42 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPNameAndType.java
@@ -69,13 +69,8 @@ public class CPNameAndType extends ConstantPoolEntry {
             return false;
         }
         final CPNameAndType other = (CPNameAndType) obj;
-        if (!descriptor.equals(other.descriptor)) {
-            return false;
-        }
-        if (!name.equals(other.name)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(descriptor, other.descriptor)
+                && Objects.equals(name, other.name);
     }
 
     private void generateHashCode() {
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
index 16895a7ef..dbf572ef1 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/CPRef.java
@@ -63,13 +63,8 @@ public abstract class CPRef extends ConstantPoolEntry {
             return false;
         }
         final CPRef other = (CPRef) obj;
-        if (!className.equals(other.className)) {
-            return false;
-        }
-        if (!nameAndType.equals(other.nameAndType)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(className, other.className)
+                && Objects.equals(nameAndType, other.nameAndType);
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
index 448b3ce57..39371eb80 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/ConstantValueAttribute.java
@@ -52,10 +52,7 @@ public class ConstantValueAttribute extends Attribute {
             return false;
         }
         final ConstantValueAttribute other = (ConstantValueAttribute) obj;
-        if (!Objects.equals(entry, other.entry)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(entry, other.entry);
     }
 
     @Override
diff --git a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
index 07ba4b468..fa9b0df1f 100644
--- a/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
+++ b/src/main/java/org/apache/commons/compress/harmony/unpack200/bytecode/SourceFileAttribute.java
@@ -52,10 +52,7 @@ public class SourceFileAttribute extends Attribute {
             return false;
         }
         final SourceFileAttribute other = (SourceFileAttribute) obj;
-        if (!Objects.equals(name, other.name)) {
-            return false;
-        }
-        return true;
+        return Objects.equals(name, other.name);
     }
 
     @Override