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 37f6efc7d0 OAK-11593 : removed usage of Iterators.toArray with
oak-commons util (#2235)
37f6efc7d0 is described below
commit 37f6efc7d023a14e05d38e316cac892c7562fe8d
Author: Rishabh Kumar <[email protected]>
AuthorDate: Thu Apr 17 20:24:46 2025 +0530
OAK-11593 : removed usage of Iterators.toArray with oak-commons util (#2235)
Co-authored-by: Rishabh Kumar <[email protected]>
---
.../security/authentication/external/impl/jmx/Delegatee.java | 3 ++-
.../authorization/cug/impl/CugAccessControlManagerTest.java | 11 ++++++-----
.../EffectivePoliciesByPrincipalsAndPathsTest.java | 2 +-
3 files changed, 9 insertions(+), 7 deletions(-)
diff --git
a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
index fa3b0684df..d4f33cd9e1 100644
---
a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
+++
b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
@@ -23,6 +23,7 @@ import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.commons.jdkcompat.Java23Subject;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl;
@@ -235,7 +236,7 @@ final class Delegatee {
*/
@NotNull
String[] listOrphanedUsers() {
- return Iterators.toArray(internalListOrphanedIdentities(),
String.class);
+ return IteratorUtils.toArray(internalListOrphanedIdentities(),
String.class);
}
/**
diff --git
a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
index 9f4be9bad7..32dd349cd7 100644
---
a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
+++
b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
@@ -39,6 +39,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.PathUtils;
+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.spi.nodetype.NodeTypeConstants;
@@ -651,7 +652,7 @@ public class CugAccessControlManagerTest extends
AbstractCugTest {
Set<Principal> principalSet =
Collections.singleton(getTestGroupPrincipal());
Iterator<AccessControlPolicy> effective =
cugAccessControlManager.getEffectivePolicies(principalSet, new String[0]);
assertTrue(effective.hasNext());
-
assertEquivalentCugs(cugAccessControlManager.getEffectivePolicies(principalSet),
Iterators.toArray(effective, AccessControlPolicy.class));
+
assertEquivalentCugs(cugAccessControlManager.getEffectivePolicies(principalSet),
IteratorUtils.toArray(effective, AccessControlPolicy.class));
}
@Test
@@ -662,7 +663,7 @@ public class CugAccessControlManagerTest extends
AbstractCugTest {
String[] paths = null;
Iterator<AccessControlPolicy> effective =
cugAccessControlManager.getEffectivePolicies(principalSet, paths);
assertTrue(effective.hasNext());
-
assertEquivalentCugs(cugAccessControlManager.getEffectivePolicies(principalSet),
Iterators.toArray(effective, AccessControlPolicy.class));
+
assertEquivalentCugs(cugAccessControlManager.getEffectivePolicies(principalSet),
IteratorUtils.toArray(effective, AccessControlPolicy.class));
}
@Test
@@ -688,7 +689,7 @@ public class CugAccessControlManagerTest extends
AbstractCugTest {
Set<Principal> principalSet =
Collections.singleton(getTestGroupPrincipal());
Iterator<AccessControlPolicy> effective =
cugAccessControlManager.getEffectivePolicies(principalSet, cugPath, cugPath);
assertTrue(effective.hasNext());
-
assertEquivalentCugs(cugAccessControlManager.getEffectivePolicies(cugPath),
Iterators.toArray(effective, AccessControlPolicy.class));
+
assertEquivalentCugs(cugAccessControlManager.getEffectivePolicies(cugPath),
IteratorUtils.toArray(effective, AccessControlPolicy.class));
}
@Test
@@ -707,8 +708,8 @@ public class CugAccessControlManagerTest extends
AbstractCugTest {
String cugPath = "/content/a";
Set<Principal> principalSet =
Collections.singleton(getTestGroupPrincipal());
Iterator<AccessControlPolicy> effective =
cugAccessControlManager.getEffectivePolicies(principalSet,
cugPath+"/jcr:primaryType");
- AccessControlPolicy[] expected =
Iterators.toArray(cugAccessControlManager.getEffectivePolicies(principalSet,
cugPath), AccessControlPolicy.class);
- assertEquivalentCugs(expected, Iterators.toArray(effective,
AccessControlPolicy.class));
+ AccessControlPolicy[] expected =
IteratorUtils.toArray(cugAccessControlManager.getEffectivePolicies(principalSet,
cugPath), AccessControlPolicy.class);
+ assertEquivalentCugs(expected, IteratorUtils.toArray(effective,
AccessControlPolicy.class));
}
@Test
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/EffectivePoliciesByPrincipalsAndPathsTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/EffectivePoliciesByPrincipalsAndPathsTest.java
index e50c50286f..9005479adb 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/EffectivePoliciesByPrincipalsAndPathsTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/EffectivePoliciesByPrincipalsAndPathsTest.java
@@ -109,7 +109,7 @@ public class EffectivePoliciesByPrincipalsAndPathsTest
extends AbstractAccessCon
Iterator<AccessControlPolicy> effective =
acMgr.getEffectivePolicies(Collections.singleton(testPrincipal), new String[0]);
AccessControlPolicy[] expected =
acMgr.getEffectivePolicies(Collections.singleton(testPrincipal));
- assertArrayEquals(expected, Iterators.toArray(effective,
AccessControlPolicy.class));
+ assertArrayEquals(expected, IteratorUtils.toArray(effective,
AccessControlPolicy.class));
}
@Test
