(jackrabbit-oak) branch OAK-11100 updated: OAK-11100: remove use of Guava transform/filter - oak-authorization-cug

[re...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

reschke pushed a commit to branch OAK-11100
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git


The following commit(s) were added to refs/heads/OAK-11100 by this push:
     new 340990f881 OAK-11100: remove use of Guava transform/filter - oak-authorization-cug
340990f881 is described below

commit 340990f881800cc5e3df3c04c6afb09972c77611
Author: Julian Reschke <re...@apache.org>
AuthorDate: Sat Sep 14 17:29:07 2024 +0100

    OAK-11100: remove use of Guava transform/filter - oak-authorization-cug
---
 .../authorization/cug/impl/CugAccessControlManager.java        |  2 +-
 .../spi/security/authorization/cug/impl/CugImportBaseTest.java | 10 ++++++----
 2 files changed, 7 insertions(+), 5 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 0fd6220e02..45ffbce30e 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
@@ -229,7 +229,7 @@ class CugAccessControlManager extends AbstractAccessControlManager implements Cu
             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 {
diff --git a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
index 0c217d9538..445ff53043 100644
--- a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
+++ b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImportBaseTest.java
@@ -18,7 +18,11 @@ package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.Set;
+import java.util.stream.Collectors;
+
 import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.Node;
 import javax.jcr.Property;
@@ -31,8 +35,6 @@ import javax.jcr.ValueFactory;
 import javax.jcr.nodetype.ConstraintViolationException;
 import javax.jcr.security.AccessControlException;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.api.JackrabbitRepository;
 import org.apache.jackrabbit.api.JackrabbitSession;
 import org.apache.jackrabbit.api.security.user.Group;
@@ -191,13 +193,13 @@ public abstract class CugImportBaseTest {
 
     static void assertPrincipalNames(@NotNull Set<String> expectedPrincipalNames, @NotNull Value[] principalNames) {
         assertEquals(expectedPrincipalNames.size(), principalNames.length);
-        Set<String> result = ImmutableSet.copyOf(Iterables.transform(ImmutableSet.copyOf(principalNames), principalName -> {
+        Set<String> result = Collections.unmodifiableSet(Arrays.asList(principalNames).stream().map(principalName -> {
             try {
                 return principalName.getString();
             } catch (RepositoryException e) {
                 throw new IllegalStateException(e);
             }
-        }));
+        }).collect(Collectors.toSet()));
         assertEquals(expectedPrincipalNames, result);
     }