This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new 2ec6d67261 OAK-11744 : removed usage of Guava's ImmutableList (#2320)
2ec6d67261 is described below
commit 2ec6d67261bccba798673add68fa82ebe60b69b7
Author: Rishabh Kumar <[email protected]>
AuthorDate: Mon Jun 2 20:56:26 2025 +0530
OAK-11744 : removed usage of Guava's ImmutableList (#2320)
Co-authored-by: Rishabh Kumar <[email protected]>
---
.../token/TokenConfigurationImpl.java | 3 +-
.../composite/CompositeAccessControlManager.java | 39 ++++++++++------------
.../restriction/AbstractRestrictionProvider.java | 4 +--
.../jackrabbit/oak/upgrade/RepositoryUpgrade.java | 4 +--
4 files changed, 22 insertions(+), 28 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
index edabce8325..d3b53b58d1 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authentication.token;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
import org.apache.jackrabbit.oak.spi.commit.MoveTracker;
@@ -147,7 +146,7 @@ public class TokenConfigurationImpl extends
ConfigurationBase implements TokenCo
@Override
public List<? extends ValidatorProvider> getValidators(@NotNull String
workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker
moveTracker) {
ValidatorProvider vp = new
TokenValidatorProvider(getSecurityProvider().getParameters(UserConfiguration.NAME),
getTreeProvider());
- return ImmutableList.of(vp);
+ return List.of(vp);
}
@Override
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
index 2db5c637c3..cf629b2e22 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
@@ -32,7 +32,6 @@ import javax.jcr.security.AccessControlPolicy;
import javax.jcr.security.AccessControlPolicyIterator;
import javax.jcr.security.Privilege;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
import
org.apache.jackrabbit.commons.iterator.AccessControlPolicyIteratorAdapter;
@@ -81,24 +80,23 @@ class CompositeAccessControlManager extends
AbstractAccessControlManager {
@Override
public AccessControlPolicy[] getPolicies(String absPath) throws
RepositoryException {
- ImmutableList.Builder<AccessControlPolicy> policies =
ImmutableList.builder();
+ List<AccessControlPolicy> policies = new ArrayList<>();
for (AccessControlManager acMgr : acMgrs) {
- policies.add(acMgr.getPolicies(absPath));
+ policies.addAll(Arrays.asList(acMgr.getPolicies(absPath)));
}
- List<AccessControlPolicy> l = policies.build();
- return l.toArray(new AccessControlPolicy[0]);
+ return policies.toArray(new AccessControlPolicy[0]);
}
@Override
public AccessControlPolicy[] getEffectivePolicies(String absPath) throws
RepositoryException {
- ImmutableList.Builder<AccessControlPolicy> policies =
ImmutableList.builder();
+ List<AccessControlPolicy> policies = new ArrayList<>();
for (AccessControlManager acMgr : acMgrs) {
- policies.add(acMgr.getEffectivePolicies(absPath));
+
policies.addAll(Arrays.asList(acMgr.getEffectivePolicies(absPath)));
if (aggregationFilter.stop(acMgr, absPath)) {
break;
}
}
- return
policies.build().stream().distinct().toArray(AccessControlPolicy[]::new);
+ return
policies.stream().distinct().toArray(AccessControlPolicy[]::new);
}
@Override
@@ -138,49 +136,46 @@ class CompositeAccessControlManager extends
AbstractAccessControlManager {
@NotNull
@Override
public JackrabbitAccessControlPolicy[] getApplicablePolicies(@NotNull
Principal principal) throws RepositoryException {
- ImmutableList.Builder<JackrabbitAccessControlPolicy> policies =
ImmutableList.builder();
+ List<JackrabbitAccessControlPolicy> policies = new ArrayList<>();
for (AccessControlManager acMgr : acMgrs) {
if (acMgr instanceof JackrabbitAccessControlManager && acMgr
instanceof PolicyOwner) {
- policies.add(((JackrabbitAccessControlManager)
acMgr).getApplicablePolicies(principal));
+
policies.addAll(Arrays.asList(((JackrabbitAccessControlManager)
acMgr).getApplicablePolicies(principal)));
}
}
- List<JackrabbitAccessControlPolicy> l = policies.build();
- return l.toArray(new JackrabbitAccessControlPolicy[0]);
+ return policies.toArray(new JackrabbitAccessControlPolicy[0]);
}
@NotNull
@Override
public JackrabbitAccessControlPolicy[] getPolicies(@NotNull Principal
principal) throws RepositoryException {
- ImmutableList.Builder<JackrabbitAccessControlPolicy> policies =
ImmutableList.builder();
+ List<JackrabbitAccessControlPolicy> policies = new ArrayList<>();
for (AccessControlManager acMgr : acMgrs) {
if (acMgr instanceof JackrabbitAccessControlManager) {
- policies.add(((JackrabbitAccessControlManager)
acMgr).getPolicies(principal));
+
policies.addAll(Arrays.asList(((JackrabbitAccessControlManager)
acMgr).getPolicies(principal)));
}
}
- List<JackrabbitAccessControlPolicy> l = policies.build();
- return l.toArray(new JackrabbitAccessControlPolicy[0]);
+ return policies.toArray(new JackrabbitAccessControlPolicy[0]);
}
@NotNull
@Override
public AccessControlPolicy[] getEffectivePolicies(@NotNull Set<Principal>
principals) throws RepositoryException {
- ImmutableList.Builder<AccessControlPolicy> policies =
ImmutableList.builder();
+ List<AccessControlPolicy> policies = new ArrayList<>();
for (AccessControlManager acMgr : acMgrs) {
if (acMgr instanceof JackrabbitAccessControlManager) {
JackrabbitAccessControlManager jAcMgr =
(JackrabbitAccessControlManager) acMgr;
- policies.add(jAcMgr.getEffectivePolicies(principals));
+
policies.addAll(Arrays.asList(jAcMgr.getEffectivePolicies(principals)));
if (aggregationFilter.stop(jAcMgr, principals)) {
break;
}
}
}
- List<AccessControlPolicy> l = policies.build();
- return l.toArray(new AccessControlPolicy[0]);
+ return policies.toArray(new AccessControlPolicy[0]);
}
@Override
public @NotNull Iterator<AccessControlPolicy>
getEffectivePolicies(@NotNull Set<Principal> principals, @Nullable String...
absPaths) throws AccessDeniedException, AccessControlException,
UnsupportedRepositoryOperationException, RepositoryException {
- ImmutableList.Builder<Iterator<AccessControlPolicy>> iterators =
ImmutableList.builder();
+ List<Iterator<AccessControlPolicy>> iterators = new ArrayList<>();
for (AccessControlManager acMgr : acMgrs) {
if (acMgr instanceof JackrabbitAccessControlManager) {
JackrabbitAccessControlManager jAcMgr =
(JackrabbitAccessControlManager) acMgr;
@@ -190,6 +185,6 @@ class CompositeAccessControlManager extends
AbstractAccessControlManager {
}
}
}
- return IteratorUtils.chainedIterator(iterators.build().toArray(new
Iterator[0]));
+ return IteratorUtils.chainedIterator(iterators.toArray(new
Iterator[0]));
}
}
diff --git
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
index dbec152197..d6930b2a2d 100644
---
a/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
+++
b/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
@@ -21,6 +21,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
@@ -30,7 +31,6 @@ import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.security.AccessControlException;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
@@ -85,7 +85,7 @@ public abstract class AbstractRestrictionProvider implements
RestrictionProvider
}
PropertyState propertyState;
if (requiredType.isArray()) {
- propertyState = PropertyStates.createProperty(oakName,
ImmutableList.of(value), tag);
+ propertyState = PropertyStates.createProperty(oakName,
List.of(value), tag);
} else {
propertyState = PropertyStates.createProperty(oakName, value);
}
diff --git
a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
index 506df9bf7d..ef62e1737c 100644
---
a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
+++
b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
@@ -31,6 +31,7 @@ import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Calendar;
import java.util.Collection;
import java.util.Collections;
@@ -55,7 +56,6 @@ import javax.jcr.nodetype.NodeTypeTemplate;
import javax.jcr.nodetype.PropertyDefinitionTemplate;
import javax.jcr.security.Privilege;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.commons.collections4.bidimap.DualHashBidiMap;
import org.apache.jackrabbit.JcrConstants;
@@ -772,7 +772,7 @@ public class RepositoryUpgrade {
while (it.hasNext()) {
Privilege aggrPriv = it.next();
- List<String> aggrNames =
Lists.transform(ImmutableList.copyOf(aggrPriv.getDeclaredAggregatePrivileges()),
+ List<String> aggrNames =
Lists.transform(Arrays.asList(aggrPriv.getDeclaredAggregatePrivileges()),
input -> (input == null) ? null : input.getName());
if (allAggregatesRegistered(pMgr, aggrNames)) {
pMgr.registerPrivilege(aggrPriv.getName(),
aggrPriv.isAbstract(), aggrNames.toArray(new String[aggrNames.size()]));
