(jackrabbit-oak) branch trunk updated: OAK-11577 : removed usage of Guava's Iterables.find() with oak-commons (#2164)

[daim]

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 3f5167cb95 OAK-11577 : removed usage of Guava's Iterables.find() with 
oak-commons (#2164)
3f5167cb95 is described below

commit 3f5167cb95d1f8cb2be55a071f0e08ab4ebe022d
Author: Rishabh Kumar <rishabhdaim1...@gmail.com>
AuthorDate: Tue Mar 11 08:19:27 2025 +0530

    OAK-11577 : removed usage of Guava's Iterables.find() with oak-commons 
(#2164)
    
    * OAK-11577 : removed usage of Guava's Iterables.find() with oak-commons
    
    * OAK-11577 : fixed compilation issue
    
    ---------
    
    Co-authored-by: Rishabh Kumar <d...@adobe.com>
---
 .../jackrabbit/oak/plugins/migration/FilteringNodeStateTest.java       | 2 +-
 .../authorization/principalbased/AbstractPrincipalBasedTest.java       | 3 ++-
 .../org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java    | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeStateTest.java
 
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeStateTest.java
index 3f4d5d9199..a642d12e22 100644
--- 
a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeStateTest.java
+++ 
b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/migration/FilteringNodeStateTest.java
@@ -158,7 +158,7 @@ public class FilteringNodeStateTest {
                     return OAK_CHILD_ORDER.equals(propertyState.getName());
                 }
             };
-            final PropertyState childOrder = 
Iterables.find(decorated.getProperties(), isChildOrderProperty::test);
+            final PropertyState childOrder = 
IterableUtils.find(decorated.getProperties(), isChildOrderProperty::test);
             final Iterable<String> values = childOrder.getValue(Type.STRINGS);
             assertEquals(List.of("football"), ListUtils.toList(values));
         }
diff --git 
a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/AbstractPrincipalBasedTest.java
 
b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/AbstractPrincipalBasedTest.java
index 5276820ba9..f5dd641ab9 100644
--- 
a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/AbstractPrincipalBasedTest.java
+++ 
b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/principalbased/AbstractPrincipalBasedTest.java
@@ -24,6 +24,7 @@ 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.api.ContentSession;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
 import org.apache.jackrabbit.oak.commons.jdkcompat.Java23Subject;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.composite.MountInfoProviderService;
@@ -160,7 +161,7 @@ abstract class AbstractPrincipalBasedTest extends 
AbstractSecurityTest {
     @Nullable
     static PrincipalAccessControlList 
getApplicablePrincipalAccessControlList(@NotNull JackrabbitAccessControlManager 
acMgr, @NotNull Principal principal) throws Exception {
         Set<JackrabbitAccessControlPolicy> applicable = 
Set.of(acMgr.getApplicablePolicies(principal));
-        PrincipalAccessControlList acl = (PrincipalAccessControlList) 
Iterables.find(applicable, accessControlPolicy -> accessControlPolicy 
instanceof PrincipalAccessControlList, null);
+        PrincipalAccessControlList acl = (PrincipalAccessControlList) 
IterableUtils.find(applicable, accessControlPolicy -> accessControlPolicy 
instanceof PrincipalAccessControlList);
         return acl;
     }
 
diff --git 
a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
 
b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
index 7f4d045281..0fba6879c2 100644
--- 
a/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
+++ 
b/oak-it/src/test/java/org/apache/jackrabbit/oak/composite/CompositeNodeStoreTest.java
@@ -233,7 +233,7 @@ public class CompositeNodeStoreTest {
 
     @Test
     public void childNodeEntryForMountIsComposite() {
-        ChildNodeEntry libsNode = 
Iterables.find(store.getRoot().getChildNodeEntries(),
+        ChildNodeEntry libsNode = 
IterableUtils.find(store.getRoot().getChildNodeEntries(),
                 input -> input.getName().equals("libs"));
 
         assertThat("root.libs(childCount)", 
libsNode.getNodeState().getChildNodeCount(10), equalTo(3l));