[commons-compress] branch master updated: Use java API compare instead of do it manual. (#285)

[ggregory]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 53618e3d Use java API compare instead of do it manual. (#285)
53618e3d is described below

commit 53618e3d7304c6ffb0abfcb050ce445d86a3b08e
Author: Arturo Bernal <arturobern...@gmail.com>
AuthorDate: Fri Apr 22 20:23:08 2022 +0200

    Use java API compare instead of do it manual. (#285)
---
 .../java/org/apache/commons/compress/harmony/pack200/CPInt.java   | 8 +-------
 .../java/org/apache/commons/compress/harmony/pack200/CPLong.java  | 8 +-------
 .../java/org/apache/commons/compress/harmony/pack200/IcBands.java | 5 +++--
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git 
a/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java 
b/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java
index a28f2a53..5bbaa5cd 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPInt.java
@@ -29,13 +29,7 @@ public class CPInt extends CPConstant {
 
     @Override
     public int compareTo(final Object obj) {
-        if (theInt > ((CPInt) obj).theInt) {
-            return 1;
-        }
-        if (theInt == ((CPInt) obj).theInt) {
-            return 0;
-        }
-        return -1;
+        return Integer.compare(theInt, ((CPInt) obj).theInt);
     }
 
     public int getInt() {
diff --git 
a/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java 
b/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java
index 934867da..c0c0e858 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/CPLong.java
@@ -29,13 +29,7 @@ public class CPLong extends CPConstant {
 
     @Override
     public int compareTo(final Object obj) {
-        if (theLong > ((CPLong) obj).theLong) {
-            return 1;
-        }
-        if (theLong == ((CPLong) obj).theLong) {
-            return 0;
-        }
-        return -1;
+        return Long.compare(theLong, ((CPLong) obj).theLong);
     }
 
     public long getLong() {
diff --git 
a/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java 
b/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
index cfbb197e..5c8caa26 100644
--- a/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
+++ b/src/main/java/org/apache/commons/compress/harmony/pack200/IcBands.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.TreeSet;
 
@@ -157,8 +158,8 @@ public class IcBands extends BandSet {
         public boolean equals(final Object o) {
             if (o instanceof IcTuple) {
                 final IcTuple icT = (IcTuple) o;
-                return C.equals(icT.C) && F == icT.F && (C2 != null ? 
C2.equals(icT.C2) : icT.C2 == null)
-                    && (N != null ? N.equals(icT.N) : icT.N == null);
+                return C.equals(icT.C) && F == icT.F && (Objects.equals(C2, 
icT.C2))
+                    && (Objects.equals(N, icT.N));
             }
             return false;
         }