OAK-11304: Remove usage of Guava Collections2 - oak-commons

apache · Dec 12, 2024 · 5a1f56b · 5a1f56b
1 parent 15b2afe
commit 5a1f56b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml
@@ -127,6 +127,11 @@
       <artifactId>commons-lang3</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-collections4</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.mockito</groupId>
       <artifactId>mockito-core</artifactId>
@@ -137,6 +142,6 @@
       <artifactId>lz4-java</artifactId>
       <version>1.8.0</version>
       <scope>test</scope>
-    </dependency>    
+    </dependency>
   </dependencies>
 </project>
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
@@ -28,7 +28,7 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.jackrabbit.guava.common.collect.Collections2;
+import org.apache.commons.collections4.CollectionUtils;
 import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.junit.Test;
 
@@ -121,12 +121,12 @@ private static List<String> createTestPaths(int depth, boolean permutation){
         List<String> rootPaths = Arrays.asList("a", "b", "c", "d", "e", "f", "g");
         List<String> paths = new ArrayList<String>();
 
-
-        if (permutation){
-            List<String> newRoots = new ArrayList<String>();
-            for (List<String> permuts : Collections2.orderedPermutations(rootPaths)){
-                newRoots.add(String.join("", permuts));
-            }
+        if (permutation) {
+            List<String> newRoots = new ArrayList<>();
+            CollectionUtils.permutations(rootPaths).
+                    stream().
+                    sorted((a, b) -> Arrays.compare(a.toArray(new String[0]), b.toArray(new String[0]))).
+                    forEach(permuts -> newRoots.add(String.join("", permuts)));
             rootPaths = newRoots;
         }