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 09:28:54 UTC
(jackrabbit-oak) branch OAK-11278 updated: OAK-11278: remove ImmutableMap.of - multiple argument case - oak-auth-external
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 da4bb0a069 OAK-11278: remove ImmutableMap.of - multiple argument case - oak-auth-external
da4bb0a069 is described below
commit da4bb0a0695c0fc8c16be1180fc49d887437c80c
Author: Julian Reschke <re...@apache.org>
AuthorDate: Thu Nov 28 10:28:39 2024 +0100
OAK-11278: remove ImmutableMap.of - multiple argument case - oak-auth-external
---
.../external/impl/ExternalLoginModuleFactory.java | 3 +-
.../external/AbstractExternalAuthTest.java | 2 +-
.../external/ExternalLoginAutoMembershipTest.java | 9 +++---
.../external/impl/DefaultSyncConfigImplTest.java | 3 +-
.../external/impl/ExternalLoginModuleTest.java | 35 +++++++++++-----------
.../external/impl/jmx/DelegateeTest.java | 10 +++----
.../external/impl/jmx/SyncMBeanImplTest.java | 21 +++++++------
.../impl/principal/AbstractAutoMembershipTest.java | 5 ++--
.../principal/AbstractProtectionConfigTest.java | 3 +-
.../impl/principal/AutomembershipServiceTest.java | 5 ++--
.../DynamicGroupMembershipServiceTest.java | 5 ++--
.../ExternalAuthorizableActionProviderTest.java | 5 ++--
.../ExternalGroupPrincipalProviderDMTest.java | 3 +-
.../principal/ExternalIdentityValidatorTest.java | 6 ++--
.../ExternalLoginCachedDynamicMembershipTest.java | 5 ++--
.../impl/principal/SyncConfigTrackerTest.java | 25 ++++++++--------
.../impl/principal/ValidatorNoProtectionTest.java | 3 +-
17 files changed, 67 insertions(+), 81 deletions(-)
diff --git a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
index 05533f28fb..98664a6b36 100644
--- a/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
+++ b/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactory.java
@@ -21,7 +21,6 @@ import java.util.Optional;
import javax.management.MalformedObjectNameException;
import javax.security.auth.spi.LoginModule;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.felix.jaas.LoginModuleFactory;
import org.apache.jackrabbit.oak.api.ContentRepository;
import org.apache.jackrabbit.oak.commons.jmx.JmxUtil;
@@ -214,7 +213,7 @@ public class ExternalLoginModuleFactory implements LoginModuleFactory, SyncHandl
String sncName = osgiConfig.getConfigValue(PARAM_SYNC_HANDLER_NAME, "");
SyncMBeanImpl bean = new SyncMBeanImpl(contentRepository, securityProvider, syncManager, sncName, idpManager, idpName);
- Map<String, String> properties = ImmutableMap.of("handler", sncName, "idp", idpName);
+ Map<String, String> properties = Map.of("handler", sncName, "idp", idpName);
mbeanRegistration = whiteboard.register(SynchronizationMBean.class, bean,
JmxUtil.createObjectNameMap("UserManagement", "External Identity Synchronization Management", properties));
log.debug("Registration of SynchronizationMBean completed");
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
index f697f4a17a..9a9e193533 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
@@ -193,7 +193,7 @@ public abstract class AbstractExternalAuthTest extends AbstractSecurityTest {
}
protected DefaultSyncHandler registerSyncHandler(@NotNull Map<String, Object> syncConfigMap, @NotNull String idpName) {
- context.registerService(SyncHandlerMapping.class, mock(ExternalLoginModuleFactory.class), ImmutableMap.of(
+ context.registerService(SyncHandlerMapping.class, mock(ExternalLoginModuleFactory.class), Map.of(
SyncHandlerMapping.PARAM_IDP_NAME, idpName,
SyncHandlerMapping.PARAM_SYNC_HANDLER_NAME, syncConfigMap.get(DefaultSyncConfigImpl.PARAM_NAME)
));
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginAutoMembershipTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginAutoMembershipTest.java
index 2103149129..cea58c01ea 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginAutoMembershipTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginAutoMembershipTest.java
@@ -26,7 +26,6 @@ import javax.jcr.ValueFactory;
import javax.security.auth.login.AppConfigurationEntry;
import javax.security.auth.login.Configuration;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -140,13 +139,13 @@ public class ExternalLoginAutoMembershipTest extends ExternalLoginTestBase {
private static void registerSyncHandlerMapping(@NotNull OsgiContext ctx, @NotNull ExternalSetup setup) {
String syncHandlerName = setup.sc.getName();
- Map<String, Object> props = ImmutableMap.of(
+ Map<String, Object> props = Map.of(
DefaultSyncConfigImpl.PARAM_NAME, syncHandlerName,
DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, setup.sc.user().getDynamicMembership(),
DefaultSyncConfigImpl.PARAM_USER_AUTO_MEMBERSHIP, setup.sc.user().getAutoMembership());
ctx.registerService(SyncHandler.class, setup.sh, props);
- Map<String, String> mappingProps = ImmutableMap.of(
+ Map<String, String> mappingProps = Map.of(
SyncHandlerMapping.PARAM_IDP_NAME, setup.idp.getName(),
SyncHandlerMapping.PARAM_SYNC_HANDLER_NAME, syncHandlerName);
ctx.registerService(SyncHandlerMapping.class, new SyncHandlerMapping() {}, mappingProps);
@@ -342,7 +341,7 @@ public class ExternalLoginAutoMembershipTest extends ExternalLoginTestBase {
}
idpRegistration = whiteboard.register(ExternalIdentityProvider.class, idp, Collections.<String, Object>emptyMap());
- shRegistration = whiteboard.register(SyncHandler.class, sh, ImmutableMap.of(
+ shRegistration = whiteboard.register(SyncHandler.class, sh, Map.of(
DefaultSyncConfigImpl.PARAM_NAME, sh.getName(),
DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, sc.user().getDynamicMembership(),
DefaultSyncConfigImpl.PARAM_GROUP_AUTO_MEMBERSHIP, sc.user().getAutoMembership()));
@@ -376,7 +375,7 @@ public class ExternalLoginAutoMembershipTest extends ExternalLoginTestBase {
return new AppConfigurationEntry(
ExternalLoginModule.class.getName(),
AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT,
- ImmutableMap.of(
+ Map.of(
SyncHandlerMapping.PARAM_SYNC_HANDLER_NAME, sh.getName(),
SyncHandlerMapping.PARAM_IDP_NAME, idp.getName()
));
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImplTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImplTest.java
index 5cdbee3fae..288b14e642 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImplTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImplTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
import org.jetbrains.annotations.NotNull;
@@ -125,7 +124,7 @@ public class DefaultSyncConfigImplTest {
public void testValidMapping() {
String[] validMapping = new String[] {"valid=mapping","valid2=mapping"};
DefaultSyncConfig.User userConfig = DefaultSyncConfigImpl.of(ConfigurationParameters.of(PARAM_USER_PROPERTY_MAPPING, validMapping)).user();
- assertEquals(ImmutableMap.of("valid","mapping","valid2","mapping"), userConfig.getPropertyMapping());
+ assertEquals(Map.of("valid","mapping","valid2","mapping"), userConfig.getPropertyMapping());
}
private static Map<String,String> getMapping(@NotNull String[] defaultMapping) {
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleTest.java
index 5c816cc792..851bb7d057 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -158,7 +157,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
loginModule.setSyncManager(syncManager);
CallbackHandler cbh = mock(CallbackHandler.class);
- loginModule.initialize(new Subject(), cbh, Collections.emptyMap(), ImmutableMap.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), cbh, Collections.emptyMap(), Map.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "syncHandler"));
verify(extIPMgr, never()).getProvider("idp");
verify(syncManager, never()).getSyncHandler("syncHandler");
@@ -170,7 +169,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
@Test
public void testInitializeMissingIdpSyncHandler() throws LoginException {
- loginModule.initialize(new Subject(), createCallbackHandler(wb, null, null, null), Collections.emptyMap(), ImmutableMap.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), createCallbackHandler(wb, null, null, null), Collections.emptyMap(), Map.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "syncHandler"));
assertFalse(loginModule.login());
assertFalse(loginModule.commit());
assertFalse(loginModule.logout());
@@ -182,7 +181,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
wb.register(ExternalIdentityProviderManager.class, extIPMgr, Collections.emptyMap());
wb.register(SyncManager.class, syncManager, Collections.emptyMap());
- loginModule.initialize(new Subject(), createCallbackHandler(wb, null, null, null), Collections.emptyMap(), ImmutableMap.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), createCallbackHandler(wb, null, null, null), Collections.emptyMap(), Map.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "syncHandler"));
verify(extIPMgr, times(1)).getProvider("idp");
verify(syncManager, times(1)).getSyncHandler("syncHandler");
@@ -247,7 +246,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
CallbackHandler cbh = createCallbackHandler(wb, getContentRepository(), getSecurityProvider(), new GuestCredentials());
- loginModule.initialize(new Subject(), cbh, new HashMap<>(), ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), cbh, new HashMap<>(), Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
assertFalse(loginModule.login());
assertFalse(loginModule.commit());
assertFalse(loginModule.logout());
@@ -269,7 +268,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
CallbackHandler cbh = createCallbackHandler(wb, getContentRepository(), getSecurityProvider(), null);
Subject subject = new Subject();
- loginModule.initialize(subject, cbh, sharedState, ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(subject, cbh, sharedState, Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
assertTrue(loginModule.login());
assertTrue(loginModule.commit());
@@ -308,7 +307,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
Subject subject = new Subject();
subject.getPrincipals().add(principal);
- loginModule.initialize(subject, cbh, sharedState, ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(subject, cbh, sharedState, Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
assertTrue(loginModule.login());
assertTrue(loginModule.commit());
@@ -350,7 +349,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
CallbackHandler cbh = createCallbackHandler(wb, getContentRepository(), getSecurityProvider(), creds);
Subject subject = new Subject();
- loginModule.initialize(subject, cbh, new HashMap<>(), ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(subject, cbh, new HashMap<>(), Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
assertTrue(loginModule.login());
assertTrue(loginModule.commit());
@@ -380,7 +379,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
CallbackHandler cbh = createCallbackHandler(wb, getContentRepository(), getSecurityProvider(), null);
Subject readOnly = new Subject(true, Collections.emptySet(), Collections.emptySet(), Collections.emptySet());
- loginModule.initialize(readOnly, cbh, sharedState, ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(readOnly, cbh, sharedState, Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
assertTrue(loginModule.login());
assertTrue(loginModule.commit());
@@ -404,7 +403,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
Map<String,Object> sharedState = new HashMap<>();
sharedState.put(SHARED_KEY_PRE_AUTH_LOGIN, new PreAuthenticatedLogin(ID_TEST_USER));
- loginModule.initialize(new Subject(), createCallbackHandler(wb, null, null, null), sharedState, ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), createCallbackHandler(wb, null, null, null), sharedState, Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
try {
loginModule.login();
} catch (LoginException e) {
@@ -432,7 +431,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
Map<String,Object> sharedState = new HashMap<>();
sharedState.put(SHARED_KEY_PRE_AUTH_LOGIN, new PreAuthenticatedLogin(ID_TEST_USER));
- loginModule.initialize(new Subject(), cbh, sharedState, ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), cbh, sharedState, Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
try {
loginModule.login();
} catch (LoginException e) {
@@ -465,7 +464,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
Map<String,Object> sharedState = new HashMap<>();
sharedState.put(SHARED_KEY_PRE_AUTH_LOGIN, new PreAuthenticatedLogin(ID_TEST_USER));
- loginModule.initialize(new Subject(), cbh, sharedState, ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), cbh, sharedState, Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
try {
loginModule.login();
} catch (LoginException e) {
@@ -494,7 +493,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
CallbackHandler cbh = createCallbackHandler(wb, getContentRepository(), getSecurityProvider(), null);
- loginModule.initialize(new Subject(), cbh, sharedState, ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), cbh, sharedState, Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
assertFalse(loginModule.login());
root.refresh();
assertNull(getUserManager(root).getAuthorizable("local"));
@@ -530,7 +529,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
CallbackHandler cbh = createCallbackHandler(wb, repository, getSecurityProvider(), null);
- loginModule.initialize(new Subject(), cbh, sharedState, ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), cbh, sharedState, Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
try {
loginModule.login();
} catch (LoginException e) {
@@ -553,7 +552,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
Credentials credentials = new SimpleCredentials(ID_TEST_USER, "wrongpassword".toCharArray());
CallbackHandler cbh = createCallbackHandler(wb, getContentRepository(), getSecurityProvider(), credentials);
- loginModule.initialize(new Subject(), cbh, new HashMap<>(), ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), cbh, new HashMap<>(), Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
try {
loginModule.login();
} finally {
@@ -573,7 +572,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
Credentials crds = new SimpleCredentials("testUser", new char[0]);
CallbackHandler cbh = createCallbackHandler(wb, getContentRepository(), getSecurityProvider(), crds);
- loginModule.initialize(new Subject(), cbh, new HashMap<>(), ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ loginModule.initialize(new Subject(), cbh, new HashMap<>(), Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
assertTrue(loginModule.login());
root.refresh();
Authorizable a = getUserManager(root).getAuthorizable("testUser");
@@ -601,7 +600,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
Credentials crds = new SimpleCredentials("testUser", new char[0]);
CallbackHandler cbh = createCallbackHandler(wb, getContentRepository(), getSecurityProvider(), crds);
lm.initialize(new Subject(), cbh, new HashMap<>(),
- ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
try {
lm.login();
@@ -624,7 +623,7 @@ public class ExternalLoginModuleTest extends AbstractSecurityTest {
Credentials crds = new SimpleCredentials(ID_EXCEPTION, new char[0]);
CallbackHandler cbh = createCallbackHandler(wb, getContentRepository(), getSecurityProvider(), crds);
lm.initialize(new Subject(), cbh, new HashMap<>(),
- ImmutableMap.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
+ Map.of(PARAM_IDP_NAME, DEFAULT_IDP_NAME, PARAM_SYNC_HANDLER_NAME, "syncHandler"));
try {
assertFalse(lm.login());
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 b81d8c2e21..5eb99d53c1 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
@@ -177,7 +177,7 @@ public class DelegateeTest extends AbstractJmxTest {
Root r = preventRootCommit(delegatee);
String[] result = delegatee.syncUsers(TEST_IDS, false);
- assertResultMessages(result, ImmutableMap.of(
+ assertResultMessages(result, Map.of(
ID_TEST_USER, "nsa",
TestIdentityProvider.ID_SECOND_USER, "nsa",
TestIdentityProvider.ID_WILDCARD_USER, "nsa"));
@@ -196,7 +196,7 @@ public class DelegateeTest extends AbstractJmxTest {
ID_TEST_USER,
TestIdentityProvider.ID_SECOND_USER,
TestIdentityProvider.ID_WILDCARD_USER}, false);
- assertResultMessages(result, ImmutableMap.of(
+ assertResultMessages(result, Map.of(
ID_TEST_USER, "ERR",
TestIdentityProvider.ID_SECOND_USER, "for",
TestIdentityProvider.ID_WILDCARD_USER, "nsa"));
@@ -296,7 +296,7 @@ public class DelegateeTest extends AbstractJmxTest {
externalIds.add(new ExternalIdentityRef(id, idp.getName()).getString());
}
String[] result = delegatee.syncExternalUsers(externalIds.toArray(new String[0]));
- assertResultMessages(result, ImmutableMap.of(
+ assertResultMessages(result, Map.of(
ID_TEST_USER, "ERR",
TestIdentityProvider.ID_SECOND_USER, "ERR",
TestIdentityProvider.ID_WILDCARD_USER, "ERR"));
@@ -322,7 +322,7 @@ public class DelegateeTest extends AbstractJmxTest {
Root r = preventRootCommit(delegatee);
String[] result = delegatee.syncAllExternalUsers();
- assertResultMessages(result, ImmutableMap.of(
+ assertResultMessages(result, Map.of(
ID_TEST_USER, "ERR",
TestIdentityProvider.ID_SECOND_USER, "ERR",
TestIdentityProvider.ID_WILDCARD_USER, "ERR"));
@@ -377,7 +377,7 @@ public class DelegateeTest extends AbstractJmxTest {
Root r = preventRootCommit(delegatee);
String[] result = delegatee.purgeOrphanedUsers();
- assertResultMessages(result, ImmutableMap.of(
+ assertResultMessages(result, Map.of(
"third", "ERR",
"forth", "ERR"));
assertFalse(r.hasPendingChanges());
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
index f0030d5c7c..29c35dc476 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
@@ -24,7 +24,6 @@ import java.util.Set;
import javax.jcr.RepositoryException;
import javax.jcr.ValueFactory;
-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;
@@ -165,10 +164,10 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
String[] userIds = new String[] {ID_TEST_USER, TestIdentityProvider.ID_SECOND_USER};
String[] result = syncMBean.syncUsers(userIds, false);
- assertResultMessages(result, ImmutableMap.of(ID_TEST_USER, "nsa", TestIdentityProvider.ID_SECOND_USER, "nsa"));
+ assertResultMessages(result, Map.of(ID_TEST_USER, "nsa", TestIdentityProvider.ID_SECOND_USER, "nsa"));
result = syncMBean.syncUsers(userIds, true);
- assertResultMessages(result, ImmutableMap.of(ID_TEST_USER, "nsa", TestIdentityProvider.ID_SECOND_USER, "nsa"));
+ assertResultMessages(result, Map.of(ID_TEST_USER, "nsa", TestIdentityProvider.ID_SECOND_USER, "nsa"));
}
@Test
@@ -177,10 +176,10 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
String[] userIds = new String[]{ID_TEST_USER, TestIdentityProvider.ID_SECOND_USER};
String[] result = syncMBean.syncUsers(userIds, false);
- assertResultMessages(result, ImmutableMap.of(ID_TEST_USER, "upd", TestIdentityProvider.ID_SECOND_USER, "nsa"));
+ assertResultMessages(result, Map.of(ID_TEST_USER, "upd", TestIdentityProvider.ID_SECOND_USER, "nsa"));
result = syncMBean.syncUsers(userIds, true);
- assertResultMessages(result, ImmutableMap.of(ID_TEST_USER, "upd", TestIdentityProvider.ID_SECOND_USER, "nsa"));
+ assertResultMessages(result, Map.of(ID_TEST_USER, "upd", TestIdentityProvider.ID_SECOND_USER, "nsa"));
}
@Test
@@ -191,7 +190,7 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
syncConfig.user().setExpirationTime(Long.MAX_VALUE);
String[]result = syncMBean.syncUsers(userIds, false);
- assertResultMessages(result, ImmutableMap.of(ID_TEST_USER, "upd", TestIdentityProvider.ID_SECOND_USER, "nsa"));
+ assertResultMessages(result, Map.of(ID_TEST_USER, "upd", TestIdentityProvider.ID_SECOND_USER, "nsa"));
}
@Test
@@ -503,7 +502,7 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
// syncAll with purge = false
String[] result = syncMBean.syncAllUsers(false);
- assertResultMessages(result, ImmutableMap.of("thirdUser", "mis", "g", "mis"));
+ assertResultMessages(result, Map.of("thirdUser", "mis", "g", "mis"));
UserManager userManager = getUserManager();
assertNotNull(userManager.getAuthorizable("thirdUser"));
@@ -518,7 +517,7 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
// syncAll with purge = true
String[] result = syncMBean.syncAllUsers(true);
- assertResultMessages(result, ImmutableMap.of("thirdUser", "del", "g", "del"));
+ assertResultMessages(result, Map.of("thirdUser", "del", "g", "del"));
UserManager userManager = getUserManager();
assertNull(userManager.getAuthorizable("thirdUser"));
@@ -537,7 +536,7 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
// verify effect of syncAllUsers : foreign user/group must be ignored by the sync.
String[] result = syncMBean.syncAllUsers(false);
- Map<String, String> expectedResults = ImmutableMap.of(ID_TEST_USER, "upd", "a", "upd");
+ Map<String, String> expectedResults = Map.of(ID_TEST_USER, "upd", "a", "upd");
assertResultMessages(result, expectedResults);
ExternalIdentity[] expectedIds = new ExternalIdentity[] {
@@ -689,7 +688,7 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
sync(new TestIdentityProvider.TestGroup("g", idp.getName()), idp);
String[] result = syncMBean.purgeOrphanedUsers();
- assertResultMessages(result, ImmutableMap.of("thirdUser", "del", "g", "del"));
+ assertResultMessages(result, Map.of("thirdUser", "del", "g", "del"));
UserManager userManager = getUserManager();
assertNull(userManager.getAuthorizable("thirdUser"));
@@ -737,7 +736,7 @@ public class SyncMBeanImplTest extends AbstractJmxTest {
sync(new TestIdentityProvider.TestGroup("g", idp.getName()), idp);
String[] result = createThrowingSyncMBean(true).purgeOrphanedUsers();
- assertResultMessages(result, ImmutableMap.of("thirdUser", "ERR", "g", "ERR"));
+ assertResultMessages(result, Map.of("thirdUser", "ERR", "g", "ERR"));
UserManager userManager = getUserManager();
assertNotNull(userManager.getAuthorizable("thirdUser"));
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractAutoMembershipTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractAutoMembershipTest.java
index 6e5fddf213..3f9b35f6c4 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractAutoMembershipTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractAutoMembershipTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -40,12 +39,12 @@ public abstract class AbstractAutoMembershipTest extends AbstractExternalAuthTe
static final String AUTOMEMBERSHIP_GROUP_ID_3 = "autoMembershipGroupId_3";
static final String NON_EXISTING_GROUP_ID = "nonExistingGroupId";
- static final Map<String, String[]> MAPPING = ImmutableMap.of(
+ static final Map<String, String[]> MAPPING = Map.of(
IDP_VALID_AM, new String[] {AUTOMEMBERSHIP_GROUP_ID_1, AUTOMEMBERSHIP_GROUP_ID_2},
IDP_INVALID_AM, new String[] {NON_EXISTING_GROUP_ID},
IDP_MIXED_AM, new String[] {AUTOMEMBERSHIP_GROUP_ID_1, NON_EXISTING_GROUP_ID});
- static final Map<String, String[]> MAPPING_GROUP = ImmutableMap.of(
+ static final Map<String, String[]> MAPPING_GROUP = Map.of(
IDP_VALID_AM, new String[] {AUTOMEMBERSHIP_GROUP_ID_3},
IDP_INVALID_AM, new String[] {NON_EXISTING_GROUP_ID},
IDP_MIXED_AM, new String[] {AUTOMEMBERSHIP_GROUP_ID_3, NON_EXISTING_GROUP_ID});
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractProtectionConfigTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractProtectionConfigTest.java
index 8a4b487fbc..e0b62d9467 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractProtectionConfigTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractProtectionConfigTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.spi.security.authentication.external.AbstractExternalAuthTest;
@@ -30,7 +29,7 @@ import static org.mockito.Mockito.when;
public abstract class AbstractProtectionConfigTest extends AbstractExternalAuthTest {
- static final Map<String, String[]> PROPERTIES = ImmutableMap.of(
+ static final Map<String, String[]> PROPERTIES = Map.of(
"propertyNames", new String[] {"prop1", "prop2"},
"nodeNames", new String[] {"node1", "node2"});
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutomembershipServiceTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutomembershipServiceTest.java
index a38d266a3c..9c9341cbe4 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutomembershipServiceTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutomembershipServiceTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.DefaultSyncHandler;
import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.SyncHandlerMapping;
@@ -70,11 +69,11 @@ public class AutomembershipServiceTest extends AbstractAutoMembershipTest {
}
private static Map<String, String> getMappingParams() {
- return ImmutableMap.of(PARAM_IDP_NAME, IDP_VALID_AM, PARAM_SYNC_HANDLER_NAME, "sh");
+ return Map.of(PARAM_IDP_NAME, IDP_VALID_AM, PARAM_SYNC_HANDLER_NAME, "sh");
}
private static Map<String, Object> getSyncHandlerParams() {
- return ImmutableMap.of(
+ return Map.of(
PARAM_USER_DYNAMIC_MEMBERSHIP, true,
PARAM_NAME, "sh",
PARAM_USER_AUTO_MEMBERSHIP, new String[] {AUTOMEMBERSHIP_GROUP_ID_1});
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupMembershipServiceTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupMembershipServiceTest.java
index 4294440b29..1de1fa5077 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupMembershipServiceTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/DynamicGroupMembershipServiceTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.spi.security.authentication.external.AbstractExternalAuthTest;
import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.DefaultSyncHandler;
@@ -73,11 +72,11 @@ public class DynamicGroupMembershipServiceTest extends AbstractExternalAuthTest
}
private static Map<String, String> getMappingParams() {
- return ImmutableMap.of(PARAM_IDP_NAME, IDP_VALID_AM, PARAM_SYNC_HANDLER_NAME, "sh");
+ return Map.of(PARAM_IDP_NAME, IDP_VALID_AM, PARAM_SYNC_HANDLER_NAME, "sh");
}
private static Map<String, Object> getSyncHandlerParams(boolean enableDynamicGroups) {
- return ImmutableMap.of(
+ return Map.of(
PARAM_USER_DYNAMIC_MEMBERSHIP, true,
PARAM_NAME, "sh",
PARAM_GROUP_DYNAMIC_GROUPS, enableDynamicGroups);
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalAuthorizableActionProviderTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalAuthorizableActionProviderTest.java
index 54814bc1c3..01d5a4c340 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalAuthorizableActionProviderTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalAuthorizableActionProviderTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
@@ -330,13 +329,13 @@ public class ExternalAuthorizableActionProviderTest extends AbstractExternalAuth
private static Map<String, Object> createSyncConfig(@NotNull String automembershipId, boolean isUserAutoMembership) {
String autoMembershipName = (isUserAutoMembership) ? DefaultSyncConfigImpl.PARAM_USER_AUTO_MEMBERSHIP : DefaultSyncConfigImpl.PARAM_GROUP_AUTO_MEMBERSHIP;
- return ImmutableMap.of(
+ return Map.of(
DefaultSyncConfigImpl.PARAM_NAME, "sh",
autoMembershipName, new String[] {automembershipId});
}
private static Map<String, Object> createMappingConfig(@NotNull String idpName) {
- return ImmutableMap.of(
+ return Map.of(
SyncHandlerMapping.PARAM_IDP_NAME, idpName,
SyncHandlerMapping.PARAM_SYNC_HANDLER_NAME, "sh");
}
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderDMTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderDMTest.java
index 5f44cc0a1e..93d3d2bed5 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderDMTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderDMTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;
@@ -175,7 +174,7 @@ public class ExternalGroupPrincipalProviderDMTest extends AbstractPrincipalTest
String extId = new ExternalIdentityRef(testGroup.getID(), idp.getName()).getString();
testGroup.setProperty(ExternalIdentityConstants.REP_EXTERNAL_ID, getValueFactory(root).createValue(extId));
- Map<String, String> nameType = ImmutableMap.of(
+ Map<String, String> nameType = Map.of(
UserConstants.REP_MEMBERS, UserConstants.NT_REP_MEMBERS,
UserConstants.REP_MEMBERS_LIST, UserConstants.NT_REP_MEMBER_REFERENCES_LIST);
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorTest.java
index 81219db0ed..52963b0370 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorTest.java
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.prin
import javax.jcr.SimpleCredentials;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.oak.api.CommitFailedException;
@@ -37,6 +36,7 @@ import org.jetbrains.annotations.NotNull;
import org.junit.Test;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import static org.apache.jackrabbit.oak.api.CommitFailedException.CONSTRAINT;
@@ -176,7 +176,7 @@ public class ExternalIdentityValidatorTest extends ExternalLoginTestBase {
Root systemRoot = getSystemRoot();
Tree userTree = systemRoot.getTree(testUserPath);
- java.util.Map<Type, Object> valMap = ImmutableMap.of(
+ java.util.Map<Type, Object> valMap = Map.of(
Type.BOOLEANS, Set.of(Boolean.TRUE),
Type.LONGS, Set.of(1234L),
Type.NAMES, Set.of("id", "id2")
@@ -249,7 +249,7 @@ public class ExternalIdentityValidatorTest extends ExternalLoginTestBase {
Root systemRoot = getSystemRoot();
Tree userTree = systemRoot.getTree(testUserPath);
- java.util.Map<Type, Object> valMap = ImmutableMap.of(
+ java.util.Map<Type, Object> valMap = Map.of(
Type.BOOLEAN, Boolean.TRUE,
Type.LONG, 1234L,
Type.NAME, "id"
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalLoginCachedDynamicMembershipTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalLoginCachedDynamicMembershipTest.java
index 7f0f6f1cb3..6c3b4a53e1 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalLoginCachedDynamicMembershipTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalLoginCachedDynamicMembershipTest.java
@@ -36,7 +36,6 @@ import javax.security.auth.login.Configuration;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.UserManager;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.api.ContentSession;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -69,14 +68,14 @@ public class ExternalLoginCachedDynamicMembershipTest extends ExternalLoginTestB
// now register the sync-handler with the dynamic membership config
// in order to enable dynamic membership with the external principal configuration
- Map<String, Boolean> props = ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP,
+ Map<String, Boolean> props = Map.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP,
syncConfig.user().getDynamicMembership(),
DefaultSyncConfigImpl.PARAM_GROUP_DYNAMIC_GROUPS,
syncConfig.group().getDynamicGroups());
SyncHandler syncHandler = WhiteboardUtils.getService(whiteboard, SyncHandler.class);
context.registerService(SyncHandler.class, syncHandler, props);
- Map<String, String> mappingProps = ImmutableMap.of(
+ Map<String, String> mappingProps = Map.of(
SyncHandlerMapping.PARAM_IDP_NAME, idp.getName(),
SyncHandlerMapping.PARAM_SYNC_HANDLER_NAME, syncHandler.getName());
context.registerService(SyncHandlerMapping.class, new SyncHandlerMapping() {}, mappingProps);
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTrackerTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTrackerTest.java
index c8c4a9e939..a93b91e855 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTrackerTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SyncConfigTrackerTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import org.apache.jackrabbit.guava.common.collect.ObjectArrays;
import org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
@@ -82,11 +81,11 @@ public class SyncConfigTrackerTest {
}
private void registerSyncHandlerMapping(@NotNull String idpName, @NotNull String syncHandlerName) {
- context.registerService(SyncHandlerMapping.class, mapping, ImmutableMap.of(PARAM_IDP_NAME, idpName, PARAM_SYNC_HANDLER_NAME, syncHandlerName));
+ context.registerService(SyncHandlerMapping.class, mapping, Map.of(PARAM_IDP_NAME, idpName, PARAM_SYNC_HANDLER_NAME, syncHandlerName));
}
private void registerSyncHandlerWithAutoMembership(@NotNull String syncHandlerName, boolean dynamicMembership, @NotNull String[] userAutoMembership, @NotNull String[] groupAutoMembership) {
- context.registerService(SyncHandler.class, service, ImmutableMap.of(
+ context.registerService(SyncHandler.class, service, Map.of(
PARAM_NAME, syncHandlerName,
PARAM_USER_DYNAMIC_MEMBERSHIP, dynamicMembership,
PARAM_GROUP_AUTO_MEMBERSHIP, userAutoMembership,
@@ -239,9 +238,9 @@ public class SyncConfigTrackerTest {
public void testNotAutoMembershipAware() {
assertTrue(tracker.getAutoMembershipConfig().isEmpty());
- context.registerService(SyncHandlerMapping.class, mapping, ImmutableMap.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "sh"));
+ context.registerService(SyncHandlerMapping.class, mapping, Map.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "sh"));
// sync-handler mock is not AutoMembershipAware
- context.registerService(SyncHandler.class, service, ImmutableMap.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+ context.registerService(SyncHandler.class, service, Map.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
assertTrue(tracker.isEnabled());
assertTrue(tracker.getAutoMembershipConfig().isEmpty());
@@ -251,12 +250,12 @@ public class SyncConfigTrackerTest {
public void testAutomembershipAware() {
assertTrue(tracker.getAutoMembershipConfig().isEmpty());
- context.registerService(SyncHandlerMapping.class, mapping, ImmutableMap.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "sh"));
+ context.registerService(SyncHandlerMapping.class, mapping, Map.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "sh"));
// sync-handler mock is AutoMembershipAware
SyncHandler syncHandler = mock(SyncHandler.class, withSettings().extraInterfaces(AutoMembershipAware.class));
AutoMembershipConfig amc = mock(AutoMembershipConfig.class);
when(((AutoMembershipAware) syncHandler).getAutoMembershipConfig()).thenReturn(amc);
- context.registerService(SyncHandler.class, syncHandler, ImmutableMap.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+ context.registerService(SyncHandler.class, syncHandler, Map.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
assertTrue(tracker.isEnabled());
Map<String, AutoMembershipConfig> m = tracker.getAutoMembershipConfig();
@@ -269,15 +268,15 @@ public class SyncConfigTrackerTest {
public void testAutomembershipAwareWithDuplication() {
assertTrue(tracker.getAutoMembershipConfig().isEmpty());
- context.registerService(SyncHandlerMapping.class, mapping, ImmutableMap.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "sh"));
+ context.registerService(SyncHandlerMapping.class, mapping, Map.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "sh"));
// sync-handler mock is AutoMembershipAware
SyncHandler syncHandler = mock(SyncHandler.class, withSettings().extraInterfaces(AutoMembershipAware.class));
AutoMembershipConfig amc = mock(AutoMembershipConfig.class);
when(((AutoMembershipAware) syncHandler).getAutoMembershipConfig()).thenReturn(amc);
- context.registerService(SyncHandler.class, syncHandler, ImmutableMap.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+ context.registerService(SyncHandler.class, syncHandler, Map.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
// duplicate registration
- context.registerService(SyncHandler.class, syncHandler, ImmutableMap.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+ context.registerService(SyncHandler.class, syncHandler, Map.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
assertTrue(tracker.isEnabled());
Map<String, AutoMembershipConfig> m = tracker.getAutoMembershipConfig();
@@ -290,12 +289,12 @@ public class SyncConfigTrackerTest {
public void testAutomembershipAwareWithCollision() {
assertTrue(tracker.getAutoMembershipConfig().isEmpty());
- context.registerService(SyncHandlerMapping.class, mapping, ImmutableMap.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "sh"));
+ context.registerService(SyncHandlerMapping.class, mapping, Map.of(PARAM_IDP_NAME, "idp", PARAM_SYNC_HANDLER_NAME, "sh"));
// sync-handler mock is AutoMembershipAware
SyncHandler syncHandler = mock(SyncHandler.class, withSettings().extraInterfaces(AutoMembershipAware.class));
AutoMembershipConfig amc = mock(AutoMembershipConfig.class);
when(((AutoMembershipAware) syncHandler).getAutoMembershipConfig()).thenReturn(amc);
- context.registerService(SyncHandler.class, syncHandler, ImmutableMap.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+ context.registerService(SyncHandler.class, syncHandler, Map.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
assertTrue(tracker.isEnabled());
Map<String, AutoMembershipConfig> m = tracker.getAutoMembershipConfig();
@@ -306,7 +305,7 @@ public class SyncConfigTrackerTest {
SyncHandler syncHandler2 = mock(SyncHandler.class, withSettings().extraInterfaces(AutoMembershipAware.class));
AutoMembershipConfig amc2 = mock(AutoMembershipConfig.class);
when(((AutoMembershipAware) syncHandler2).getAutoMembershipConfig()).thenReturn(amc2);
- context.registerService(SyncHandler.class, syncHandler2, ImmutableMap.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+ context.registerService(SyncHandler.class, syncHandler2, Map.of(PARAM_NAME, "sh", PARAM_USER_DYNAMIC_MEMBERSHIP, true));
assertTrue(tracker.isEnabled());
m = tracker.getAutoMembershipConfig();
diff --git a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ValidatorNoProtectionTest.java b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ValidatorNoProtectionTest.java
index 0f90ed6b5d..0c894a3551 100644
--- a/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ValidatorNoProtectionTest.java
+++ b/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ValidatorNoProtectionTest.java
@@ -19,7 +19,6 @@ package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.prin
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.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -52,7 +51,7 @@ public class ValidatorNoProtectionTest extends ExternalIdentityValidatorTest {
Root systemRoot = getSystemRoot();
Tree userTree = systemRoot.getTree(testUserPath);
- Map<Type, Object> valMap = ImmutableMap.of(
+ Map<Type, Object> valMap = Map.of(
Type.BOOLEAN, Boolean.TRUE,
Type.LONG, 1234L,
Type.NAME, "id"