OAK-11105: Remove usage of Guava ImmutableMap.of() - zero/one argumen…

…t case (apache#1869)

* OAK-11105: Remove usage of Guava ImmutableMap.of() - zero argument case

* OAK-11105: simplify generics

* OAK-11105: remove ImmutableMap.of(a, b) - oak-benchmarks-elastic

* OAK-11105: remove ImmutableMap.of(a, b) - oak-benchmarks-lucene

* OAK-11105: remove ImmutableMap.of(a, b) - oak-benchmarks-solr

* OAK-11105: remove ImmutableMap.of(a, b) - oak-blob-plugins

* OAK-11105: remove ImmutableMap.of(a, b) - oak-auth-ldap

* OAK-11105: remove ImmutableMap.of(a, b) - oak-run-elastic

* OAK-11105: remove ImmutableMap.of(a, b) - oak-it

* OAK-11105: remove ImmutableMap.of(a, b) - oak-upgrade

* OAK-11105: remove ImmutableMap.of(a, b) - oak-doc

* OAK-11105: remove ImmutableMap.of(a, b) - oak-store-spi

* OAK-11105: remove ImmutableMap.of(a, b) - oak-benchmarks

* OAK-11105: remove ImmutableMap.of(a, b) - oak-store-document

* OAK-11105: remove ImmutableMap.of(a, b) - oak-lucene

* OAK-11105: remove ImmutableMap.of(a, b) - oak-store-composite

* OAK-11105: remove ImmutableMap.of(a, b) - oak-core-spi

* OAK-11105: remove ImmutableMap.of(a, b) - oak-jcr

* OAK-11105: remove ImmutableMap.of(a, b) - oak-segment-tar

* OAK-11105: remove ImmutableMap.of(a, b) - oak-authorization-cug

* OAK-11105: remove ImmutableMap.of(a, b) - oak-exercise

* OAK-11105: remove ImmutableMap.of(a, b) - oak-authorization-principalbased

* OAK-11105: remove ImmutableMap.of(a, b) - oak-security-spi

* OAK-11105: fix review comments

* OAK-11105: remove ImmutableMap.of(a, b) - oak-core

* OAK-11105: remove ImmutableMap.of(a, b) - oak-auth-external

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java

@@ -21,7 +21,7 @@
 import java.util.Set;
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
+
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.junit.Test;
@@ -162,7 +162,7 @@ public Iterable<ExternalIdentityRef> getDeclaredGroups() {
             @NotNull
             @Override
             public Map<String, ?> getProperties() {
-                return ImmutableMap.of();
+                return Map.of();
             }
         }));
     }

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginDynamicMembershipTest.java

@@ -24,7 +24,6 @@
 import javax.jcr.SimpleCredentials;
 import javax.jcr.Value;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
 import org.apache.jackrabbit.api.security.principal.PrincipalManager;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
@@ -55,7 +54,7 @@ public void before() throws Exception {
 
         // 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, syncConfig.user().getDynamicMembership());
+        Map<String, Boolean> props = Map.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, syncConfig.user().getDynamicMembership());
         context.registerService(SyncHandler.class, WhiteboardUtils.getService(whiteboard, SyncHandler.class), props);
     }
 

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java

@@ -19,7 +19,7 @@
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
+
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.api.security.user.Group;
 import org.apache.jackrabbit.api.security.user.User;
@@ -58,9 +58,9 @@ private static void assertAuthorizableConfig(@NotNull DefaultSyncConfig.Authoriz
         assertNotNull(mapping);
         assertTrue(mapping.isEmpty());
 
-        assertSame(authorizableConfig, authorizableConfig.setPropertyMapping(ImmutableMap.of("a", "b")));
-        assertEquals(ImmutableMap.of("a", "b"), authorizableConfig.getPropertyMapping());
-        assertEquals(ImmutableMap.of(), authorizableConfig.setPropertyMapping(null).getPropertyMapping());
+        assertSame(authorizableConfig, authorizableConfig.setPropertyMapping(Map.of("a", "b")));
+        assertEquals(Map.of("a", "b"), authorizableConfig.getPropertyMapping());
+        assertEquals(Map.of(), authorizableConfig.setPropertyMapping(null).getPropertyMapping());
 
         assertEquals(0, authorizableConfig.getExpirationTime());
         assertSame(authorizableConfig, authorizableConfig.setExpirationTime(Long.MAX_VALUE));

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java

@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.spi.security.authentication.external.basic;
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
@@ -1057,7 +1056,7 @@ public void testSyncPropertiesEmptyMap() throws Exception {
         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 +1075,7 @@ public void testSyncPropertiesEmptyMapExistingProps() throws Exception {
             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]);

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java

@@ -27,7 +27,6 @@
 import javax.security.auth.login.LoginException;
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
 import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
 import org.apache.jackrabbit.guava.common.collect.Maps;
 import org.apache.jackrabbit.oak.api.AuthInfo;
@@ -112,7 +111,7 @@ private TestCredentials(@NotNull String uid) {
 
     static final class IDP implements ExternalIdentityProvider, CredentialsSupport {
 
-        private final Map<String, Object> attributes = Maps.newHashMap(ImmutableMap.of("a", "a"));
+        private final Map<String, Object> attributes = Maps.newHashMap(Map.of("a", "a"));
 
         @NotNull
         @Override
@@ -219,7 +218,7 @@ public String getUserId(@NotNull Credentials credentials) {
             if (credentials instanceof TestCredentials) {
                 return attributes;
             } else {
-                return ImmutableMap.of();
+                return Map.of();
             }
         }
 

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.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.guava.common.collect.Iterators;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;
@@ -352,7 +351,7 @@ public void testSyncMembershipCaseMismatch() throws Exception {
     @Test
     public void testActivate() {
         DefaultSyncHandler handler = new DefaultSyncHandler();
-        Map<String,Object> props = ImmutableMap.of(DefaultSyncConfigImpl.PARAM_NAME, "testName");
+        Map<String,Object> props = Map.of(DefaultSyncConfigImpl.PARAM_NAME, "testName");
         context.registerInjectActivateService(handler, props);
 
         assertEquals("testName", handler.getName());

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleTest.java

@@ -338,7 +338,7 @@ public void testLoginCommitImpersonationCredentials() throws Exception {
         when(idp.authenticate(creds)).thenReturn(new TestIdentityProvider.TestUser(ID_TEST_USER, DEFAULT_IDP_NAME));
         when(((CredentialsSupport) idp).getUserId(any(Credentials.class))).thenReturn(ID_TEST_USER);
         when(((CredentialsSupport) idp).getCredentialClasses()).thenReturn(Set.of(ImpersonationCredentials.class));
-        Map attr = ImmutableMap.of("attr","value");
+        Map attr = Map.of("attr","value");
         when(((CredentialsSupport) idp).getAttributes(creds)).thenReturn(attr);
         when(((CredentialsSupport) idp).getAttributes(sc)).thenReturn(Collections.emptyMap());
 

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/TokenExternalLoginModuleTest.java

@@ -22,7 +22,6 @@
 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.authentication.token.TokenCredentials;
 import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.oak.api.ContentSession;
@@ -89,7 +88,7 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
     @Test
     public void testTokenCreation() throws Exception {
         Credentials creds = createTestCredentials();
-        assertTrue(credentialsSupport.setAttributes(creds, ImmutableMap.<String, Object>of(".token", "")));
+        assertTrue(credentialsSupport.setAttributes(creds, Map.of(".token", "")));
 
         String expectedUserId = credentialsSupport.getUserId(creds);
 
@@ -112,7 +111,7 @@ public void testTokenCreation() throws Exception {
     @Test
     public void testTokenLogin() throws Exception {
         Credentials creds = createTestCredentials();
-        assertTrue(credentialsSupport.setAttributes(creds, ImmutableMap.<String, Object>of(".token", "")));
+        assertTrue(credentialsSupport.setAttributes(creds, Map.of(".token", "")));
 
         String expectedUserId = credentialsSupport.getUserId(creds);
 

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.java

@@ -17,7 +17,7 @@
 package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx;
 
 import java.util.Map;
-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.User;
@@ -50,7 +50,7 @@ public void before() throws Exception {
     }
 
     static void assertResultMessages(@NotNull String[] resultMessages, String uid, @NotNull String expectedOperation) {
-        assertResultMessages(resultMessages, ImmutableMap.of(uid, expectedOperation));
+        assertResultMessages(resultMessages, Map.of(uid, expectedOperation));
     }
 
     static void assertResultMessages(@NotNull String[] resultMessages, @NotNull Map<String, String> expected) {

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java

@@ -208,7 +208,7 @@ public void testSyncAllUsersBeforeSaveError() throws Exception {
         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 void refresh() {
 
         @Override
         public void commit() throws CommitFailedException {
-            commit(ImmutableMap.of());
+            commit(Map.of());
         }
 
         @Override

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java

@@ -198,7 +198,7 @@ public void testSyncUsersAlwaysForcesSync() throws Exception {
     public void testSyncGroups() throws Exception {
         sync(idp, "a", true);
 
-        Map<String, String> expected = ImmutableMap.of("a", "upd");
+        Map<String, String> expected = Map.of("a", "upd");
         syncConfig.group().setExpirationTime(Long.MAX_VALUE);
 
         // force group sync is true by default => exp time is ignored

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipPrincipalsTest.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.Iterators;
 import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
@@ -265,7 +264,7 @@ public void testIsInheritedMemberGroupLookupFails() throws Exception {
 
     @Test
     public void testIsInheritedMemberConfiguredUser() throws Exception {
-        Map<String, String[]> mapping = ImmutableMap.of(IDP_INVALID_AM, new String[] {getTestUser().getID()});
+        Map<String, String[]> mapping = Map.of(IDP_INVALID_AM, new String[] {getTestUser().getID()});
         AutoMembershipPrincipals amprincipals = new AutoMembershipPrincipals(userManager, mapping, Collections.emptyMap());
         assertFalse(amprincipals.isInheritedMember(IDP_INVALID_AM, getTestGroup(), authorizable));
     }

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AutoMembershipProviderTest.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.Iterators;
 import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -224,7 +223,7 @@ public void testGetMembersMatchingUsersAndGroups() throws Exception {
 
         // create provider with a group mapping that contains same group as user-mapping
         if (dynamicGroupsEnabled) {
-            Map<String, String[]> grMapping = ImmutableMap.of(IDP_VALID_AM, new String[] {AUTOMEMBERSHIP_GROUP_ID_1});
+            Map<String, String[]> grMapping = Map.of(IDP_VALID_AM, new String[] {AUTOMEMBERSHIP_GROUP_ID_1});
             AutoMembershipProvider amp = new AutoMembershipProvider(root, userManager, getNamePathMapper(), MAPPING, grMapping, getAutoMembershipConfigMapping());
             // external group does have 'automembershipGroup3' as configured autom-membership
             Iterator<Authorizable> it = amp.getMembers(automembershipGroup1, false);

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalTest.java

@@ -17,7 +17,6 @@
 package org.apache.jackrabbit.oak.spi.security.authentication.external.impl.principal;
 
 import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.api.security.principal.GroupPrincipal;
 import org.apache.jackrabbit.api.security.principal.ItemBasedPrincipal;

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java

@@ -343,11 +343,11 @@ public void testDeactivateWithNullTrackers() {
 
     @Test
     public void testAddingSyncHandler() {
-        Map<String, Object> enableProps =  ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true);
-        Map<String, Object> disableProps =  ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false);
+        Map<String, Object> enableProps =  Map.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true);
+        Map<String, Object> disableProps =  Map.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);
@@ -362,10 +362,10 @@ public void testAddingSyncHandler() {
 
     @Test
     public void testAddingCustomSyncHandler() {
-        Map<String, Object> enableProps =  ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true);
+        Map<String, Object> enableProps =  Map.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);
@@ -374,8 +374,8 @@ public void testAddingCustomSyncHandler() {
 
     @Test
     public void testRemoveSyncHandler() {
-        Dictionary<String, Object> enableProps = MapUtil.toDictionary(ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
-        Dictionary<String, Object> disableProps =  MapUtil.toDictionary(ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false));
+        Dictionary<String, Object> enableProps = MapUtil.toDictionary(Map.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+        Dictionary<String, Object> disableProps =  MapUtil.toDictionary(Map.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false));
 
         DefaultSyncHandler sh = new DefaultSyncHandler();
         BundleContext bundleContext = context.bundleContext();

oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/SystemPrincipalConfigTest.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.Iterators;
 import org.apache.jackrabbit.guava.common.collect.Lists;
@@ -77,7 +76,7 @@ public static Collection<Object[]> parameters() {
     @Override
     public void before() throws Exception {
         super.before();
-        context.registerService(SyncHandler.class, new DefaultSyncHandler(), ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
+        context.registerService(SyncHandler.class, new DefaultSyncHandler(), Map.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
         workspaceName = root.getContentSession().getWorkspaceName();
 
         systemPrincipalConfig = (systemUserNames == null) ? new SystemPrincipalConfig(Collections.emptySet()) : new SystemPrincipalConfig(systemUserNames);

oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapGroupTest.java

@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.security.authentication.ldap.impl;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
@@ -43,7 +42,7 @@ public void testGetDeclaredMembers() throws Exception {
         Dn dn = when(mock(Dn.class).getName()).thenReturn("dn").getMock();
         when(entry.getDn()).thenReturn(dn);
 
-        Map<String, ExternalIdentityRef> memberRefs = ImmutableMap.of("m", mock(ExternalIdentityRef.class));
+        Map<String, ExternalIdentityRef> memberRefs = Map.of("m", mock(ExternalIdentityRef.class));
         when(idp.getDeclaredMemberRefs(ref, "dn")).thenReturn(memberRefs);
 
         Collection<ExternalIdentityRef> expected = memberRefs.values();

oak-auth-ldap/src/test/java/org/apache/jackrabbit/oak/security/authentication/ldap/impl/LdapIdentityTest.java

@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.security.authentication.ldap.impl;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
 import org.apache.directory.api.ldap.model.entry.Entry;
 import org.apache.directory.api.ldap.model.name.Dn;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
@@ -61,7 +60,7 @@ public void testGetDeclaredGroups() throws Exception {
         Dn dn = when(mock(Dn.class).getName()).thenReturn("dn").getMock();
         when(entry.getDn()).thenReturn(dn);
 
-        Map<String, ExternalIdentityRef> groupRefs = ImmutableMap.of("gr", mock(ExternalIdentityRef.class));
+        Map<String, ExternalIdentityRef> groupRefs = Map.of("gr", mock(ExternalIdentityRef.class));
         when(idp.getDeclaredGroupRefs(ref, "dn")).thenReturn(groupRefs);
 
         Collection<ExternalIdentityRef> expected = groupRefs.values();

oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationOsgiTest.java

@@ -100,7 +100,7 @@ public void testCugExcludeExcludedDefault() {
 
     @Test
     public void testCugExcludeExcludedPrincipal() {
-        context.registerInjectActivateService(cugExclude, ImmutableMap.of("principalNames", new String[] {EXCLUDED_PRINCIPAL_NAME}));
+        context.registerInjectActivateService(cugExclude, Map.of("principalNames", new String[] {EXCLUDED_PRINCIPAL_NAME}));
         context.registerInjectActivateService(cugConfiguration, PROPERTIES);
 
         AuthorizationConfiguration config = context.getService(AuthorizationConfiguration.class);
@@ -110,7 +110,7 @@ public void testCugExcludeExcludedPrincipal() {
 
     @Test
     public void testCugExcludeAnyPrincipal() {
-        context.registerInjectActivateService(cugExclude, ImmutableMap.of("principalNames", new String[] {EXCLUDED_PRINCIPAL_NAME}));
+        context.registerInjectActivateService(cugExclude, Map.of("principalNames", new String[] {EXCLUDED_PRINCIPAL_NAME}));
         context.registerInjectActivateService(cugConfiguration, PROPERTIES);
 
         AuthorizationConfiguration config = context.getService(AuthorizationConfiguration.class);
@@ -120,7 +120,7 @@ public void testCugExcludeAnyPrincipal() {
 
     @Test
     public void testNotEnabled() {
-        context.registerInjectActivateService(cugExclude, ImmutableMap.of("principalNames", new String[] {ANY_PRINCIPAL_NAME}));
+        context.registerInjectActivateService(cugExclude, Map.of("principalNames", new String[] {ANY_PRINCIPAL_NAME}));
         context.registerInjectActivateService(cugConfiguration, ImmutableMap.of(
                 CugConstants.PARAM_CUG_ENABLED, false,
                 CugConstants.PARAM_CUG_SUPPORTED_PATHS, new String[]{"/"}));
@@ -132,7 +132,7 @@ public void testNotEnabled() {
 
     @Test
     public void testNoSupportedPaths() {
-        context.registerInjectActivateService(cugExclude, ImmutableMap.of("principalNames", new String[] {ANY_PRINCIPAL_NAME}));
+        context.registerInjectActivateService(cugExclude, Map.of("principalNames", new String[] {ANY_PRINCIPAL_NAME}));
         context.registerInjectActivateService(cugConfiguration, ImmutableMap.of(
                 CugConstants.PARAM_CUG_ENABLED, true,
                 CugConstants.PARAM_CUG_SUPPORTED_PATHS, new String[0]));