[commons-compress] 08/13: Use Objects.equals()

[ebourg]

This is an automated email from the ASF dual-hosted git repository.

ebourg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/commons-compress.git

commit ff2a8c517a47ca3fe02fb2abe66b8deb5edc1565
Author: Emmanuel Bourg <ebo...@apache.org>
AuthorDate: Mon Jul 19 14:57:31 2021 +0200

    Use Objects.equals()
---
 .../java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java | 7 ++++---
 .../commons/compress/archivers/zip/X5455_ExtendedTimestamp.java    | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java 
b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
index 2dd5c33..80b61e5 100644
--- a/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
+++ b/src/main/java/org/apache/commons/compress/archivers/zip/X000A_NTFS.java
@@ -18,6 +18,7 @@
 package org.apache.commons.compress.archivers.zip;
 
 import java.util.Date;
+import java.util.Objects;
 import java.util.zip.ZipException;
 
 /**
@@ -325,9 +326,9 @@ public class X000A_NTFS implements ZipExtraField {
         if (o instanceof X000A_NTFS) {
             final X000A_NTFS xf = (X000A_NTFS) o;
 
-            return (modifyTime == xf.modifyTime || (modifyTime != null && 
modifyTime.equals(xf.modifyTime))) &&
-                    (accessTime == xf.accessTime || (accessTime != null && 
accessTime.equals(xf.accessTime))) &&
-                    (createTime == xf.createTime || (createTime != null && 
createTime.equals(xf.createTime)));
+            return Objects.equals(modifyTime, xf.modifyTime) &&
+                   Objects.equals(accessTime, xf.accessTime) &&
+                   Objects.equals(createTime, xf.createTime);
         }
         return false;
     }
diff --git 
a/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java
 
b/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java
index f7f5e42..b462d6b 100644
--- 
a/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java
+++ 
b/src/main/java/org/apache/commons/compress/archivers/zip/X5455_ExtendedTimestamp.java
@@ -21,6 +21,7 @@ package org.apache.commons.compress.archivers.zip;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Date;
+import java.util.Objects;
 import java.util.zip.ZipException;
 
 /**
@@ -564,9 +565,9 @@ public class X5455_ExtendedTimestamp implements 
ZipExtraField, Cloneable, Serial
             // The ZipLong==ZipLong clauses handle the cases where both are 
null.
             // and only last 3 bits of flags matter.
             return ((flags & 0x07) == (xf.flags & 0x07)) &&
-                    (modifyTime == xf.modifyTime || (modifyTime != null && 
modifyTime.equals(xf.modifyTime))) &&
-                    (accessTime == xf.accessTime || (accessTime != null && 
accessTime.equals(xf.accessTime))) &&
-                    (createTime == xf.createTime || (createTime != null && 
createTime.equals(xf.createTime)));
+                    Objects.equals(modifyTime, xf.modifyTime) &&
+                    Objects.equals(accessTime, xf.accessTime) &&
+                    Objects.equals(createTime, xf.createTime);
         }
         return false;
     }