Skip to content

OAK-11744 : removed usage of Guava's ImmutableList #2320

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rishabhdaim merged 1 commit into from
Jun 2, 2025
Merged

OAK-11744 : removed usage of Guava's ImmutableList #2320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .../java/org/apache/jackrabbit/oak/security/authentication/token/TokenConfigurationImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -147,7 +146,7 @@ public String getName() {
@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
Expand Down
39 changes: 17 additions & 22 deletions ...apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
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;
Expand Down Expand Up @@ -81,24 +80,23 @@ public Privilege[] getSupportedPrivileges(String absPath) throws RepositoryExcep

@Override
public AccessControlPolicy[] getPolicies(String absPath) throws RepositoryException {
ImmutableList.Builder<AccessControlPolicy> policies = ImmutableList.builder();
List<AccessControlPolicy> policies = new ArrayList<>();
Copy link
Contributor Author

@rishabhdaim rishabhdaim May 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No need for Immutability here, since the List is never exposed outside the method.

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<>();
Copy link
Contributor Author

@rishabhdaim rishabhdaim May 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

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
Expand Down Expand Up @@ -138,49 +136,46 @@ public void removePolicy(String absPath, AccessControlPolicy policy) throws Repo
@NotNull
@Override
public JackrabbitAccessControlPolicy[] getApplicablePolicies(@NotNull Principal principal) throws RepositoryException {
ImmutableList.Builder<JackrabbitAccessControlPolicy> policies = ImmutableList.builder();
List<JackrabbitAccessControlPolicy> policies = new ArrayList<>();
Copy link
Contributor Author

@rishabhdaim rishabhdaim May 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above.

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<>();
Copy link
Contributor Author

@rishabhdaim rishabhdaim May 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above

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<>();
Copy link
Contributor Author

@rishabhdaim rishabhdaim May 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above.

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<>();
Copy link
Contributor Author

@rishabhdaim rishabhdaim May 30, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same as above.

for (AccessControlManager acMgr : acMgrs) {
if (acMgr instanceof JackrabbitAccessControlManager) {
JackrabbitAccessControlManager jAcMgr = (JackrabbitAccessControlManager) acMgr;
Expand All @@ -190,6 +185,6 @@ public AccessControlPolicy[] getEffectivePolicies(@NotNull Set<Principal> princi
}
}
}
return IteratorUtils.chainedIterator(iterators.build().toArray(new Iterator[0]));
return IteratorUtils.chainedIterator(iterators.toArray(new Iterator[0]));
}
}
4 changes: 2 additions & 2 deletions ...he/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
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;
Expand All @@ -30,7 +31,6 @@
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;
Expand Down Expand Up @@ -85,7 +85,7 @@ public Restriction createRestriction(@Nullable String oakPath, @NotNull String o
}
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);
}
Expand Down
4 changes: 2 additions & 2 deletions oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/RepositoryUpgrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
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;
Expand All @@ -55,7 +56,6 @@
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;
Expand Down Expand Up @@ -772,7 +772,7 @@ private void copyCustomPrivileges(PrivilegeManager pMgr) throws RepositoryExcept
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()]));
Expand Down
Loading