This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11652 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 40afd4332353e47e129133a233bfe5c6297fd485 Author: Julian Reschke <[email protected]> AuthorDate: Thu Apr 10 15:44:07 2025 +0100 OAK-11652: Remove usage of Guava Iterators.forArray --- .../authorization/cug/impl/CugAccessControlManager.java | 4 ++-- .../oak/security/principal/EveryoneFilterTest.java | 16 +++++++++------- .../oak/security/user/DuplicateMembershipTest.java | 6 ++++-- .../oak/security/user/InheritedMembersIteratorTest.java | 4 +++- .../lucene/directory/ActiveDeletedBlobCollectorTest.java | 2 +- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java b/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java index 36d575cc8d..15cf126554 100644 --- a/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java +++ b/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl; -import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy; import org.apache.jackrabbit.api.security.principal.PrincipalManager; import org.apache.jackrabbit.commons.iterator.AccessControlPolicyIteratorAdapter; @@ -55,6 +54,7 @@ import javax.jcr.security.AccessControlPolicyIterator; import javax.jcr.security.Privilege; import java.security.Principal; import java.util.ArrayList; +import java.util.Arrays; import java.util.Collections; import java.util.HashSet; import java.util.Iterator; @@ -252,7 +252,7 @@ class CugAccessControlManager extends AbstractAccessControlManager implements Cu return Collections.emptyIterator(); } if (absPaths == null || absPaths.length == 0) { - return Iterators.forArray(getEffectivePolicies(principals)); + return Arrays.asList(getEffectivePolicies(principals)).iterator(); } boolean enabled = config.getConfigValue(CugConstants.PARAM_CUG_ENABLED, false); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/EveryoneFilterTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/EveryoneFilterTest.java index ee3fd8ce63..50eb018bff 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/EveryoneFilterTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/EveryoneFilterTest.java @@ -26,7 +26,9 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import java.security.Principal; +import java.util.Arrays; import java.util.Collection; +import java.util.Collections; import java.util.Iterator; import java.util.List; @@ -58,9 +60,9 @@ public class EveryoneFilterTest { @Test public void testEveryoneAlreadyIncluded() { - Iterator<Principal> principals = Iterators.forArray(EveryonePrincipal.getInstance(), anotherPrincipal); + Iterator<Principal> principals = List.of(EveryonePrincipal.getInstance(), anotherPrincipal).iterator(); Iterator<Principal> result = EveryoneFilter.filter(principals, EveryonePrincipal.NAME, searchType, 0, Long.MAX_VALUE); - + assertEquals(2, IteratorUtils.size(result)); } @@ -75,7 +77,7 @@ public class EveryoneFilterTest { @Test public void testMissingEveryoneNullHint() { - Iterator<Principal> principals = Iterators.forArray(anotherPrincipal); + Iterator<Principal> principals = List.of(anotherPrincipal).iterator(); Iterator<Principal> result = EveryoneFilter.filter(principals, null, searchType, 0, Long.MAX_VALUE); int expectedSize = adjustExpectedSize(searchType, 1); @@ -84,7 +86,7 @@ public class EveryoneFilterTest { @Test public void testMissingEveryoneOffset() { - Iterator<Principal> principals = Iterators.forArray(anotherPrincipal); + Iterator<Principal> principals = List.of(anotherPrincipal).iterator(); Iterator<Principal> result = EveryoneFilter.filter(principals, EveryonePrincipal.NAME, searchType, 1, Long.MAX_VALUE); assertEquals(1, IteratorUtils.size(result)); @@ -92,15 +94,15 @@ public class EveryoneFilterTest { @Test public void testMissingEveryoneLimit() { - Iterator<Principal> principals = Iterators.forArray(); + Iterator<Principal> principals = Collections.emptyIterator(); Iterator<Principal> result = EveryoneFilter.filter(principals, EveryonePrincipal.NAME, searchType, 0, 10); assertEquals(0, IteratorUtils.size(result)); } - + @Test public void testResultContainsNull() { - Iterator<Principal> principals = Iterators.forArray(anotherPrincipal, null, EveryonePrincipal.getInstance()); + Iterator<Principal> principals = Arrays.asList(new Principal[]{anotherPrincipal, null, EveryonePrincipal.getInstance()}).iterator(); Iterator<Principal> result = EveryoneFilter.filter(principals, EveryonePrincipal.NAME, searchType, 0, Long.MAX_VALUE); assertEquals(3, IteratorUtils.size(result)); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DuplicateMembershipTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DuplicateMembershipTest.java index 7cf76e3d6c..e28a638d16 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DuplicateMembershipTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DuplicateMembershipTest.java @@ -28,6 +28,8 @@ import org.junit.Test; import javax.jcr.RepositoryException; +import java.util.List; + import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyBoolean; @@ -70,8 +72,8 @@ public class DuplicateMembershipTest extends AbstractSecurityTest { DynamicMembershipProvider dmp = mock(DynamicMembershipProvider.class); when(dmp.coversAllMembers(any(Group.class))).thenReturn(true); // mock iterators with duplicate entries - when(dmp.getMembers(any(Group.class), anyBoolean())).thenReturn(Iterators.forArray(member, member)); - when(dmp.getMembership(any(Authorizable.class), anyBoolean())).thenReturn(Iterators.forArray(group, group)); + when(dmp.getMembers(any(Group.class), anyBoolean())).thenReturn(List.of(member, member).iterator()); + when(dmp.getMembership(any(Authorizable.class), anyBoolean())).thenReturn(List.of(group, group).iterator()); return dmp; } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/InheritedMembersIteratorTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/InheritedMembersIteratorTest.java index 53970e0d28..019fc1e55f 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/InheritedMembersIteratorTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/InheritedMembersIteratorTest.java @@ -31,8 +31,10 @@ import org.junit.Test; import javax.jcr.RepositoryException; +import java.util.Arrays; import java.util.Collections; import java.util.HashSet; +import java.util.Iterator; import java.util.Set; import static org.junit.Assert.assertEquals; @@ -110,7 +112,7 @@ public class InheritedMembersIteratorTest extends AbstractSecurityTest { @Test public void testDynamicMembers() throws Exception { DynamicMembershipProvider dmp = mock(DynamicMembershipProvider.class); - when(dmp.getMembers(dynamicGroup, false)).thenReturn(Iterators.forArray(dynamicUser, getTestUser())); + when(dmp.getMembers(dynamicGroup, false)).thenReturn(Arrays.asList(new Authorizable[]{dynamicUser, getTestUser()}).iterator()); when(dmp.getMembers(nonDynamicGroup, false)).thenReturn(Collections.emptyIterator()); // dynamic members get resolved this time diff --git a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java index 3d02dd8e78..4cec1e2d3b 100644 --- a/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java +++ b/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/ActiveDeletedBlobCollectorTest.java @@ -629,7 +629,7 @@ public class ActiveDeletedBlobCollectorTest { @Override public Iterator<String> resolveChunks(String blobId) throws IOException { - return Iterators.forArray(blobId + "-1", blobId + "-2"); + return List.of(blobId + "-1", blobId + "-2").iterator(); } @Override
