Merge pull request #347 from dmlloyd/signum

Use `compare` instead of `signum`
smallrye · Sep 27, 2024 · dbb8aa3 · dbb8aa3
2 parents 521ecdb + 4f5a7ef
commit dbb8aa3
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/net/src/main/java/io/smallrye/common/net/CidrAddress.java b/net/src/main/java/io/smallrye/common/net/CidrAddress.java
@@ -1,6 +1,5 @@
 package io.smallrye.common.net;
 
-import static java.lang.Integer.signum;
 import static java.lang.Math.min;
 
 import java.io.Serializable;
@@ -271,10 +270,10 @@ public int compareAddressBytesTo(final byte[] otherBytes, final int otherNetmask
         }
         // IPv4 before IPv6
         final byte[] cachedBytes = this.cachedBytes;
-        int res = signum(cachedBytes.length - otherLength);
+        int res = Integer.compare(cachedBytes.length, otherLength);
         if (res != 0)
             return res;
-        res = signum(scopeId - getScopeId());
+        res = Integer.compare(scopeId, getScopeId());
         if (res != 0)
             return res;
         // sorted numerically with long matches coming later
@@ -283,21 +282,21 @@ public int compareAddressBytesTo(final byte[] otherBytes, final int otherNetmask
         // compare byte-wise as far as we can
         int i = 0;
         while (commonPrefix >= 8) {
-            res = signum((cachedBytes[i] & 0xff) - (otherBytes[i] & 0xff));
+            res = Integer.compare(Byte.toUnsignedInt(cachedBytes[i]), Byte.toUnsignedInt(otherBytes[i]));
             if (res != 0)
                 return res;
             i++;
             commonPrefix -= 8;
         }
         while (commonPrefix > 0) {
             final int bit = 1 << commonPrefix;
-            res = signum((cachedBytes[i] & bit) - (otherBytes[i] & bit));
+            res = Integer.compare(cachedBytes[i] & bit, otherBytes[i] & bit);
             if (res != 0)
                 return res;
             commonPrefix--;
         }
         // common prefix is a match; now the shortest mask wins
-        return signum(netmaskBits - otherNetmaskBits);
+        return Integer.compare(netmaskBits, otherNetmaskBits);
     }
 
     public boolean equals(final Object obj) {