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/11/28 12:01:45 UTC
(jackrabbit-oak) branch OAK-11278 updated: OAK-11278: remove ImmutableMap.of - multiple argument case - oak-authorization-cug
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11278
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-11278 by this push:
new 01c883e491 OAK-11278: remove ImmutableMap.of - multiple argument case - oak-authorization-cug
01c883e491 is described below
commit 01c883e4915790d622a995d7293846b64d9dfc7d
Author: Julian Reschke <re...@apache.org>
AuthorDate: Thu Nov 28 13:01:31 2024 +0100
OAK-11278: remove ImmutableMap.of - multiple argument case - oak-authorization-cug
---
.../oak/spi/security/authorization/cug/impl/AbstractCugTest.java | 3 +--
.../authorization/cug/impl/CugAccessControlManagerTest.java | 3 +--
.../security/authorization/cug/impl/CugConfigurationOsgiTest.java | 7 +++----
.../spi/security/authorization/cug/impl/CugConfigurationTest.java | 3 +--
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
index edeb230c33..a80cfa3b7d 100644
--- a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
+++ b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/AbstractCugTest.java
@@ -28,7 +28,6 @@ import javax.jcr.security.AccessControlManager;
import javax.jcr.security.AccessControlPolicy;
import javax.jcr.security.AccessControlPolicyIterator;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
@@ -180,7 +179,7 @@ public abstract class AbstractCugTest extends AbstractSecurityTest implements Cu
// - /content/aa/bb : allow testGroup, deny everyone
// - /content/a/b/c : allow everyone, deny testGroup (isolated)
// - /content2 : allow everyone, deny testGroup (isolated)
- Map<String, Principal> m = ImmutableMap.of(
+ Map<String, Principal> m = Map.of(
"/content/a", testGroupPrincipal,
"/content/aa/bb", testGroupPrincipal,
"/content/a/b/c", EveryonePrincipal.getInstance(),
diff --git a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
index 743f914d37..34e1598281 100644
--- a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
+++ b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
@@ -31,7 +31,6 @@ import javax.jcr.security.NamedAccessControlPolicy;
import javax.jcr.security.Privilege;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.guava.common.collect.Sets;
@@ -89,7 +88,7 @@ public class CugAccessControlManagerTest extends AbstractCugTest {
@Test
public void testGetSupportedPrivileges() throws Exception {
Privilege[] readPrivs = privilegesFromNames(PrivilegeConstants.JCR_READ);
- Map<String, Privilege[]> pathMap = ImmutableMap.of(
+ Map<String, Privilege[]> pathMap = Map.of(
SUPPORTED_PATH, readPrivs,
SUPPORTED_PATH + "/subtree", readPrivs,
UNSUPPORTED_PATH, new Privilege[0],
diff --git a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationOsgiTest.java b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationOsgiTest.java
index 033b4d808a..e8b64d981b 100644
--- a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationOsgiTest.java
+++ b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationOsgiTest.java
@@ -20,7 +20,6 @@ import java.security.Principal;
import java.util.Map;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.composite.MountInfoProviderService;
import org.apache.jackrabbit.oak.plugins.tree.impl.RootProviderService;
@@ -46,7 +45,7 @@ public class CugConfigurationOsgiTest extends AbstractSecurityTest {
private static final String EXCLUDED_PRINCIPAL_NAME = "excludedPrincipal";
private static final String ANY_PRINCIPAL_NAME = "anyPrincipal";
- private static final Map<String, Object> PROPERTIES = ImmutableMap.of(
+ private static final Map<String, Object> PROPERTIES = Map.of(
CugConstants.PARAM_CUG_ENABLED, true,
CugConstants.PARAM_CUG_SUPPORTED_PATHS, new String[] {"/"});
@@ -121,7 +120,7 @@ public class CugConfigurationOsgiTest extends AbstractSecurityTest {
@Test
public void testNotEnabled() {
context.registerInjectActivateService(cugExclude, Map.of("principalNames", new String[] {ANY_PRINCIPAL_NAME}));
- context.registerInjectActivateService(cugConfiguration, ImmutableMap.of(
+ context.registerInjectActivateService(cugConfiguration, Map.of(
CugConstants.PARAM_CUG_ENABLED, false,
CugConstants.PARAM_CUG_SUPPORTED_PATHS, new String[]{"/"}));
@@ -133,7 +132,7 @@ public class CugConfigurationOsgiTest extends AbstractSecurityTest {
@Test
public void testNoSupportedPaths() {
context.registerInjectActivateService(cugExclude, Map.of("principalNames", new String[] {ANY_PRINCIPAL_NAME}));
- context.registerInjectActivateService(cugConfiguration, ImmutableMap.of(
+ context.registerInjectActivateService(cugConfiguration, Map.of(
CugConstants.PARAM_CUG_ENABLED, true,
CugConstants.PARAM_CUG_SUPPORTED_PATHS, new String[0]));
diff --git a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
index 58bfbcfb6e..e5aab423ae 100644
--- a/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
+++ b/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
@@ -24,7 +24,6 @@ import java.util.Set;
import javax.jcr.security.AccessControlManager;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
@@ -204,7 +203,7 @@ public class CugConfigurationTest extends AbstractCugTest {
@Test
public void testActivate() {
CugConfiguration cugConfiguration = createConfiguration(ConfigurationParameters.EMPTY);
- cugConfiguration.activate(ImmutableMap.of(
+ cugConfiguration.activate(Map.of(
CugConstants.PARAM_CUG_ENABLED, false,
CugConstants.PARAM_CUG_SUPPORTED_PATHS, new String[] {"/content", "/anotherContent"}
));