You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by da...@apache.org on 2025/04/29 12:17:27 UTC
(jackrabbit-oak) branch trunk updated: OAK-11678 : removed usage of Guava's Iterators.cycle with oak-commons (#2260)
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 143d02a07f OAK-11678 : removed usage of Guava's Iterators.cycle with oak-commons (#2260)
143d02a07f is described below
commit 143d02a07f99c8f935f1a9eb212f1e6d6e2ce6b3
Author: Rishabh Kumar <ri...@gmail.com>
AuthorDate: Tue Apr 29 17:47:22 2025 +0530
OAK-11678 : removed usage of Guava's Iterators.cycle with oak-commons (#2260)
Co-authored-by: Rishabh Kumar <di...@adobe.com>
---
.../principalbased/impl/ReadablePathsAccessControlTest.java | 5 +++--
.../principalbased/impl/ReadablePathsPermissionTest.java | 5 +++--
.../oak/benchmark/authorization/permission/EagerCacheSizeTest.java | 3 ++-
.../authorization/principalbased/PrinicipalBasedReadTest.java | 3 ++-
.../java/org/apache/jackrabbit/oak/jcr/ObservationQueueTest.java | 3 ++-
.../main/java/org/apache/jackrabbit/oak/upgrade/AsciiArtTicker.java | 3 ++-
6 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
index ec0ebe5f22..875508465a 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
+++ b/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.JcrConstants;
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 class ReadablePathsAccessControlTest extends AbstractPrincipalBasedTest {
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() {
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java
index 27365a4975..afbc603b15 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java
+++ b/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.guava.common.collect.Iterators;
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 class ReadablePathsPermissionTest extends AbstractPrincipalBasedTest {
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());
}
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/permission/EagerCacheSizeTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/permission/EagerCacheSizeTest.java
index 13937add64..2e3c79bb86 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/permission/EagerCacheSizeTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/permission/EagerCacheSizeTest.java
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.Oak;
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 @@ public class EagerCacheSizeTest extends ReadDeepTreeTest {
// 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()) {
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java
index ee55326082..91cfa6c5b3 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authorization/principalbased/PrinicipalBasedReadTest.java
@@ -29,6 +29,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.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 @@ public class PrinicipalBasedReadTest extends ReadDeepTreeTest {
}
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()) {
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ObservationQueueTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ObservationQueueTest.java
index 4116daab14..edad94056f 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ObservationQueueTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/ObservationQueueTest.java
@@ -50,6 +50,7 @@ import org.apache.jackrabbit.commons.JcrUtils;
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 class ObservationQueueTest extends AbstractClusterTest {
@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());
diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/AsciiArtTicker.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/AsciiArtTicker.java
index f3d77b9440..d9e41d7ad1 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/AsciiArtTicker.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/AsciiArtTicker.java
@@ -22,6 +22,7 @@ package org.apache.jackrabbit.oak.upgrade;
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 class AsciiArtTicker implements ProgressTicker {
" ",
};
- private final Iterator<String> ticks = Iterators.cycle(message);
+ private final Iterator<String> ticks = IteratorUtils.cycle(message);
}