This is an automated email from the ASF dual-hosted git repository. daim pushed a commit to branch OAK-11591 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 62a997921079fa3c6be7e49d6acc8b8707199ca8 Author: Rishabh Kumar <[email protected]> AuthorDate: Tue Apr 15 13:31:39 2025 +0530 OAK-11591 : removed usage of Iterators.contains with oak-commons util --- .../external/impl/DynamicSyncContextTest.java | 3 ++- .../PrincipalProviderAutoMembershipTest.java | 7 ++++--- .../oak/plugins/blob/CachingDataStoreTest.java | 4 ++-- .../oak/plugins/atomic/AtomicCounterEditor.java | 3 ++- .../oak/security/user/MembershipProvider.java | 7 ++++--- .../security/user/DynamicMembershipTrackerTest.java | 9 +++++---- .../oak/security/user/ImpersonationImplTest.java | 5 +++-- .../oak/security/user/MembershipProviderTest.java | 2 +- .../oak/security/user/UserImporterTest.java | 3 ++- .../jcr/security/user/GroupImportIgnoreTest.java | 5 +++-- .../principal/PrincipalManagerImplTest.java | 21 +++++++++++---------- .../oak/segment/file/JournalReaderTest.java | 7 ++++--- 12 files changed, 43 insertions(+), 33 deletions(-) diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java index a50b75bf80..a764feefd2 100644 --- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java +++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContextTest.java @@ -25,6 +25,7 @@ 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.IterableUtils; +import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.SetUtils; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalGroup; @@ -165,7 +166,7 @@ public class DynamicSyncContextTest extends AbstractDynamicTest { if (IterableUtils.contains(declaredGroupRefs, ref)) { assertTrue(gr.isDeclaredMember(a)); - assertTrue(Iterators.contains(a.declaredMemberOf(), gr)); + assertTrue(IteratorUtils.contains(a.declaredMemberOf(), gr)); } } } diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderAutoMembershipTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderAutoMembershipTest.java index 1afb4307a7..52d58fcf97 100644 --- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderAutoMembershipTest.java +++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderAutoMembershipTest.java @@ -24,6 +24,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.namepath.NamePathMapper; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.AutoMembershipConfig; import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig; @@ -310,9 +311,9 @@ public class PrincipalProviderAutoMembershipTest extends ExternalGroupPrincipalP for (String hint : hints) { Iterator<? extends Principal> res = principalProvider.findPrincipals(hint, PrincipalManager.SEARCH_TYPE_GROUP); - assertFalse(Iterators.contains(res, userAutoMembershipGroup.getPrincipal())); - assertFalse(Iterators.contains(res, groupAutoMembershipGroup.getPrincipal())); - assertFalse(Iterators.contains(res, new PrincipalImpl(NON_EXISTING_GROUP_ID))); + assertFalse(IteratorUtils.contains(res, userAutoMembershipGroup.getPrincipal())); + assertFalse(IteratorUtils.contains(res, groupAutoMembershipGroup.getPrincipal())); + assertFalse(IteratorUtils.contains(res, new PrincipalImpl(NON_EXISTING_GROUP_ID))); } } diff --git a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java index 8552d1faad..8b4c90ad34 100644 --- a/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java +++ b/oak-blob-plugins/src/test/java/org/apache/jackrabbit/oak/plugins/blob/CachingDataStoreTest.java @@ -509,14 +509,14 @@ public class CachingDataStoreTest extends AbstractDataStoreCacheTest { DataRecord rec = dataStore.addRecord(fin); assertEquals(id, rec.getIdentifier().toString()); - assertTrue(Iterators.contains(dataStore.getAllIdentifiers(), new DataIdentifier(id))); + assertTrue(IteratorUtils.contains(dataStore.getAllIdentifiers(), new DataIdentifier(id))); //start & finish taskLatch.countDown(); callbackLatch.countDown(); waitFinish(); - assertTrue(Iterators.contains(dataStore.getAllIdentifiers(), new DataIdentifier(id))); + assertTrue(IteratorUtils.contains(dataStore.getAllIdentifiers(), new DataIdentifier(id))); LOG.info("Finished getAllIdentifiers"); } diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java index c66705c687..3bab8ee600 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/atomic/AtomicCounterEditor.java @@ -34,6 +34,7 @@ import org.apache.jackrabbit.oak.api.CommitFailedException; import org.apache.jackrabbit.oak.api.PropertyState; 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.plugins.memory.LongPropertyState; import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.apache.jackrabbit.oak.spi.commit.CommitContext; @@ -222,7 +223,7 @@ public class AtomicCounterEditor extends DefaultEditor { boolean process = false; PropertyState mixin = requireNonNull(builder).getProperty(JCR_MIXINTYPES); if (mixin != null && PROP_INCREMENT.equals(property.getName()) && - Iterators.contains(mixin.getValue(NAMES).iterator(), MIX_ATOMIC_COUNTER)) { + IteratorUtils.contains(mixin.getValue(NAMES).iterator(), MIX_ATOMIC_COUNTER)) { if (LONG.equals(property.getType())) { process = true; } else { diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java index 4457049589..3159df00d0 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java @@ -29,6 +29,7 @@ import org.apache.jackrabbit.oak.api.PropertyState; 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.IteratorUtils; import org.apache.jackrabbit.oak.plugins.memory.PropertyValues; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; @@ -165,7 +166,7 @@ class MembershipProvider extends AuthorizableBaseProvider { * @return {@code true} if the group is contained in the membership of the specified authorizable. */ private boolean hasMembership(@NotNull Tree authorizableTree, @NotNull String groupPath) { - return Iterators.contains(Iterators.transform(getMembership(authorizableTree, true), Tree::getPath), groupPath); + return IteratorUtils.contains(Iterators.transform(getMembership(authorizableTree, true), Tree::getPath), groupPath); } /** @@ -243,7 +244,7 @@ class MembershipProvider extends AuthorizableBaseProvider { return false; } if (pendingChanges(groupTree)) { - return Iterators.contains(Iterators.transform(getMembers(groupTree, true), Tree::getPath), authorizableTree.getPath()); + return IteratorUtils.contains(Iterators.transform(getMembers(groupTree, true), Tree::getPath), authorizableTree.getPath()); } else { return hasMembership(authorizableTree, groupTree.getPath()); } @@ -256,7 +257,7 @@ class MembershipProvider extends AuthorizableBaseProvider { String contentId = getContentID(authorizableTree); MemberReferenceIterator refs = getDeclaredMemberReferenceIterator(groupTree); - return Iterators.contains(refs, contentId); + return IteratorUtils.contains(refs, contentId); } /** diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DynamicMembershipTrackerTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DynamicMembershipTrackerTest.java index 55a9e777db..52ada11be7 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DynamicMembershipTrackerTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/DynamicMembershipTrackerTest.java @@ -20,6 +20,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.oak.AbstractSecurityTest; +import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; import org.apache.jackrabbit.oak.spi.security.user.DynamicMembershipProvider; @@ -114,8 +115,8 @@ public class DynamicMembershipTrackerTest extends AbstractSecurityTest { assertFalse(dmp instanceof EveryoneMembershipProvider); // verify dmp is properly wired - assertTrue(Iterators.contains(provider.getMembership(a, false), gr)); - assertFalse(Iterators.contains(provider.getMembership(testUser, false), gr)); + assertTrue(IteratorUtils.contains(provider.getMembership(a, false), gr)); + assertFalse(IteratorUtils.contains(provider.getMembership(testUser, false), gr)); assertTrue(provider.coversAllMembers(gr)); assertFalse(provider.coversAllMembers(mock(Group.class))); @@ -123,8 +124,8 @@ public class DynamicMembershipTrackerTest extends AbstractSecurityTest { assertTrue(provider.isMember(gr, a, false)); assertFalse(provider.isMember(gr, testUser, true)); - assertTrue(Iterators.contains(provider.getMembers(gr, true), a)); - assertFalse(Iterators.contains(provider.getMembers(gr, true), testUser)); + assertTrue(IteratorUtils.contains(provider.getMembers(gr, true), a)); + assertFalse(IteratorUtils.contains(provider.getMembers(gr, true), testUser)); // verify that EveryoneMembershipProvider is covered as well Group everyone = mock(Group.class); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ImpersonationImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ImpersonationImplTest.java index 4e89815a49..3f74e24d31 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ImpersonationImplTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ImpersonationImplTest.java @@ -32,6 +32,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.commons.collections.SetUtils; import org.apache.jackrabbit.oak.spi.security.principal.PrincipalImpl; import org.apache.jackrabbit.oak.spi.security.user.UserConstants; @@ -74,7 +75,7 @@ public class ImpersonationImplTest extends ImpersonationImplEmptyTest { public void testGetImpersonators() throws Exception { PrincipalIterator it = impersonation.getImpersonators(); assertTrue(it.hasNext()); - assertTrue(Iterators.contains(it, impersonator.getPrincipal())); + assertTrue(IteratorUtils.contains(it, impersonator.getPrincipal())); } @Test @@ -84,7 +85,7 @@ public class ImpersonationImplTest extends ImpersonationImplEmptyTest { PrincipalIterator it = impersonation.getImpersonators(); assertTrue(it.hasNext()); - assertTrue(Iterators.contains(it, p)); + assertTrue(IteratorUtils.contains(it, p)); } @Test diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipProviderTest.java index 07970df4bf..149bfea0e2 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipProviderTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipProviderTest.java @@ -412,6 +412,6 @@ public class MembershipProviderTest extends MembershipBaseTest { } private static boolean contains(@NotNull Iterator<Tree> treeIterator, @NotNull Tree tree) { - return Iterators.contains(Iterators.transform(treeIterator, Tree::getPath), tree.getPath()); + return IteratorUtils.contains(Iterators.transform(treeIterator, Tree::getPath), tree.getPath()); } } \ No newline at end of file diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterTest.java index a8782755da..97f375c6df 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterTest.java @@ -28,6 +28,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.namepath.NamePathMapper; import org.apache.jackrabbit.oak.plugins.tree.TreeUtil; import org.apache.jackrabbit.oak.security.user.autosave.AutoSaveEnabledManager; @@ -426,7 +427,7 @@ public class UserImporterTest extends UserImporterBaseTest implements UserConsta refTracker.processedReference(unknownReferenceObj); importer.processReferences(); - assertTrue(Iterators.contains(refTracker.getProcessedReferences(), unknownReferenceObj)); + assertTrue(IteratorUtils.contains(refTracker.getProcessedReferences(), unknownReferenceObj)); } //------------------------------------------------< propertiesCompleted >--- diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportIgnoreTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportIgnoreTest.java index e641aaffba..338dc5ee64 100644 --- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportIgnoreTest.java +++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/GroupImportIgnoreTest.java @@ -23,6 +23,7 @@ import java.util.UUID; import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.Group; +import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.spi.xml.ImportBehavior; import org.apache.jackrabbit.test.NotExecutableException; import org.jetbrains.annotations.NotNull; @@ -139,7 +140,7 @@ public class GroupImportIgnoreTest extends AbstractImportTest { boolean b = g1.isDeclaredMember(g); assertEquals("Circular membership must be detected", !b, g.isDeclaredMember(g1)); - assertEquals("Circular membership must be detected", b, Iterators.contains(g1.getMembers(), g)); - assertEquals("Circular membership must be detected", !b, Iterators.contains(g.getMembers(), g1)); + assertEquals("Circular membership must be detected", b, IteratorUtils.contains(g1.getMembers(), g)); + assertEquals("Circular membership must be detected", !b, IteratorUtils.contains(g.getMembers(), g1)); } } diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java index b171e26d4e..b324320deb 100644 --- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java +++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalManagerImplTest.java @@ -25,6 +25,7 @@ import org.apache.jackrabbit.guava.common.collect.Iterators; import org.apache.jackrabbit.api.security.principal.GroupPrincipal; import org.apache.jackrabbit.api.security.principal.PrincipalIterator; import org.apache.jackrabbit.api.security.principal.PrincipalManager; +import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.commons.collections.SetUtils; import org.jetbrains.annotations.NotNull; import org.junit.Test; @@ -202,7 +203,7 @@ public class PrincipalManagerImplTest { @Test public void testGetGroupMembershipEveryoneWithoutEveryone() { - assertFalse(Iterators.contains(principalMgr.getGroupMembership(EveryonePrincipal.getInstance()), EveryonePrincipal.getInstance())); + assertFalse(IteratorUtils.contains(principalMgr.getGroupMembership(EveryonePrincipal.getInstance()), EveryonePrincipal.getInstance())); } @Test @@ -239,7 +240,7 @@ public class PrincipalManagerImplTest { for (Principal pcpl : testPrincipals) { PrincipalIterator it = principalMgr.findPrincipals(pcpl.getName()); - assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', Iterators.contains(it, pcpl)); + assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', IteratorUtils.contains(it, pcpl)); } } @@ -248,10 +249,10 @@ public class PrincipalManagerImplTest { for (Principal pcpl : testPrincipals) { if (isGroup(pcpl)) { PrincipalIterator it = principalMgr.findPrincipals(pcpl.getName(), PrincipalManager.SEARCH_TYPE_GROUP); - assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', Iterators.contains(it, pcpl)); + assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', IteratorUtils.contains(it, pcpl)); } else { PrincipalIterator it = principalMgr.findPrincipals(pcpl.getName(), PrincipalManager.SEARCH_TYPE_NOT_GROUP); - assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', Iterators.contains(it, pcpl)); + assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', IteratorUtils.contains(it, pcpl)); } } } @@ -262,10 +263,10 @@ public class PrincipalManagerImplTest { for (Principal pcpl : testPrincipals) { if (isGroup(pcpl)) { PrincipalIterator it = principalMgr.findPrincipals(pcpl.getName(), PrincipalManager.SEARCH_TYPE_GROUP); - assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', Iterators.contains(it, pcpl)); + assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', IteratorUtils.contains(it, pcpl)); } else { PrincipalIterator it = principalMgr.findPrincipals(pcpl.getName(), PrincipalManager.SEARCH_TYPE_NOT_GROUP); - assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', Iterators.contains(it, pcpl)); + assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', IteratorUtils.contains(it, pcpl)); } } } @@ -274,7 +275,7 @@ public class PrincipalManagerImplTest { public void testFindPrincipalByTypeAll() { for (Principal pcpl : testPrincipals) { PrincipalIterator it = principalMgr.findPrincipals(pcpl.getName(), PrincipalManager.SEARCH_TYPE_ALL); - assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', Iterators.contains(it, pcpl)); + assertTrue("findPrincipals does not find principal with filter '" + pcpl.getName() + '\'', IteratorUtils.contains(it, pcpl)); } } @@ -282,21 +283,21 @@ public class PrincipalManagerImplTest { public void testFindEveryone() { // untyped search -> everyone must be part of the result set PrincipalIterator it = principalMgr.findPrincipals(EveryonePrincipal.NAME); - assertTrue("findPrincipals does not find principal with filter '" + EveryonePrincipal.NAME + '\'', Iterators.contains(it, EveryonePrincipal.getInstance())); + assertTrue("findPrincipals does not find principal with filter '" + EveryonePrincipal.NAME + '\'', IteratorUtils.contains(it, EveryonePrincipal.getInstance())); } @Test public void testFindEveryoneTypeGroup() { // search group only -> everyone must be part of the result set PrincipalIterator it = principalMgr.findPrincipals(EveryonePrincipal.NAME, PrincipalManager.SEARCH_TYPE_GROUP); - assertTrue("findPrincipals does not find principal with filter '" + EveryonePrincipal.NAME + '\'', Iterators.contains(it, EveryonePrincipal.getInstance())); + assertTrue("findPrincipals does not find principal with filter '" + EveryonePrincipal.NAME + '\'', IteratorUtils.contains(it, EveryonePrincipal.getInstance())); } @Test public void testFindEveryoneTypeNonGroup() { // search non-group only -> everyone should not be part of the result set PrincipalIterator it = principalMgr.findPrincipals(EveryonePrincipal.NAME, PrincipalManager.SEARCH_TYPE_NOT_GROUP); - assertFalse("findPrincipals did find principal with filter '" + EveryonePrincipal.NAME + '\'', Iterators.contains(it, EveryonePrincipal.getInstance())); + assertFalse("findPrincipals did find principal with filter '" + EveryonePrincipal.NAME + '\'', IteratorUtils.contains(it, EveryonePrincipal.getInstance())); } @Test diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalReaderTest.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalReaderTest.java index a5bb4c219e..07482432d4 100644 --- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalReaderTest.java +++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/file/JournalReaderTest.java @@ -28,6 +28,7 @@ import java.io.File; import java.io.IOException; import org.apache.jackrabbit.guava.common.collect.Iterators; +import org.apache.jackrabbit.oak.commons.collections.IteratorUtils; import org.apache.jackrabbit.oak.segment.file.tar.LocalJournalFile; import org.junit.Rule; import org.junit.Test; @@ -136,9 +137,9 @@ public class JournalReaderTest { @Test public void testIterable() throws IOException { try (JournalReader journalReader = createJournalReader("one 1\ntwo 2\ninvalid\nthree 3 123")) { - assertTrue(Iterators.contains(journalReader, new JournalEntry("three", 123L))); - assertTrue(Iterators.contains(journalReader, new JournalEntry("two", -1L))); - assertTrue(Iterators.contains(journalReader, new JournalEntry("one", -1L))); + assertTrue(IteratorUtils.contains(journalReader, new JournalEntry("three", 123L))); + assertTrue(IteratorUtils.contains(journalReader, new JournalEntry("two", -1L))); + assertTrue(IteratorUtils.contains(journalReader, new JournalEntry("one", -1L))); } }
