Revert "OAK-11105: Remove usage of Guava ImmutableMap.of() - zero arg…

…ument case" This reverts commit 9fdfbb6.
apache · Nov 18, 2024 · 607f849 · 607f849
1 parent 9fdfbb6
commit 607f849
Show file tree

Hide file tree

Showing 35 changed files with 88 additions and 94 deletions.
diff --git a/...g/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java b/...g/apache/jackrabbit/oak/spi/security/authentication/external/ExternalIdentityRefTest.java
@@ -162,7 +162,7 @@ public Iterable<ExternalIdentityRef> getDeclaredGroups() {
             @NotNull
             @Override
             public Map<String, ?> getProperties() {
-                return Map.of();
+                return ImmutableMap.of();
             }
         }));
     }

diff --git a/...ache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java b/...ache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfigTest.java
@@ -60,7 +60,7 @@ private static void assertAuthorizableConfig(@NotNull DefaultSyncConfig.Authoriz
 
         assertSame(authorizableConfig, authorizableConfig.setPropertyMapping(ImmutableMap.of("a", "b")));
         assertEquals(ImmutableMap.of("a", "b"), authorizableConfig.getPropertyMapping());
-        assertEquals(Map.of(), authorizableConfig.setPropertyMapping(null).getPropertyMapping());
+        assertEquals(ImmutableMap.of(), authorizableConfig.setPropertyMapping(null).getPropertyMapping());
 
         assertEquals(0, authorizableConfig.getExpirationTime());
         assertSame(authorizableConfig, authorizableConfig.setExpirationTime(Long.MAX_VALUE));

diff --git a/...che/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java b/...che/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContextTest.java
@@ -1057,7 +1057,7 @@ public void testSyncPropertiesEmptyMap() throws Exception {
         ExternalUser externalUser = idp.getUser(TestIdentityProvider.ID_SECOND_USER);
         Authorizable a = syncCtx.createUser(externalUser);
 
-        syncCtx.syncProperties(externalUser, a, Map.of());
+        syncCtx.syncProperties(externalUser, a, ImmutableMap.of());
 
         for (String propName : externalUser.getProperties().keySet()) {
             assertFalse(a.hasProperty(propName));
@@ -1076,7 +1076,7 @@ public void testSyncPropertiesEmptyMapExistingProps() throws Exception {
             a.setProperty(propName, anyValue);
         }
 
-        syncCtx.syncProperties(externalUser, a, Map.of());
+        syncCtx.syncProperties(externalUser, a, ImmutableMap.of());
         for (String propName : extProps.keySet()) {
             assertTrue(a.hasProperty(propName));
             assertEquals(anyValue, a.getProperty(propName)[0]);

diff --git a/...ackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java b/...ackrabbit/oak/spi/security/authentication/external/impl/CustomCredentialsSupportTest.java
@@ -219,7 +219,7 @@ public String getUserId(@NotNull Credentials credentials) {
             if (credentials instanceof TestCredentials) {
                 return attributes;
             } else {
-                return Map.of();
+                return ImmutableMap.of();
             }
         }
 

diff --git a/...rg/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java b/...rg/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, Map.of());
+        assertResultMessages(result, ImmutableMap.of());
         assertFalse(r.hasPendingChanges());
     }
 
@@ -459,7 +459,7 @@ public void refresh() {
 
         @Override
         public void commit() throws CommitFailedException {
-            commit(Map.of());
+            commit(ImmutableMap.of());
         }
 
         @Override

diff --git a/...i/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java b/...i/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
@@ -347,7 +347,7 @@ public void testAddingSyncHandler() {
         Map<String, Object> disableProps =  ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false);
 
         SyncHandler sh = new DefaultSyncHandler();
-        context.registerService(SyncHandler.class, sh, Map.of());
+        context.registerService(SyncHandler.class, sh, ImmutableMap.of());
         assertIsEnabled(externalPrincipalConfiguration, false);
 
         context.registerService(SyncHandler.class, sh, disableProps);
@@ -365,7 +365,7 @@ public void testAddingCustomSyncHandler() {
         Map<String, Object> enableProps =  ImmutableMap.of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true);
 
         SyncHandler sh = new TestSyncHandler();
-        context.registerService(SyncHandler.class, sh, Map.of());
+        context.registerService(SyncHandler.class, sh, ImmutableMap.of());
         assertIsEnabled(externalPrincipalConfiguration, false);
 
         context.registerService(SyncHandler.class, sh, enableProps);

diff --git a/...he/jackrabbit/oak/spi/security/authorization/principalbased/impl/EffectivePolicyTest.java b/...he/jackrabbit/oak/spi/security/authorization/principalbased/impl/EffectivePolicyTest.java
@@ -82,11 +82,11 @@ public void testBefore() throws Exception {
         // - 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, Map.of());
+        policy.addEntry(jcrEffectivePath, privilegesFromNames(JCR_READ), restrictions, ImmutableMap.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), Map.of(), mvRestrictions);
+        policy.addEntry(PathUtils.ROOT_PATH, privilegesFromNames(PrivilegeConstants.JCR_LIFECYCLE_MANAGEMENT), ImmutableMap.of(), mvRestrictions);
 
         acMgr.setPolicy(policy.getPath(), policy);
 

diff --git a/...k/spi/security/authorization/principalbased/impl/PermissionProviderAccessControlTest.java b/...k/spi/security/authorization/principalbased/impl/PermissionProviderAccessControlTest.java
@@ -244,7 +244,7 @@ public void testIsGrantedOnNonExistingRestrictionTree() throws Exception {
     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, Map.of());
+        policy.addEntry(accessControlledPath, privilegesFromNames(JCR_READ_ACCESS_CONTROL), restr, ImmutableMap.of());
         root.commit();
         permissionProvider.refresh();
 

diff --git a/...ak/spi/security/authorization/principalbased/impl/PermissionProviderVersionStoreTest.java b/...ak/spi/security/authorization/principalbased/impl/PermissionProviderVersionStoreTest.java
@@ -82,7 +82,7 @@ private void grantReadOnVersionStoreTrees() throws Exception {
         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), Map.of(), restr);
+        policy.addEntry(PathUtils.ROOT_PATH, privilegesFromNames(PrivilegeConstants.JCR_READ), ImmutableMap.of(), restr);
         jacm.setPolicy(policy.getPath(), policy);
         root.commit();
 

diff --git a/...y/authorization/principalbased/impl/PrincipalBasedAuthorizationConfigurationOsgiTest.java b/...y/authorization/principalbased/impl/PrincipalBasedAuthorizationConfigurationOsgiTest.java
@@ -40,7 +40,6 @@
 import org.junit.Rule;
 import org.junit.Test;
 
-import java.util.Map;
 import java.util.Set;
 
 import static org.junit.Assert.assertEquals;
@@ -56,7 +55,7 @@ public class PrincipalBasedAuthorizationConfigurationOsgiTest extends AbstractPr
 
     @Test(expected = ReferenceViolationException.class)
     public void testMissingMandatoryReferences() {
-        context.registerInjectActivateService(pbac, Map.of());
+        context.registerInjectActivateService(pbac, ImmutableMap.of());
     }
 
     @Test(expected = ReferenceViolationException.class)
@@ -68,7 +67,7 @@ public void testMissingMountInfoProviderReference() {
     @Test(expected = ReferenceViolationException.class)
     public void testMissingFilterProviderReference() {
         context.registerInjectActivateService(new MountInfoProviderService());
-        context.registerInjectActivateService(pbac, Map.of());
+        context.registerInjectActivateService(pbac, ImmutableMap.of());
     }
 
     @Test
@@ -80,7 +79,7 @@ public void testMountCollidingWithFilterRoot() {
         context.registerInjectActivateService(mipService, ImmutableMap.of("mountedPaths", new String[] {SUPPORTED_PATH + "/some/subtree", "/etc"}));
 
         try {
-            context.registerInjectActivateService(pbac, Map.of());
+            context.registerInjectActivateService(pbac, ImmutableMap.of());
         } catch (RuntimeException e) {
             assertTrue(e.getCause() instanceof IllegalStateException);
         }
@@ -94,7 +93,7 @@ public void testMountMatchingFilterRoot() {
         MountInfoProviderService mipService = new MountInfoProviderService();
         context.registerInjectActivateService(mipService, ImmutableMap.of("mountedPaths", new String[] {SUPPORTED_PATH}));
 
-        context.registerInjectActivateService(pbac, Map.of());
+        context.registerInjectActivateService(pbac, ImmutableMap.of());
     }
 
     @Test
@@ -105,7 +104,7 @@ public void testMountAboveFilterRoot() {
         MountInfoProviderService mipService = new MountInfoProviderService();
         context.registerInjectActivateService(mipService, ImmutableMap.of("mountedPaths", new String[] {Text.getRelativeParent(SUPPORTED_PATH, 1)}));
 
-        context.registerInjectActivateService(pbac, Map.of());
+        context.registerInjectActivateService(pbac, ImmutableMap.of());
     }
 
     @Test
@@ -116,7 +115,7 @@ public void testMountsElsewhere() {
         MountInfoProviderService mipService = new MountInfoProviderService();
         context.registerInjectActivateService(mipService, ImmutableMap.of("mountedPaths", new String[] {"/etc", "/var/some/mount", UserConstants.DEFAULT_GROUP_PATH}));
 
-        context.registerInjectActivateService(pbac, Map.of());
+        context.registerInjectActivateService(pbac, ImmutableMap.of());
     }
 
     @Test

diff --git a/.../spi/security/authorization/principalbased/impl/PrincipalBasedPermissionProviderTest.java b/.../spi/security/authorization/principalbased/impl/PrincipalBasedPermissionProviderTest.java
@@ -76,7 +76,7 @@ public void before() throws Exception {
         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), Map.of(), restrictions);
+        policy.addEntry(childPath, privilegesFromNames(JCR_REMOVE_NODE), ImmutableMap.of(), restrictions);
         jacm.setPolicy(policy.getPath(), policy);
         root.commit();
 

diff --git a/...ackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImplTest.java b/...ackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImplTest.java
@@ -239,7 +239,7 @@ public void testAddEntriesForSamePath() throws Exception {
     @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), Map.of(), createMvRestrictions(REP_ITEM_NAMES, PropertyType.NAME, "removable")));
+        assertTrue(emptyPolicy.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_REMOVE_CHILD_NODES), ImmutableMap.of(), createMvRestrictions(REP_ITEM_NAMES, PropertyType.NAME, "removable")));
 
         PrivilegeBitsProvider bitsProvider = new PrivilegeBitsProvider(root);
 
@@ -260,8 +260,8 @@ public void testAddEntriesWithRestrictionsForSamePath() throws Exception {
 
     @Test
     public void testAddEntriesWithMultipleRestrictionsForSamePath() throws Exception {
-        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")));
+        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")));
 
         PrivilegeBitsProvider bitsProvider = new PrivilegeBitsProvider(root);
 
@@ -310,7 +310,7 @@ public void testAddEntryMissingMandatoryRestriction() throws Exception {
         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), Map.of(), mvRestrictions);
+        plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), ImmutableMap.of(), mvRestrictions);
     }
 
     @Test(expected = AccessControlException.class)
@@ -324,7 +324,7 @@ public void testAddEntryMissingMandatoryMVRestriction() throws Exception {
         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, Map.of());
+        plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), svRestrictions, ImmutableMap.of());
     }
 
     @Test(expected = AccessControlException.class)
@@ -336,7 +336,7 @@ public void testAddEntryMandatoryRestrictionWithOakName() throws Exception {
 
         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, Map.of());
+        plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), svRestrictions, ImmutableMap.of());
     }
 
     @Test
@@ -355,7 +355,7 @@ public void testAddEntryMandatoryRestriction() throws Exception {
 
         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, Map.of());
+        plc.addEntry(testJcrPath, privilegesFromNames(PrivilegeConstants.JCR_VERSION_MANAGEMENT), svRestrictions, ImmutableMap.of());
 
         assertTrue(plc.getEntries().get(0).getRestrictions().contains(r));
     }

diff --git a/...abbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImporterTest.java b/...abbit/oak/spi/security/authorization/principalbased/impl/PrincipalPolicyImporterTest.java
@@ -592,7 +592,7 @@ public void testStartChildInfoNestedRestriction() throws Exception {
 
         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(Map.of()));
+        importer.startChildInfo(mockNodeInfo(getJcrName(REP_RESTRICTIONS), getJcrName(NT_REP_RESTRICTIONS)), mockPropInfos(ImmutableMap.of()));
     }
 
     @Test(expected = IllegalStateException.class)
@@ -604,7 +604,7 @@ public void testStartChildInfoNestedMvRestriction() throws Exception {
 
         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(Map.of()));
+        importer.startChildInfo(mockNodeInfo(getJcrName(REP_RESTRICTIONS), getJcrName(NT_REP_RESTRICTIONS)), mockPropInfos(ImmutableMap.of()));
     }
 
     @Test(expected = IllegalStateException.class)

diff --git a/...ava/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java b/...ava/org/apache/jackrabbit/oak/benchmark/authentication/external/AbstractExternalTest.java
@@ -422,7 +422,7 @@ public Iterable<ExternalIdentityRef> getDeclaredGroups() {
         @NotNull
         @Override
         public Map<String, ?> getProperties() {
-            return Map.of();
+            return ImmutableMap.of();
         }
 
 

diff --git a/.../java/org/apache/jackrabbit/oak/benchmark/authentication/external/AutoMembershipTest.java b/.../java/org/apache/jackrabbit/oak/benchmark/authentication/external/AutoMembershipTest.java
@@ -40,7 +40,6 @@
 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;
@@ -127,11 +126,11 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
                         new AppConfigurationEntry(
                                 GuestLoginModule.class.getName(),
                                 OPTIONAL,
-                                Map.of()),
+                                ImmutableMap.of()),
                         new AppConfigurationEntry(
                                 TokenLoginModule.class.getName(),
                                 SUFFICIENT,
-                                Map.of()),
+                                ImmutableMap.of()),
                         new AppConfigurationEntry(
                                 ExternalLoginModule.class.getName(),
                                 SUFFICIENT,
@@ -141,7 +140,7 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
                         new AppConfigurationEntry(
                                 LoginModuleImpl.class.getName(),
                                 SUFFICIENT,
-                                Map.of())
+                                ImmutableMap.of())
                 };
             }
         };

diff --git a/...rg/apache/jackrabbit/oak/benchmark/authentication/external/CachedMembershipLoginTest.java b/...rg/apache/jackrabbit/oak/benchmark/authentication/external/CachedMembershipLoginTest.java
@@ -24,7 +24,6 @@
 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;
@@ -189,11 +188,11 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
                         new AppConfigurationEntry(
                                 GuestLoginModule.class.getName(),
                                 OPTIONAL,
-                                Map.of()),
+                                ImmutableMap.of()),
                         new AppConfigurationEntry(
                                 TokenLoginModule.class.getName(),
                                 SUFFICIENT,
-                                Map.of()),
+                                ImmutableMap.of()),
                         new AppConfigurationEntry(
                                 ExternalLoginModule.class.getName(),
                                 SUFFICIENT,
@@ -203,7 +202,7 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
                         new AppConfigurationEntry(
                                 LoginModuleImpl.class.getName(),
                                 SUFFICIENT,
-                                Map.of())
+                                ImmutableMap.of())
                 };
             }
         };

diff --git a/...n/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java b/...n/java/org/apache/jackrabbit/oak/benchmark/authentication/external/ExternalLoginTest.java
@@ -36,7 +36,6 @@
 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;
@@ -150,11 +149,11 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
                         new AppConfigurationEntry(
                                 GuestLoginModule.class.getName(),
                                 OPTIONAL,
-                                Map.of()),
+                                ImmutableMap.of()),
                         new AppConfigurationEntry(
                                 TokenLoginModule.class.getName(),
                                 SUFFICIENT,
-                                Map.of()),
+                                ImmutableMap.of()),
                         new AppConfigurationEntry(
                                 ExternalLoginModule.class.getName(),
                                 SUFFICIENT,
@@ -164,7 +163,7 @@ public AppConfigurationEntry[] getAppConfigurationEntry(String s) {
                         new AppConfigurationEntry(
                                 LoginModuleImpl.class.getName(),
                                 SUFFICIENT,
-                                Map.of())
+                                ImmutableMap.of())
                 };
             }
         };