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/18 19:37:12 UTC
(jackrabbit-oak) branch trunk updated: OAK-11105: Remove usage of Guava ImmutableMap.of() - zero argument case
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9fdfbb6831 OAK-11105: Remove usage of Guava ImmutableMap.of() - zero argument case
9fdfbb6831 is described below
commit 9fdfbb6831ed3758f8c3bcc7215e160027ced172
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Nov 18 20:36:57 2024 +0100
OAK-11105: Remove usage of Guava ImmutableMap.of() - zero argument case
---
.../authentication/external/ExternalIdentityRefTest.java | 2 +-
.../external/basic/DefaultSyncConfigTest.java | 2 +-
.../external/basic/DefaultSyncContextTest.java | 4 ++--
.../external/impl/CustomCredentialsSupportTest.java | 2 +-
.../authentication/external/impl/jmx/DelegateeTest.java | 4 ++--
.../impl/principal/ExternalPrincipalConfigurationTest.java | 4 ++--
.../principalbased/impl/EffectivePolicyTest.java | 4 ++--
.../impl/PermissionProviderAccessControlTest.java | 2 +-
.../impl/PermissionProviderVersionStoreTest.java | 2 +-
.../PrincipalBasedAuthorizationConfigurationOsgiTest.java | 13 +++++++------
.../impl/PrincipalBasedPermissionProviderTest.java | 2 +-
.../principalbased/impl/PrincipalPolicyImplTest.java | 14 +++++++-------
.../principalbased/impl/PrincipalPolicyImporterTest.java | 4 ++--
.../authentication/external/AbstractExternalTest.java | 2 +-
.../authentication/external/AutoMembershipTest.java | 7 ++++---
.../authentication/external/CachedMembershipLoginTest.java | 7 ++++---
.../authentication/external/ExternalLoginTest.java | 7 ++++---
.../oak/spi/whiteboard/DefaultWhiteboardTest.java | 14 +++++++-------
.../org/apache/jackrabbit/oak/core/ImmutableRootTest.java | 4 ++--
.../authentication/token/TestCredentialsSupport.java | 2 +-
.../security/authentication/token/TokenCleanupTest.java | 4 +++-
.../authentication/token/TokenLoginModuleTest.java | 12 ++++++------
.../token/TokenProviderImplReadOnlyTest.java | 7 ++++---
.../accesscontrol/AccessControlValidatorTest.java | 5 +++--
.../permission/PrincipalPermissionEntriesTest.java | 2 +-
.../restriction/WhiteboardRestrictionProviderTest.java | 4 ++--
.../WhiteboardAuthorizableActionProviderTest.java | 5 +++--
.../whiteboard/WhiteboardAuthorizableNodeNameTest.java | 5 +++--
.../external/CustomExternalIdentityProvider.java | 5 ++---
.../credentials/CompositeCredentialsSupport.java | 4 +---
.../security/authentication/AbstractLoginModuleTest.java | 8 ++++----
.../credentials/CompositeCredentialsSupportTest.java | 2 +-
.../authentication/token/CompositeTokenProviderTest.java | 8 ++++----
.../accesscontrol/AbstractAccessControlManagerTest.java | 7 +++----
.../apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java | 2 +-
35 files changed, 94 insertions(+), 88 deletions(-)
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java
index 050f76999f..581857e23b 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java
@@ -162,7 +162,7 @@ public class ExternalIdentityRefTest {
@NotNull
@Override
public Map<String, ?> getProperties() {
- return ImmutableMap.of();
+ return Map.of();
}
}));
}
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
index 869f6fa1b4..6700839a01 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
@@ -60,7 +60,7 @@ public class DefaultSyncConfigTest {
assertSame(authorizableConfig, authorizableConfig.setPropertyMapping(ImmutableMap.of("a", "b")));
assertEquals(ImmutableMap.of("a", "b"), authorizableConfig.getPropertyMapping());
- assertEquals(ImmutableMap.of(), authorizableConfig.setPropertyMapping(null).getPropertyMapping());
+ assertEquals(Map.of(), authorizableConfig.setPropertyMapping(null).getPropertyMapping());
assertEquals(0, authorizableConfig.getExpirationTime());
assertSame(authorizableConfig, authorizableConfig.setExpirationTime(Long.MAX_VALUE));
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
index 7d0b9ff1eb..f79fa889ba 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
@@ -1057,7 +1057,7 @@ public class DefaultSyncContextTest extends AbstractExternalAuthTest {
ExternalUser externalUser = idp.getUser(TestIdentityProvider.ID_SECOND_USER);
Authorizable a = syncCtx.createUser(externalUser);
- syncCtx.syncProperties(externalUser, a, ImmutableMap.of());
+ syncCtx.syncProperties(externalUser, a, Map.of());
for (String propName : externalUser.getProperties().keySet()) {
assertFalse(a.hasProperty(propName));
@@ -1076,7 +1076,7 @@ public class DefaultSyncContextTest extends AbstractExternalAuthTest {
a.setProperty(propName, anyValue);
}
- syncCtx.syncProperties(externalUser, a, ImmutableMap.of());
+ syncCtx.syncProperties(externalUser, a, Map.of());
for (String propName : extProps.keySet()) {
assertTrue(a.hasProperty(propName));
assertEquals(anyValue, a.getProperty(propName)[0]);
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java
index 8be442b959..f544baf3f4 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java
@@ -219,7 +219,7 @@ public class CustomCredentialsSupportTest extends ExternalLoginTestBase {
if (credentials instanceof TestCredentials) {
return attributes;
} else {
- return ImmutableMap.of();
+ return Map.of();
}
}
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
index f693ab444a..b81d8c2e21 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
@@ -208,7 +208,7 @@ public class DelegateeTest extends AbstractJmxTest {
Root r = preventRootCommit(delegatee);
String[] result = delegatee.syncAllUsers(false);
- assertResultMessages(result, ImmutableMap.of());
+ assertResultMessages(result, Map.of());
assertFalse(r.hasPendingChanges());
}
@@ -459,7 +459,7 @@ public class DelegateeTest extends AbstractJmxTest {
@Override
public void commit() throws CommitFailedException {
- commit(ImmutableMap.of());
+ commit(Map.of());
}
@Override
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
index 7ec022c181..0882797eba 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
@@ -347,7 +347,7 @@ public class ExternalPrincipalConfigurationTest extends AbstractExternalAuthTest
Map<String, Object> disableProps = ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false);
SyncHandler sh = new DefaultSyncHandler();
- context.registerService(SyncHandler.class, sh, ImmutableMap.of());
+ context.registerService(SyncHandler.class, sh, Map.of());
assertIsEnabled(externalPrincipalConfiguration, false);
context.registerService(SyncHandler.class, sh, disableProps);
@@ -365,7 +365,7 @@ public class ExternalPrincipalConfigurationTest extends AbstractExternalAuthTest
Map<String, Object> enableProps = ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true);
SyncHandler sh = new TestSyncHandler();
- context.registerService(SyncHandler.class, sh, ImmutableMap.of());
+ context.registerService(SyncHandler.class, sh, Map.of());
assertIsEnabled(externalPrincipalConfiguration, false);
context.registerService(SyncHandler.class, sh, enableProps);
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/EffectivePolicyTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/EffectivePolicyTest.java
index d59cbd7033..eb4179073a 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/EffectivePolicyTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/EffectivePolicyTest.java
@@ -82,11 +82,11 @@ public class EffectivePolicyTest extends AbstractPrincipalBasedTest {
// - root : lifecycleMgt
policy = (PrincipalPolicyImpl) acMgr.getApplicablePolicies(validPrincipal2)[0];
Map<String, Value> restrictions = ImmutableMap.of(getNamePathMapper().getJcrName(REP_GLOB), getValueFactory(root).createValue("/*/glob"));
- policy.addEntry(jcrEffectivePath, privilegesFromNames(JCR_READ), restrictions, ImmutableMap.of());
+ policy.addEntry(jcrEffectivePath, privilegesFromNames(JCR_READ), restrictions, Map.of());
String ntJcrName = getNamePathMapper().getJcrName(JcrConstants.NT_RESOURCE);
Map<String, Value[]> mvRestrictions = ImmutableMap.of(getNamePathMapper().getJcrName(REP_NT_NAMES), new Value[] {getValueFactory(root).createValue(ntJcrName, PropertyType.NAME)});
- policy.addEntry(PathUtils.ROOT_PATH, privilegesFromNames(PrivilegeConstants.JCR_LIFECYCLE_MANAGEMENT), ImmutableMap.of(), mvRestrictions);
+ policy.addEntry(PathUtils.ROOT_PATH, privilegesFromNames(PrivilegeConstants.JCR_LIFECYCLE_MANAGEMENT), Map.of(), mvRestrictions);
acMgr.setPolicy(policy.getPath(), policy);
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderAccessControlTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderAccessControlTest.java
index ddd1ca358c..27fc8bda00 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderAccessControlTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderAccessControlTest.java
@@ -244,7 +244,7 @@ public class PermissionProviderAccessControlTest extends AbstractPrincipalBasedT
public void testIsGrantedOnRestrictionTree() throws Exception {
PrincipalPolicyImpl policy = getPrincipalPolicyImpl(testPrincipal, getAccessControlManager(root));
Map<String, Value> restr = ImmutableMap.of(getNamePathMapper().getJcrName(REP_GLOB), getValueFactory(root).createValue(REP_RESTRICTIONS + "*"));
- policy.addEntry(accessControlledPath, privilegesFromNames(JCR_READ_ACCESS_CONTROL), restr, ImmutableMap.of());
+ policy.addEntry(accessControlledPath, privilegesFromNames(JCR_READ_ACCESS_CONTROL), restr, Map.of());
root.commit();
permissionProvider.refresh();
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderVersionStoreTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderVersionStoreTest.java
index 55f3a7fc17..d092f3202e 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderVersionStoreTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PermissionProviderVersionStoreTest.java
@@ -82,7 +82,7 @@ public class PermissionProviderVersionStoreTest extends AbstractPrincipalBasedTe
JackrabbitAccessControlManager jacm = getAccessControlManager(root);
PrincipalPolicyImpl policy = getPrincipalPolicyImpl(testPrincipal, jacm);
Map<String, Value[]> restr = ImmutableMap.of(REP_NT_NAMES, new Value[] {getValueFactory(root).createValue(REP_VERSIONSTORAGE, PropertyType.NAME)});
- policy.addEntry(PathUtils.ROOT_PATH, privilegesFromNames(PrivilegeConstants.JCR_READ), ImmutableMap.of(), restr);
+ policy.addEntry(PathUtils.ROOT_PATH, privilegesFromNames(PrivilegeConstants.JCR_READ), Map.of(), restr);
jacm.setPolicy(policy.getPath(), policy);
root.commit();
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedAuthorizationConfigurationOsgiTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedAuthorizationConfigurationOsgiTest.java
index cc4494b827..940c892ad7 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedAuthorizationConfigurationOsgiTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedAuthorizationConfigurationOsgiTest.java
@@ -40,6 +40,7 @@ import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
import org.junit.Rule;
import org.junit.Test;
+import java.util.Map;
import java.util.Set;
import static org.junit.Assert.assertEquals;
@@ -55,7 +56,7 @@ public class PrincipalBasedAuthorizationConfigurationOsgiTest extends AbstractPr
@Test(expected = ReferenceViolationException.class)
public void testMissingMandatoryReferences() {
- context.registerInjectActivateService(pbac, ImmutableMap.of());
+ context.registerInjectActivateService(pbac, Map.of());
}
@Test(expected = ReferenceViolationException.class)
@@ -67,7 +68,7 @@ public class PrincipalBasedAuthorizationConfigurationOsgiTest extends AbstractPr
@Test(expected = ReferenceViolationException.class)
public void testMissingFilterProviderReference() {
context.registerInjectActivateService(new MountInfoProviderService());
- context.registerInjectActivateService(pbac, ImmutableMap.of());
+ context.registerInjectActivateService(pbac, Map.of());
}
@Test
@@ -79,7 +80,7 @@ public class PrincipalBasedAuthorizationConfigurationOsgiTest extends AbstractPr
context.registerInjectActivateService(mipService, ImmutableMap.of("mountedPaths", new String[] {SUPPORTED_PATH + "/some/subtree", "/etc"}));
try {
- context.registerInjectActivateService(pbac, ImmutableMap.of());
+ context.registerInjectActivateService(pbac, Map.of());
} catch (RuntimeException e) {
assertTrue(e.getCause() instanceof IllegalStateException);
}
@@ -93,7 +94,7 @@ public class PrincipalBasedAuthorizationConfigurationOsgiTest extends AbstractPr
MountInfoProviderService mipService = new MountInfoProviderService();
context.registerInjectActivateService(mipService, ImmutableMap.of("mountedPaths", new String[] {SUPPORTED_PATH}));
- context.registerInjectActivateService(pbac, ImmutableMap.of());
+ context.registerInjectActivateService(pbac, Map.of());
}
@Test
@@ -104,7 +105,7 @@ public class PrincipalBasedAuthorizationConfigurationOsgiTest extends AbstractPr
MountInfoProviderService mipService = new MountInfoProviderService();
context.registerInjectActivateService(mipService, ImmutableMap.of("mountedPaths", new String[] {Text.getRelativeParent(SUPPORTED_PATH, 1)}));
- context.registerInjectActivateService(pbac, ImmutableMap.of());
+ context.registerInjectActivateService(pbac, Map.of());
}
@Test
@@ -115,7 +116,7 @@ public class PrincipalBasedAuthorizationConfigurationOsgiTest extends AbstractPr
MountInfoProviderService mipService = new MountInfoProviderService();
context.registerInjectActivateService(mipService, ImmutableMap.of("mountedPaths", new String[] {"/etc", "/var/some/mount", UserConstants.DEFAULT_GROUP_PATH}));
- context.registerInjectActivateService(pbac, ImmutableMap.of());
+ context.registerInjectActivateService(pbac, Map.of());
}
@Test
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedPermissionProviderTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedPermissionProviderTest.java
index 474d699148..2e5962e445 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedPermissionProviderTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedPermissionProviderTest.java
@@ -76,7 +76,7 @@ public class PrincipalBasedPermissionProviderTest extends AbstractPrincipalBased
JackrabbitAccessControlManager jacm = getAccessControlManager(root);
policy = getPrincipalPolicyImpl(testPrincipal, jacm);
Map<String, Value[]> restrictions = ImmutableMap.of(REP_NT_NAMES, new Value[] {getValueFactory(root).createValue(NT_FOLDER, PropertyType.NAME)});
- policy.addEntry(childPath, privilegesFromNames(JCR_REMOVE_NODE), ImmutableMap.of(), restrictions);
+ policy.addEntry(childPath, privilegesFromNames(JCR_REMOVE_NODE), Map.of(), restrictions);
jacm.setPolicy(policy.getPath(), policy);
root.commit();
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImplTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImplTest.java
index 1b4cf080e6..77511ac347 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImplTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImplTest.java
@@ -239,7 +239,7 @@ public class PrincipalPolicyImplTest extends AbstractPrincipalBasedTest {
@Test
public void testAddEntriesWithRestrictionsForSamePath() throws Exception {
assertTrue(emptyPolicy.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_ADD_CHILD_NODES)));
- assertTrue(emptyPolicy.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_REMOVE_CHILD_NODES), ImmutableMap.of(), createMvRestrictions(REP_ITEM_NAMES, PropertyType.NAME, "removable")));
+ assertTrue(emptyPolicy.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_REMOVE_CHILD_NODES), Map.of(), createMvRestrictions(REP_ITEM_NAMES, PropertyType.NAME, "removable")));
PrivilegeBitsProvider bitsProvider = new PrivilegeBitsProvider(root);
@@ -260,8 +260,8 @@ public class PrincipalPolicyImplTest extends AbstractPrincipalBasedTest {
@Test
public void testAddEntriesWithMultipleRestrictionsForSamePath() throws Exception {
- assertTrue(emptyPolicy.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_ADD_CHILD_NODES), createGlobRestriction("/any*/glob"), ImmutableMap.of()));
- assertTrue(emptyPolicy.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_REMOVE_CHILD_NODES), ImmutableMap.of(), createMvRestrictions(REP_ITEM_NAMES, PropertyType.NAME, "removable")));
+ assertTrue(emptyPolicy.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_ADD_CHILD_NODES), createGlobRestriction("/any*/glob"), Map.of()));
+ assertTrue(emptyPolicy.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_REMOVE_CHILD_NODES), Map.of(), createMvRestrictions(REP_ITEM_NAMES, PropertyType.NAME, "removable")));
PrivilegeBitsProvider bitsProvider = new PrivilegeBitsProvider(root);
@@ -310,7 +310,7 @@ public class PrincipalPolicyImplTest extends AbstractPrincipalBasedTest {
PrincipalPolicyImpl plc = new PrincipalPolicyImpl(principal, POLICY_OAK_PATH, mp);
String jcrName = namePathMapper.getJcrName("oak:mandatory");
Map<String,Value[]> mvRestrictions = ImmutableMap.of(jcrName, new Value[] {getValueFactory(root).createValue(1)});
- plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), ImmutableMap.of(), mvRestrictions);
+ plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), Map.of(), mvRestrictions);
}
@Test(expected = AccessControlException.class)
@@ -324,7 +324,7 @@ public class PrincipalPolicyImplTest extends AbstractPrincipalBasedTest {
PrincipalPolicyImpl plc = new PrincipalPolicyImpl(principal, POLICY_OAK_PATH, mp);
String jcrName = namePathMapper.getJcrName("oak:mandatory");
Map<String,Value> svRestrictions = ImmutableMap.of(jcrName, getValueFactory(root).createValue(1));
- plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), svRestrictions, ImmutableMap.of());
+ plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), svRestrictions, Map.of());
}
@Test(expected = AccessControlException.class)
@@ -336,7 +336,7 @@ public class PrincipalPolicyImplTest extends AbstractPrincipalBasedTest {
PrincipalPolicyImpl plc = new PrincipalPolicyImpl(principal, POLICY_OAK_PATH, mp);
Map<String,Value> svRestrictions = ImmutableMap.of("oak:mandatory", getValueFactory(root).createValue(1));
- plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), svRestrictions, ImmutableMap.of());
+ plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), svRestrictions, Map.of());
}
@Test
@@ -355,7 +355,7 @@ public class PrincipalPolicyImplTest extends AbstractPrincipalBasedTest {
PrincipalPolicyImpl plc = new PrincipalPolicyImpl(principal, POLICY_OAK_PATH, mp);
Map<String,Value> svRestrictions = ImmutableMap.of("mandatory", getValueFactory(root).createValue(1));
- plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), svRestrictions, ImmutableMap.of());
+ plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), svRestrictions, Map.of());
assertTrue(plc.getEntries().get(0).getRestrictions().contains(r));
}
diff --git a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImporterTest.java b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImporterTest.java
index f01936eeaf..92a7f9623a 100644
--- a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImporterTest.java
+++ b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImporterTest.java
@@ -592,7 +592,7 @@ public class PrincipalPolicyImporterTest extends AbstractPrincipalBasedTest {
importer.startChildInfo(mockNodeInfo("entry", getJcrName(NT_REP_PRINCIPAL_ENTRY)), mockPropInfos("/effective/path", PrivilegeConstants.REP_WRITE));
importer.startChildInfo(mockNodeInfo(getJcrName(REP_RESTRICTIONS), getJcrName(NT_REP_RESTRICTIONS)), mockPropInfos(ImmutableMap.of(getJcrName(REP_GLOB), "/some/glob"), PropertyType.STRING));
- importer.startChildInfo(mockNodeInfo(getJcrName(REP_RESTRICTIONS), getJcrName(NT_REP_RESTRICTIONS)), mockPropInfos(ImmutableMap.of()));
+ importer.startChildInfo(mockNodeInfo(getJcrName(REP_RESTRICTIONS), getJcrName(NT_REP_RESTRICTIONS)), mockPropInfos(Map.of()));
}
@Test(expected = IllegalStateException.class)
@@ -604,7 +604,7 @@ public class PrincipalPolicyImporterTest extends AbstractPrincipalBasedTest {
importer.startChildInfo(mockNodeInfo("entry", getJcrName(NT_REP_PRINCIPAL_ENTRY)), mockPropInfos("/effective/path", PrivilegeConstants.REP_WRITE));
importer.startChildInfo(mockNodeInfo(getJcrName(REP_RESTRICTIONS), getJcrName(NT_REP_RESTRICTIONS)), mockPropInfos(ImmutableMap.of(getJcrName(REP_NT_NAMES), new Value[0])));
- importer.startChildInfo(mockNodeInfo(getJcrName(REP_RESTRICTIONS), getJcrName(NT_REP_RESTRICTIONS)), mockPropInfos(ImmutableMap.of()));
+ importer.startChildInfo(mockNodeInfo(getJcrName(REP_RESTRICTIONS), getJcrName(NT_REP_RESTRICTIONS)), mockPropInfos(Map.of()));
}
@Test(expected = IllegalStateException.class)
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
index 9930459d5c..31d3254494 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
@@ -422,7 +422,7 @@ abstract class AbstractExternalTest extends AbstractTest<RepositoryFixture> {
@NotNull
@Override
public Map<String, ?> getProperties() {
- return ImmutableMap.of();
+ return Map.of();
}
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AutoMembershipTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AutoMembershipTest.java
index 2b095ff226..d6ace50c51 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AutoMembershipTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/AutoMembershipTest.java
@@ -40,6 +40,7 @@ import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import static javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag.OPTIONAL;
@@ -126,11 +127,11 @@ public class AutoMembershipTest extends AbstractExternalTest {
new AppConfigurationEntry(
GuestLoginModule.class.getName(),
OPTIONAL,
- ImmutableMap.of()),
+ Map.of()),
new AppConfigurationEntry(
TokenLoginModule.class.getName(),
SUFFICIENT,
- ImmutableMap.of()),
+ Map.of()),
new AppConfigurationEntry(
ExternalLoginModule.class.getName(),
SUFFICIENT,
@@ -140,7 +141,7 @@ public class AutoMembershipTest extends AbstractExternalTest {
new AppConfigurationEntry(
LoginModuleImpl.class.getName(),
SUFFICIENT,
- ImmutableMap.of())
+ Map.of())
};
}
};
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/CachedMembershipLoginTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/CachedMembershipLoginTest.java
index 651b0cc224..ebf0fdcfb4 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/CachedMembershipLoginTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/CachedMembershipLoginTest.java
@@ -24,6 +24,7 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicLong;
@@ -188,11 +189,11 @@ public class CachedMembershipLoginTest extends AbstractExternalTest {
new AppConfigurationEntry(
GuestLoginModule.class.getName(),
OPTIONAL,
- ImmutableMap.of()),
+ Map.of()),
new AppConfigurationEntry(
TokenLoginModule.class.getName(),
SUFFICIENT,
- ImmutableMap.of()),
+ Map.of()),
new AppConfigurationEntry(
ExternalLoginModule.class.getName(),
SUFFICIENT,
@@ -202,7 +203,7 @@ public class CachedMembershipLoginTest extends AbstractExternalTest {
new AppConfigurationEntry(
LoginModuleImpl.class.getName(),
SUFFICIENT,
- ImmutableMap.of())
+ Map.of())
};
}
};
diff --git a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
index 2d937ebcb9..d89f4f808b 100644
--- a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
+++ b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
@@ -36,6 +36,7 @@ import javax.security.auth.login.Configuration;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.atomic.AtomicLong;
@@ -149,11 +150,11 @@ public class ExternalLoginTest extends AbstractExternalTest {
new AppConfigurationEntry(
GuestLoginModule.class.getName(),
OPTIONAL,
- ImmutableMap.of()),
+ Map.of()),
new AppConfigurationEntry(
TokenLoginModule.class.getName(),
SUFFICIENT,
- ImmutableMap.of()),
+ Map.of()),
new AppConfigurationEntry(
ExternalLoginModule.class.getName(),
SUFFICIENT,
@@ -163,7 +164,7 @@ public class ExternalLoginTest extends AbstractExternalTest {
new AppConfigurationEntry(
LoginModuleImpl.class.getName(),
SUFFICIENT,
- ImmutableMap.of())
+ Map.of())
};
}
};
diff --git a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboardTest.java b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboardTest.java
index 2a6451b689..22262d111f 100644
--- a/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboardTest.java
+++ b/oak-core-spi/src/test/java/org/apache/jackrabbit/oak/spi/whiteboard/DefaultWhiteboardTest.java
@@ -38,9 +38,9 @@ public class DefaultWhiteboardTest {
@Test
public void filteredTracker() {
- whiteboard.register(Service1.class, new Service1("s1"), ImmutableMap.of());
+ whiteboard.register(Service1.class, new Service1("s1"), Map.of());
whiteboard.register(Service2.class, new Service2("s2"), ImmutableMap.of("role", "myrole"));
- whiteboard.register(Service3.class, new Service3("s3_1"), ImmutableMap.of());
+ whiteboard.register(Service3.class, new Service3("s3_1"), Map.of());
whiteboard.register(Service3.class, new Service3("s3_2"), ImmutableMap.of("role", "myrole"));
whiteboard.register(Service3.class, new Service3("s3_3"), ImmutableMap.of("role", "myotherrole", "id", 1024));
@@ -65,18 +65,18 @@ public class DefaultWhiteboardTest {
public void sameServiceRegisteredAgain() {
Service1 s1 = new Service1("s1");
- whiteboard.register(Service1.class, s1, ImmutableMap.of());
- whiteboard.register(Service1.class, s1, ImmutableMap.of());
- whiteboard.register(Service1.class, s1, ImmutableMap.of());
+ whiteboard.register(Service1.class, s1, Map.of());
+ whiteboard.register(Service1.class, s1, Map.of());
+ whiteboard.register(Service1.class, s1, Map.of());
assertEquals(Set.of("s1"), track(Service1.class));
}
@Test
public void unregister() {
- Registration r1 = whiteboard.register(Service1.class, new Service1("s1"), ImmutableMap.of());
+ Registration r1 = whiteboard.register(Service1.class, new Service1("s1"), Map.of());
Registration r2 = whiteboard.register(Service2.class, new Service2("s2"), ImmutableMap.of("role", "myrole"));
- Registration r3_1 = whiteboard.register(Service3.class, new Service3("s3_1"), ImmutableMap.of());
+ Registration r3_1 = whiteboard.register(Service3.class, new Service3("s3_1"), Map.of());
Registration r3_2 = whiteboard.register(Service3.class, new Service3("s3_2"), ImmutableMap.of("role", "myrole"));
Registration r3_3 = whiteboard.register(Service3.class, new Service3("s3_3"), ImmutableMap.of("role", "myotherrole", "id", 1024));
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableRootTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableRootTest.java
index eb3e3b0d4b..a9c9a83c64 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableRootTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/core/ImmutableRootTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.core;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.AuthInfo;
import org.apache.jackrabbit.oak.api.ContentSession;
@@ -30,6 +29,7 @@ import org.junit.Test;
import java.io.ByteArrayInputStream;
import java.io.IOException;
+import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -71,7 +71,7 @@ public class ImmutableRootTest extends AbstractSecurityTest {
@Test(expected = UnsupportedOperationException.class)
public void testCommitWithMap() {
- root.commit(ImmutableMap.of());
+ root.commit(Map.of());
}
@Test(expected = UnsupportedOperationException.class)
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestCredentialsSupport.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestCredentialsSupport.java
index eb25c71006..a804005720 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestCredentialsSupport.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TestCredentialsSupport.java
@@ -68,7 +68,7 @@ public class TestCredentialsSupport implements CredentialsSupport {
if (credentials instanceof Creds) {
return ((Creds) credentials).attributes;
} else {
- return ImmutableMap.of();
+ return Map.of();
}
}
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java
index 6baf86264b..d49af8d430 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenCleanupTest.java
@@ -18,6 +18,8 @@ package org.apache.jackrabbit.oak.security.authentication.token;
import static org.junit.Assert.assertEquals;
+import java.util.Map;
+
import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
@@ -86,7 +88,7 @@ public class TokenCleanupTest extends AbstractTokenTest {
@Test
public void testNotExpiredReachingThreshold() throws Exception {
for (int i = 0; i < 10; i++) {
- tokenProvider.createToken(userId, ImmutableMap.of());
+ tokenProvider.createToken(userId, Map.of());
}
assertTokenNodes(10);
}
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModuleTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModuleTest.java
index 35554a310f..8ad85fab37 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModuleTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModuleTest.java
@@ -216,7 +216,7 @@ public class TokenLoginModuleTest extends AbstractSecurityTest {
TokenLoginModule lm = new TokenLoginModule();
lm.initialize(new Subject(), new TestCallbackHandler(null),
ImmutableMap.of(AbstractLoginModule.SHARED_KEY_CREDENTIALS, mock(Credentials.class)),
- ImmutableMap.of());
+ Map.of());
assertFalse(lm.login());
assertFalse(lm.commit());
@@ -340,7 +340,7 @@ public class TokenLoginModuleTest extends AbstractSecurityTest {
TokenLoginModule lm = new TokenLoginModule();
lm.initialize(new Subject(), new TestCallbackHandler(tp),
ImmutableMap.of(AbstractLoginModule.SHARED_KEY_CREDENTIALS, "notCredentialsObject"),
- ImmutableMap.of());
+ Map.of());
assertFalse(lm.login());
assertFalse(lm.commit());
@@ -354,8 +354,8 @@ public class TokenLoginModuleTest extends AbstractSecurityTest {
TokenLoginModule lm = new TokenLoginModule();
lm.initialize(new Subject(), new TestCallbackHandler(tp),
- ImmutableMap.of(),
- ImmutableMap.of());
+ Map.of(),
+ Map.of());
assertFalse(lm.login());
assertFalse(lm.commit());
@@ -382,7 +382,7 @@ public class TokenLoginModuleTest extends AbstractSecurityTest {
TokenLoginModule lm = new TokenLoginModule();
lm.initialize(new Subject(), new TestCallbackHandler(tp, cbh),
sharedState,
- ImmutableMap.of());
+ Map.of());
assertFalse(lm.login());
assertFalse(lm.commit());
@@ -409,7 +409,7 @@ public class TokenLoginModuleTest extends AbstractSecurityTest {
TokenLoginModule lm = new TokenLoginModule();
lm.initialize(new Subject(), new TestCallbackHandler(tp, cbh),
sharedState,
- ImmutableMap.of());
+ Map.of());
assertFalse(lm.login());
assertFalse(lm.commit());
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImplReadOnlyTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImplReadOnlyTest.java
index 9c9a7a8b21..96bc4c811a 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImplReadOnlyTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenProviderImplReadOnlyTest.java
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.security.authentication.token;
import javax.jcr.GuestCredentials;
import javax.jcr.security.AccessControlManager;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlList;
import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
import org.apache.jackrabbit.oak.api.ContentSession;
@@ -34,6 +33,8 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import java.util.Map;
+
public class TokenProviderImplReadOnlyTest extends AbstractTokenTest {
private ContentSession cs;
@@ -79,7 +80,7 @@ public class TokenProviderImplReadOnlyTest extends AbstractTokenTest {
String userId = getTestUser().getID();
readOnlyRoot.refresh();
- assertNull(readOnlyTp.createToken(userId, ImmutableMap.of()));
+ assertNull(readOnlyTp.createToken(userId, Map.of()));
}
@Test
@@ -87,7 +88,7 @@ public class TokenProviderImplReadOnlyTest extends AbstractTokenTest {
// make sure user already has a token-parent node.
generateToken();
// now generate a new token with the read-only root
- assertNull(readOnlyTp.createToken(getTestUser().getID(), ImmutableMap.of()));
+ assertNull(readOnlyTp.createToken(getTestUser().getID(), Map.of()));
}
@Test
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidatorTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidatorTest.java
index 23e9b6192c..02403ad6c1 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidatorTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidatorTest.java
@@ -64,6 +64,7 @@ import javax.jcr.ValueFactory;
import javax.jcr.security.AccessControlManager;
import java.security.Principal;
import java.util.Collections;
+import java.util.Map;
import java.util.Set;
import static org.apache.jackrabbit.JcrConstants.JCR_MIXINTYPES;
@@ -476,12 +477,12 @@ public class AccessControlValidatorTest extends AbstractSecurityTest implements
AccessControlManager acMgr = getAccessControlManager(root);
JackrabbitAccessControlList acl = AccessControlUtils.getAccessControlList(acMgr, testPath);
acl.addEntry(testPrincipal, privilegesFromNames(PrivilegeConstants.JCR_ADD_CHILD_NODES), true,
- ImmutableMap.of(),
+ Map.of(),
ImmutableMap.of(AccessControlConstants.REP_NT_NAMES, new Value[] {vf.createValue(NodeTypeConstants.NT_OAK_UNSTRUCTURED, PropertyType.NAME)}));
// add ac-entry that only differs by the value of the restriction
acl.addEntry(testPrincipal, privilegesFromNames(PrivilegeConstants.JCR_ADD_CHILD_NODES), true,
- ImmutableMap.of(),
+ Map.of(),
ImmutableMap.of(AccessControlConstants.REP_NT_NAMES, new Value[] {vf.createValue(NodeTypeConstants.NT_UNSTRUCTURED, PropertyType.NAME)}));
assertEquals(2, acl.getAccessControlEntries().length);
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java
index 8f5a2452d4..14949e486b 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java
@@ -81,7 +81,7 @@ public class PrincipalPermissionEntriesTest {
@Test
public void testPutAllEntriesSetsFullyLoadedIgnoresExpectedSize() {
PrincipalPermissionEntries ppe = new PrincipalPermissionEntries(1);
- ppe.putAllEntries(ImmutableMap.of());
+ ppe.putAllEntries(Map.of());
assertTrue(ppe.isFullyLoaded());
}
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/WhiteboardRestrictionProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/WhiteboardRestrictionProviderTest.java
index 54ac3a939e..dd4150af3f 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/WhiteboardRestrictionProviderTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/WhiteboardRestrictionProviderTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authorization.restriction;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.Restriction;
@@ -30,6 +29,7 @@ import org.junit.Test;
import javax.jcr.Value;
+import java.util.Map;
import java.util.Set;
import static org.junit.Assert.assertSame;
@@ -56,7 +56,7 @@ public class WhiteboardRestrictionProviderTest {
when(registered.getPattern(PathUtils.ROOT_PATH, tree)).thenThrow(new RestrictionException());
restrictionProvider.start(whiteboard);
- whiteboard.register(RestrictionProvider.class, registered, ImmutableMap.of());
+ whiteboard.register(RestrictionProvider.class, registered, Map.of());
}
@After
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProviderTest.java
index 961ce37dd9..e46fb2bd27 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProviderTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableActionProviderTest.java
@@ -17,8 +17,9 @@
package org.apache.jackrabbit.oak.security.user.whiteboard;
import java.util.List;
+import java.util.Map;
+
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
import org.apache.jackrabbit.oak.spi.security.user.action.AbstractAuthorizableAction;
import org.apache.jackrabbit.oak.spi.security.user.action.AuthorizableAction;
@@ -64,7 +65,7 @@ public class WhiteboardAuthorizableActionProviderTest {
actionProvider.start(whiteboard);
AuthorizableActionProvider registered = securityProvider -> ImmutableList.of(new TestAction());
- whiteboard.register(AuthorizableActionProvider.class, registered, ImmutableMap.of());
+ whiteboard.register(AuthorizableActionProvider.class, registered, Map.of());
List<? extends AuthorizableAction> actions = actionProvider.getAuthorizableActions(Mockito.mock(SecurityProvider.class));
assertNotNull(actions);
diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeNameTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeNameTest.java
index 859cfa8e8e..006146654f 100644
--- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeNameTest.java
+++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/whiteboard/WhiteboardAuthorizableNodeNameTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user.whiteboard;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.spi.security.user.AuthorizableNodeName;
import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
import org.apache.jackrabbit.oak.spi.whiteboard.Whiteboard;
@@ -25,6 +24,8 @@ import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import java.util.Map;
+
public class WhiteboardAuthorizableNodeNameTest {
private static final String TEST_ID = "testID";
@@ -53,7 +54,7 @@ public class WhiteboardAuthorizableNodeNameTest {
authorizableNodeName.start(whiteboard);
AuthorizableNodeName registered = authorizableId -> "generated";
- whiteboard.register(AuthorizableNodeName.class, registered, ImmutableMap.of());
+ whiteboard.register(AuthorizableNodeName.class, registered, Map.of());
assertEquals(registered.generateNodeName(TEST_ID), authorizableNodeName.generateNodeName(TEST_ID));
}
}
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 605fc80477..6d8576d4e1 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
@@ -16,7 +16,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.Iterables;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalGroup;
@@ -160,7 +159,7 @@ public class CustomExternalIdentityProvider implements ExternalIdentityProvider
@NotNull
@Override
public Map<String, ?> getProperties() {
- return ImmutableMap.of();
+ return Map.of();
}
};
} else {
@@ -226,7 +225,7 @@ public class CustomExternalIdentityProvider implements ExternalIdentityProvider
@NotNull
@Override
public Map<String, ?> getProperties() {
- return ImmutableMap.of();
+ return Map.of();
}
};
} else {
diff --git a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java
index d952868eff..55d5936d84 100644
--- a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java
+++ b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupport.java
@@ -25,8 +25,6 @@ import java.util.function.Supplier;
import javax.jcr.Credentials;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
-
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -83,7 +81,7 @@ public final class CompositeCredentialsSupport implements CredentialsSupport {
public Map<String, ?> getAttributes(@NotNull Credentials credentials) {
Collection<CredentialsSupport> all = this.credentialSupplier.get();
if (all.isEmpty()) {
- return ImmutableMap.of();
+ return Map.of();
} else if (all.size() == 1) {
return all.iterator().next().getAttributes(credentials);
} else {
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
index 4e141cc21a..9f1d9fd811 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
@@ -140,7 +140,7 @@ public class AbstractLoginModuleTest {
@Test
public void testLogout() throws Exception {
- AbstractLoginModule loginModule = initLoginModule(TestCredentials.class, ImmutableMap.of());
+ AbstractLoginModule loginModule = initLoginModule(TestCredentials.class, Map.of());
assertFalse(loginModule.logout());
}
@@ -350,7 +350,7 @@ public class AbstractLoginModuleTest {
@Test
public void testAbort() throws LoginException {
- AbstractLoginModule loginModule = initLoginModule(TestCredentials.class, ImmutableMap.of());
+ AbstractLoginModule loginModule = initLoginModule(TestCredentials.class, Map.of());
assertTrue(loginModule.abort());
}
@@ -461,7 +461,7 @@ public class AbstractLoginModuleTest {
subject.getPublicCredentials().add(new TestCredentials());
AbstractLoginModule lm = new TestLoginModule(TestCredentials.class);
- lm.initialize(subject, null, ImmutableMap.of(), null);
+ lm.initialize(subject, null, Map.of(), null);
assertTrue(lm.getCredentials() instanceof TestCredentials);
}
@@ -530,7 +530,7 @@ public class AbstractLoginModuleTest {
@Test
public void testGetSharedPreAuthLoginEmptySharedState() {
- AbstractLoginModule loginModule = initLoginModule(TestCredentials.class, ImmutableMap.of());
+ AbstractLoginModule loginModule = initLoginModule(TestCredentials.class, Map.of());
assertNull(loginModule.getSharedPreAuthLogin());
}
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 b4ea306f61..d3ed80b8a9 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
@@ -170,7 +170,7 @@ public class CompositeCredentialsSupportTest {
if (credentials instanceof TestCredentials) {
return attributes;
} else {
- return ImmutableMap.of();
+ return Map.of();
}
}
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java
index 44ca16a215..270b5f6e2b 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenProviderTest.java
@@ -114,22 +114,22 @@ public class CompositeTokenProviderTest {
@Test
public void testCreateTokenFromId() {
- assertSame(info, composite.createToken(USERID, ImmutableMap.of()));
+ assertSame(info, composite.createToken(USERID, Map.of()));
}
@Test
public void testCreateTokenFromUnknownId() {
- assertNull(composite.createToken("unknown", ImmutableMap.of()));
+ assertNull(composite.createToken("unknown", Map.of()));
}
@Test
public void testCreateTokenFromIdFirstWins() {
TokenInfo ti = mock(TokenInfo.class);
- TokenProvider tp1 = when(mock(TokenProvider.class).createToken(USERID, ImmutableMap.of())).thenReturn(ti).getMock();
+ TokenProvider tp1 = when(mock(TokenProvider.class).createToken(USERID, Map.of())).thenReturn(ti).getMock();
TokenProvider tp2 = new TestTokenProvider();
TokenProvider ctp = CompositeTokenProvider.newInstance(tp1, tp2);
- assertSame(ti, ctp.createToken(USERID, ImmutableMap.of()));
+ assertSame(ti, ctp.createToken(USERID, Map.of()));
}
@Test
diff --git a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
index 64b5515d08..8164f00ae3 100644
--- a/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
+++ b/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
-import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.api.security.authorization.PrivilegeCollection;
import org.apache.jackrabbit.api.security.authorization.PrivilegeManager;
import org.apache.jackrabbit.oak.api.ContentSession;
@@ -54,6 +52,7 @@ import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import static org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeConstants.JCR_ADD_CHILD_NODES;
@@ -106,7 +105,7 @@ public class AbstractAccessControlManagerTest extends AbstractAccessControlTest
cs = mock(ContentSession.class);
when(cs.getWorkspaceName()).thenReturn(WSP_NAME);
- when(cs.getAuthInfo()).thenReturn(new AuthInfoImpl(null, ImmutableMap.of(), testPrincipals));
+ when(cs.getAuthInfo()).thenReturn(new AuthInfoImpl(null, Map.of(), testPrincipals));
when(root.getContentSession()).thenReturn(cs);
@@ -288,7 +287,7 @@ public class AbstractAccessControlManagerTest extends AbstractAccessControlTest
@Test(expected = AccessDeniedException.class)
public void testGetTreeDefinesNoAccess() throws Exception {
- when(cs.getAuthInfo()).thenReturn(new AuthInfoImpl(null, ImmutableMap.of(), getEveryonePrincipalSet()));
+ when(cs.getAuthInfo()).thenReturn(new AuthInfoImpl(null, Map.of(), getEveryonePrincipalSet()));
AbstractAccessControlManager mgr = createAccessControlManager(root, getNamePathMapper());
mgr.getTree(testPath, Permissions.ALL, true);
diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
index ac99238d34..2c6d4fa123 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
@@ -149,7 +149,7 @@ class JackrabbitNodeState extends AbstractNodeState {
boolean skipOnError
) throws RepositoryException {
- final Map<NodeId, JackrabbitNodeState> emptyMountPoints = ImmutableMap.of();
+ final Map<NodeId, JackrabbitNodeState> emptyMountPoints = Map.of();
final PersistenceManager versionPM = context.getInternalVersionManager().getPersistenceManager();
final JackrabbitNodeState versionStorage = new JackrabbitNodeState(
versionPM, root, uriToPrefix,