OAK-11326 : removed the usage of Guava Sets

apache · Dec 30, 2024 · e82f536 · e82f536
1 parent 07c91e4
commit e82f536
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 22 deletions.
diff --git a/...abbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java b/...abbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java
@@ -18,7 +18,6 @@
 
 import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.guava.common.collect.Iterators;
-import org.apache.jackrabbit.guava.common.collect.Sets;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.plugins.tree.TreeLocation;

diff --git a/...ore/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java b/...ore/src/test/java/org/apache/jackrabbit/oak/plugins/index/nodetype/NodeTypeIndexTest.java
@@ -47,8 +47,6 @@
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.junit.Test;
 
-import org.apache.jackrabbit.guava.common.collect.Sets;
-
 /**
  * {@code NodeTypeIndexTest} performs tests on {@link NodeTypeIndex}.
  */

diff --git a/...st/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java b/...st/java/org/apache/jackrabbit/oak/plugins/observation/filter/ChangeSetFilterImplTest.java
@@ -26,8 +26,6 @@
 import java.util.Set;
 
 import org.apache.jackrabbit.guava.common.base.Stopwatch;
-import org.apache.jackrabbit.guava.common.collect.Sets;
-
 import org.apache.jackrabbit.oak.commons.PathUtils;
 import org.apache.jackrabbit.oak.spi.observation.ChangeSet;
 import org.apache.jackrabbit.oak.spi.observation.ChangeSetBuilder;

diff --git a/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipWriterTest.java b/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/MembershipWriterTest.java
@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.Sets;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.api.security.user.Authorizable;
 import org.apache.jackrabbit.api.security.user.Group;

diff --git a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
@@ -50,6 +50,7 @@
 import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
+import java.util.concurrent.CopyOnWriteArraySet;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
@@ -85,7 +86,6 @@
 
 import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.guava.common.collect.Lists;
-import org.apache.jackrabbit.guava.common.collect.Sets;
 import org.apache.jackrabbit.guava.common.util.concurrent.ForwardingListenableFuture;
 import org.apache.jackrabbit.guava.common.util.concurrent.Futures;
 import org.apache.jackrabbit.guava.common.util.concurrent.ListenableFuture;
@@ -1242,10 +1242,8 @@ public String toString() {
     }
 
     private static class ExpectationListener implements EventListener {
-        private final Set<Expectation> expected = synchronizedSet(
-                Sets.<Expectation>newCopyOnWriteArraySet());
-        private final Set<Expectation> optional = synchronizedSet(
-                Sets.<Expectation>newCopyOnWriteArraySet());
+        private final Set<Expectation> expected = synchronizedSet(new CopyOnWriteArraySet<>());
+        private final Set<Expectation> optional = synchronizedSet(new CopyOnWriteArraySet<>());
         private final List<Event> unexpected = synchronizedList(
                 Lists.<Event>newCopyOnWriteArrayList());
 

diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/run/cli/Options.java
@@ -20,7 +20,6 @@
 package org.apache.jackrabbit.oak.run.cli;
 
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.Sets;
 import joptsimple.OptionParser;
 import joptsimple.OptionSet;
 import org.apache.jackrabbit.oak.spi.whiteboard.DefaultWhiteboard;
@@ -53,7 +52,8 @@ public Options(){
     }
 
     public Options(OptionBeans... options) {
-        this.oakRunOptions = Sets.newEnumSet(asList(options), OptionBeans.class);
+        this.oakRunOptions = EnumSet.noneOf(OptionBeans.class);
+        this.oakRunOptions.addAll(asList(options));
     }
 
     public OptionSet parseAndConfigure(OptionParser parser, String[] args) throws IOException {

diff --git a/...un/src/main/groovy/org/apache/jackrabbit/oak/console/commands/PrintDocumentCommand.groovy b/...un/src/main/groovy/org/apache/jackrabbit/oak/console/commands/PrintDocumentCommand.groovy
@@ -18,7 +18,6 @@
  */
 package org.apache.jackrabbit.oak.console.commands
 
-import org.apache.jackrabbit.guava.common.collect.Sets
 import groovy.transform.CompileStatic
 import org.apache.jackrabbit.oak.console.ConsoleSession
 import org.apache.jackrabbit.oak.plugins.document.DocumentNodeStore

diff --git a/...cument/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java b/...cument/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
@@ -45,8 +45,6 @@
 import java.util.stream.Collectors;
 
 import org.apache.jackrabbit.guava.common.collect.Iterables;
-import org.apache.jackrabbit.guava.common.collect.Sets;
-
 import org.apache.jackrabbit.oak.commons.TimeDurationFormatter;
 import org.apache.jackrabbit.oak.commons.properties.SystemPropertySupplier;
 import org.apache.jackrabbit.oak.plugins.document.bundlor.DocumentBundlor;

diff --git a/...nt/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java b/...nt/src/test/java/org/apache/jackrabbit/oak/plugins/document/CacheConsistencyTestBase.java
@@ -17,15 +17,11 @@
 package org.apache.jackrabbit.oak.plugins.document;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import org.apache.jackrabbit.guava.common.collect.Lists;
-import org.apache.jackrabbit.guava.common.collect.Sets;
-
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;

diff --git a/...store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionTest.java b/...store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/RevisionTest.java
@@ -33,9 +33,7 @@
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.apache.jackrabbit.guava.common.collect.Lists;
 import org.apache.jackrabbit.guava.common.collect.Queues;
-import org.apache.jackrabbit.guava.common.collect.Sets;
 import org.apache.jackrabbit.guava.common.util.concurrent.Uninterruptibles;
 
 import org.junit.Test;