OAK-11100: remove use of Guava transform/filter

oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.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.UserManager;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalGroup;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentity;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityException;
@@ -234,7 +235,8 @@ private Map<ExternalIdentityRef, SyncEntry> collectSyncEntries(@NotNull Iterable
      */
     private void collectSyncEntries(@NotNull Iterable<ExternalIdentityRef> declaredGroupRefs, long depth, @NotNull Map<ExternalIdentityRef, SyncEntry> map) throws ExternalIdentityException, RepositoryException {
         boolean shortcut = shortcut(depth);
-        for (ExternalIdentityRef ref : Iterables.filter(declaredGroupRefs, this::isSameIDP)) {
+        Iterable<ExternalIdentityRef> filtered = () -> CollectionUtils.toStream(declaredGroupRefs).filter(this::isSameIDP).iterator();
+        for (ExternalIdentityRef ref : filtered) {
             String principalName = null;
             Authorizable a = null;
             ExternalGroup externalGroup = null;

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.ContentRepository;
 import org.apache.jackrabbit.oak.api.ContentSession;
 import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.plugins.value.jcr.ValueFactoryImpl;
 import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
@@ -54,6 +55,7 @@
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Objects;
 
 import static java.util.Objects.requireNonNull;
 
@@ -354,25 +356,27 @@ private List<SyncResult> commit(@NotNull ResultMessages messages, @NotNull List<
 
     @NotNull
     private Iterator<String> internalListOrphanedIdentities() {
-        try {
-            Iterator<SyncedIdentity> it = handler.listIdentities(userMgr);
-            return Iterators.filter(Iterators.transform(it, syncedIdentity -> {
-                if (syncedIdentity != null && isMyIDP(syncedIdentity)) {
-                    try {
-                        // nonNull-ExternalIdRef has already been asserted by 'isMyIDP'
-                        ExternalIdentity extId = idp.getIdentity(requireNonNull(syncedIdentity.getExternalIdRef()));
-                        if (extId == null) {
-                            return syncedIdentity.getId();
-                        }
-                    } catch (ExternalIdentityException e) {
-                        log.error("Error while fetching external identity {}", syncedIdentity, e);
+        Iterable<SyncedIdentity> it = () -> {
+            try {
+                return handler.listIdentities(userMgr);
+            } catch (RepositoryException e) {
+                log.error("Error while listing orphaned users", e);
+                return Collections.emptyIterator();
+            }
+        };
+        return CollectionUtils.toStream(it).map(syncedIdentity -> {
+            if (syncedIdentity != null && isMyIDP(syncedIdentity)) {
+                try {
+                    // nonNull-ExternalIdRef has already been asserted by 'isMyIDP'
+                    ExternalIdentity extId = idp.getIdentity(requireNonNull(syncedIdentity.getExternalIdRef()));
+                    if (extId == null) {
+                        return syncedIdentity.getId();
                     }
+                } catch (ExternalIdentityException e) {
+                    log.error("Error while fetching external identity {}", syncedIdentity, e);
                 }
-                return null;
-            }), x -> x != null);
-        } catch (RepositoryException e) {
-            log.error("Error while listing orphaned users", e);
-            return Collections.emptyIterator();
-        }
+            }
+            return null;
+        }).filter(Objects::nonNull).iterator();
     }
 }

oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java

@@ -19,7 +19,6 @@
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.guava.common.collect.Iterators;
-import org.apache.jackrabbit.guava.common.collect.Sets;
 import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
 import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
 import org.apache.jackrabbit.api.security.principal.PrincipalManager;
@@ -35,6 +34,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.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
 import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
@@ -213,7 +213,7 @@ public Iterator<? extends Principal> findPrincipals(@Nullable String nameHint, i
         // search for external group principals that have not been synchronzied into the repository
         Result result = findPrincipals(Objects.toString(nameHint, ""), false);
         if (result != null) {
-            return Iterators.filter(new GroupPrincipalIterator(nameHint, result), Objects::nonNull);
+            return CollectionUtils.toStream(new GroupPrincipalIterator(nameHint, result)).filter(Objects::nonNull).iterator();
         } else {
             return Collections.emptyIterator();
         }
@@ -305,15 +305,15 @@ public boolean isMember(@NotNull Group group, @NotNull Authorizable authorizable
             }
 
             Set<Value> valueSet = ImmutableSet.copyOf(vs);
-            Iterator<Group> declared = Iterators.filter(Iterators.transform(valueSet.iterator(), value -> {
+            Iterator<Group> declared = valueSet.stream().map(value -> {
                 try {
                     String groupPrincipalName = value.getString();
                     Authorizable gr = userManager.getAuthorizable(new PrincipalImpl(groupPrincipalName));
                     return isValidGroup(gr, authorizable) ? (Group) gr : null;
                 } catch (RepositoryException e) {
                     return null;
                 }
-            }), Objects::nonNull);
+            }).filter(Objects::nonNull).iterator();
             if (includeInherited) {
                 // retrieve groups inherited from dynamic groups through cross-IDP membership
                 return new InheritedMembershipIterator(declared);
@@ -640,7 +640,8 @@ private GroupPrincipalIterator(@Nullable String queryString, @NotNull Result que
             if (!propValues.hasNext()) {
                 if (rows.hasNext()) {
                     ResultRow row = rows.next();
-                    propValues = Iterators.filter(row.getValue(REP_EXTERNAL_PRINCIPAL_NAMES).getValue(Type.STRINGS).iterator(), Objects::nonNull);
+                    propValues = CollectionUtils.toStream(row.getValue(REP_EXTERNAL_PRINCIPAL_NAMES).getValue(Type.STRINGS))
+                            .filter(Objects::nonNull).iterator();
                     idpName = getIdpName(row);
                 } else {
                     propValues = Collections.emptyIterator();

oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncHandlerMappingTracker.java

@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
 
-import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.oak.commons.PropertiesUtil;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.SyncHandlerMapping;
@@ -29,6 +28,7 @@
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
 import static org.apache.jackrabbit.oak.spi.security.authentication.external.impl.SyncHandlerMapping.PARAM_IDP_NAME;
 import static org.apache.jackrabbit.oak.spi.security.authentication.external.impl.SyncHandlerMapping.PARAM_SYNC_HANDLER_NAME;
@@ -77,14 +77,13 @@ private void addMapping(ServiceReference reference) {
     }
 
     Iterable<String> getIdpNames(@NotNull final String syncHandlerName) {
-        return Iterables.filter(Iterables.transform(referenceMap.values(), mapping -> {
+        return () -> referenceMap.values().stream().map(mapping -> {
             if (syncHandlerName.equals(mapping.syncHandlerName)) {
                 return mapping.idpName;
             } else {
                 // different synchandler name
                 return null;
-            }
-        }), x -> x != null);
+            }}).filter(Objects::nonNull).iterator();
     }
 
     private static final class Mapping {

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java

@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.spi.security.authentication.external;
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
-import org.apache.jackrabbit.guava.common.collect.Iterators;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.api.security.user.UserManager;
@@ -136,7 +135,7 @@ protected static void assertException(@NotNull CommitFailedException e, @NotNull
     @NotNull
     private static Iterator<String> getAllAuthorizableIds(@NotNull UserManager userManager) throws Exception {
         Iterator<Authorizable> iter = userManager.findAuthorizables("jcr:primaryType", null);
-        return Iterators.filter(Iterators.transform(iter, input -> {
+        return CollectionUtils.toStream(iter).map(input -> {
             try {
                 if (input != null) {
                     return input.getID();
@@ -145,7 +144,7 @@ private static Iterator<String> getAllAuthorizableIds(@NotNull UserManager userM
                 // failed to retrieve ID
             }
             return null;
-        }), Objects::nonNull);
+        }).filter(Objects::nonNull).iterator();
     }
 
     @Override

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/AbstractDynamicTest.java

@@ -16,12 +16,11 @@
  */
 package org.apache.jackrabbit.oak.spi.security.authentication.external.impl;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.Iterators;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.AbstractExternalAuthTest;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentity;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser;
@@ -34,8 +33,10 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.ValueFactory;
 import java.security.Principal;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static org.junit.Assert.assertSame;
 
@@ -116,17 +117,19 @@ protected void sync(@NotNull ExternalIdentity externalIdentity, @NotNull SyncRes
 
     @NotNull
     static List<String> getIds(@NotNull Iterator<? extends Authorizable> authorizables) {
-        return ImmutableList.copyOf(Iterators.transform(authorizables, authorizable -> {
+        return Collections.unmodifiableList(
+                CollectionUtils.toStream(authorizables).map(authorizable -> {
             try {
                 return authorizable.getID();
             } catch (RepositoryException repositoryException) {
                 throw new RuntimeException();
             }
-        }));
+        }).collect(Collectors.toList()));
     }
 
     @NotNull
     static List<String> getPrincipalNames(@NotNull Iterator<Principal> groupPrincipals) {
-        return ImmutableList.copyOf(Iterators.transform(groupPrincipals, Principal::getName));
+        return Collections
+                .unmodifiableList(CollectionUtils.toStream(groupPrincipals).map(Principal::getName).collect(Collectors.toList()));
     }
 }

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipProviderTest.java

@@ -26,6 +26,7 @@
 import org.apache.jackrabbit.api.security.user.UserManager;
 import org.apache.jackrabbit.oak.api.QueryEngine;
 import org.apache.jackrabbit.oak.api.Root;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
 import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
@@ -38,9 +39,11 @@
 import javax.jcr.RepositoryException;
 import java.text.ParseException;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import static org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants.REP_EXTERNAL_ID;
 import static org.junit.Assert.assertEquals;
@@ -108,13 +111,13 @@ private AutoMembershipProvider createAutoMembershipProvider(@NotNull Root root,
     }
 
     private static void assertMatchingEntries(@NotNull Iterator<Authorizable> it, @NotNull String... expectedIds) {
-        Set<String> ids = ImmutableSet.copyOf(Iterators.transform(it, authorizable -> {
+        Set<String> ids = Collections.unmodifiableSet(CollectionUtils.toStream(it).map(authorizable -> {
             try {
                 return authorizable.getID();
             } catch (RepositoryException repositoryException) {
                 return "";
             }
-        }));
+        }).collect(Collectors.toSet()));
         assertEquals(ImmutableSet.copyOf(expectedIds), ids);
     }
 

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java

@@ -17,8 +17,6 @@
 package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
 import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
 import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -27,6 +25,8 @@
 import org.apache.jackrabbit.oak.api.QueryEngine;
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
+import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalGroup;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentity;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalUser;
@@ -40,6 +40,7 @@
 import java.text.ParseException;
 import java.util.Enumeration;
 import java.util.Map;
+import java.util.stream.Stream;
 
 import static org.apache.jackrabbit.oak.spi.security.authentication.external.TestIdentityProvider.ID_SECOND_USER;
 import static org.apache.jackrabbit.oak.spi.security.authentication.external.impl.ExternalIdentityConstants.REP_EXTERNAL_PRINCIPAL_NAMES;
@@ -81,7 +82,9 @@ public void testNotIsMember() throws Exception {
     public void testIsMemberExternalGroup() throws Exception {
         GroupPrincipal principal = getGroupPrincipal();
 
-        Iterable<String> exGroupPrincNames = Iterables.transform(ImmutableList.copyOf(idp.listGroups()), ExternalIdentity::getPrincipalName);
+        Stream<ExternalGroup> s = CollectionUtils.toStream(idp.listGroups());
+        Iterable<String> exGroupPrincNames = () -> s.map(ExternalIdentity::getPrincipalName).iterator();
+
         for (String principalName : exGroupPrincNames) {
             assertFalse(principal.isMember(new PrincipalImpl(principalName)));
         }

oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityProviderTest.java

@@ -14,13 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.jackrabbit.oak.security.authentication.ldap.impl;
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.guava.common.collect.Iterators;
 import org.apache.directory.api.util.Strings;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalGroup;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentity;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityException;
@@ -200,7 +199,8 @@ public void testGetDeclaredMembersByRef() throws Exception {
     public void testGetDeclaredMembers() throws Exception {
         ExternalGroup gr = idp.getGroup(TEST_GROUP1_NAME);
         Iterable<ExternalIdentityRef> memberrefs = gr.getDeclaredMembers();
-        Iterable<String> memberIds = Iterables.transform(memberrefs, externalIdentityRef -> externalIdentityRef.getId());
+        Iterable<String> memberIds = () -> CollectionUtils.toStream(memberrefs)
+                .map(externalIdentityRef -> externalIdentityRef.getId()).iterator();
 
         Set<String> expected = ImmutableSet.copyOf(TEST_GROUP1_MEMBERS);
         assertEquals(expected, ImmutableSet.copyOf(memberIds));
@@ -212,7 +212,7 @@ public void testGetDeclaredMembersInvalidMemberAttribute() throws Exception {
 
         ExternalGroup gr = idp.getGroup(TEST_GROUP1_NAME);
         Iterable<ExternalIdentityRef> memberrefs = gr.getDeclaredMembers();
-        assertTrue(Iterables.isEmpty(memberrefs));
+        assertTrue(!memberrefs.iterator().hasNext());
     }
 
     @Test
@@ -237,7 +237,8 @@ public void testGetDeclaredGroupMissingIdAttribute() throws Exception {
 
         ExternalUser user = idp.getUser(TEST_USER1_UID);
         Iterable<ExternalIdentityRef> groupRefs = user.getDeclaredGroups();
-        Iterable<String> groupIds = Iterables.transform(groupRefs, externalIdentityRef -> externalIdentityRef.getId());
+        Iterable<String> groupIds = () -> CollectionUtils.toStream(groupRefs)
+                .map(externalIdentityRef -> externalIdentityRef.getId()).iterator();
         assertEquals(ImmutableSet.copyOf(TEST_USER1_GROUPS), ImmutableSet.copyOf(groupIds));
     }
 

oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java

@@ -229,7 +229,7 @@ public AccessControlPolicy[] getEffectivePolicies(@NotNull Set<Principal> princi
             return new AccessControlPolicy[0];
         }
         Root r = getLatestRoot();
-        Set<String> candidates = collectEffectiveCandidates(r, Iterables.transform(principals, Principal::getName));
+        Set<String> candidates = collectEffectiveCandidates(r, () -> principals.stream().map(Principal::getName).iterator());
         if (candidates.isEmpty()) {
             return new AccessControlPolicy[0];
         } else {