You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/09/16 18:38:23 UTC
(jackrabbit-oak) 01/02: OAK-11100: remove use of Guava transform/filter - oak-exercise
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
commit 804e154d60c5cc95a3487611fd250c794394d3be
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Sep 16 18:12:23 2024 +0100
OAK-11100: remove use of Guava transform/filter - oak-exercise
---
.../authentication/external/CustomExternalIdentityProvider.java | 7 +++----
.../models/simplifiedroles/ThreeRolesPermissionProvider.java | 4 ++--
.../authorization/advanced/L5_CustomPermissionEvaluationTest.java | 3 +--
.../oak/exercise/security/privilege/L4_CustomPrivilegeTest.java | 6 ++----
4 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java b/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
index 8050611891..81d48b22e8 100644
--- a/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
+++ b/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authentication/external/CustomExternalIdentityProvider.java
@@ -17,8 +17,6 @@
package org.apache.jackrabbit.oak.exercise.security.authentication.external;
import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalGroup;
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentity;
@@ -46,6 +44,7 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
+import java.util.stream.Collectors;
@Component(service = ExternalIdentityProvider.class, immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE)
@Designate(ocd = CustomExternalIdentityProvider.Configuration.class)
@@ -153,8 +152,8 @@ public class CustomExternalIdentityProvider implements ExternalIdentityProvider
if (groupIds == null || groupIds.isEmpty()) {
return Set.of();
} else {
- return Iterables.transform(groupIds,
- input -> new ExternalIdentityRef(input, getName()));
+ return groupIds.stream().map(input -> new ExternalIdentityRef(input, getName()))
+ .collect(Collectors.toUnmodifiableSet());
}
}
diff --git a/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java b/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java
index b62101bb2f..4e91d2960d 100644
--- a/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java
+++ b/oak-exercise/src/main/java/org/apache/jackrabbit/oak/exercise/security/authorization/models/simplifiedroles/ThreeRolesPermissionProvider.java
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.exercise.security.authorization.models.simplifiedroles;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
@@ -39,6 +38,7 @@ import org.jetbrains.annotations.Nullable;
import java.security.Principal;
import java.util.Set;
+import java.util.stream.Collectors;
class ThreeRolesPermissionProvider implements AggregatedPermissionProvider, ThreeRolesConstants {
@@ -61,7 +61,7 @@ class ThreeRolesPermissionProvider implements AggregatedPermissionProvider, Thre
@NotNull String supportedPath, @NotNull Context ctx,
@NotNull RootProvider rootProvider) {
this.root = root;
- this.principalNames = ImmutableSet.copyOf(Iterables.transform(principals, Principal::getName));
+ this.principalNames = principals.stream().map(Principal::getName).collect(Collectors.toUnmodifiableSet());
this.supportedPath = supportedPath;
this.ctx = ctx;
this.rootProvider = rootProvider;
diff --git a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L5_CustomPermissionEvaluationTest.java b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L5_CustomPermissionEvaluationTest.java
index 35c9d8076a..f272d65bea 100644
--- a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L5_CustomPermissionEvaluationTest.java
+++ b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/authorization/advanced/L5_CustomPermissionEvaluationTest.java
@@ -25,7 +25,6 @@ import javax.jcr.security.Privilege;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
@@ -212,7 +211,7 @@ public class L5_CustomPermissionEvaluationTest extends AbstractSecurityTest {
}
private Iterable<String> getTreePaths() {
- return Iterables.transform(trees, Tree::getPath);
+ return () -> trees.stream().map(Tree::getPath).iterator();
}
private Set<Principal> getGuestPrincipals() throws Exception {
diff --git a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java
index 65506fe24f..d8a42c25c9 100644
--- a/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java
+++ b/oak-exercise/src/test/java/org/apache/jackrabbit/oak/exercise/security/privilege/L4_CustomPrivilegeTest.java
@@ -17,15 +17,14 @@
package org.apache.jackrabbit.oak.exercise.security.privilege;
import java.security.Principal;
+import java.util.Arrays;
import java.util.Set;
import java.util.UUID;
import javax.jcr.security.Privilege;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
-import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants;
import org.junit.Test;
@@ -116,8 +115,7 @@ public class L4_CustomPrivilegeTest extends AbstractSecurityTest {
fail();
}
- Iterable<String> resultNames = Iterables.transform(CollectionUtils.toSet(result),
- Object::toString);
+ Iterable<String> resultNames = () -> Arrays.asList(result).stream().map(Object::toString).iterator();
Iterables.removeAll(resultNames, expectedNames);
assertFalse(resultNames.iterator().hasNext());