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 10:57:28 UTC
(jackrabbit-oak) 02/02: OAK-11278: remove ImmutableMap.of - multiple argument case - oak-security-spi
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
commit 68edf4beef1fc445392f8b90e609db16cf23c95c
Author: Julian Reschke <re...@apache.org>
AuthorDate: Thu Nov 28 11:57:12 2024 +0100
OAK-11278: remove ImmutableMap.of - multiple argument case - oak-security-spi
---
.../oak/spi/security/ConfigurationParameters.java | 4 ++--
.../oak/spi/security/privilege/PrivilegeConstants.java | 3 +--
.../user/action/DefaultAuthorizableActionProvider.java | 4 ++--
.../oak/spi/security/ConfigurationParametersTest.java | 5 ++---
.../credentials/CompositeCredentialsSupportTest.java | 6 ++----
.../credentials/SimpleCredentialsSupportTest.java | 5 ++---
.../authorization/permission/PermissionsTest.java | 15 +++++++--------
.../restriction/AbstractRestrictionProviderTest.java | 3 +--
.../restriction/CompositeRestrictionProviderTest.java | 8 ++++----
.../oak/spi/security/user/util/UserUtilTest.java | 12 ++++++------
10 files changed, 29 insertions(+), 36 deletions(-)
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
index e1c62373bb..63406d872e 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
@@ -26,7 +26,7 @@ import java.util.Properties;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
+
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.commons.PropertiesUtil;
import org.jetbrains.annotations.NotNull;
@@ -170,7 +170,7 @@ public final class ConfigurationParameters implements Map<String, Object> {
@NotNull
public static ConfigurationParameters of(@NotNull String key1, @NotNull Object value1,
@NotNull String key2, @NotNull Object value2) {
- return new ConfigurationParameters(ImmutableMap.of(key1, value1, key2, value2));
+ return new ConfigurationParameters(Map.of(key1, value1, key2, value2));
}
/**
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeConstants.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeConstants.java
index a6ed9c651d..bb733a5b76 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeConstants.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeConstants.java
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.security.privilege;
import java.util.Map;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.JcrConstants;
/**
@@ -243,7 +242,7 @@ public interface PrivilegeConstants {
* The internal names and aggregation definition of all built-in privileges
* that are aggregates (except for jcr:all).
*/
- Map<String, String[]> AGGREGATE_PRIVILEGES = ImmutableMap.of(
+ Map<String, String[]> AGGREGATE_PRIVILEGES = Map.of(
JCR_READ, new String[]{REP_READ_NODES, REP_READ_PROPERTIES},
JCR_MODIFY_PROPERTIES, new String[]{REP_ADD_PROPERTIES, REP_ALTER_PROPERTIES, REP_REMOVE_PROPERTIES},
JCR_WRITE, new String[]{JCR_MODIFY_PROPERTIES, JCR_ADD_CHILD_NODES, JCR_REMOVE_CHILD_NODES, JCR_REMOVE_NODE},
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
index 8ccd4b6b56..de93a642d6 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/user/action/DefaultAuthorizableActionProvider.java
@@ -21,7 +21,7 @@ import static org.apache.jackrabbit.oak.spi.security.RegistrationConstants.OAK_S
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
+
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.jetbrains.annotations.NotNull;
@@ -76,7 +76,7 @@ public class DefaultAuthorizableActionProvider implements AuthorizableActionProv
private static final Logger log = LoggerFactory.getLogger(DefaultAuthorizableActionProvider.class);
- private static final Map<String, Class<? extends AuthorizableAction>> SUPPORTED_ACTIONS = ImmutableMap.of(
+ private static final Map<String, Class<? extends AuthorizableAction>> SUPPORTED_ACTIONS = Map.of(
AccessControlAction.class.getName(), AccessControlAction.class,
PasswordValidationAction.class.getName(), PasswordValidationAction.class,
PasswordChangeAction.class.getName(), PasswordChangeAction.class,
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
index 086495485d..32cfc1bf0a 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
@@ -27,7 +27,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-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;
@@ -72,7 +71,7 @@ public class ConfigurationParametersTest {
@Test
public void testCreationFromMap() {
- Map<String, String> m = ImmutableMap.of("a", "b");
+ Map<String, String> m = Map.of("a", "b");
ConfigurationParameters cp = ConfigurationParameters.of(m);
assertEquals(m.size(), cp.size());
@@ -589,7 +588,7 @@ public class ConfigurationParametersTest {
@Test(expected = UnsupportedOperationException.class)
public void testPutAll() {
ConfigurationParameters options = ConfigurationParameters.of();
- options.putAll(ImmutableMap.of("test", "val", "test2", "val2"));
+ options.putAll(Map.of("test", "val", "test2", "val2"));
}
@Test(expected = UnsupportedOperationException.class)
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
index 0eefced48f..d65514b15d 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
@@ -22,8 +22,6 @@ import java.util.Set;
import javax.jcr.Credentials;
import javax.jcr.SimpleCredentials;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
-
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.junit.Test;
@@ -71,7 +69,7 @@ public class CompositeCredentialsSupportTest {
assertNotNull(attributes);
assertTrue(attributes.isEmpty());
- Map<String, ?> expected = ImmutableMap.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
+ Map<String, ?> expected = Map.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
expected.forEach((key, value) -> sc.setAttribute(key, value));
attributes = credentialsSupport.getAttributes(sc);
@@ -99,7 +97,7 @@ public class CompositeCredentialsSupportTest {
assertNotNull(attributesD);
assertTrue(attributesD.isEmpty());
- Map<String, ?> expectedS = ImmutableMap.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
+ Map<String, ?> expectedS = Map.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
assertTrue(credentialsSupport.setAttributes(sc, expectedS));
Map<String, ?> expectedT = Map.of("test", "Test1CredentialsSupport");
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupportTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupportTest.java
index a5156270b7..8de9f18e83 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupportTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/SimpleCredentialsSupportTest.java
@@ -21,7 +21,6 @@ import java.util.Set;
import javax.jcr.Credentials;
import javax.jcr.SimpleCredentials;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -61,7 +60,7 @@ public class SimpleCredentialsSupportTest {
assertNotNull(attributes);
assertTrue(attributes.isEmpty());
- Map<String, ?> expected = ImmutableMap.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
+ Map<String, ?> expected = Map.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
expected.forEach((key, value) -> sc.setAttribute(key, value));
attributes = credentialsSupport.getAttributes(sc);
@@ -78,7 +77,7 @@ public class SimpleCredentialsSupportTest {
SimpleCredentials sc = new SimpleCredentials("uid", new char[0]);
- Map<String, ?> expected = ImmutableMap.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
+ Map<String, ?> expected = Map.of("a", "a", "b", Boolean.TRUE, "c", new TestCredentials());
credentialsSupport.setAttributes(sc, expected);
expected.forEach((key, value) -> assertEquals(value, sc.getAttribute(key)));
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java
index 4e6b913119..4a990363fc 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java
@@ -26,7 +26,6 @@ import javax.jcr.Session;
import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.base.Splitter;
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.Iterables;
import org.apache.jackrabbit.JcrConstants;
@@ -58,7 +57,7 @@ import static org.mockito.Mockito.when;
public class PermissionsTest {
- private static final Map<Long, Set<Long>> TEST = ImmutableMap.of(
+ private static final Map<Long, Set<Long>> TEST = Map.of(
Permissions.ADD_NODE|Permissions.ADD_PROPERTY,
Set.of(Permissions.ADD_NODE, Permissions.ADD_PROPERTY),
Permissions.LOCK_MANAGEMENT|Permissions.MODIFY_CHILD_NODE_COLLECTION,
@@ -115,7 +114,7 @@ public class PermissionsTest {
@Test
public void testGetNamesMultiple() {
- Map<Long, Set<Long>> test = ImmutableMap.of(
+ Map<Long, Set<Long>> test = Map.of(
Permissions.ADD_NODE|Permissions.ADD_PROPERTY,
Set.of(Permissions.ADD_NODE, Permissions.ADD_PROPERTY),
Permissions.LOCK_MANAGEMENT|Permissions.MODIFY_CHILD_NODE_COLLECTION,
@@ -137,7 +136,7 @@ public class PermissionsTest {
@Test
public void testGetNamesAggregates() {
- Map<Long, Set<Long>> test = ImmutableMap.of(
+ Map<Long, Set<Long>> test = Map.of(
Permissions.READ|Permissions.READ_ACCESS_CONTROL,
Set.of(Permissions.READ, Permissions.READ_NODE, Permissions.READ_PROPERTY, Permissions.READ_ACCESS_CONTROL),
Permissions.REMOVE|Permissions.SET_PROPERTY,
@@ -190,7 +189,7 @@ public class PermissionsTest {
@Test
public void testGetStringAggregates() {
- Map<Long, Set<Long>> test = ImmutableMap.of(
+ Map<Long, Set<Long>> test = Map.of(
Permissions.READ|Permissions.READ_ACCESS_CONTROL,
Set.of(Permissions.READ, Permissions.READ_NODE, Permissions.READ_PROPERTY, Permissions.READ_ACCESS_CONTROL),
Permissions.REMOVE|Permissions.SET_PROPERTY,
@@ -229,7 +228,7 @@ public class PermissionsTest {
@Test
public void testAggregates() {
- Map<Long, Set<Long>> aggregation = ImmutableMap.of(
+ Map<Long, Set<Long>> aggregation = Map.of(
Permissions.READ, Set.of(Permissions.READ_NODE, Permissions.READ_PROPERTY),
Permissions.SET_PROPERTY, Set.of(Permissions.ADD_PROPERTY, Permissions.MODIFY_PROPERTY, Permissions.REMOVE_PROPERTY),
Permissions.WRITE, Set.of(Permissions.ADD_NODE, Permissions.REMOVE_NODE, Permissions.ADD_PROPERTY, Permissions.REMOVE_PROPERTY,Permissions.MODIFY_PROPERTY)
@@ -341,7 +340,7 @@ public class PermissionsTest {
@Test
public void testGetPermissionsFromActions() {
TreeLocation tl = TreeLocation.create(existingTree);
- Map<String, Long> map = ImmutableMap.of(
+ Map<String, Long> map = Map.of(
Session.ACTION_READ, Permissions.READ_NODE,
Session.ACTION_READ + "," + Session.ACTION_REMOVE, Permissions.READ_NODE|Permissions.REMOVE_NODE
);
@@ -535,7 +534,7 @@ public class PermissionsTest {
@Test
public void testGetPermissionsForReservedPaths() {
- Map<String, Long> mapping = ImmutableMap.of(
+ Map<String, Long> mapping = Map.of(
NamespaceConstants.NAMESPACES_PATH, Permissions.NAMESPACE_MANAGEMENT,
NodeTypeConstants.NODE_TYPES_PATH, Permissions.NODE_TYPE_DEFINITION_MANAGEMENT,
PrivilegeConstants.PRIVILEGES_PATH, Permissions.PRIVILEGE_MANAGEMENT
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
index f7edf1211b..1c9abd5b53 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.restriction;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -84,7 +83,7 @@ public class AbstractRestrictionProviderTest implements AccessControlConstants {
when(undef.getName()).thenReturn("undefined");
when(undef.getRequiredType()).thenReturn((Type) Type.UNDEFINED);
- supported = ImmutableMap.of(glob.getName(), glob, nts.getName(), nts, mand.getName(), mand, undef.getName(), undef);
+ supported = Map.of(glob.getName(), glob, nts.getName(), nts, mand.getName(), mand, undef.getName(), undef);
restrictionProvider = new AbstractRestrictionProvider(supported) {
@NotNull
@Override
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
index 048da0f431..bd86128639 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
@@ -187,7 +187,7 @@ public class CompositeRestrictionProviderTest implements AccessControlConstants
@Test
public void testCreateRestriction() throws Exception {
- Map<String, Value> valid = ImmutableMap.of(
+ Map<String, Value> valid = Map.of(
NAME_BOOLEAN, vf.createValue(true),
NAME_LONGS, vf.createValue(10),
REP_GLOB, vf.createValue("*")
@@ -206,7 +206,7 @@ public class CompositeRestrictionProviderTest implements AccessControlConstants
@Test
public void testCreateInvalidRestriction() throws Exception {
- Map<String, Value> invalid = ImmutableMap.of(
+ Map<String, Value> invalid = Map.of(
NAME_BOOLEAN, vf.createValue("wrong_type"),
REP_GLOB, vf.createValue(true)
);
@@ -223,7 +223,7 @@ public class CompositeRestrictionProviderTest implements AccessControlConstants
@Test
public void testMvCreateRestriction() throws RepositoryException {
- Map<String, Value[]> valid = ImmutableMap.of(
+ Map<String, Value[]> valid = Map.of(
NAME_LONGS, new Value[] {vf.createValue(100)},
REP_PREFIXES, new Value[] {vf.createValue("prefix"), vf.createValue("prefix2")}
);
@@ -241,7 +241,7 @@ public class CompositeRestrictionProviderTest implements AccessControlConstants
@Test
public void testCreateInvalidMvRestriction() throws Exception {
- Map<String, Value[]> invalid = ImmutableMap.of(
+ Map<String, Value[]> invalid = Map.of(
NAME_BOOLEAN, new Value[] {vf.createValue(true), vf.createValue(false)},
NAME_LONGS, new Value[] {vf.createValue("wrong_type")},
REP_PREFIXES, new Value[] {vf.createValue(true)}
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java
index 9a52e5cd05..2eb1ef3620 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/UserUtilTest.java
@@ -115,7 +115,7 @@ public class UserUtilTest {
@Test
public void testIsTypeGroupFromTree() {
- Map<String, Boolean> test = ImmutableMap.of(
+ Map<String, Boolean> test = Map.of(
UserConstants.NT_REP_GROUP, true,
UserConstants.NT_REP_USER, false,
UserConstants.NT_REP_SYSTEM_USER, false,
@@ -128,7 +128,7 @@ public class UserUtilTest {
@Test
public void testIsTypeUserFromTree() {
- Map<String, Boolean> test = ImmutableMap.of(
+ Map<String, Boolean> test = Map.of(
UserConstants.NT_REP_GROUP, false,
UserConstants.NT_REP_USER, true,
UserConstants.NT_REP_SYSTEM_USER, true,
@@ -144,7 +144,7 @@ public class UserUtilTest {
@Test
public void testIsTypeAuthorizableFromTree() {
- Map<String, Boolean> test = ImmutableMap.of(
+ Map<String, Boolean> test = Map.of(
UserConstants.NT_REP_GROUP, true,
UserConstants.NT_REP_USER, true,
UserConstants.NT_REP_SYSTEM_USER, true,
@@ -160,7 +160,7 @@ public class UserUtilTest {
@Test
public void testGetTypeFromTree() {
- Map<String, AuthorizableType> test = ImmutableMap.of(
+ Map<String, AuthorizableType> test = Map.of(
UserConstants.NT_REP_GROUP, AuthorizableType.GROUP,
UserConstants.NT_REP_USER, AuthorizableType.USER,
UserConstants.NT_REP_SYSTEM_USER, AuthorizableType.USER
@@ -208,7 +208,7 @@ public class UserUtilTest {
@Test
public void testIsSystemUser() {
- Map<String, Boolean> test = ImmutableMap.of(
+ Map<String, Boolean> test = Map.of(
UserConstants.NT_REP_GROUP, false,
UserConstants.NT_REP_USER, false,
UserConstants.NT_REP_SYSTEM_USER, true,
@@ -381,7 +381,7 @@ public class UserUtilTest {
@Test
public void testGetImportBehavior() {
- Map<ConfigurationParameters, Integer> testMap = ImmutableMap.of(
+ Map<ConfigurationParameters, Integer> testMap = Map.of(
ConfigurationParameters.EMPTY, ImportBehavior.IGNORE,
ConfigurationParameters.of(ProtectedItemImporter.PARAM_IMPORT_BEHAVIOR, "anyString"), ImportBehavior.ABORT,
ConfigurationParameters.of(ProtectedItemImporter.PARAM_IMPORT_BEHAVIOR, ImportBehavior.BESTEFFORT), ImportBehavior.ABORT,