OAK-11678 : removed usage of Guava's Iterators.cycle with oak-commons (#2260)

Co-authored-by: Rishabh Kumar <diam@adobe.com>

Author: rishabhdaim

oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java

@@ -21,6 +21,7 @@
 import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
 import org.apache.jackrabbit.oak.api.ContentSession;
 import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 import org.apache.jackrabbit.oak.commons.collections.SetUtils;
 import org.apache.jackrabbit.oak.commons.jdkcompat.Java23Subject;
 import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -70,12 +71,12 @@ public void before() throws Exception {
         Set<String> paths = getConfig(AuthorizationConfiguration.class).getParameters().getConfigValue(PermissionConstants.PARAM_READ_PATHS, PermissionConstants.DEFAULT_READ_PATHS);
         assertFalse(paths.isEmpty());
 
-        readablePaths = Iterators.cycle(IterableUtils.transform(paths, f -> getNamePathMapper().getJcrPath(f)));
+        readablePaths = IteratorUtils.cycle(IterableUtils.transform(paths, f -> getNamePathMapper().getJcrPath(f)));
         Set<String> childPaths = new HashSet<>();
         for (String path : paths) {
             IterableUtils.transform(root.getTree(path).getChildren(), tree -> getNamePathMapper().getJcrPath(tree.getPath())).forEach(childPaths::add);
         }
-        readableChildPaths = Iterators.cycle(childPaths);
+        readableChildPaths = IteratorUtils.cycle(childPaths);
     }
 
     private Subject getTestSubject() {

oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java

@@ -20,6 +20,7 @@
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 import org.apache.jackrabbit.oak.plugins.tree.TreeLocation;
 import org.apache.jackrabbit.oak.spi.namespace.NamespaceConstants;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
@@ -61,12 +62,12 @@ public void before() throws Exception {
         Set<String> paths = getConfig(AuthorizationConfiguration.class).getParameters().getConfigValue(PermissionConstants.PARAM_READ_PATHS, PermissionConstants.DEFAULT_READ_PATHS);
         assertFalse(paths.isEmpty());
 
-        readablePaths = Iterators.cycle(paths);
+        readablePaths = IteratorUtils.cycle(paths);
         Set<String> childPaths = new HashSet<>();
         for (String path : paths) {
             IterableUtils.transform(root.getTree(path).getChildren(), Tree::getPath).forEach(childPaths::add);
         }
-        readableChildPaths = Iterators.cycle(childPaths);
+        readableChildPaths = IteratorUtils.cycle(childPaths);
 
         permissionProvider = new PrincipalBasedPermissionProvider(root, root.getContentSession().getWorkspaceName(), Collections.singleton(getTestSystemUser().getPath()), getPrincipalBasedAuthorizationConfiguration());
     }

oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/permission/EagerCacheSizeTest.java

@@ -26,6 +26,7 @@
 import org.apache.jackrabbit.oak.benchmark.ReadDeepTreeTest;
 import org.apache.jackrabbit.oak.benchmark.authorization.Utils;
 import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 import org.apache.jackrabbit.oak.fixture.JcrCreator;
 import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
 import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
@@ -104,7 +105,7 @@ protected void beforeSuite() throws Exception {
 
         // create additional ACEs for each principal in the subject
         List<Privilege> allPrivileges = Arrays.asList(acMgr.privilegeFromName(JCR_ALL).getAggregatePrivileges());
-        Iterator<Principal> principalIterator = Iterators.cycle(subject.getPrincipals());
+        Iterator<Principal> principalIterator = IteratorUtils.cycle(subject.getPrincipals());
         int cnt = 0;
         while (cnt < numberOfACEs) {
             if (!principalIterator.hasNext()) {

oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java

@@ -29,6 +29,7 @@
 import org.apache.jackrabbit.oak.benchmark.authorization.Utils;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 import org.apache.jackrabbit.oak.composite.MountInfoProviderService;
 import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
 import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
@@ -120,7 +121,7 @@ protected void beforeSuite() throws Exception {
     }
 
     private void createForRotatingPrincipal(@NotNull JackrabbitAccessControlManager acMgr, @NotNull List<Privilege> allPrivileges) throws RepositoryException {
-        Iterator<Principal> principalIterator = Iterators.cycle(subject.getPrincipals());
+        Iterator<Principal> principalIterator = IteratorUtils.cycle(subject.getPrincipals());
         int cnt = 0;
         while (cnt < numberOfACEs) {
             if (!principalIterator.hasNext()) {

oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ObservationQueueTest.java

@@ -50,6 +50,7 @@
 import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 import org.apache.jackrabbit.oak.fixture.DocumentMongoFixture;
 import org.apache.jackrabbit.oak.fixture.NodeStoreFixture;
 import org.apache.jackrabbit.oak.jcr.cluster.AbstractClusterTest;
@@ -107,7 +108,7 @@ public void logoutSessions() throws Exception {
     @Test
     public void heavyLoad() throws Throwable {
         List<Whiteboard> whiteboards = List.of(w1, w2);
-        Iterator<Repository> repos = Iterators.cycle(r1, r2);
+        Iterator<Repository> repos = IteratorUtils.cycle(r1, r2);
         AtomicLong commitCounter = new AtomicLong();
         for (int i = 0; i < NUM_WRITERS; i++) {
             Session s = loginUser(repos.next());

oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/AsciiArtTicker.java

@@ -22,6 +22,7 @@
 import java.util.Iterator;
 
 import org.apache.jackrabbit.guava.common.collect.Iterators;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
 
 public class AsciiArtTicker implements ProgressTicker {
     @Override
@@ -107,5 +108,5 @@ public String tick() {
             "             ",
     };
 
-    private final Iterator<String> ticks = Iterators.cycle(message);
+    private final Iterator<String> ticks = IteratorUtils.cycle(message);
 }