You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/11/26 08:08:38 UTC
(jackrabbit-oak) 03/05: OAK-11278: remove ImmutableMap.of - multiple argument case - oak-jcr
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 d7003751a0f7632c451a9365463af15a866f6c1d
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Nov 25 19:12:07 2024 +0100
OAK-11278: remove ImmutableMap.of - multiple argument case - oak-jcr
---
.../org/apache/jackrabbit/oak/jcr/observation/EventFactory.java | 4 ++--
.../org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java | 4 +---
.../org/apache/jackrabbit/oak/jcr/security/user/RemappingTest.java | 7 +++----
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java
index dd07fde04c..cb1be3a438 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/observation/EventFactory.java
@@ -222,14 +222,14 @@ public class EventFactory {
private Map<String, ?> createInfoMap(String primaryType, Iterable<String> mixinTypes) {
if (isEmpty(mixinTypes)) {
- return ImmutableMap.of(
+ return Map.of(
JCR_PRIMARYTYPE, mapper.getJcrName(primaryType));
} else {
List<String> jcrNames = new ArrayList<>();
for (String name : mixinTypes) {
jcrNames.add(mapper.getJcrName(name));
}
- return ImmutableMap.of(
+ return Map.of(
JCR_PRIMARYTYPE, mapper.getJcrName(primaryType),
JCR_MIXINTYPES, toArray(jcrNames, String.class));
}
diff --git a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java
index 08fd283ed6..b7f607b33b 100644
--- a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java
+++ b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/repository/RepositoryImpl.java
@@ -40,8 +40,6 @@ import javax.jcr.SimpleCredentials;
import javax.jcr.Value;
import javax.security.auth.login.LoginException;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
-
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.api.JackrabbitRepository;
import org.apache.jackrabbit.api.security.authentication.token.TokenCredentials;
@@ -505,7 +503,7 @@ public class RepositoryImpl implements JackrabbitRepository {
} else if (!relaxedLocking) {
return singletonMap(REFRESH_INTERVAL, (Object) refreshInterval);
} else {
- return ImmutableMap.of(
+ return Map.of(
REFRESH_INTERVAL, (Object) refreshInterval,
RELAXED_LOCKING, (Object) Boolean.valueOf(relaxedLocking));
}
diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/RemappingTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/RemappingTest.java
index d56da207ec..2cd275ae80 100644
--- a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/RemappingTest.java
+++ b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/RemappingTest.java
@@ -25,7 +25,6 @@ import javax.jcr.Session;
import javax.jcr.Value;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-import org.apache.jackrabbit.guava.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Query;
import org.apache.jackrabbit.api.security.user.QueryBuilder;
@@ -102,7 +101,7 @@ public class RemappingTest extends AbstractUserTest {
superuser.save();
session.refresh(false);
- Map<String, String> m = ImmutableMap.of("prop", "true", "my:property", "value", "my:node/my:property2", "value");
+ Map<String, String> m = Map.of("prop", "true", "my:property", "value", "my:node/my:property2", "value");
for (String relPath : m.keySet()) {
String value = m.get(relPath);
Iterator<Authorizable> result = getUserManager(session).findAuthorizables(relPath, value);
@@ -119,7 +118,7 @@ public class RemappingTest extends AbstractUserTest {
superuser.save();
session.refresh(false);
- Map<String, String> m = ImmutableMap.of("my:property", "my:value", "my:node/my:property2", "my:value");
+ Map<String, String> m = Map.of("my:property", "my:value", "my:node/my:property2", "my:value");
for (String relPath : m.keySet()) {
String value = m.get(relPath);
Iterator<Authorizable> result = getUserManager(session).findAuthorizables(relPath, value);
@@ -136,7 +135,7 @@ public class RemappingTest extends AbstractUserTest {
superuser.save();
session.refresh(false);
- Map<String, String> m = ImmutableMap.of("my:property", "my:value", "my:node/my:property2", "my:value");
+ Map<String, String> m = Map.of("my:property", "my:value", "my:node/my:property2", "my:value");
for (String relPath : m.keySet()) {
String value = m.get(relPath);
Iterator<Authorizable> result = getUserManager(session).findAuthorizables(relPath, value, UserManager.SEARCH_TYPE_USER);