You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/09/09 15:50:28 UTC
(jackrabbit-oak) 01/01: OAK-11100: remove use of Guava transform/filter
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11100
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit d2e424a66b06a4edb39b04e67f13806917ffb9fc
Author: Julian Reschke <re...@apache.org>
AuthorDate: Mon Sep 9 16:50:06 2024 +0100
OAK-11100: remove use of Guava transform/filter
---
.../oak/plugins/blob/datastore/BlobIdTracker.java | 9 ++++----
.../oak/commons/sort/ExternalSortTest.java | 6 ++---
.../apache/jackrabbit/oak/spi/mount/MountInfo.java | 17 ++++++--------
.../jackrabbit/oak/core/SecureNodeState.java | 19 ++++++----------
.../oak/plugins/index/IndexPathServiceImpl.java | 20 +++++++----------
.../plugins/index/reference/ReferenceIndex.java | 6 +++--
.../oak/plugins/tree/impl/AbstractTree.java | 14 ++++++------
.../jackrabbit/oak/query/ast/LowerCaseImpl.java | 8 +++----
.../ActiveDeletedBlobCollectorMBeanImpl.java | 2 +-
.../oak/plugins/index/lucene/IndexCopier.java | 2 +-
.../lucene/property/HybridPropertyIndexLookup.java | 2 +-
.../indexer/document/NodeStateEntryTraverser.java | 2 +-
.../mongo/MongoDocumentStoreCheckHelper.java | 2 +-
.../apache/jackrabbit/oak/run/PrintingDiff.java | 2 +-
.../jackrabbit/oak/segment/tool/PrintingDiff.java | 6 ++---
.../jackrabbit/oak/segment/upgrade/UpgradeIT.java | 13 +++++------
.../oak/composite/CompositeChildrenCountTest.java | 4 ++--
.../jackrabbit/oak/plugins/document/Branch.java | 20 +++++------------
.../jackrabbit/oak/plugins/document/Commit.java | 7 +++---
.../oak/plugins/document/DocumentNodeStore.java | 8 ++++---
.../document/DocumentNodeStoreMBeanImpl.java | 23 +++++++++----------
.../oak/plugins/document/LastRevRecoveryAgent.java | 8 ++++---
.../oak/plugins/document/MissingBcSweeper2.java | 10 +++++----
.../oak/plugins/document/NodeDocument.java | 21 ++++++++---------
.../oak/plugins/document/NodeDocumentSweeper.java | 8 ++++---
.../oak/plugins/document/PropertyHistory.java | 26 +++++++++++-----------
.../oak/plugins/document/SplitOperations.java | 6 ++---
.../document/mongo/MongoMissingLastRevSeeker.java | 10 +++++----
.../document/mongo/MongoVersionGCSupport.java | 20 +++++++++--------
.../plugins/document/rdb/RDBDocumentStoreJDBC.java | 4 +---
.../oak/plugins/document/util/Utils.java | 8 +++----
.../oak/upgrade/SameNameSiblingsEditor.java | 9 ++++----
32 files changed, 156 insertions(+), 166 deletions(-)
diff --git a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
index bba731b6ab..dfc9e9dd11 100644
--- a/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
+++ b/oak-blob-plugins/src/main/java/org/apache/jackrabbit/oak/plugins/blob/datastore/BlobIdTracker.java
@@ -30,11 +30,13 @@ import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.collect.Lists;
import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.jackrabbit.core.data.DataRecord;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.commons.concurrent.ExecutorCloser;
import org.apache.jackrabbit.oak.commons.io.BurnOnCloseFileIterator;
import org.apache.jackrabbit.oak.commons.io.FileLineDifferenceIterator;
@@ -45,8 +47,6 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
-import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.io.Files.move;
import static org.apache.jackrabbit.guava.common.io.Files.newWriter;
import static java.io.File.createTempFile;
@@ -267,7 +267,7 @@ public class BlobIdTracker implements Closeable, BlobTracker {
Iterable<DataRecord> refRecords = datastore.getAllMetadataRecords(fileNamePrefix);
// Download all the corresponding files for the records
- List<File> refFiles = newArrayList(transform(refRecords, input -> {
+ List<File> refFiles = CollectionUtils.toStream(refRecords).map(input -> {
InputStream inputStream = null;
try {
inputStream = input.getStream();
@@ -278,7 +278,8 @@ public class BlobIdTracker implements Closeable, BlobTracker {
closeQuietly(inputStream);
}
return null;
- }));
+ }).collect(Collectors.toList());
+
LOG.info("Retrieved all blob id files in [{}]", watch.elapsed(TimeUnit.MILLISECONDS));
// Merge all the downloaded files in to the local store
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
index 47530a471b..d34de1c28a 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.commons.sort;
import net.jpountz.lz4.LZ4FrameInputStream;
import net.jpountz.lz4.LZ4FrameOutputStream;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.jackrabbit.guava.common.primitives.Ints;
import org.apache.jackrabbit.oak.commons.Compression;
@@ -49,8 +48,8 @@ import java.util.Comparator;
import java.util.List;
import java.util.function.Function;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -488,7 +487,8 @@ public class ExternalSortTest {
Function<String, TestLine> stringToType = line -> line != null ? new TestLine(line) : null;
Function<TestLine, String> typeToString = tl -> tl != null ? tl.line : null;
- String testData = Joiner.on('\n').join(transform(testLines, tl -> tl.line));
+ String testData = testLines.stream().map(tl -> tl.line).collect(Collectors.joining("\n"));
+
File testFile = folder.newFile();
try (BufferedWriter bufferedWriter = Files.newWriter(testFile, charset)) {
bufferedWriter.write(testData);
diff --git a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java
index 6f8af9d0c8..336bb75f1a 100644
--- a/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java
+++ b/oak-core-spi/src/main/java/org/apache/jackrabbit/oak/spi/mount/MountInfo.java
@@ -27,12 +27,12 @@ import java.util.NavigableSet;
import java.util.Set;
import java.util.TreeSet;
import java.util.function.Function;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.guava.common.collect.ImmutableSet;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
-import static org.apache.jackrabbit.guava.common.collect.Sets.newTreeSet;
+
import static org.apache.jackrabbit.oak.commons.PathUtils.getParentPath;
import static org.apache.jackrabbit.oak.commons.PathUtils.isAncestor;
import static org.apache.jackrabbit.oak.spi.mount.FragmentMatcher.Result.FULL_MATCH;
@@ -43,14 +43,11 @@ import static org.apache.jackrabbit.oak.spi.mount.FragmentMatcher.Result.PARTIAL
*/
public final class MountInfo implements Mount {
- private static final Function<String, String> SANITIZE_PATH = new Function<String, String>() {
- @Override
- public String apply(String input) {
- if (input.endsWith("/") && input.length() > 1) {
- return input.substring(0, input.length() - 1);
- }
- return input;
+ private static final Function<String, String> SANITIZE_PATH = input -> {
+ if (input.endsWith("/") && input.length() > 1) {
+ return input.substring(0, input.length() - 1);
}
+ return input;
};
private final String name;
@@ -140,7 +137,7 @@ public final class MountInfo implements Mount {
private static TreeSet<String> cleanCopy(Collection<String> includedPaths) {
// ensure that paths don't have trailing slashes - this triggers an assertion in PathUtils isAncestor
- return newTreeSet(transform(includedPaths, SANITIZE_PATH::apply));
+ return includedPaths.stream().map(SANITIZE_PATH).collect(Collectors.toCollection(TreeSet::new));
}
public Set<String> getPathsSupportingFragments() {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
index 7e6f7ff502..e370ea61ad 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/core/SecureNodeState.java
@@ -17,6 +17,7 @@
package org.apache.jackrabbit.oak.core;
import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.memory.MemoryChildNodeEntry;
import org.apache.jackrabbit.oak.plugins.memory.MemoryNodeBuilder;
import org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
@@ -28,11 +29,10 @@ import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import java.util.function.Function;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
import static java.util.Collections.emptyList;
@@ -78,9 +78,7 @@ class SecureNodeState extends AbstractNodeState {
if (treePermission.canReadProperties()) {
propertyCount = state.getPropertyCount();
} else {
- propertyCount = count(filter(
- state.getProperties(),
- new ReadablePropertyPredicate()::test));
+ propertyCount = CollectionUtils.toStream(state.getProperties()).filter(new ReadablePropertyPredicate()).count();
}
}
return propertyCount;
@@ -91,9 +89,8 @@ class SecureNodeState extends AbstractNodeState {
if (treePermission.canReadProperties()) {
return state.getProperties();
} else {
- return filter(
- state.getProperties(),
- new ReadablePropertyPredicate()::test);
+ return CollectionUtils.toStream(state.getProperties()).filter(new ReadablePropertyPredicate())
+ .collect(Collectors.toList());
}
}
@@ -144,10 +141,8 @@ class SecureNodeState extends AbstractNodeState {
// everything is readable including ac-content -> no secure wrapper needed
return state.getChildNodeEntries();
} else if (treePermission.canRead()) {
- Iterable<ChildNodeEntry> readable = transform(
- state.getChildNodeEntries(),
- new WrapChildEntryFunction()::apply);
- return filter(readable, new IterableNodePredicate()::test);
+ return CollectionUtils.toStream(state.getChildNodeEntries()).map(new WrapChildEntryFunction())
+ .filter(new IterableNodePredicate()).collect(Collectors.toList());
} else {
return emptyList();
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexPathServiceImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexPathServiceImpl.java
index 9b9dd6314c..8cc81b2b94 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexPathServiceImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/IndexPathServiceImpl.java
@@ -16,13 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.index;
import java.util.Iterator;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.index.nodetype.NodeTypeIndexProvider;
import org.apache.jackrabbit.oak.query.NodeStateNodeTypeInfoProvider;
import org.apache.jackrabbit.oak.query.QueryEngineSettings;
@@ -43,9 +44,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
-import static org.apache.jackrabbit.guava.common.collect.Iterators.transform;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.DECLARING_NODE_TYPES;
import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NODE_TYPE;
@@ -91,15 +89,13 @@ public class IndexPathServiceImpl implements IndexPathService {
log.warn("{} is not found to be indexed as part of nodetype index. Non root indexes would " +
"not be listed", INDEX_DEFINITIONS_NODE_TYPE);
NodeState oakIndex = nodeStore.getRoot().getChildNode("oak:index");
- return transform(filter(oakIndex.getChildNodeEntries(),
- cne -> INDEX_DEFINITIONS_NODE_TYPE.equals(cne.getNodeState().getName(JCR_PRIMARYTYPE))),
- cne -> PathUtils.concat("/oak:index", cne.getName()));
- }
-
- return () -> {
+ return CollectionUtils.toStream(oakIndex.getChildNodeEntries())
+ .filter(cne -> INDEX_DEFINITIONS_NODE_TYPE.equals(cne.getNodeState().getName(JCR_PRIMARYTYPE)))
+ .map(cne -> PathUtils.concat("/oak:index", cne.getName())).collect(Collectors.toList());
+ } else {
Iterator<IndexRow> itr = getIndex().query(createFilter(INDEX_DEFINITIONS_NODE_TYPE), nodeStore.getRoot());
- return transform(itr, input -> input.getPath());
- };
+ return CollectionUtils.toStream(itr).map(input -> input.getPath()).collect(Collectors.toList());
+ }
}
private FilterImpl createFilter(String nodeTypeName) {
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java
index bb31b8dd2d..2fdf57f30c 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/reference/ReferenceIndex.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.plugins.index.reference;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static java.lang.Double.POSITIVE_INFINITY;
import static javax.jcr.PropertyType.REFERENCE;
import static javax.jcr.PropertyType.WEAKREFERENCE;
@@ -33,7 +33,9 @@ import static org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceCon
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.index.property.Multiplexers;
import org.apache.jackrabbit.oak.plugins.index.property.strategy.IndexStoreStrategy;
import org.apache.jackrabbit.oak.query.SQL2Parser;
@@ -140,7 +142,7 @@ class ReferenceIndex implements QueryIndex {
if (!"*".equals(name)) {
paths = filter(paths, path -> name.equals(getName(path)));
}
- paths = transform(paths, path -> getParentPath(path));
+ paths = CollectionUtils.toStream(paths).map(path -> getParentPath(path)).collect(Collectors.toList());
return newPathCursor(paths, filter.getQueryLimits());
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java
index 07eec74425..a228dc618c 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/tree/impl/AbstractTree.java
@@ -22,7 +22,7 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.size;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayListWithCapacity;
import static org.apache.jackrabbit.guava.common.collect.Sets.newLinkedHashSet;
import static org.apache.jackrabbit.oak.api.Tree.Status.MODIFIED;
@@ -34,10 +34,12 @@ import static org.apache.jackrabbit.oak.plugins.tree.TreeConstants.OAK_CHILD_ORD
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
import org.apache.jackrabbit.oak.plugins.index.reference.NodeReferenceConstants;
import org.apache.jackrabbit.oak.plugins.tree.TreeConstants;
@@ -310,11 +312,9 @@ public abstract class AbstractTree implements Tree {
@Override
@NotNull
public Iterable<Tree> getChildren() {
- Iterable<Tree> children = transform(getChildNames(),
- name -> {
- AbstractTree child = createChild(name);
- return child.exists() ? child : null;
- });
- return filter(children, x -> x != null);
+ return CollectionUtils.toStream(getChildNames()).map(name -> {
+ AbstractTree child = createChild(name);
+ return child.exists() ? child : null;
+ }).filter(x -> x != null).collect(Collectors.toList());
}
}
diff --git a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/LowerCaseImpl.java b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/LowerCaseImpl.java
index df46dd8273..de50b5b924 100644
--- a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/LowerCaseImpl.java
+++ b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/LowerCaseImpl.java
@@ -20,17 +20,18 @@ package org.apache.jackrabbit.oak.query.ast;
import java.util.List;
import java.util.Set;
+import java.util.stream.Collectors;
import javax.jcr.PropertyType;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.query.index.FilterImpl;
import org.apache.jackrabbit.oak.plugins.memory.PropertyValues;
import org.apache.jackrabbit.oak.spi.query.QueryConstants;
import org.apache.jackrabbit.oak.spi.query.QueryIndex.OrderEntry;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.api.Type.STRINGS;
@@ -77,9 +78,8 @@ public class LowerCaseImpl extends DynamicOperandImpl {
}
// TODO toLowerCase(): document the Turkish locale problem
if (p.getType().isArray()) {
- Iterable<String> lowerCase = transform(p.getValue(STRINGS),
- input -> input.toLowerCase());
- return PropertyValues.newString(lowerCase);
+ return PropertyValues.newString(
+ CollectionUtils.toStream(p.getValue(STRINGS)).map(input -> input.toLowerCase()).collect(Collectors.toList()));
} else {
String value = p.getValue(STRING);
return PropertyValues.newString(value.toLowerCase());
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
index 6f64434fe9..e881e8c39b 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/ActiveDeletedBlobCollectorMBeanImpl.java
@@ -51,7 +51,7 @@ import java.util.stream.Collectors;
import java.util.stream.StreamSupport;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.oak.api.Type.STRING;
import static org.apache.jackrabbit.oak.api.jmx.IndexStatsMBean.STATUS_RUNNING;
import static org.apache.jackrabbit.oak.commons.jmx.ManagementOperation.Status.failed;
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
index a18f560a0e..7d05314372 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/IndexCopier.java
@@ -62,7 +62,7 @@ import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Iterables.toArray;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.guava.common.collect.Maps.newConcurrentMap;
import static org.apache.jackrabbit.oak.commons.IOUtils.humanReadableByteCount;
diff --git a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexLookup.java b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexLookup.java
index db9e772b82..3ea4a14861 100644
--- a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexLookup.java
+++ b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/property/HybridPropertyIndexLookup.java
@@ -35,7 +35,7 @@ import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.oak.commons.PathUtils.isAbsolute;
import static org.apache.jackrabbit.oak.plugins.index.lucene.property.HybridPropertyIndexUtil.PROPERTY_INDEX;
import static org.apache.jackrabbit.oak.plugins.index.lucene.property.HybridPropertyIndexUtil.PROP_HEAD_BUCKET;
diff --git a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java
index 65bf0a678f..3f36a09365 100644
--- a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java
+++ b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/NodeStateEntryTraverser.java
@@ -41,7 +41,7 @@ import java.util.function.Consumer;
import static java.util.Collections.emptyList;
import static java.util.Collections.singleton;
import static org.apache.jackrabbit.guava.common.collect.Iterables.concat;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
public class NodeStateEntryTraverser implements Iterable<NodeStateEntry>, Closeable {
private final Closer closer = Closer.create();
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreCheckHelper.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreCheckHelper.java
index 4944e72764..54c8c05fd6 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreCheckHelper.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoDocumentStoreCheckHelper.java
@@ -23,7 +23,7 @@ import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
import org.bson.BsonDocument;
import org.bson.BsonInt32;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
/**
* <code>MongoDocumentStoreCheckHelper</code>...
diff --git a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/PrintingDiff.java b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/PrintingDiff.java
index 1bda8da88e..806150c8df 100644
--- a/oak-run/src/main/java/org/apache/jackrabbit/oak/run/PrintingDiff.java
+++ b/oak-run/src/main/java/org/apache/jackrabbit/oak/run/PrintingDiff.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.run;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.commons.io.FileUtils.byteCountToDisplaySize;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
diff --git a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java
index 3cea0f777d..f70521073e 100644
--- a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java
+++ b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/tool/PrintingDiff.java
@@ -14,10 +14,8 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.jackrabbit.oak.segment.tool;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.commons.io.FileUtils.byteCountToDisplaySize;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
@@ -29,9 +27,11 @@ import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.MISSING_NO
import java.io.PrintWriter;
import java.util.function.Function;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStateDiff;
@@ -112,7 +112,7 @@ final class PrintingDiff implements NodeStateDiff {
String v = BLOB_LENGTH.apply(ps.getValue(BINARY));
val.append(" = {").append(v).append("}");
} else if (ps.getType() == BINARIES) {
- String v = transform(ps.getValue(BINARIES), BLOB_LENGTH::apply).toString();
+ String v = CollectionUtils.toStream(ps.getValue(BINARIES)).map(BLOB_LENGTH).collect(Collectors.toList()).toString();
val.append("[").append(ps.count()).append("] = ").append(v);
} else if (ps.isArray()) {
val.append("[").append(ps.count()).append("] = ").append(ps.getValue(STRINGS));
diff --git a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
index 5e73076567..d087502e58 100644
--- a/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
+++ b/oak-segment-tar/src/test/java/org/apache/jackrabbit/oak/segment/upgrade/UpgradeIT.java
@@ -15,11 +15,10 @@
* limitations under the License.
*
*/
-
package org.apache.jackrabbit.oak.segment.upgrade;
import static org.apache.jackrabbit.guava.common.base.StandardSystemProperty.OS_NAME;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static java.lang.String.format;
import static java.util.concurrent.TimeUnit.MINUTES;
import static org.apache.jackrabbit.oak.segment.SegmentVersion.V_12;
@@ -34,9 +33,11 @@ import static org.junit.Assume.assumeFalse;
import java.io.File;
import java.io.IOException;
+import java.util.stream.Collectors;
import org.apache.commons.lang3.JavaVersion;
import org.apache.commons.lang3.SystemUtils;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.segment.SegmentVersion;
import org.apache.jackrabbit.oak.segment.data.SegmentData;
import org.apache.jackrabbit.oak.segment.file.InvalidFileStoreVersionException;
@@ -152,10 +153,8 @@ public class UpgradeIT {
}
private static Iterable<SegmentData> getSegments(@NotNull TarFiles tarFiles) {
- return transform(
- tarFiles.getSegmentIds(),
- uuid -> newSegmentData(tarFiles.readSegment(
- uuid.getMostSignificantBits(),
- uuid.getLeastSignificantBits())));
+ return CollectionUtils.toStream(tarFiles.getSegmentIds())
+ .map(uuid -> newSegmentData(tarFiles.readSegment(uuid.getMostSignificantBits(), uuid.getLeastSignificantBits())))
+ .collect(Collectors.toList());
}
}
diff --git a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
index 416a773221..cfc901c730 100644
--- a/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
+++ b/oak-store-composite/src/test/java/org/apache/jackrabbit/oak/composite/CompositeChildrenCountTest.java
@@ -39,10 +39,10 @@ import org.junit.Test;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
import static org.apache.jackrabbit.guava.common.collect.Iterables.cycle;
import static org.apache.jackrabbit.guava.common.collect.Iterables.limit;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static java.lang.Long.MAX_VALUE;
import static java.util.Arrays.asList;
@@ -223,7 +223,7 @@ public class CompositeChildrenCountTest {
Iterable<? extends ChildNodeEntry> childrenIterable = cycle(new MemoryChildNodeEntry("child", EMPTY_NODE));
return asCountingIterable(limit(childrenIterable, childrenCount == MAX_VALUE ? 1000 : (int) childrenCount));
} else {
- return asCountingIterable(transform(asList(children), input -> new MemoryChildNodeEntry(input, EMPTY_NODE)));
+ return asCountingIterable(asList(children).stream().map(input -> new MemoryChildNodeEntry(input, EMPTY_NODE)).collect(Collectors.toList()));
}
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
index 6948b8f152..037bed5f87 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Branch.java
@@ -18,8 +18,6 @@ package org.apache.jackrabbit.oak.plugins.document;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference;
@@ -30,11 +28,10 @@ import java.util.Set;
import java.util.SortedSet;
import java.util.TreeMap;
import java.util.concurrent.ConcurrentSkipListMap;
-import java.util.function.Predicate;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.guava.common.collect.Sets;
-
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -271,14 +268,9 @@ class Branch {
if (!commits.containsKey(r)) {
return Collections.emptyList();
}
- Iterable<Iterable<Path>> paths = transform(filter(commits.entrySet(),
- new Predicate<Map.Entry<Revision, BranchCommit>>() {
- @Override
- public boolean test(Map.Entry<Revision, BranchCommit> input) {
- return !input.getValue().isRebase()
- && input.getKey().compareRevisionTime(r) <= 0;
- }
- }::test), input -> input.getValue().getModifiedPaths());
+ Iterable<Iterable<Path>> paths = commits.entrySet().stream()
+ .filter(input -> !input.getValue().isRebase() && input.getKey().compareRevisionTime(r) <= 0)
+ .map(input -> input.getValue().getModifiedPaths()).collect(Collectors.toList());
return Iterables.concat(paths);
}
@@ -405,8 +397,8 @@ class Branch {
@Override
Iterable<Path> getModifiedPaths() {
- Iterable<Iterable<Path>> paths = transform(previous.values(),
- branchCommit -> branchCommit.getModifiedPaths());
+ Iterable<Iterable<Path>> paths = previous.values().stream().map(branchCommit -> branchCommit.getModifiedPaths())
+ .collect(Collectors.toList());
return Iterables.concat(paths);
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
index 16b41093fa..62428e4b7b 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/Commit.java
@@ -43,8 +43,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.guava.common.collect.Lists.partition;
import static java.util.Collections.singletonList;
import static org.apache.jackrabbit.oak.plugins.document.Collection.JOURNAL;
@@ -891,7 +890,7 @@ public class Commit {
}
private static boolean hasContentChanges(UpdateOp op) {
- return filter(transform(op.getChanges().keySet(),
- input -> input.getName()), Utils.PROPERTY_OR_DELETED::test).iterator().hasNext();
+ return op.getChanges().keySet().stream().map(input -> input.getName()).filter(Utils.PROPERTY_OR_DELETED).iterator()
+ .hasNext();
}
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
index 5283f9a03f..d171ffd11c 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStore.java
@@ -20,7 +20,7 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgumen
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkState;
import static org.apache.jackrabbit.guava.common.collect.Iterables.partition;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Lists.reverse;
import static java.util.Collections.singletonList;
@@ -70,6 +70,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
+import java.util.stream.Collectors;
import javax.jcr.PropertyType;
@@ -1574,7 +1575,8 @@ public final class DocumentNodeStore
}
final RevisionVector readRevision = parent.getLastRevision();
- return transform(getChildren(parent, name, limit).children, new Function<String, DocumentNodeState>() {
+ return getChildren(parent, name, limit).children.stream().map(
+ new Function<String, DocumentNodeState>() {
@Override
public DocumentNodeState apply(String input) {
Path p = new Path(parent.getPath(), input);
@@ -1617,7 +1619,7 @@ public final class DocumentNodeStore
return e.toString();
}
}
- }::apply);
+ }).collect(Collectors.toList());
}
@Nullable
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java
index f3ade339c1..d9a5a66d42 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/DocumentNodeStoreMBeanImpl.java
@@ -21,12 +21,14 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
+import java.util.stream.Collectors;
import javax.management.openmbean.CompositeData;
import org.apache.jackrabbit.api.stats.RepositoryStatistics;
import org.apache.jackrabbit.api.stats.TimeSeries;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.commons.jmx.AnnotatedStandardMBean;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.apache.jackrabbit.stats.TimeSeriesStatsUtil;
@@ -35,9 +37,6 @@ import org.slf4j.LoggerFactory;
import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgument;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.toArray;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
/**
* Implementation of a DocumentNodeStoreMBean.
@@ -87,23 +86,23 @@ final class DocumentNodeStoreMBeanImpl extends AnnotatedStandardMBean implements
@Override
public String[] getInactiveClusterNodes() {
- return toArray(transform(filter(clusterNodes,
- input -> !input.isActive()),
- input -> input.getClusterId() + "=" + input.getCreated()), String.class);
+ return CollectionUtils.toStream(clusterNodes).
+ filter(input -> !input.isActive()).
+ map(input -> input.getClusterId() + "=" + input.getCreated()).
+ collect(Collectors.toList()).toArray(new String[0]);
}
@Override
public String[] getActiveClusterNodes() {
- return toArray(transform(filter(clusterNodes,
- input -> input.isActive()),
- input -> input.getClusterId() + "=" + input.getLeaseEndTime()), String.class);
+ return CollectionUtils.toStream(clusterNodes).filter(input -> !input.isActive())
+ .map(input -> input.getClusterId() + "=" + input.getLeaseEndTime()).collect(Collectors.toList())
+ .toArray(new String[0]);
}
@Override
public String[] getLastKnownRevisions() {
- return toArray(transform(filter(nodeStore.getHeadRevision(),
- input -> input.getClusterId() != getClusterId()),
- input -> input.getClusterId() + "=" + input.toString()), String.class);
+ return CollectionUtils.toStream(nodeStore.getHeadRevision()).filter(input -> input.getClusterId() != getClusterId())
+ .map(input -> input.getClusterId() + "=" + input.toString()).collect(Collectors.toList()).toArray(new String[0]);
}
@Override
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
index 0417435e60..656ad09418 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/LastRevRecoveryAgent.java
@@ -19,7 +19,7 @@
package org.apache.jackrabbit.oak.plugins.document;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.guava.common.collect.Lists.newArrayList;
import static org.apache.jackrabbit.guava.common.collect.Maps.filterKeys;
import static java.util.Collections.singletonList;
@@ -40,11 +40,13 @@ import java.util.concurrent.locks.ReentrantLock;
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.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.document.bundlor.DocumentBundlor;
import org.apache.jackrabbit.oak.plugins.document.cache.CacheInvalidationStats;
import org.apache.jackrabbit.oak.plugins.document.util.MapFactory;
@@ -285,8 +287,8 @@ public class LastRevRecoveryAgent {
// make sure recovery does not run on stale cache
// invalidate all suspects (OAK-9908)
log.info("Starting cache invalidation before sweep...");
- CacheInvalidationStats stats = store.invalidateCache(
- transform(suspects, Document::getId));
+ CacheInvalidationStats stats = store
+ .invalidateCache(CollectionUtils.toStream(suspects).map(Document::getId).collect(Collectors.toList()));
log.info("Invalidation stats: {}", stats);
sweeper.sweep(suspects, new NodeDocumentSweepListener() {
@Override
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MissingBcSweeper2.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MissingBcSweeper2.java
index 2e02023f12..77146976f6 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MissingBcSweeper2.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/MissingBcSweeper2.java
@@ -19,7 +19,7 @@ package org.apache.jackrabbit.oak.plugins.document;
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.partition;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.guava.common.collect.Maps.immutableEntry;
import static org.apache.jackrabbit.oak.plugins.document.util.Utils.COMMITROOT_OR_REVISIONS;
@@ -32,8 +32,10 @@ import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.function.Function;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.oak.commons.TimeDurationFormatter;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -136,7 +138,7 @@ final class MissingBcSweeper2 {
private Iterable<Map.Entry<Path, UpdateOp>> sweepOperations(
final Iterable<NodeDocument> docs) {
- return filter(transform(docs,
+ return CollectionUtils.toStream(docs).map(
new Function<NodeDocument, Map.Entry<Path, UpdateOp>>() {
int yieldCnt = 0;
@@ -159,8 +161,8 @@ final class MissingBcSweeper2 {
yieldCnt = 0;
}
return immutableEntry(doc.getPath(), sweepOne(doc));
- }
- }::apply), input -> input.getValue() != null);
+ }}
+ ).filter(input -> input.getValue() != null).collect(Collectors.toList());
}
private UpdateOp sweepOne(NodeDocument doc) throws DocumentStoreException {
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
index e13c271c9a..0e4cdeeafc 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocument.java
@@ -22,7 +22,7 @@ import static org.apache.jackrabbit.guava.common.base.Preconditions.checkArgumen
import static org.apache.jackrabbit.guava.common.collect.ImmutableList.copyOf;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.mergeSorted;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
import static org.apache.jackrabbit.oak.plugins.document.StableRevisionComparator.REVERSE;
import static org.apache.jackrabbit.oak.plugins.document.util.Utils.abortingIterable;
@@ -50,6 +50,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.function.Function;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
@@ -1353,12 +1354,12 @@ public final class NodeDocument extends Document {
}
// didn't find entry -> scan through remaining head ranges
- return filter(transform(getPreviousRanges().headMap(revision).entrySet(), input -> {
- if (input.getValue().includes(revision)) {
- return getPreviousDoc(input.getKey(), input.getValue());
- }
- return null;
- }), input ->input != null && input.getValueMap(property).containsKey(revision));
+ return getPreviousRanges().headMap(revision).entrySet().stream().map(input -> {
+ if (input.getValue().includes(revision)) {
+ return getPreviousDoc(input.getKey(), input.getValue());
+ }
+ return null;
+ }).filter(input -> input != null && input.getValueMap(property).containsKey(revision)).collect(Collectors.toList());
}
}
@@ -1662,7 +1663,7 @@ public final class NodeDocument extends Document {
}
};
} else {
- changes = Iterables.concat(transform(copyOf(ranges), rangeToChanges::apply));
+ changes = Iterables.concat(copyOf(ranges).stream().map(rangeToChanges).collect(Collectors.toList()));
}
return filter(changes, input -> !readRev.isRevisionNewer(input.getKey()));
}
@@ -1760,8 +1761,8 @@ public final class NodeDocument extends Document {
*/
@NotNull
RevisionVector getSweepRevisions() {
- return new RevisionVector(transform(getLocalMap(SWEEP_REV).values(),
- s -> Revision.fromString(s)));
+ return new RevisionVector(
+ getLocalMap(SWEEP_REV).values().stream().map(s -> Revision.fromString(s)).collect(Collectors.toList()));
}
//-------------------------< UpdateOp modifiers >---------------------------
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java
index 970c281578..14283e4fd2 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/NodeDocumentSweeper.java
@@ -21,8 +21,10 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
import java.util.function.Predicate;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.oak.commons.TimeDurationFormatter;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -32,7 +34,7 @@ import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterables.partition;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.guava.common.collect.Maps.immutableEntry;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.isDeletedEntry;
@@ -164,8 +166,8 @@ final class NodeDocumentSweeper {
private Iterable<Map.Entry<Path, UpdateOp>> sweepOperations(
final Iterable<NodeDocument> docs) {
- return filter(transform(docs, doc -> immutableEntry(doc.getPath(), sweepOne(doc))),
- input -> input.getValue() != null);
+ return CollectionUtils.toStream(docs).map(doc -> immutableEntry(doc.getPath(), sweepOne(doc)))
+ .filter(input -> input.getValue() != null).collect(Collectors.toList());
}
private UpdateOp sweepOne(NodeDocument doc) throws DocumentStoreException {
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java
index 967a1b3d6d..34715190bf 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/PropertyHistory.java
@@ -17,13 +17,13 @@
package org.apache.jackrabbit.oak.plugins.document;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static java.util.AbstractMap.SimpleImmutableEntry;
import java.util.Iterator;
import java.util.Map;
import java.util.TreeMap;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
import org.apache.jackrabbit.guava.common.collect.Iterators;
@@ -55,17 +55,17 @@ class PropertyHistory implements Iterable<NodeDocument> {
@Override
public Iterator<NodeDocument> iterator() {
- return ensureOrder(filter(transform(doc.getPreviousRanges().entrySet(), input -> {
- Revision r = input.getKey();
- int h = input.getValue().height;
- String prevId = Utils.getPreviousIdFor(mainPath, r, h);
- NodeDocument prev = doc.getPreviousDocument(prevId);
- if (prev == null) {
- LOG.debug("Document with previous revisions not found: " + prevId);
- return null;
- }
- return new SimpleImmutableEntry<Revision, NodeDocument>(r, prev);
- }), x -> x != null));
+ return ensureOrder(doc.getPreviousRanges().entrySet().stream().map(input -> {
+ Revision r = input.getKey();
+ int h = input.getValue().height;
+ String prevId = Utils.getPreviousIdFor(mainPath, r, h);
+ NodeDocument prev = doc.getPreviousDocument(prevId);
+ if (prev == null) {
+ LOG.debug("Document with previous revisions not found: " + prevId);
+ return null;
+ }
+ return new SimpleImmutableEntry<Revision, NodeDocument>(r, prev);
+ }).filter(x -> x != null).collect(Collectors.toList()));
}
/**
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
index babae59815..052c317e95 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/SplitOperations.java
@@ -30,6 +30,7 @@ import java.util.function.Function;
import java.util.function.Predicate;
import java.util.function.Supplier;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.util.Utils;
import org.jetbrains.annotations.NotNull;
@@ -43,8 +44,7 @@ import org.apache.jackrabbit.guava.common.collect.Maps;
import org.apache.jackrabbit.guava.common.collect.Sets;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.any;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
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;
@@ -228,7 +228,7 @@ class SplitOperations {
}
private boolean hasBinaryPropertyForSplit(Iterable<String> values) {
- return doc.hasBinary() && any(transform(values, binarySize::apply), BINARY_FOR_SPLIT_THRESHOLD::test);
+ return doc.hasBinary() && CollectionUtils.toStream(values).map(binarySize).anyMatch(BINARY_FOR_SPLIT_THRESHOLD);
}
/**
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
index d904cc1650..8c6f5924e2 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoMissingLastRevSeeker.java
@@ -16,13 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.plugins.document.mongo;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.jackrabbit.oak.plugins.document.Collection.CLUSTER_NODES;
import static org.apache.jackrabbit.oak.plugins.document.Collection.NODES;
+import java.util.stream.Collectors;
+
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
+
import com.mongodb.BasicDBObject;
import com.mongodb.ReadPreference;
import com.mongodb.client.FindIterable;
@@ -61,8 +63,8 @@ public class MongoMissingLastRevSeeker extends MissingLastRevSeeker {
FindIterable<BasicDBObject> cursor = getNodeCollection()
.find(query).sort(sortFields);
- return CloseableIterable.wrap(transform(cursor,
- input -> store.convertFromDBObject(NODES, input)));
+ return CloseableIterable.wrap(CollectionUtils.toStream(cursor).map(input -> store.convertFromDBObject(NODES, input))
+ .collect(Collectors.toList()));
}
@Override
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
index e72991ff34..618990997e 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongoVersionGCSupport.java
@@ -26,8 +26,7 @@ import static com.mongodb.client.model.Projections.include;
import static java.util.Optional.empty;
import static java.util.Optional.ofNullable;
import static org.apache.jackrabbit.guava.common.collect.Iterables.concat;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static com.mongodb.client.model.Filters.and;
import static com.mongodb.client.model.Filters.lt;
import static java.util.Collections.emptyList;
@@ -50,9 +49,11 @@ import java.util.Optional;
import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import com.mongodb.client.MongoCursor;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.plugins.document.Document;
import org.apache.jackrabbit.oak.plugins.document.NodeDocument;
@@ -143,8 +144,8 @@ public class MongoVersionGCSupport extends VersionGCSupport {
FindIterable<BasicDBObject> cursor = getNodeCollection()
.find(query).batchSize(batchSize);
- return CloseableIterable.wrap(transform(cursor,
- input -> store.convertFromDBObject(NODES, input)));
+ return wrap(CollectionUtils.toStream(cursor).map(input -> store.convertFromDBObject(NODES, input))
+ .collect(Collectors.toList()));
}
/**
@@ -267,7 +268,8 @@ public class MongoVersionGCSupport extends VersionGCSupport {
.hint(modifiedIdHint)
.sort(sort)
.limit(limit);
- return wrap(transform(cursor, input -> store.convertFromDBObject(NODES, input)));
+ return wrap(CollectionUtils.toStream(cursor).map(input -> store.convertFromDBObject(NODES, input))
+ .collect(Collectors.toList()));
}
/**
@@ -331,10 +333,10 @@ public class MongoVersionGCSupport extends VersionGCSupport {
// of the query as part of OAK-8351 does), it nevertheless
// makes any future similar problem more visible than long running
// queries alone (15min is still long).
- Iterable<NodeDocument> iterable = filter(transform(getNodeCollection().find(query)
- .maxTime(15, TimeUnit.MINUTES).hint(hint),
- input -> store.convertFromDBObject(NODES, input)),
- input -> !isDefaultNoBranchSplitNewerThan(input, sweepRevs));
+ Iterable<NodeDocument> iterable = CollectionUtils
+ .toStream(getNodeCollection().find(query).maxTime(15, TimeUnit.MINUTES).hint(hint))
+ .map(input -> store.convertFromDBObject(NODES, input))
+ .filter(input -> !isDefaultNoBranchSplitNewerThan(input, sweepRevs)).collect(Collectors.toList());
allResults = concat(allResults, iterable);
}
return allResults;
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
index 4941a3f4a5..4ecf5df442 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/rdb/RDBDocumentStoreJDBC.java
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.document.rdb;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
-import static org.apache.jackrabbit.guava.common.collect.Sets.newHashSet;
import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.CHAR2OCTETRATIO;
import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBDocumentStore.asBytes;
import static org.apache.jackrabbit.oak.plugins.document.rdb.RDBJDBCTools.asDocumentStoreException;
@@ -430,7 +428,7 @@ public class RDBDocumentStoreJDBC {
}
private static <T extends Document> void assertNoDuplicatedIds(List<T> documents) {
- if (newHashSet(transform(documents, input -> input.getId())).size() < documents.size()) {
+ if (documents.stream().map(input -> input.getId()).distinct().count() < documents.size()) {
throw new IllegalArgumentException("There are duplicated ids in the document list");
}
}
diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
index c04e8efea8..4a5cfba313 100644
--- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
+++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/util/Utils.java
@@ -39,11 +39,11 @@ import java.util.TreeMap;
import java.util.function.Predicate;
import java.util.stream.Collectors;
-
import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
import org.apache.jackrabbit.oak.commons.OakVersion;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.commons.StringUtils;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfo;
import org.apache.jackrabbit.oak.plugins.document.ClusterNodeInfoDocument;
import org.apache.jackrabbit.oak.plugins.document.Collection;
@@ -64,7 +64,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
+
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.MIN_ID_VALUE;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.isDeletedEntry;
import static org.apache.jackrabbit.oak.plugins.document.NodeDocument.isCommitRootEntry;
@@ -969,14 +969,14 @@ public class Utils {
*/
public static Iterable<StringValue> asStringValueIterable(
@NotNull Iterable<String> values) {
- return transform(values, input -> new StringValue(input));
+ return CollectionUtils.toStream(values).map(input -> new StringValue(input)).collect(Collectors.toList());
}
/**
* Transforms the given paths into ids using {@link #getIdFromPath(String)}.
*/
public static Iterable<String> pathToId(@NotNull Iterable<String> paths) {
- return transform(paths, input -> getIdFromPath(input));
+ return CollectionUtils.toStream(paths).map(input -> getIdFromPath(input)).collect(Collectors.toList());
}
/**
diff --git a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SameNameSiblingsEditor.java b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SameNameSiblingsEditor.java
index 381903e670..075eb39dd9 100644
--- a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SameNameSiblingsEditor.java
+++ b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/SameNameSiblingsEditor.java
@@ -16,8 +16,6 @@
*/
package org.apache.jackrabbit.oak.upgrade;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.filter;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.transform;
import static org.apache.jackrabbit.JcrConstants.JCR_SAMENAMESIBLINGS;
import static org.apache.jackrabbit.JcrConstants.JCR_SYSTEM;
import static org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants.JCR_NODE_TYPES;
@@ -32,8 +30,10 @@ import java.util.Map.Entry;
import java.util.function.Predicate;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import java.util.stream.Collectors;
import org.apache.jackrabbit.oak.api.CommitFailedException;
+import org.apache.jackrabbit.oak.commons.collections.CollectionUtils;
import org.apache.jackrabbit.oak.plugins.nodetype.TypePredicate;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.commit.DefaultEditor;
@@ -160,9 +160,8 @@ public class SameNameSiblingsEditor extends DefaultEditor {
* @return a list of names of children accepting the predicate
*/
private static Iterable<String> filterChildren(NodeState parent, final Predicate<NodeState> predicate) {
- return transform(filter(parent.getChildNodeEntries(),
- input -> predicate.test(input.getNodeState())),
- input -> input.getName());
+ return CollectionUtils.toStream(parent.getChildNodeEntries()).filter(input -> predicate.test(input.getNodeState()))
+ .map(input -> input.getName()).collect(Collectors.toList());
}
/**