Merge branch 'trunk' into OAK-11311

Author: reschke

oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/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;

oak-core/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}.
  */

oak-core/src/test/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;

oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeProviderCustomMixTest.java

@@ -20,8 +20,9 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.IntStream;
 
-import org.apache.jackrabbit.guava.common.collect.Sets;
 import org.apache.jackrabbit.api.JackrabbitSession;
 import org.apache.jackrabbit.oak.AbstractSecurityTest;
 import org.apache.jackrabbit.oak.api.PropertyState;
@@ -63,9 +64,9 @@ public void hasPrivilegesTest() throws Exception {
 
         // tests all possible 256 shuffles
         for (CompositionType type : CompositionType.values()) {
-            for (Set<String> granted1 : Sets.powerSet(supp1)) {
-                for (Set<String> granted2 : Sets.powerSet(supp2)) {
-                    for (Set<String> ps : Sets.powerSet(all)) {
+            for (Set<String> granted1 : powerSet(supp1)) {
+                for (Set<String> granted2 : powerSet(supp2)) {
+                    for (Set<String> ps : powerSet(all)) {
                         CompositePermissionProvider cpp = buildCpp(supp1, granted1, supp2, granted2, type, null);
 
                         boolean expected = expected(ps, supp1, granted1, supp2, granted2, type, true);
@@ -99,9 +100,9 @@ public void isGrantedTest() throws Exception {
         Tree tree = mock(Tree.class, withSettings().extraInterfaces(ReadOnly.class));
         // tests all possible 256 shuffles
         for (CompositionType type : CompositionType.values()) {
-            for (Set<String> granted1 : Sets.powerSet(supp1)) {
-                for (Set<String> granted2 : Sets.powerSet(supp2)) {
-                    for (Set<String> ps : Sets.powerSet(all)) {
+            for (Set<String> granted1 : powerSet(supp1)) {
+                for (Set<String> granted2 : powerSet(supp2)) {
+                    for (Set<String> ps : powerSet(all)) {
                         CompositePermissionProvider cpp = buildCpp(supp1, granted1, supp2, granted2, type, grantMap);
                         boolean expected = expected(ps, supp1, granted1, supp2, granted2, type, false);
 
@@ -140,9 +141,9 @@ public void getRepositoryPermissionTest() throws Exception {
 
         // tests all possible 256 shuffles
         for (CompositionType type : CompositionType.values()) {
-            for (Set<String> granted1 : Sets.powerSet(supp1)) {
-                for (Set<String> granted2 : Sets.powerSet(supp2)) {
-                    for (Set<String> ps : Sets.powerSet(all)) {
+            for (Set<String> granted1 : powerSet(supp1)) {
+                for (Set<String> granted2 : powerSet(supp2)) {
+                    for (Set<String> ps : powerSet(all)) {
                         CompositePermissionProvider cpp = buildCpp(supp1, granted1, supp2, granted2, type, grantMap);
 
                         boolean expected = expected(ps, supp1, granted1, supp2, granted2, type, false);
@@ -170,9 +171,9 @@ public void getTreePermissionTest() throws Exception {
 
         // tests all possible 256 shuffles
         for (CompositionType type : CompositionType.values()) {
-            for (Set<String> granted1 : Sets.powerSet(supp1)) {
-                for (Set<String> granted2 : Sets.powerSet(supp2)) {
-                    for (Set<String> ps : Sets.powerSet(all)) {
+            for (Set<String> granted1 : powerSet(supp1)) {
+                for (Set<String> granted2 : powerSet(supp2)) {
+                    for (Set<String> ps : powerSet(all)) {
                         CompositePermissionProvider cpp = buildCpp(supp1, granted1, supp2, granted2, type, grantMap);
 
                         boolean expected = expected(ps, supp1, granted1, supp2, granted2, type, false);
@@ -410,4 +411,13 @@ public boolean isGranted(long permissions, @NotNull PropertyState property) {
         }
 
     }
+
+    private <T> Set<Set<T>> powerSet(final Set<T> s) {
+        final T[] arr = s.toArray((T[]) new Object[0]);
+        return IntStream
+                .range(0, (int) Math.pow(2, arr.length))
+                .parallel() //performance improvement
+                .mapToObj(e -> IntStream.range(0, arr.length).filter(i -> (e & (0b1 << i)) != 0).mapToObj(i -> arr[i]).collect(Collectors.toSet()))
+                .collect(Collectors.toSet());
+    }
 }

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;

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());
 

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 {

oak-run/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

oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java

@@ -42,10 +42,9 @@
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+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;
@@ -724,7 +723,7 @@ private Revision determineLastModification(NodeDocument doc, int clusterId) {
         ClusterPredicate cp = new ClusterPredicate(clusterId);
 
         Revision lastModified = null;
-        for (String property : Sets.filter(doc.keySet(), PROPERTY_OR_DELETED::test)) {
+        for (String property : doc.keySet().stream().filter(PROPERTY_OR_DELETED).collect(Collectors.toSet())) {
             Map<Revision, String> valueMap = doc.getLocalMap(property);
             // collect committed changes of this cluster node
             for (Map.Entry<Revision, String> entry : filterKeys(valueMap, cp::test).entrySet()) {

oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java

@@ -31,6 +31,7 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.function.Supplier;
+import java.util.stream.Collectors;
 
 import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
 import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
@@ -45,7 +46,6 @@
 
 import static java.util.Objects.requireNonNull;
 
-import static org.apache.jackrabbit.guava.common.collect.Sets.filter;
 import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.COMMIT_ROOT;
 import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.DOC_SIZE_THRESHOLD;
 import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.PREV_SPLIT_FACTOR;
@@ -438,7 +438,7 @@ private Map<Integer, List<Range>> getPreviousDocsHistogram() {
     private void collectLocalChanges(
             Map<String, NavigableMap<Revision, String>> committedLocally,
             Set<Revision> changes) {
-        for (String property : filter(doc.keySet(), PROPERTY_OR_DELETED::test)) {
+        for (String property : doc.keySet().stream().filter(PROPERTY_OR_DELETED).collect(Collectors.toSet())) {
             NavigableMap<Revision, String> splitMap
                     = new TreeMap<Revision, String>(StableRevisionComparator.INSTANCE);
             committedLocally.put(property, splitMap);