OAK-11354: Remove usage of Guava Ints.compare()

apache · Jan 7, 2025 · 92dcdc3 · 92dcdc3
1 parent 5d04e22
commit 92dcdc3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 13 deletions.
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
@@ -19,7 +19,6 @@
 import net.jpountz.lz4.LZ4FrameInputStream;
 import net.jpountz.lz4.LZ4FrameOutputStream;
 import org.apache.jackrabbit.guava.common.io.Files;
-import org.apache.jackrabbit.guava.common.primitives.Ints;
 import org.apache.jackrabbit.oak.commons.Compression;
 import org.junit.After;
 import org.junit.Before;
@@ -528,7 +527,7 @@ public TestLine(String line) {
 
         @Override
         public int compareTo(TestLine o) {
-            return Ints.compare(value, o.value);
+            return Integer.compare(value, o.value);
         }
 
         @Override

diff --git a/...java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PolicyComparator.java b/...java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PolicyComparator.java
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.security.authorization.accesscontrol;
 
-import org.apache.jackrabbit.guava.common.primitives.Ints;
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 
@@ -53,7 +52,7 @@ private static int compare(JackrabbitAccessControlPolicy policy1, JackrabbitAcce
         } else {
             int depth1 = PathUtils.getDepth(p1);
             int depth2 = PathUtils.getDepth(p2);
-            return (depth1 == depth2) ? p1.compareTo(p2) : Ints.compare(depth1, depth2);
+            return (depth1 == depth2) ? p1.compareTo(p2) : Integer.compare(depth1, depth2);
         }
     }
 }
diff --git a/.../org/apache/jackrabbit/oak/security/authorization/accesscontrol/PolicyComparatorTest.java b/.../org/apache/jackrabbit/oak/security/authorization/accesscontrol/PolicyComparatorTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.security.authorization.accesscontrol;
 
-import org.apache.jackrabbit.guava.common.primitives.Ints;
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.ReadPolicy;
@@ -90,15 +89,15 @@ public void testEqualDepth() {
     public void testPath1Deeper() {
         JackrabbitAccessControlPolicy policy1 = when(mock(JackrabbitAccessControlPolicy.class).getPath()).thenReturn("/some/deeper/path").getMock();
         JackrabbitAccessControlPolicy policy2 = when(mock(JackrabbitAccessControlPolicy.class).getPath()).thenReturn("/").getMock();
-        int expected = Ints.compare(PathUtils.getDepth("/some/deeper/path"), PathUtils.getDepth("/"));
+        int expected = Integer.compare(PathUtils.getDepth("/some/deeper/path"), PathUtils.getDepth("/"));
         assertEquals(expected, comparator.compare(policy1, policy2));
     }
 
     @Test
     public void testPath2Deeper() {
         JackrabbitAccessControlPolicy policy1 = when(mock(JackrabbitAccessControlPolicy.class).getPath()).thenReturn("/path").getMock();
         JackrabbitAccessControlPolicy policy2 = when(mock(JackrabbitAccessControlPolicy.class).getPath()).thenReturn("/a/deeper/path").getMock();
-        int expected = Ints.compare(PathUtils.getDepth("/path"), PathUtils.getDepth("/a/deeper/path"));
+        int expected = Integer.compare(PathUtils.getDepth("/path"), PathUtils.getDepth("/a/deeper/path"));
         assertEquals(expected, comparator.compare(policy1, policy2));
     }
 

diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/OakHelpFormatter.java
@@ -28,7 +28,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.apache.jackrabbit.guava.common.primitives.Ints;
 import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 
 import joptsimple.BuiltinHelpFormatter;
@@ -136,7 +135,7 @@ public String format() {
 
         @Override
         public int compareTo(OptionCategory that) {
-            return Ints.compare(this.bean.order(), that.bean.order());
+            return Integer.compare(this.bean.order(), that.bean.order());
         }
     }
 

diff --git a/...ore-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java b/...ore-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/RevisionVector.java
@@ -26,7 +26,6 @@
 import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
 import org.apache.jackrabbit.guava.common.collect.Iterators;
 import org.apache.jackrabbit.guava.common.collect.PeekingIterator;
-import org.apache.jackrabbit.guava.common.primitives.Ints;
 import org.apache.jackrabbit.oak.cache.CacheValue;
 import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.plugins.document.util.Utils;
@@ -307,7 +306,7 @@ public Revision getBranchRevision() {
      */
     public Revision getRevision(int clusterId) {
         for (Revision r : revisions) {
-            int cmp = Ints.compare(r.getClusterId(), clusterId);
+            int cmp = Integer.compare(r.getClusterId(), clusterId);
             if (cmp == 0) {
                 return r;
             } else if (cmp > 0) {
@@ -449,7 +448,7 @@ public int compareTo(@NotNull RevisionVector other) {
                 return 1;
             }
             Revision otherRev = it.next();
-            int cmp = -Ints.compare(r.getClusterId(), otherRev.getClusterId());
+            int cmp = -Integer.compare(r.getClusterId(), otherRev.getClusterId());
             if (cmp != 0) {
                 return cmp;
             }
@@ -544,7 +543,7 @@ private static final class RevisionComparator implements Comparator<Revision> {
 
         @Override
         public int compare(Revision o1, Revision o2) {
-            return Ints.compare(o1.getClusterId(), o2.getClusterId());
+            return Integer.compare(o1.getClusterId(), o2.getClusterId());
         }
     }
 }