Skip to content

OAK-11330: Remove usage of Guava ImmutableList (Builder) #1926

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
reschke merged 2 commits into from
Dec 30, 2024
Merged

OAK-11330: Remove usage of Guava ImmutableList (Builder) #1926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b0eda2a
OAK-11330: Remove usage of Guava ImmutableList (Builder)
reschke Dec 30, 2024
a370d3a
OAK-11330: Remove usage of Guava ImmutableList (Builder) - fix typo i…
reschke Dec 30, 2024
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
6 changes: 3 additions & 3 deletions ...k/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.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.spi.security.authentication.external.impl.principal;

import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.api.security.principal.PrincipalManager;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
Expand Down Expand Up @@ -53,6 +52,7 @@
import org.osgi.service.metatype.annotations.Option;

import java.security.Principal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -182,7 +182,7 @@ public RepositoryInitializer getRepositoryInitializer() {
public List<? extends ValidatorProvider> getValidators(@NotNull String workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker moveTracker) {
boolean isSystem = new SystemPrincipalConfig(getPrincipalNames()).containsSystemPrincipal(principals);

ImmutableList.Builder<ValidatorProvider> vps = new ImmutableList.Builder<>();
List<ValidatorProvider> vps = new ArrayList<>();
vps.add(new ExternalIdentityValidatorProvider(isSystem, protectedExternalIds()));

Set<String> idpNamesWithDynamicGroups = getIdpNamesWithDynamicGroups();
Expand All @@ -194,7 +194,7 @@ public List<? extends ValidatorProvider> getValidators(@NotNull String workspace
if (ipt != IdentityProtectionType.NONE && !isSystem) {
vps.add(new ExternalUserValidatorProvider(getRootProvider(), getTreeProvider(), getSecurityProvider(), ipt, getProtectionConfig()));
}
return vps.build();
return Collections.unmodifiableList(vps);
}

@NotNull
Expand Down
7 changes: 4 additions & 3 deletions ...ak/spi/security/authentication/external/impl/principal/ExternalUserValidatorProvider.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.spi.security.authentication.external.impl.principal;

import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
Expand Down Expand Up @@ -44,6 +43,8 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import static org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
Expand Down Expand Up @@ -284,13 +285,13 @@ private static final class AggregatedContext extends Context.Default {
List<Context> ctxs;

private AggregatedContext(@NotNull SecurityProvider securityProvider) {
ImmutableList.Builder<Context> builder = ImmutableList.builder();
List<Context> builder = new ArrayList<>();
for (SecurityConfiguration sc : securityProvider.getConfigurations()) {
if (!UserConfiguration.NAME.equals(sc.getName())) {
builder.add(sc.getContext());
}
}
ctxs = builder.build();
ctxs = Collections.unmodifiableList(builder);
}

@Override
Expand Down
40 changes: 18 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 @@ -18,6 +18,7 @@

import java.security.Principal;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
Expand All @@ -31,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.guava.common.collect.Iterators;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlManager;
import org.apache.jackrabbit.api.security.JackrabbitAccessControlPolicy;
Expand Down Expand Up @@ -81,24 +81,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<>();
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
Expand Down Expand Up @@ -138,49 +137,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<>();
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;
Expand All @@ -190,6 +186,6 @@ public AccessControlPolicy[] getEffectivePolicies(@NotNull Set<Principal> princi
}
}
}
return Iterators.concat(iterators.build().toArray(new Iterator[0]));
return Iterators.concat(iterators.toArray(new Iterator[0]));
}
}
14 changes: 7 additions & 7 deletions ...ene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LucenePropertyIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Deque;
import java.util.HashMap;
import java.util.HashSet;
Expand All @@ -38,7 +39,6 @@

import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
import org.apache.jackrabbit.guava.common.collect.FluentIterable;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.oak.api.PropertyValue;
Expand Down Expand Up @@ -1688,15 +1688,15 @@ private List<Facet> getFacetsUncached(int numberOfFacets, String columnName) thr
Facets facets = FacetHelper.getFacets(searcher, query, plan, config);
if (facets != null) {
try {
ImmutableList.Builder<Facet> res = new ImmutableList.Builder<>();
List<Facet> res = new ArrayList<>();
FacetResult topChildren = facets.getTopChildren(numberOfFacets, facetFieldName);
if (topChildren != null) {
for (LabelAndValue lav : topChildren.labelValues) {
res.add(new Facet(
lav.label, lav.value.intValue()
));
}
return res.build();
return Collections.unmodifiableList(res);
}
} catch (IllegalArgumentException iae) {
LOG.debug(iae.getMessage(), iae);
Expand All @@ -1712,7 +1712,7 @@ private List<Facet> getFacetsUncached(int numberOfFacets, String columnName) thr
private List<Facet> getFacetsUncached(Facets facets, int numberOfFacets, String columnName) throws IOException {
String facetFieldName = FulltextIndex.parseFacetField(columnName);
try {
ImmutableList.Builder<Facet> res = new ImmutableList.Builder<>();
List<Facet> res = new ArrayList<>();
FacetResult topChildren = facets.getTopChildren(numberOfFacets, facetFieldName);
if (topChildren == null) {
return null;
Expand All @@ -1722,7 +1722,7 @@ private List<Facet> getFacetsUncached(Facets facets, int numberOfFacets, String
lav.label, lav.value.intValue()
));
}
return res.build();
return Collections.unmodifiableList(res);
} catch (IllegalArgumentException iae) {
LOG.debug(iae.getMessage(), iae);
LOG.warn("facets for {} not yet indexed: {}", facetFieldName, iae);
Expand All @@ -1746,15 +1746,15 @@ public List<Facet> getFacets(int numberOfFacets, String columnName) throws IOExc

if (facets != null) {
try {
ImmutableList.Builder<Facet> res = new ImmutableList.Builder<>();
List<Facet> res = new ArrayList<>();
FacetResult topChildren = facets.getTopChildren(numberOfFacets, facetFieldName);
if (topChildren != null) {
for (LabelAndValue lav : topChildren.labelValues) {
res.add(new Facet(
lav.label, lav.value.intValue()
));
}
return res.build();
return Collections.unmodifiableList(res);
}
} catch (IllegalArgumentException iae) {
LOG.debug(iae.getMessage(), iae);
Expand Down
9 changes: 4 additions & 5 deletions ...java/org/apache/jackrabbit/oak/plugins/index/lucene/reader/DefaultIndexReaderFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/

package org.apache.jackrabbit.oak.plugins.index.lucene.reader;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.oak.plugins.index.lucene.IndexCopier;
import org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexDefinition;
import org.apache.jackrabbit.oak.plugins.index.lucene.directory.OakDirectory;
Expand Down Expand Up @@ -55,15 +54,15 @@ public List<LuceneIndexReader> createReaders(LuceneIndexDefinition definition, N
if (!mountInfoProvider.hasNonDefaultMounts()) {
LuceneIndexReader reader = createReader(definition, defnState, indexPath,
FulltextIndexConstants.INDEX_DATA_CHILD_NAME, SUGGEST_DATA_CHILD_NAME);
return reader != null ? ImmutableList.of(reader) : Collections.<LuceneIndexReader>emptyList();
return reader != null ? List.of(reader) : Collections.emptyList();
} else {
return createMountedReaders(definition, defnState, indexPath);
}
}

private List<LuceneIndexReader> createMountedReaders(LuceneIndexDefinition definition, NodeState defnState, String
indexPath) throws IOException {
ImmutableList.Builder<LuceneIndexReader> readers = ImmutableList.builder();
List<LuceneIndexReader> readers = new ArrayList<>();
LuceneIndexReader reader = createReader(mountInfoProvider.getDefaultMount(), definition, defnState, indexPath);
//Default mount is the first entry. This ensures that suggester, spellcheck can work on that untill they
//support multiple readers
Expand All @@ -77,7 +76,7 @@ private List<LuceneIndexReader> createMountedReaders(LuceneIndexDefinition defin
readers.add(reader);
}
}
return readers.build();
return Collections.unmodifiableList(readers);
}

@Nullable
Expand Down
8 changes: 3 additions & 5 deletions oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/cli/MigrationFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,14 @@
package org.apache.jackrabbit.oak.upgrade.cli;

import java.io.IOException;
import java.util.Iterator;
import java.util.Collections;
import java.util.List;
import java.util.ServiceLoader;

import javax.jcr.RepositoryException;

import org.apache.jackrabbit.core.RepositoryContext;
import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.blob.datastore.DataStoreBlobStore;
import org.apache.jackrabbit.oak.spi.blob.BlobStore;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
Expand All @@ -35,7 +36,6 @@
import org.apache.jackrabbit.oak.upgrade.cli.parser.MigrationOptions;
import org.apache.jackrabbit.oak.upgrade.cli.parser.StoreArguments;

import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.apache.jackrabbit.guava.common.io.Closer;

public class MigrationFactory {
Expand Down Expand Up @@ -123,9 +123,7 @@ private RepositorySidegrade createSidegrade(NodeStore srcStore, NodeStore dstSto

private List<CommitHook> loacCommitHooks() {
ServiceLoader<CommitHook> loader = ServiceLoader.load(CommitHook.class);
Iterator<CommitHook> iterator = loader.iterator();
ImmutableList.Builder<CommitHook> builder = ImmutableList.<CommitHook> builder().addAll(iterator);
return builder.build();
return Collections.unmodifiableList(CollectionUtils.toList(loader.iterator()));
}

}
Loading