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 195a48be0c OAK-11677 : removed usage of Guava's
Iterators.elementsEqual with oak-commons (#2253)
195a48be0c is described below
commit 195a48be0c453e561f151b7caf7b8be0a2aa3ee1
Author: Rishabh Kumar <[email protected]>
AuthorDate: Tue Apr 29 11:20:54 2025 +0530
OAK-11677 : removed usage of Guava's Iterators.elementsEqual with
oak-commons (#2253)
Co-authored-by: Rishabh Kumar <[email protected]>
---
.../authentication/external/impl/AutoMembershipAwareTest.java | 3 ++-
.../external/impl/principal/AutoMembershipPrincipalsTest.java | 3 ++-
.../impl/principal/ExternalGroupPrincipalProviderDMTest.java | 2 +-
.../composite/CompositeAccessControlManagerTest.java | 3 ++-
.../oak/security/principal/AbstractPrincipalProviderTest.java | 3 ++-
.../oak/security/principal/PrincipalProviderImplTest.java | 5 +++--
.../org/apache/jackrabbit/oak/security/user/GroupImplTest.java | 3 ++-
.../jackrabbit/oak/security/user/UserPrincipalProviderTest.java | 4 ++--
.../oak/security/user/autosave/AuthorizableImplTest.java | 9 +++++----
.../jackrabbit/oak/spi/xml/ReferenceChangeTrackerTest.java | 5 +++--
10 files changed, 24 insertions(+), 16 deletions(-)
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/AutoMembershipAwareTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/AutoMembershipAwareTest.java
index 25f44d9ed7..3fadf4f2b2 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/AutoMembershipAwareTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/AutoMembershipAwareTest.java
@@ -21,6 +21,7 @@ import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.AbstractExternalAuthTest;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.AutoMembershipConfig;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
@@ -110,7 +111,7 @@ public class AutoMembershipAwareTest extends
AbstractExternalAuthTest {
assertEquals(sh.getName(), config.getName());
assertEquals(groupIds, config.getAutoMembership(authorizable));
-
assertTrue(Iterators.elementsEqual(Collections.singleton(authorizable).iterator(),
config.getAutoMembers(userManager, gr)));
+
assertTrue(IteratorUtils.elementsEqual(Collections.singleton(authorizable).iterator(),
config.getAutoMembers(userManager, gr)));
// verify that DefaultSyncHandler was notified about the service
verify(amc).getAutoMembership(authorizable);
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
index c42b6920e5..2ebcb232d5 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.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.Group;
import org.apache.jackrabbit.api.security.user.UserManager;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.AutoMembershipConfig;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
@@ -373,6 +374,6 @@ public class AutoMembershipPrincipalsTest extends
AbstractAutoMembershipTest {
assertFalse(amp.getMembersFromAutoMembershipConfig(automembershipGroup1).hasNext());
assertFalse(amp.getMembersFromAutoMembershipConfig(automembershipGroup2).hasNext());
-
assertTrue(Iterators.elementsEqual(Collections.singleton(authorizable).iterator(),
amp.getMembersFromAutoMembershipConfig(automembershipGroup3)));
+
assertTrue(IteratorUtils.elementsEqual(Collections.singleton(authorizable).iterator(),
amp.getMembersFromAutoMembershipConfig(automembershipGroup3)));
}
}
\ No newline at end of file
diff --git
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderDMTest.java
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderDMTest.java
index b10d2a3b71..bfb0f4cafa 100644
---
a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderDMTest.java
+++
b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderDMTest.java
@@ -215,7 +215,7 @@ public class ExternalGroupPrincipalProviderDMTest extends
AbstractPrincipalTest
Iterator<Authorizable> membersInh =
principalProvider.getMembers(gr, true);
assertTrue(membersDecl.hasNext());
assertTrue(membersInh.hasNext());
- assertTrue(Iterators.elementsEqual(membersDecl, membersInh));
+ assertTrue(IteratorUtils.elementsEqual(membersDecl, membersInh));
}
}
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java
index 92f2905393..c091c2dbbb 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManagerTest.java
@@ -24,6 +24,7 @@ import
org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
import
org.apache.jackrabbit.commons.iterator.AccessControlPolicyIteratorAdapter;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.Tree;
+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.tree.TreeUtil;
@@ -421,7 +422,7 @@ public class CompositeAccessControlManagerTest extends
AbstractSecurityTest {
Set<Principal> principalSet = Set.of(EveryonePrincipal.getInstance());
CompositeAccessControlManager composite = createComposite(mgr);
-
assertTrue(Iterators.elementsEqual(Collections.singleton(policy).iterator(),
composite.getEffectivePolicies(principalSet, ROOT_PATH)));
+
assertTrue(IteratorUtils.elementsEqual(Collections.singleton(policy).iterator(),
composite.getEffectivePolicies(principalSet, ROOT_PATH)));
verify(mgr, times(0)).getEffectivePolicies(principalSet);
verify(mgr, times(1)).getEffectivePolicies(principalSet, ROOT_PATH);
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java
index b55a055bc9..93a63d4c09 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/AbstractPrincipalProviderTest.java
@@ -37,6 +37,7 @@ import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.spi.security.principal.AdminPrincipal;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
@@ -460,7 +461,7 @@ public abstract class AbstractPrincipalProviderTest extends
AbstractSecurityTest
PrincipalManager.SEARCH_TYPE_ALL, -1, limit);
Iterator<? extends Principal> i2 =
principalProvider.findPrincipals("testGroup", true,
PrincipalManager.SEARCH_TYPE_ALL, 0, limit);
- assertTrue(Iterators.elementsEqual(i1, i2));
+ assertTrue(IteratorUtils.elementsEqual(i1, i2));
}
}
}
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
index 0ca4abda17..4ef4d292a1 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImplTest.java
@@ -32,6 +32,7 @@ import org.apache.jackrabbit.api.security.user.Query;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.oak.api.Root;
+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.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl;
@@ -128,7 +129,7 @@ public class PrincipalProviderImplTest extends
AbstractPrincipalProviderTest {
assertFalse(result.hasNext());
result =
createPrincipalProvider(umMock).findPrincipals(PrincipalManager.SEARCH_TYPE_GROUP);
-
assertTrue(Iterators.elementsEqual(Collections.singleton(EveryonePrincipal.getInstance()).iterator(),
result));
+
assertTrue(IteratorUtils.elementsEqual(Collections.singleton(EveryonePrincipal.getInstance()).iterator(),
result));
}
@Test
@@ -141,6 +142,6 @@ public class PrincipalProviderImplTest extends
AbstractPrincipalProviderTest {
assertFalse(result.hasNext());
result =
createPrincipalProvider(umMock).findPrincipals(PrincipalManager.SEARCH_TYPE_GROUP);
-
assertTrue(Iterators.elementsEqual(Collections.singleton(EveryonePrincipal.getInstance()).iterator(),
result));
+
assertTrue(IteratorUtils.elementsEqual(Collections.singleton(EveryonePrincipal.getInstance()).iterator(),
result));
}
}
\ No newline at end of file
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/GroupImplTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/GroupImplTest.java
index e88bc84bc4..ec61133a34 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/GroupImplTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/GroupImplTest.java
@@ -23,6 +23,7 @@ import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.junit.Test;
@@ -159,7 +160,7 @@ public class GroupImplTest extends AbstractUserTest {
AbstractGroupPrincipal groupPrincipal = (AbstractGroupPrincipal)
group.getPrincipal();
Iterator<Authorizable> members = groupPrincipal.getMembers();
- assertTrue(Iterators.elementsEqual(group.getMembers(), members));
+ assertTrue(IteratorUtils.elementsEqual(group.getMembers(), members));
}
@Test
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderTest.java
index 7dd0daa7da..68c7c5dfac 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProviderTest.java
@@ -268,7 +268,7 @@ public class UserPrincipalProviderTest extends
AbstractPrincipalProviderTest {
SEARCH_TYPE_GROUP, 0, -1);
Iterator<? extends Principal> i2 =
principalProvider.findPrincipals("testGroup*", true,
SEARCH_TYPE_GROUP, 0, -1);
- assertTrue(Iterators.elementsEqual(i1, i2));
+ assertTrue(IteratorUtils.elementsEqual(i1, i2));
}
@Test
@@ -297,7 +297,7 @@ public class UserPrincipalProviderTest extends
AbstractPrincipalProviderTest {
SEARCH_TYPE_GROUP, 0, limit);
Iterator<? extends Principal> i2 =
principalProvider.findPrincipals("testGroup*", true,
SEARCH_TYPE_GROUP, 0, limit);
- assertTrue(Iterators.elementsEqual(i1, i2));
+ assertTrue(IteratorUtils.elementsEqual(i1, i2));
}
}
diff --git
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableImplTest.java
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableImplTest.java
index 0ec5e65001..c872473d51 100644
---
a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableImplTest.java
+++
b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AuthorizableImplTest.java
@@ -18,6 +18,7 @@ package org.apache.jackrabbit.oak.security.user.autosave;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.api.security.user.Authorizable;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -104,14 +105,14 @@ public class AuthorizableImplTest extends
AbstractAutoSaveTest {
@Test
public void testDeclaredMemberOf() throws Exception {
- assertTrue(Iterators.elementsEqual(dlg.declaredMemberOf(),
a.declaredMemberOf()));
+ assertTrue(IteratorUtils.elementsEqual(dlg.declaredMemberOf(),
a.declaredMemberOf()));
verify(dlg, times(2)).declaredMemberOf();
verify(autosaveMgr, never()).autosave();
}
@Test
public void testMemberOf() throws Exception {
- assertTrue(Iterators.elementsEqual(dlg.memberOf(), a.memberOf()));
+ assertTrue(IteratorUtils.elementsEqual(dlg.memberOf(), a.memberOf()));
verify(dlg, times(2)).memberOf();
verify(autosaveMgr, never()).autosave();
}
@@ -125,14 +126,14 @@ public class AuthorizableImplTest extends
AbstractAutoSaveTest {
@Test
public void testGetPropertyNames() throws Exception {
- assertTrue(Iterators.elementsEqual(dlg.getPropertyNames(),
a.getPropertyNames()));
+ assertTrue(IteratorUtils.elementsEqual(dlg.getPropertyNames(),
a.getPropertyNames()));
verify(dlg, times(2)).getPropertyNames();
verify(autosaveMgr, never()).autosave();
}
@Test
public void testGetPropertyNamesRelPath() throws Exception {
- assertTrue(Iterators.elementsEqual(dlg.getPropertyNames("."),
a.getPropertyNames(".")));
+ assertTrue(IteratorUtils.elementsEqual(dlg.getPropertyNames("."),
a.getPropertyNames(".")));
verify(dlg, times(2)).getPropertyNames(".");
verify(autosaveMgr, never()).autosave();
}
diff --git
a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTrackerTest.java
b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTrackerTest.java
index f3042da9da..4c23d39f7a 100644
---
a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTrackerTest.java
+++
b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTrackerTest.java
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.spi.xml;
import org.apache.jackrabbit.guava.common.collect.Iterators;
+import org.apache.jackrabbit.oak.commons.collections.IteratorUtils;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -50,11 +51,11 @@ public class ReferenceChangeTrackerTest {
rct.processedReference("ref");
rct.processedReference("ref2");
- assertTrue(Iterators.elementsEqual(List.of("ref", "ref2").iterator(),
rct.getProcessedReferences()));
+ assertTrue(IteratorUtils.elementsEqual(List.of("ref",
"ref2").iterator(), rct.getProcessedReferences()));
rct.removeReferences(List.of("ref"));
- assertTrue(Iterators.elementsEqual(List.of("ref2").iterator(),
rct.getProcessedReferences()));
+ assertTrue(IteratorUtils.elementsEqual(List.of("ref2").iterator(),
rct.getProcessedReferences()));
}
}
\ No newline at end of file
