OAK-11311: Remove usage of Guava ImmutableList.of()

oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializer.java

@@ -22,7 +22,7 @@
 import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
 import org.jetbrains.annotations.NotNull;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import java.util.List;
 
 /**
  * Implementation of the {@code RepositoryInitializer} interface responsible for
@@ -54,12 +54,12 @@ public void initialize(@NotNull NodeBuilder builder) {
         NodeBuilder index = IndexUtils.getOrCreateOakIndex(builder);
         if (enforceUniqueIds && !index.hasChildNode("externalId")) {
             NodeBuilder definition = IndexUtils.createIndexDefinition(index, "externalId", true, true,
-                    ImmutableList.of(ExternalIdentityConstants.REP_EXTERNAL_ID), null);
+                    List.of(ExternalIdentityConstants.REP_EXTERNAL_ID), null);
             definition.setProperty("info", "Oak index assuring uniqueness of rep:externalId properties.");
         }
         if (!index.hasChildNode("externalPrincipalNames")) {
             NodeBuilder definition = IndexUtils.createIndexDefinition(index, "externalPrincipalNames", true, false,
-                    ImmutableList.of(ExternalIdentityConstants.REP_EXTERNAL_PRINCIPAL_NAMES), null);
+                    List.of(ExternalIdentityConstants.REP_EXTERNAL_PRINCIPAL_NAMES), null);
             definition.setProperty("info",
                     "Oak index used by the principal management provided by the external authentication module.");
         }

oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java

@@ -26,7 +26,6 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.security.AccessControlManager;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.namepath.NamePathMapper;
@@ -171,7 +170,7 @@ public List<? extends CommitHook> getCommitHooks(@NotNull String workspaceName)
     @NotNull
     @Override
     public List<? extends ValidatorProvider> getValidators(@NotNull String workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker moveTracker) {
-        return ImmutableList.of(new CugValidatorProvider());
+        return List.of(new CugValidatorProvider());
     }
 
     @NotNull

oak-authorization-principalbased/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/PrincipalBasedAuthorizationConfiguration.java

@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.spi.security.authorization.principalbased.impl;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Tree;
@@ -164,7 +163,7 @@ public List<? extends CommitHook> getCommitHooks(@NotNull String workspaceName)
     @NotNull
     @Override
     public List<? extends ValidatorProvider> getValidators(@NotNull String workspaceName, @NotNull Set<Principal> principals, @NotNull MoveTracker moveTracker) {
-        return ImmutableList.of(new PrincipalPolicyValidatorProvider(new MgrProviderImpl(this), principals, workspaceName));
+        return List.of(new PrincipalPolicyValidatorProvider(new MgrProviderImpl(this), principals, workspaceName));
     }
 
     @NotNull

oak-benchmarks-lucene/src/main/java/org/apache/jackrabbit/oak/scalability/suites/ScalabilityNodeRelationshipSuite.java

@@ -32,7 +32,6 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.commons.math3.stat.descriptive.SynchronizedDescriptiveStatistics;
 import org.apache.jackrabbit.api.JackrabbitSession;
 import org.apache.jackrabbit.api.security.user.Authorizable;
@@ -104,7 +103,7 @@ public class ScalabilityNodeRelationshipSuite extends ScalabilityNodeSuite {
     protected static final List<String> NODE_LEVELS = Splitter.on(",").trimResults()
         .omitEmptyStrings().splitToList(System.getProperty("nodeLevels", "10,5,2,1"));
 
-    protected static final List<String> NODE_LEVELS_DEFAULT = ImmutableList.of("10","5","2","1");
+    protected static final List<String> NODE_LEVELS_DEFAULT = List.of("10","5","2","1");
 
     private static final int NUM_USERS =
         (NODE_LEVELS.size() >= 1 ? Integer.parseInt(NODE_LEVELS.get(0)) : Integer.parseInt(NODE_LEVELS_DEFAULT.get(0)));

oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/ConcurrentHasPermissionTest.java

@@ -20,16 +20,14 @@
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-
 /**
  * Concurrently calls Session#hasPermission on the deep tree:
  * - the path argument a random path out of the deep tree
  * - the actions are randomly selected from the combinations listed in {@link #ACTIONS}
  */
 public class ConcurrentHasPermissionTest extends ConcurrentReadDeepTreeTest {
 
-    private static final List<String> ACTIONS = ImmutableList.of(
+    private static final List<String> ACTIONS = List.of(
             Session.ACTION_READ,
             Session.ACTION_ADD_NODE,
             Session.ACTION_SET_PROPERTY,

oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/FacetSearchTest.java

@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.benchmark;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.commons.jackrabbit.authorization.AccessControlUtils;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.api.Type;
@@ -245,7 +244,7 @@ public void initialize(@NotNull NodeBuilder builder) {
                 t.setProperty("jcr:primaryType", "nt:unstructured", NAME);
 
                 NodeBuilder uuid = IndexUtils.createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME), "uuid", true, true,
-                        ImmutableList.<String>of("jcr:uuid"), null);
+                        List.of("jcr:uuid"), null);
                 uuid.setProperty("info",
                         "Oak index for UUID lookup (direct lookup of nodes with the mixin 'mix:referenceable').");
 

oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/PropertyFullTextTest.java

@@ -16,8 +16,6 @@
  */
 package org.apache.jackrabbit.oak.benchmark;
 
-
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.benchmark.wikipedia.WikipediaImport;
 import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -36,11 +34,11 @@
 import javax.jcr.query.RowIterator;
 
 import java.io.File;
+import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-
 import static java.util.Objects.requireNonNull;
 import static org.apache.jackrabbit.oak.api.Type.BOOLEAN;
 import static org.apache.jackrabbit.oak.api.Type.LONG;
@@ -181,7 +179,7 @@ public void initialize(final @NotNull NodeBuilder builder) {
                 t.setProperty("jcr:primaryType", "nt:unstructured", NAME);
 
                 NodeBuilder uuid = IndexUtils.createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME), "uuid", true, true,
-                        ImmutableList.<String>of("jcr:uuid"), null);
+                        List.of("jcr:uuid"), null);
                 uuid.setProperty("info",
                         "Oak index for UUID lookup (direct lookup of nodes with the mixin 'mix:referenceable').");
 

oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/SearchTest.java

@@ -40,7 +40,6 @@
 import javax.jcr.query.QueryResult;
 import javax.jcr.query.RowIterator;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.commons.io.FileUtils;
 import org.apache.jackrabbit.oak.benchmark.wikipedia.WikipediaImport;
 import org.apache.jackrabbit.oak.plugins.index.IndexUtils;
@@ -219,7 +218,7 @@ protected class UUIDInitializer implements RepositoryInitializer {
         public void initialize(@NotNull NodeBuilder builder) {
 
             NodeBuilder uuid = IndexUtils.createIndexDefinition(builder.child(INDEX_DEFINITIONS_NAME), "uuid", true, true,
-                    ImmutableList.<String>of("jcr:uuid"), null);
+                    List.of("jcr:uuid"), null);
             uuid.setProperty("info",
                     "Oak index for UUID lookup (direct lookup of nodes with the mixin 'mix:referenceable').");
 

oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/authentication/external/PrincipalNameResolutionTest.java

@@ -18,13 +18,14 @@
 
 import javax.security.auth.login.Configuration;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
 import org.apache.jackrabbit.oak.spi.security.authentication.ConfigurationUtil;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityRef;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx.SyncMBeanImpl;
 import org.apache.jackrabbit.oak.spi.security.authentication.external.impl.jmx.SynchronizationMBean;
 
+import java.util.List;
+
 /**
  * Benchmark for {@link SynchronizationMBean#syncExternalUsers(String[])}
  */
@@ -33,7 +34,7 @@ public class PrincipalNameResolutionTest extends AbstractExternalTest {
     private SynchronizationMBean bean;
 
     public PrincipalNameResolutionTest(int numberOfUsers, int membershipSize, long expTime, int roundtripDelay) {
-        super(numberOfUsers, membershipSize, expTime, true, ImmutableList.<String>of(), roundtripDelay, 0L);
+        super(numberOfUsers, membershipSize, expTime, true, List.of(), roundtripDelay, 0L);
     }
 
     @Override

oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/AbstractSharedCachingDataStore.java

@@ -57,7 +57,6 @@
 import org.slf4j.LoggerFactory;
 
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.guava.common.collect.Iterators;
 import org.apache.jackrabbit.guava.common.io.Closeables;
 import org.apache.jackrabbit.guava.common.util.concurrent.ListeningExecutorService;
@@ -374,7 +373,7 @@ public boolean exists(final DataIdentifier identifier) {
     }
 
     public List<DataStoreCacheStatsMBean> getStats() {
-        return ImmutableList.of(cache.getCacheStats(), cache.getStagingCacheStats());
+        return List.of(cache.getCacheStats(), cache.getStagingCacheStats());
     }
 
     protected CompositeDataStoreCache getCache() {

oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/DataStoreCacheUpgradeUtils.java

@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.serialization.ValidatingObjectInputStream;
@@ -105,7 +104,7 @@ private static boolean notInExceptions(File file, List<String> exceptions) {
      * @param path the root of the datastore
      */
     public static void moveDownloadCache(final File path) {
-        final List<String> exceptions = ImmutableList.of("tmp", UPLOAD_STAGING_DIR, DOWNLOAD_DIR);
+        final List<String> exceptions = List.of("tmp", UPLOAD_STAGING_DIR, DOWNLOAD_DIR);
         File newDownloadDir = new File(path, DOWNLOAD_DIR);
 
         FileTreeTraverser.depthFirstPostOrder(path)

oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/MarkSweepGarbageCollector.java

@@ -41,7 +41,6 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -52,8 +51,6 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.ListValuedMap;
 import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
@@ -295,8 +292,7 @@ public List<GarbageCollectionRepoStats> getStats() throws Exception {
                 }
 
                 if (references.containsKey(id)) {
-                    List<DataRecord> refRecs = references.get(id);
-                    for(DataRecord refRec : refRecs) {
+                    for(DataRecord refRec : references.get(id)) {
                         String uniqueSessionId = refRec.getIdentifier().toString()
                             .substring(SharedStoreRecordType.REFERENCES.getType().length() + 1);
 

oak-core/src/main/java/org/apache/jackrabbit/oak/InitialContent.java

@@ -25,6 +25,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.List;
 
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.api.Root;
@@ -45,8 +46,6 @@
 import org.apache.jackrabbit.oak.spi.version.VersionConstants;
 import org.jetbrains.annotations.NotNull;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
-
 /**
  * {@code InitialContent} implements a {@link RepositoryInitializer} the creates
  * the initial JCR/Oak repository structure. This includes creating
@@ -96,11 +95,11 @@ public void initialize(@NotNull NodeBuilder builder) {
             NodeBuilder index = IndexUtils.getOrCreateOakIndex(builder);
 
             NodeBuilder uuid = IndexUtils.createIndexDefinition(index, "uuid", true, true,
-                    ImmutableList.<String>of(JCR_UUID), null);
+                    List.of(JCR_UUID), null);
             uuid.setProperty("info",
                     "Oak index for UUID lookup (direct lookup of nodes with the mixin 'mix:referenceable').");
             NodeBuilder nodetype = IndexUtils.createIndexDefinition(index, "nodetype", true, false,
-                    ImmutableList.of(JCR_PRIMARYTYPE, JCR_MIXINTYPES), null);
+                    List.of(JCR_PRIMARYTYPE, JCR_MIXINTYPES), null);
             nodetype.setProperty("info", 
                     "Oak index for queries with node type, and possibly path restrictions, " + 
                     "for example \"/jcr:root/content//element(*, mix:language)\".");

oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java

@@ -48,7 +48,6 @@
 import javax.management.StandardMBean;
 import javax.security.auth.login.LoginException;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.guava.common.io.Closer;
 
@@ -1037,20 +1036,20 @@ public static class OakDefaultComponents {
         @Deprecated
         public static final OakDefaultComponents INSTANCE = new OakDefaultComponents();
 
-        private final Iterable<CommitHook> commitHooks = ImmutableList.of(new VersionHook());
+        private final Iterable<CommitHook> commitHooks = List.of(new VersionHook());
 
-        private  final Iterable<RepositoryInitializer> repositoryInitializers = ImmutableList
+        private  final Iterable<RepositoryInitializer> repositoryInitializers = List
                 .of(new InitialContent());
 
-        private  final Iterable<EditorProvider> editorProviders = ImmutableList.of(
+        private  final Iterable<EditorProvider> editorProviders = List.of(
                 new ItemSaveValidatorProvider(), new NameValidatorProvider(), new NamespaceEditorProvider(),
                 new TypeEditorProvider(), new ConflictValidatorProvider(), new ChangeCollectorProvider());
 
-        private  final Iterable<IndexEditorProvider> indexEditorProviders = ImmutableList.of(
+        private  final Iterable<IndexEditorProvider> indexEditorProviders = List.of(
                 new ReferenceEditorProvider(), new PropertyIndexEditorProvider(), new NodeCounterEditorProvider(),
                 new OrderedPropertyIndexEditorProvider());
 
-        private  final Iterable<QueryIndexProvider> queryIndexProviders = ImmutableList
+        private  final Iterable<QueryIndexProvider> queryIndexProviders = List
                 .of(new ReferenceIndexProvider(), new PropertyIndexProvider(), new NodeTypeIndexProvider());
 
         private  final SecurityProvider securityProvider = SecurityProviderBuilder.newBuilder().build();

oak-core/src/main/java/org/apache/jackrabbit/oak/cache/impl/CacheStatsMetrics.java

@@ -25,7 +25,6 @@
 import com.codahale.metrics.Counter;
 import com.codahale.metrics.Metric;
 import com.codahale.metrics.MetricRegistry;
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 
 import org.apache.jackrabbit.oak.api.jmx.CacheStatsMBean;
 import org.osgi.service.component.annotations.Component;
@@ -51,7 +50,7 @@ public class CacheStatsMetrics {
     static final String ELEMENT = "element";
     static final String LOAD_TIME = "loadTime";
 
-    private static final List<String> TYPES = ImmutableList.of(
+    private static final List<String> TYPES = List.of(
             REQUEST, HIT, MISS, EVICTION, ELEMENT, LOAD_TIME);
 
     private Map<String, CacheStatsMBean> cacheStatsMBeans = new HashMap<>();

oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/commit/JcrConflictHandler.java

@@ -21,7 +21,8 @@
 import org.apache.jackrabbit.oak.spi.commit.CompositeConflictHandler;
 import org.apache.jackrabbit.oak.spi.commit.ConflictHandlers;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
+import java.util.List;
+
 
 /**
  * Utility class providing conflict handlers used for JCR.
@@ -34,7 +35,7 @@ public final class JcrConflictHandler {
      * and {@link AnnotatingConflictHandler}.
      */
     public static CompositeConflictHandler createJcrConflictHandler() {
-        return new CompositeConflictHandler(ImmutableList.of(
+        return new CompositeConflictHandler(List.of(
                 new JcrLastModifiedConflictHandler(),
                 ConflictHandlers.wrap(new ChildOrderConflictHandler()),
                 new AnnotatingConflictHandler()));

oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexProvider.java

@@ -27,7 +27,6 @@
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
@@ -45,7 +44,7 @@ public class NodeTypeIndexProvider implements QueryIndexProvider {
     @NotNull
     @Override
     public List<? extends QueryIndex> getQueryIndexes(NodeState nodeState) {
-        return ImmutableList.of(new NodeTypeIndex(mountInfoProvider));
+        return List.of(new NodeTypeIndex(mountInfoProvider));
     }
 
     public NodeTypeIndexProvider with(MountInfoProvider mountInfoProvider) {

oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/PropertyIndexProvider.java

@@ -25,7 +25,6 @@
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
@@ -45,7 +44,7 @@ public class PropertyIndexProvider implements QueryIndexProvider {
 
     @Override @NotNull
     public List<QueryIndex> getQueryIndexes(NodeState state) {
-        return ImmutableList.<QueryIndex>of(new PropertyIndex(mountInfoProvider));
+        return List.of(new PropertyIndex(mountInfoProvider));
     }
 
     public PropertyIndexProvider with(MountInfoProvider mountInfoProvider) {

oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndexProvider.java

@@ -25,7 +25,6 @@
 import org.apache.jackrabbit.oak.spi.state.NodeState;
 import org.jetbrains.annotations.NotNull;
 
-import org.apache.jackrabbit.guava.common.collect.ImmutableList;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
 
@@ -41,7 +40,7 @@ public class ReferenceIndexProvider implements QueryIndexProvider {
     @Override
     @NotNull
     public List<QueryIndex> getQueryIndexes(NodeState state) {
-        return ImmutableList.<QueryIndex> of(new ReferenceIndex(mountInfoProvider));
+        return List.of(new ReferenceIndex(mountInfoProvider));
     }
 
     public ReferenceIndexProvider with(MountInfoProvider mountInfoProvider) {