This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11278 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit ec420c3be796a4a66334fa9ae794788c65f8b6cc Author: Julian Reschke <[email protected]> AuthorDate: Mon Nov 25 18:52:53 2024 +0100 OAK-11278: remove ImmutableMap.of - multiple argument case - oak-core --- .../oak/plugins/index/AsyncIndexUpdate.java | 3 +-- .../oak/plugins/index/IndexMBeanRegistration.java | 3 +-- .../jackrabbit/oak/security/SecurityProviderImpl.java | 4 ++-- .../permission/CompiledPermissionImpl.java | 4 ++-- .../oak/namepath/impl/GlobalNameMapperTest.java | 4 +--- .../oak/namepath/impl/NamePathMapperImplTest.java | 5 ++--- .../oak/plugins/index/AsyncCheckpointServiceTest.java | 7 +++---- .../oak/plugins/index/AsyncIndexerServiceTest.java | 9 ++++----- .../index/progress/NodeCounterMBeanEstimatorTest.java | 4 +--- .../token/TokenConfigurationImplOSGiTest.java | 5 +++-- .../accesscontrol/AccessControlManagerImplTest.java | 8 +++----- .../authorization/accesscontrol/PrincipalACLTest.java | 4 ++-- .../accesscontrol/RemappedPrivilegeNamesTest.java | 3 +-- .../accesscontrol/RemappedRestrictionNamesTest.java | 3 +-- .../permission/PrincipalPermissionEntriesTest.java | 3 +-- .../restriction/AbstractRestrictionProviderTest.java | 3 +-- .../restriction/CompositeRestrictionProviderTest.java | 5 ++--- .../restriction/ItemNameRestrictionTest.java | 3 +-- .../internal/SecurityProviderRegistrationTest.java | 13 ++++++------- .../security/privilege/PrivilegeManagerImplTest.java | 3 +-- .../oak/security/user/PasswordExpiryHistoryTest.java | 5 +++-- .../jackrabbit/oak/security/user/UserContextTest.java | 3 +-- .../user/UserImporterSessionAutosaveTest.java | 5 +++-- .../jackrabbit/oak/security/user/UtilsTest.java | 2 +- .../oak/security/user/query/QueryUtilTest.java | 19 +++++++++---------- .../org/apache/jackrabbit/oak/util/NodeUtilTest.java | 4 ++-- 26 files changed, 58 insertions(+), 76 deletions(-) diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java index b3e454adae..c22a328768 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexUpdate.java @@ -100,7 +100,6 @@ import org.slf4j.LoggerFactory; import org.apache.jackrabbit.guava.common.base.Splitter; import org.apache.jackrabbit.guava.common.base.Stopwatch; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; public class AsyncIndexUpdate implements Runnable, Closeable { /** @@ -570,7 +569,7 @@ public class AsyncIndexUpdate implements Runnable, Closeable { String afterTime = now(); String oldThreadName = Thread.currentThread().getName(); boolean threadNameChanged = false; - String afterCheckpoint = store.checkpoint(lifetime, ImmutableMap.of( + String afterCheckpoint = store.checkpoint(lifetime, Map.of( "creator", AsyncIndexUpdate.class.getSimpleName(), "created", afterTime, "thread", oldThreadName, diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java index 2e26fff76c..7c0136a6b6 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexMBeanRegistration.java @@ -24,7 +24,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean; import org.apache.jackrabbit.oak.spi.whiteboard.CompositeRegistration; import org.apache.jackrabbit.oak.spi.whiteboard.Registration; @@ -41,7 +40,7 @@ public class IndexMBeanRegistration implements Registration { public void registerAsyncIndexer(AsyncIndexUpdate task, long delayInSeconds) { task.setIndexMBeanRegistration(this); - Map<String, Object> config = ImmutableMap.of( + Map<String, Object> config = Map.of( AsyncIndexUpdate.PROP_ASYNC_NAME, task.getName(), "scheduler.name", AsyncIndexUpdate.class.getName() + "-" + task.getName() ); diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java index 22aa0126b9..1a811177ca 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java @@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.security; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; + import org.apache.jackrabbit.oak.osgi.OsgiWhiteboard; import org.apache.jackrabbit.oak.plugins.tree.RootProvider; import org.apache.jackrabbit.oak.plugins.tree.TreeProvider; @@ -228,7 +228,7 @@ public class SecurityProviderImpl implements SecurityProvider, WhiteboardAware { AccessControlConstants.PARAM_RESTRICTION_PROVIDER, restrictionProvider) ); - Map<String, Object> userMap = ImmutableMap.of( + Map<String, Object> userMap = Map.of( UserConstants.PARAM_AUTHORIZABLE_ACTION_PROVIDER, authorizableActionProvider, UserConstants.PARAM_AUTHORIZABLE_NODE_NAME, authorizableNodeName, UserConstants.PARAM_USER_AUTHENTICATION_FACTORY, userAuthenticationFactory); diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java index db0ff94048..a9e7483995 100644 --- a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java +++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; + import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.commons.iterator.AbstractLazyIterator; import org.apache.jackrabbit.oak.api.PropertyState; @@ -62,7 +62,7 @@ final class CompiledPermissionImpl implements CompiledPermissions, PermissionCon private static final Logger log = LoggerFactory.getLogger(CompiledPermissionImpl.class); - private static final Map<Long, PrivilegeBits> READ_BITS = ImmutableMap.of( + private static final Map<Long, PrivilegeBits> READ_BITS = Map.of( Permissions.READ, PrivilegeBits.BUILT_IN.get(PrivilegeConstants.JCR_READ), Permissions.READ_NODE, PrivilegeBits.BUILT_IN.get(PrivilegeConstants.REP_READ_NODES), Permissions.READ_PROPERTY, PrivilegeBits.BUILT_IN.get(PrivilegeConstants.REP_READ_PROPERTIES), diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapperTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapperTest.java index a6543b38c9..d0eade307b 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapperTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/impl/GlobalNameMapperTest.java @@ -30,11 +30,9 @@ import javax.jcr.RepositoryException; import org.apache.jackrabbit.oak.namepath.NameMapper; import org.junit.Test; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; - public class GlobalNameMapperTest { - private static final Map<String, String> NAMESPACES = ImmutableMap.of( + private static final Map<String, String> NAMESPACES = Map.of( "jcr", "http://www.jcp.org/jcr/1.0";, "nt", "http://www.jcp.org/jcr/nt/1.0";, "mix", "http://www.jcp.org/jcr/mix/1.0";, diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/impl/NamePathMapperImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/impl/NamePathMapperImplTest.java index e9c86f0726..190bd2e4bf 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/impl/NamePathMapperImplTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/namepath/impl/NamePathMapperImplTest.java @@ -28,7 +28,6 @@ import java.util.Map; import javax.jcr.RepositoryException; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.namepath.NameMapper; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.namepath.JcrPathParser; @@ -37,14 +36,14 @@ import org.junit.Test; public class NamePathMapperImplTest { - private static final Map<String, String> GLOBAL = ImmutableMap.of( + private static final Map<String, String> GLOBAL = Map.of( "oak-jcr", "http://www.jcp.org/jcr/1.0";, "oak-nt", "http://www.jcp.org/jcr/nt/1.0";, "oak-foo", "http://www.example.com/foo";, "oak-quu", "http://www.example.com/quu";, "oak", "http://jackrabbit.apache.org/oak/ns/1.0";); - private static final Map<String, String> LOCAL = ImmutableMap.of( + private static final Map<String, String> LOCAL = Map.of( "jcr-jcr", "http://www.jcp.org/jcr/1.0";, "jcr-nt", "http://www.jcp.org/jcr/nt/1.0";, "foo", "http://www.example.com/foo";, diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointServiceTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointServiceTest.java index a9d123cd42..8450c02029 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointServiceTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncCheckpointServiceTest.java @@ -18,7 +18,6 @@ */ package org.apache.jackrabbit.oak.plugins.index; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; import org.apache.jackrabbit.oak.spi.state.Clusterable; import org.apache.jackrabbit.oak.spi.state.NodeStore; @@ -52,7 +51,7 @@ public class AsyncCheckpointServiceTest { String name1 = "checkpoint-async-test-1"; String name2 = "checkpoint-async-test-2"; String name3 = "checkpoint-async-test-3"; - Map<String,Object> config1 = ImmutableMap.of( + Map<String,Object> config1 = Map.of( "name", "checkpoint-async-test-1", "enable", true, "minConcurrentCheckpoints", 3L, @@ -61,7 +60,7 @@ public class AsyncCheckpointServiceTest { "timeIntervalBetweenCheckpoints", 60 * 15L ); - Map<String,Object> config2 = ImmutableMap.of( + Map<String,Object> config2 = Map.of( "name", "checkpoint-async-test-2", "enable", false, "minConcurrentCheckpoints", 3L, @@ -70,7 +69,7 @@ public class AsyncCheckpointServiceTest { "timeIntervalBetweenCheckpoints", 60 * 15L ); - Map<String,Object> config3 = ImmutableMap.of( + Map<String,Object> config3 = Map.of( "name", "checkpoint-async-test-3", "enable", true, "minConcurrentCheckpoints", 4L, diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java index b40b62741a..68ea735bad 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/AsyncIndexerServiceTest.java @@ -23,7 +23,6 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexUpdateTest.CommitInfoCollector; import org.apache.jackrabbit.oak.plugins.index.AsyncIndexerService.AsyncConfig; @@ -82,7 +81,7 @@ public class AsyncIndexerServiceTest { @Test public void leaseTimeout() { injectDefaultServices(); - Map<String,Object> config = ImmutableMap.of( + Map<String,Object> config = Map.of( "asyncConfigs", new String[] {"async:5"}, "leaseTimeOutMinutes" , "20" ); @@ -94,7 +93,7 @@ public class AsyncIndexerServiceTest { @Test public void leaseTimeout2() { injectDefaultServices(); - Map<String,Object> config = ImmutableMap.of( + Map<String,Object> config = Map.of( "asyncConfigs", new String[] {"async:5:13", "foo-async:5"}, "leaseTimeOutMinutes" , "20" ); @@ -141,7 +140,7 @@ public class AsyncIndexerServiceTest { nodeStore = new MemoryNodeStore(); injectDefaultServices(); - Map<String,Object> config = ImmutableMap.of( + Map<String,Object> config = Map.of( "asyncConfigs", new String[] {"async:5"}, "leaseTimeOutMinutes" , "20" ); @@ -172,7 +171,7 @@ public class AsyncIndexerServiceTest { @Test public void corruptIndexTimeout() throws Exception{ injectDefaultServices(); - Map<String,Object> config = ImmutableMap.of( + Map<String,Object> config = Map.of( "asyncConfigs", new String[] {"async:5"}, "failingIndexTimeoutSeconds" , "43", "errorWarnIntervalSeconds" , "53" diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java index 4161839cd8..5d5bf8ef92 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimatorTest.java @@ -16,13 +16,11 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.jackrabbit.oak.plugins.index.progress; import java.util.Map; import java.util.Set; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.api.Type; import org.apache.jackrabbit.oak.plugins.index.counter.jmx.NodeCounter; import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeStore; @@ -64,7 +62,7 @@ public class NodeCounterMBeanEstimatorTest { store.merge(builder, EmptyHook.INSTANCE, CommitInfo.EMPTY); - Map<String, Integer> counts = ImmutableMap.of( + Map<String, Integer> counts = Map.of( "/", 100, "/content", 50, "/content/old", 10, diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImplOSGiTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImplOSGiTest.java index 1201d91d9b..b7e8a8d790 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImplOSGiTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImplOSGiTest.java @@ -17,9 +17,10 @@ package org.apache.jackrabbit.oak.security.authentication.token; import java.util.Hashtable; +import java.util.Map; + import javax.jcr.SimpleCredentials; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.AbstractSecurityTest; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.authentication.credentials.CredentialsSupport; @@ -49,7 +50,7 @@ public class TokenConfigurationImplOSGiTest extends AbstractSecurityTest { tokenConfiguration.setSecurityProvider(getSecurityProvider()); - context.registerInjectActivateService(tokenConfiguration, ImmutableMap.of( + context.registerInjectActivateService(tokenConfiguration, Map.of( TokenProvider.PARAM_TOKEN_EXPIRATION, 25, TokenProvider.PARAM_TOKEN_LENGTH, 4)); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java index 280ead7f98..1de18efa53 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImplTest.java @@ -17,10 +17,8 @@ package org.apache.jackrabbit.oak.security.authorization.accesscontrol; import org.apache.jackrabbit.guava.common.collect.ImmutableList; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.guava.common.collect.ImmutableSet; import org.apache.jackrabbit.guava.common.collect.Iterables; -import org.apache.jackrabbit.guava.common.collect.Lists; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.api.security.JackrabbitAccessControlEntry; import org.apache.jackrabbit.api.security.JackrabbitAccessControlList; @@ -1839,14 +1837,14 @@ public class AccessControlManagerImplTest extends AbstractAccessControlTest impl ACL acl = (ACL) policies[0]; Value nodePathValue = getValueFactory().createValue(testPath, PropertyType.PATH); - assertTrue(acl.addEntry(testPrincipal, testPrivileges, true, ImmutableMap.of(REP_NODE_PATH, nodePathValue))); + assertTrue(acl.addEntry(testPrincipal, testPrivileges, true, Map.of(REP_NODE_PATH, nodePathValue))); // entry with * glob has already been created in the setup - Map<String, Value> restrictions = ImmutableMap.of(REP_NODE_PATH, nodePathValue, REP_GLOB, valueFactory.createValue("*")); + Map<String, Value> restrictions = Map.of(REP_NODE_PATH, nodePathValue, REP_GLOB, valueFactory.createValue("*")); assertFalse(acl.addEntry(testPrincipal, testPrivileges, true, restrictions)); // entry with different glob -> should be added - restrictions = ImmutableMap.of(REP_NODE_PATH, nodePathValue, REP_GLOB, valueFactory.createValue("*/a/b")); + restrictions = Map.of(REP_NODE_PATH, nodePathValue, REP_GLOB, valueFactory.createValue("*/a/b")); assertTrue(acl.addEntry(testPrincipal, testPrivileges, false, restrictions)); acMgr.setPolicy(acl.getPath(), acl); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PrincipalACLTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PrincipalACLTest.java index afa9931232..9b517bea97 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PrincipalACLTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/PrincipalACLTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.security.authorization.accesscontrol; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager; import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils; import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal; @@ -35,6 +34,7 @@ import javax.jcr.security.AccessControlPolicy; import javax.jcr.security.Privilege; import java.security.Principal; import java.util.Collections; +import java.util.Map; import static org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants.REP_GLOB; import static org.apache.jackrabbit.oak.spi.security.authorization.accesscontrol.AccessControlConstants.REP_NODE_PATH; @@ -106,7 +106,7 @@ public class PrincipalACLTest extends AbstractAccessControlTest { ValueFactory vf = getValueFactory(root); ACL acl = getPrincipalAcl(getAccessControlManager(root), testPrincipal); acl.addEntry(testPrincipal, privileges, true, - ImmutableMap.of(REP_GLOB, vf.createValue("/subtree/*"), REP_NODE_PATH, vf.createValue(TEST_PATH))); + Map.of(REP_GLOB, vf.createValue("/subtree/*"), REP_NODE_PATH, vf.createValue(TEST_PATH))); assertNotEquals(principalAcl, acl); } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/RemappedPrivilegeNamesTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/RemappedPrivilegeNamesTest.java index 9632be4f05..b65918f975 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/RemappedPrivilegeNamesTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/RemappedPrivilegeNamesTest.java @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.security.authorization.accesscontrol; 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.oak.api.Tree; import org.apache.jackrabbit.oak.namepath.NamePathMapper; @@ -46,7 +45,7 @@ import static org.mockito.Mockito.when; public class RemappedPrivilegeNamesTest extends AbstractAccessControlTest { - private static final Map<String, String> LOCAL_NAME_MAPPINGS = ImmutableMap.of( + private static final Map<String, String> LOCAL_NAME_MAPPINGS = Map.of( "a","internal", "b","http://www.jcp.org/jcr/1.0";, "c","http://jackrabbit.apache.org/oak/ns/1.0"; diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/RemappedRestrictionNamesTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/RemappedRestrictionNamesTest.java index 5e7602ab41..9198052bd4 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/RemappedRestrictionNamesTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/RemappedRestrictionNamesTest.java @@ -16,7 +16,6 @@ */ package org.apache.jackrabbit.oak.security.authorization.accesscontrol; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.namepath.NamePathMapper; import org.apache.jackrabbit.oak.namepath.impl.LocalNameMapper; import org.apache.jackrabbit.oak.namepath.impl.NamePathMapperImpl; @@ -43,7 +42,7 @@ import static org.junit.Assert.assertTrue; public class RemappedRestrictionNamesTest extends AbstractAccessControlTest { - private static final Map<String, String> LOCAL_NAME_MAPPINGS = ImmutableMap.of( + private static final Map<String, String> LOCAL_NAME_MAPPINGS = Map.of( "a","internal", "b","http://www.jcp.org/jcr/1.0";, "c","http://jackrabbit.apache.org/oak/ns/1.0"; diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java index 4ad3729f2e..0dfe40c0dd 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/permission/PrincipalPermissionEntriesTest.java @@ -21,7 +21,6 @@ import java.util.Collection; import java.util.Map; import java.util.Set; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionPattern; import org.apache.jackrabbit.oak.spi.security.privilege.PrivilegeBits; import org.jetbrains.annotations.NotNull; @@ -173,7 +172,7 @@ public class PrincipalPermissionEntriesTest { PrincipalPermissionEntries ppe = new PrincipalPermissionEntries(2); Collection<PermissionEntry> collection = Set.of(permissionEntry); Map<String, Collection<PermissionEntry>> allEntries = - ImmutableMap.of("/path", collection, "/path2", collection); + Map.of("/path", collection, "/path2", collection); ppe.putAllEntries(allEntries); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/AbstractRestrictionProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/AbstractRestrictionProviderTest.java index ca34e5e873..7601461a0b 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/AbstractRestrictionProviderTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/AbstractRestrictionProviderTest.java @@ -23,7 +23,6 @@ import javax.jcr.Value; import javax.jcr.ValueFactory; import javax.jcr.security.AccessControlException; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.guava.common.collect.ImmutableSet; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.oak.AbstractSecurityTest; @@ -76,7 +75,7 @@ public class AbstractRestrictionProviderTest extends AbstractSecurityTest implem RestrictionDefinition glob = new RestrictionDefinitionImpl(REP_GLOB, Type.STRING, false); RestrictionDefinition nts = new RestrictionDefinitionImpl(REP_NT_NAMES, Type.NAMES, false); RestrictionDefinition mand = new RestrictionDefinitionImpl("mandatory", Type.BOOLEAN, true); - Map<String, ? extends RestrictionDefinition> supported = ImmutableMap.of(glob.getName(), glob, nts.getName(), nts, mand.getName(), mand); + Map<String, ? extends RestrictionDefinition> supported = Map.of(glob.getName(), glob, nts.getName(), nts, mand.getName(), mand); restrictionProvider = new TestProvider(supported); } diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CompositeRestrictionProviderTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CompositeRestrictionProviderTest.java index ae13e0e6a2..d685423124 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CompositeRestrictionProviderTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/CompositeRestrictionProviderTest.java @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.security.authorization.restriction; 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.oak.AbstractSecurityTest; import org.apache.jackrabbit.oak.api.Tree; @@ -54,12 +53,12 @@ import static org.junit.Assert.fail; */ public class CompositeRestrictionProviderTest extends AbstractSecurityTest implements AccessControlConstants { - private RestrictionProvider rp1 = new TestProvider(ImmutableMap.of( + private RestrictionProvider rp1 = new TestProvider(Map.of( REP_GLOB, new RestrictionDefinitionImpl(REP_GLOB, Type.STRING, false), REP_NT_NAMES, new RestrictionDefinitionImpl(REP_NT_NAMES, Type.NAMES, false), REP_PREFIXES, new RestrictionDefinitionImpl(REP_PREFIXES, Type.STRINGS, false) )); - private RestrictionProvider rp2 = new TestProvider(ImmutableMap.of( + private RestrictionProvider rp2 = new TestProvider(Map.of( "boolean", new RestrictionDefinitionImpl("boolean", Type.BOOLEAN, true), "longs", new RestrictionDefinitionImpl("longs", Type.LONGS, false) )); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNameRestrictionTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNameRestrictionTest.java index 89bcd47824..95478f462c 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNameRestrictionTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/restriction/ItemNameRestrictionTest.java @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.security.authorization.restriction; import org.apache.jackrabbit.guava.common.collect.ImmutableList; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.api.security.JackrabbitAccessControlList; import org.apache.jackrabbit.api.security.user.Group; @@ -62,7 +61,7 @@ public class ItemNameRestrictionTest extends AbstractRestrictionTest { PrivilegeConstants.JCR_ADD_CHILD_NODES, PrivilegeConstants.JCR_REMOVE_NODE), true, Collections.emptyMap(), - ImmutableMap.of(AccessControlConstants.REP_ITEM_NAMES, new Value[] { + Map.of(AccessControlConstants.REP_ITEM_NAMES, new Value[] { vf.createValue("a", PropertyType.NAME), vf.createValue("b", PropertyType.NAME), vf.createValue("c", PropertyType.NAME)})); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java index c1b0a4cb58..723c552a00 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistrationTest.java @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.security.internal; 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.JackrabbitAccessControlManager; import org.apache.jackrabbit.oak.AbstractSecurityTest; @@ -878,9 +877,9 @@ public class SecurityProviderRegistrationTest extends AbstractSecurityTest { private void testMultipleServiceWithRanking(@NotNull String fieldName, @NotNull Object service1, @NotNull Object service2, @NotNull Object service3) throws Exception { context.registerService(SecurityProviderRegistration.class, registration, Map.of("requiredServicePids", new String[] {"s1", "s2", "s3"})); - context.registerInjectActivateService(service1, ImmutableMap.of(RegistrationConstants.OAK_SECURITY_NAME, "s1", Constants.SERVICE_RANKING, 50)); + context.registerInjectActivateService(service1, Map.of(RegistrationConstants.OAK_SECURITY_NAME, "s1", Constants.SERVICE_RANKING, 50)); context.registerInjectActivateService(service2, Map.of(RegistrationConstants.OAK_SECURITY_NAME, "s2")); - context.registerInjectActivateService(service3, ImmutableMap.of(RegistrationConstants.OAK_SECURITY_NAME, "s3", Constants.SERVICE_RANKING, 1)); + context.registerInjectActivateService(service3, Map.of(RegistrationConstants.OAK_SECURITY_NAME, "s3", Constants.SERVICE_RANKING, 1)); Field f = registration.getClass().getDeclaredField(fieldName); f.setAccessible(true); @@ -1009,11 +1008,11 @@ public class SecurityProviderRegistrationTest extends AbstractSecurityTest { registration.activate(context.bundleContext(), configWithRequiredServiceIds("f1", "f2", "ac1", "ac2")); AggregationFilter filter1 = mock(AggregationFilter.class, withSettings().defaultAnswer(invocationOnMock -> Boolean.FALSE)); - ServiceRegistration sr1 = context.bundleContext().registerService(AggregationFilter.class.getName(), filter1, new Hashtable(ImmutableMap.of(SERVICE_PID, "f1", SERVICE_RANKING, 100))); + ServiceRegistration sr1 = context.bundleContext().registerService(AggregationFilter.class.getName(), filter1, new Hashtable(Map.of(SERVICE_PID, "f1", SERVICE_RANKING, 100))); registration.bindAggregationFilter(sr1.getReference(), filter1); AggregationFilter filter2 = mock(AggregationFilter.class, withSettings().defaultAnswer(invocationOnMock -> Boolean.FALSE)); - ServiceRegistration sr2 = context.bundleContext().registerService(AggregationFilter.class.getName(), filter2, new Hashtable(ImmutableMap.of(SERVICE_PID, "f2", SERVICE_RANKING, 200))); + ServiceRegistration sr2 = context.bundleContext().registerService(AggregationFilter.class.getName(), filter2, new Hashtable(Map.of(SERVICE_PID, "f2", SERVICE_RANKING, 200))); registration.bindAggregationFilter(sr2.getReference(), filter2); AggregatedPermissionProvider pp = mock(AggregatedPermissionProvider.class); @@ -1058,11 +1057,11 @@ public class SecurityProviderRegistrationTest extends AbstractSecurityTest { registration.activate(context.bundleContext(), configWithRequiredServiceIds("f1", "f2", "ac1", "ac2")); AggregationFilter filter1 = mock(AggregationFilter.class, withSettings().defaultAnswer(invocationOnMock -> Boolean.TRUE)); - ServiceRegistration sr1 = context.bundleContext().registerService(AggregationFilter.class.getName(), filter1, new Hashtable(ImmutableMap.of(SERVICE_PID, "f1", SERVICE_RANKING, 200))); + ServiceRegistration sr1 = context.bundleContext().registerService(AggregationFilter.class.getName(), filter1, new Hashtable(Map.of(SERVICE_PID, "f1", SERVICE_RANKING, 200))); registration.bindAggregationFilter(sr1.getReference(), filter1); AggregationFilter filter2 = mock(AggregationFilter.class, withSettings().defaultAnswer(invocationOnMock -> Boolean.TRUE)); - ServiceRegistration sr2 = context.bundleContext().registerService(AggregationFilter.class.getName(), filter2, new Hashtable(ImmutableMap.of(SERVICE_PID, "f2", SERVICE_RANKING, 100))); + ServiceRegistration sr2 = context.bundleContext().registerService(AggregationFilter.class.getName(), filter2, new Hashtable(Map.of(SERVICE_PID, "f2", SERVICE_RANKING, 100))); registration.bindAggregationFilter(sr2.getReference(), filter2); AggregatedPermissionProvider pp = mock(AggregatedPermissionProvider.class); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java index 2f00c187b5..689b5f38c4 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImplTest.java @@ -23,7 +23,6 @@ import javax.jcr.RepositoryException; import javax.jcr.security.AccessControlException; import javax.jcr.security.Privilege; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.guava.common.collect.ImmutableSet; import org.apache.jackrabbit.api.security.authorization.PrivilegeManager; import org.apache.jackrabbit.oak.AbstractSecurityTest; @@ -197,7 +196,7 @@ public class PrivilegeManagerImplTest extends AbstractSecurityTest { }; nsRegistry.registerNamespace("ns", "http://jackrabbit.apache.org/oak/ns";); - Map<String, String> localMapping = ImmutableMap.of( + Map<String, String> localMapping = Map.of( "prefix", NamespaceRegistry.NAMESPACE_JCR, "prefix2", "http://jackrabbit.apache.org/oak/ns";); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java index 43dc1196f7..f7698b6835 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryHistoryTest.java @@ -17,7 +17,6 @@ package org.apache.jackrabbit.oak.security.user; import org.apache.jackrabbit.guava.common.collect.ImmutableList; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.api.security.user.User; import org.apache.jackrabbit.oak.AbstractSecurityTest; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; @@ -37,6 +36,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import static org.junit.Assert.fail; +import java.util.Map; + /** * @see <a href="https://issues.apache.org/jira/browse/OAK-3463";>OAK-3463</a> */ @@ -59,7 +60,7 @@ public class PasswordExpiryHistoryTest extends AbstractSecurityTest { final AuthorizableActionProvider actionProvider = securityProvider -> ImmutableList.of(pwAction); ConfigurationParameters userConfig = ConfigurationParameters.of( - ImmutableMap.of( + Map.of( UserConstants.PARAM_AUTHORIZABLE_ACTION_PROVIDER, actionProvider, UserConstants.PARAM_PASSWORD_MAX_AGE, 10, UserConstants.PARAM_PASSWORD_HISTORY_SIZE, 10 diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java index 3c14342d5d..1b9aa5da03 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserContextTest.java @@ -22,7 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; 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.JcrConstants; import org.apache.jackrabbit.oak.api.PropertyState; @@ -222,7 +221,7 @@ public class UserContextTest implements UserConstants { @Test public void testPropertyDefinesLocation() { - Map<String, Collection<String>> m = ImmutableMap.of( + Map<String, Collection<String>> m = Map.of( NT_REP_GROUP, GROUP_PROPERTY_NAMES, NT_REP_USER, USER_PROPERTY_NAMES, NT_REP_PASSWORD, PWD_PROPERTY_NAMES, diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterSessionAutosaveTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterSessionAutosaveTest.java index 7e77ad5a9e..63d763840e 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterSessionAutosaveTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserImporterSessionAutosaveTest.java @@ -16,7 +16,8 @@ */ package org.apache.jackrabbit.oak.security.user; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; +import java.util.Map; + import org.apache.jackrabbit.api.security.user.UserManager; import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters; import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration; @@ -36,7 +37,7 @@ public class UserImporterSessionAutosaveTest extends UserImporterTest { @Override protected ConfigurationParameters getSecurityConfigParameters() { ConfigurationParameters userParams = ConfigurationParameters.of( - ImmutableMap.of( + Map.of( UserConstants.PARAM_AUTHORIZABLE_ACTION_PROVIDER, actionProvider, ProtectedItemImporter.PARAM_IMPORT_BEHAVIOR, getImportBehavior(), UserConstants.PARAM_SUPPORT_AUTOSAVE, Boolean.TRUE diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UtilsTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UtilsTest.java index 5163753118..d93059cc82 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UtilsTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UtilsTest.java @@ -121,7 +121,7 @@ public class UtilsTest extends AbstractSecurityTest { @Test public void testGetOrAddTree() throws Exception { - Map<String, String> map = ImmutableMap.of( + Map<String, String> map = Map.of( "a/b/c", "/a/b/c", "a/../b/c", "/b/c", "a/b/c/../..", "/a", diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java index 8f5bb50d22..f95c8d0189 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/query/QueryUtilTest.java @@ -25,7 +25,6 @@ import javax.jcr.RepositoryException; import javax.jcr.Value; import org.apache.jackrabbit.guava.common.collect.ImmutableList; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; import org.apache.jackrabbit.JcrConstants; import org.apache.jackrabbit.api.security.user.Authorizable; import org.apache.jackrabbit.api.security.user.QueryBuilder; @@ -61,7 +60,7 @@ public class QueryUtilTest { @Test public void testGetSearchRootDefault() { - Map<AuthorizableType, String> defaultPaths = ImmutableMap.of( + Map<AuthorizableType, String> defaultPaths = Map.of( AuthorizableType.USER, UserConstants.DEFAULT_USER_PATH, AuthorizableType.GROUP, UserConstants.DEFAULT_GROUP_PATH, AuthorizableType.AUTHORIZABLE, "/rep:security/rep:authorizables"); @@ -84,7 +83,7 @@ public class QueryUtilTest { UserConstants.PARAM_USER_PATH, "/configured/users", UserConstants.PARAM_GROUP_PATH, "/configured/users/groups"); - Map<AuthorizableType, String> paths = ImmutableMap.of( + Map<AuthorizableType, String> paths = Map.of( AuthorizableType.USER, "/configured/users", AuthorizableType.GROUP, "/configured/users/groups", AuthorizableType.AUTHORIZABLE, "/configured/users"); @@ -98,7 +97,7 @@ public class QueryUtilTest { UserConstants.PARAM_USER_PATH, "/configured/groups/users", UserConstants.PARAM_GROUP_PATH, "/configured/groups"); - Map<AuthorizableType, String> paths = ImmutableMap.of( + Map<AuthorizableType, String> paths = Map.of( AuthorizableType.USER, "/configured/groups/users", AuthorizableType.GROUP, "/configured/groups", AuthorizableType.AUTHORIZABLE, "/configured/groups"); @@ -112,7 +111,7 @@ public class QueryUtilTest { UserConstants.PARAM_USER_PATH, "/users", UserConstants.PARAM_GROUP_PATH, "/groups"); - Map<AuthorizableType, String> paths = ImmutableMap.of( + Map<AuthorizableType, String> paths = Map.of( AuthorizableType.USER, "/users", AuthorizableType.GROUP, "/groups", AuthorizableType.AUTHORIZABLE, "/"); @@ -126,7 +125,7 @@ public class QueryUtilTest { UserConstants.PARAM_USER_PATH, "/users", UserConstants.PARAM_GROUP_PATH, "/"); - Map<AuthorizableType, String> paths = ImmutableMap.of( + Map<AuthorizableType, String> paths = Map.of( AuthorizableType.USER, "/users", AuthorizableType.GROUP, "/", AuthorizableType.AUTHORIZABLE, "/"); @@ -140,7 +139,7 @@ public class QueryUtilTest { UserConstants.PARAM_USER_PATH, "/configured/user/path", UserConstants.PARAM_GROUP_PATH, "/configured/group/path"); - Map<AuthorizableType, String> paths = ImmutableMap.of( + Map<AuthorizableType, String> paths = Map.of( AuthorizableType.USER, "/configured/user/path", AuthorizableType.GROUP, "/configured/group/path", AuthorizableType.AUTHORIZABLE, "/configured"); @@ -150,7 +149,7 @@ public class QueryUtilTest { @Test public void testNodeTypeName() { - Map<AuthorizableType, String> ntNames = ImmutableMap.of( + Map<AuthorizableType, String> ntNames = Map.of( AuthorizableType.USER, UserConstants.NT_REP_USER, AuthorizableType.GROUP, UserConstants.NT_REP_GROUP, AuthorizableType.AUTHORIZABLE, UserConstants.NT_REP_AUTHORIZABLE); @@ -206,8 +205,8 @@ public class QueryUtilTest { @Test public void testEscapeForQuery() { NamePathMapper namePathMapper = new NamePathMapperImpl(new LocalNameMapper( - ImmutableMap.of(NamespaceRegistry.PREFIX_JCR, NamespaceRegistry.NAMESPACE_JCR), - ImmutableMap.of("myPrefix", NamespaceRegistry.NAMESPACE_JCR))); + Map.of(NamespaceRegistry.PREFIX_JCR, NamespaceRegistry.NAMESPACE_JCR), + Map.of("myPrefix", NamespaceRegistry.NAMESPACE_JCR))); String value = "'string\\value"; assertEquals(QueryUtils.escapeForQuery("myPrefix:"+value), QueryUtil.escapeForQuery("jcr:"+value, namePathMapper)); diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtilTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtilTest.java index 7e8889eba3..352761b54c 100644 --- a/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtilTest.java +++ b/oak-core/src/test/java/org/apache/jackrabbit/oak/util/NodeUtilTest.java @@ -17,7 +17,7 @@ package org.apache.jackrabbit.oak.util; import java.util.Map; -import org.apache.jackrabbit.guava.common.collect.ImmutableMap; + import org.apache.jackrabbit.oak.AbstractSecurityTest; import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants; import org.jetbrains.annotations.NotNull; @@ -61,7 +61,7 @@ public class NodeUtilTest extends AbstractSecurityTest { NodeUtil parent = child.getOrAddTree("..", NodeTypeConstants.NT_OAK_UNSTRUCTURED); assertEqualNodeUtil(node, parent); - Map<String, String> map = ImmutableMap.of( + Map<String, String> map = Map.of( "a/b/c", "/a/b/c", "a/../b/c", "/b/c", "a/b/c/../..", "/a",
