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/17 15:27:05 UTC
(jackrabbit-oak) 01/01: OAK-11592 : removed usage of Iterators.asEnumeration with oak-commons util
This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch OAK-11592
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 1ef822d6e9e58fa1b1c6cba96e0339f08bc2872f
Author: Rishabh Kumar <di...@adobe.com>
AuthorDate: Thu Apr 17 20:56:46 2025 +0530
OAK-11592 : removed usage of Iterators.asEnumeration with oak-commons util
---
.../authentication/external/impl/principal/CachedGroupPrincipal.java | 3 ++-
.../external/impl/principal/ExternalGroupPrincipalProvider.java | 5 +++--
.../external/impl/principal/SystemPrincipalConfigTest.java | 3 ++-
.../apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java | 3 ++-
.../java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java | 3 ++-
.../jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java | 3 ++-
6 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/CachedGroupPrincipal.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/CachedGroupPrincipal.java
index ef8db1dfaf..2e510ad0d0 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/CachedGroupPrincipal.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/CachedGroupPrincipal.java
@@ -31,6 +31,7 @@ import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.guava.common.collect.Iterators;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
@@ -93,7 +94,7 @@ final class CachedGroupPrincipal extends PrincipalImpl implements GroupPrincipal
throw new IllegalStateException(msg, e);
}
});
- return Iterators.asEnumeration(Iterators.filter(principals, Objects::nonNull));
+ return IteratorUtils.asEnumeration(Iterators.filter(principals, Objects::nonNull));
}
private Group getGroup() throws RepositoryException {
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
index 03d9b229a4..f9d694b650 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
@@ -56,6 +56,7 @@ import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
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.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
@@ -623,14 +624,14 @@ class ExternalGroupPrincipalProvider implements PrincipalProvider, ExternalIdent
public Enumeration<? extends Principal> members() {
Result result = findPrincipals(getName(), true);
if (result != null) {
- return Iterators.asEnumeration(new MemberIterator<Principal>(result) {
+ return IteratorUtils.asEnumeration(new MemberIterator<Principal>(result) {
@Override
Principal get(@NotNull Authorizable authorizable) throws RepositoryException {
return authorizable.getPrincipal();
}
});
} else {
- return Iterators.asEnumeration(Collections.emptyIterator());
+ return IteratorUtils.asEnumeration(Collections.emptyIterator());
}
}
}
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SystemPrincipalConfigTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SystemPrincipalConfigTest.java
index 0efea39c5a..4b3bcd526f 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SystemPrincipalConfigTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SystemPrincipalConfigTest.java
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.prin
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.spi.commit.MoveTracker;
import org.apache.jackrabbit.oak.spi.commit.ValidatorProvider;
import org.apache.jackrabbit.oak.spi.security.authentication.external.AbstractExternalAuthTest;
@@ -135,7 +136,7 @@ public class SystemPrincipalConfigTest extends AbstractExternalAuthTest {
@Override
public @NotNull Enumeration<? extends Principal> members() {
- return Iterators.asEnumeration(Collections.emptyIterator());
+ return IteratorUtils.asEnumeration(Collections.emptyIterator());
}
@Override
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
index 641e62e6b7..23463a0aa5 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AbstractGroupPrincipal.java
@@ -21,6 +21,7 @@ import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.jetbrains.annotations.NotNull;
@@ -104,6 +105,6 @@ abstract class AbstractGroupPrincipal extends TreeBasedPrincipal implements Grou
throw new IllegalStateException(msg, e);
}
});
- return Iterators.asEnumeration(Iterators.filter(principals, x -> x != null));
+ return IteratorUtils.asEnumeration(Iterators.filter(principals, x -> x != null));
}
}
diff --git a/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java b/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java
index d0de255f94..5bc1bbfcab 100644
--- a/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java
+++ b/oak-pojosr/src/main/java/org/apache/jackrabbit/oak/run/osgi/SpringBootSupport.java
@@ -33,6 +33,7 @@ import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.felix.connect.Revision;
import org.apache.felix.connect.launch.BundleDescriptor;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.commons.conditions.Validate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -117,7 +118,7 @@ class SpringBootSupport {
@Override
public Enumeration<String> getEntries() {
final Enumeration<JarEntry> e = jarFile.entries();
- return Iterators.asEnumeration(new AbstractIterator<String>() {
+ return IteratorUtils.asEnumeration(new AbstractIterator<String>() {
@Override
protected String computeNext() {
if (e.hasMoreElements()){
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java
index 4389aa638a..bbcccf80dd 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/TestPrincipalProvider.java
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
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.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -176,7 +177,7 @@ public final class TestPrincipalProvider implements PrincipalProvider {
public TestGroup(String name, Principal... members) {
super(name);
Set<? extends Principal> mset = Set.of(members);
- this.members = Iterators.asEnumeration(mset.iterator());
+ this.members = IteratorUtils.asEnumeration(mset.iterator());
}
@Override