This is an automated email from the ASF dual-hosted git repository.
daim pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new b2351549df OAK-11441 : removed usage of Guava Iterables.addAll (#2037)
b2351549df is described below
commit b2351549df908495b84e25ae2232693cb60a6144
Author: Rishabh Kumar <[email protected]>
AuthorDate: Sat Feb 1 00:16:51 2025 +0530
OAK-11441 : removed usage of Guava Iterables.addAll (#2037)
* OAK-11441 : removed usage of Guava Iterables.addAll
* OAK-11441 : removed usage of Guava Iterables.addAll with
iterable.foreach()
---------
Co-authored-by: Rishabh Kumar <[email protected]>
---
.../security/authorization/cug/impl/CugAccessControlManager.java | 4 ++--
.../principalbased/impl/ReadablePathsAccessControlTest.java | 2 +-
.../principalbased/impl/ReadablePathsPermissionTest.java | 2 +-
.../oak/plugins/index/progress/NodeCounterMBeanEstimator.java | 5 ++---
.../oak/plugins/migration/AbstractDecoratedNodeState.java | 2 +-
.../org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java | 5 ++---
.../apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java | 7 +++----
.../java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java | 4 +---
.../security/authorization/permission/PermissionStoreEditor.java | 3 +--
.../java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java | 5 ++---
.../java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java | 2 +-
.../org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java | 3 +--
.../java/org/apache/jackrabbit/oak/plugins/document/Commit.java | 3 +--
.../apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java | 2 +-
.../jackrabbit/oak/plugins/document/ExternalChangesTest.java | 3 +--
.../jackrabbit/oak/plugins/document/ManyClusterNodesTest.java | 4 +---
.../org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java | 3 +--
.../org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java | 3 +--
18 files changed, 24 insertions(+), 38 deletions(-)
diff --git
a/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
b/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
index 8388e9c019..9e66b3a0c4 100644
---
a/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
+++
b/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
@@ -367,7 +367,7 @@ class CugAccessControlManager extends
AbstractAccessControlManager implements Cu
String path = eval.remove();
Tree t = immutableRoot.getTree(path);
if (PathUtils.denotesRoot(path)) {
- Iterables.addAll(eval, nestedCugPaths(t));
+ nestedCugPaths(t).forEach(eval::add);
}
if (CugUtil.isSupportedPath(path, supportedPaths)) {
Tree cug = CugUtil.getCug(t);
@@ -376,7 +376,7 @@ class CugAccessControlManager extends
AbstractAccessControlManager implements Cu
if (!Collections.disjoint(SetUtils.toSet(principalNames),
SetUtils.toSet(pNames.getValue(Type.STRINGS)))) {
candidates.add(path);
}
- Iterables.addAll(eval, nestedCugPaths(cug));
+ nestedCugPaths(cug).forEach(eval::add);
}
}
}
diff --git
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
index a610799436..47aa1bfca0 100644
---
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
+++
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsAccessControlTest.java
@@ -73,7 +73,7 @@ public class ReadablePathsAccessControlTest extends
AbstractPrincipalBasedTest {
readablePaths = Iterators.cycle(Iterables.transform(paths, f ->
getNamePathMapper().getJcrPath(f)));
Set<String> childPaths = new HashSet<>();
for (String path : paths) {
- Iterables.addAll(childPaths,
Iterables.transform(root.getTree(path).getChildren(), tree ->
getNamePathMapper().getJcrPath(tree.getPath())));
+ Iterables.transform(root.getTree(path).getChildren(), tree ->
getNamePathMapper().getJcrPath(tree.getPath())).forEach(childPaths::add);
}
readableChildPaths = Iterators.cycle(childPaths);
}
diff --git
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java
index 51971480fa..16e7b5ec28 100644
---
a/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java
+++
b/oak-authorization-principalbased/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/principalbased/impl/ReadablePathsPermissionTest.java
@@ -64,7 +64,7 @@ public class ReadablePathsPermissionTest extends
AbstractPrincipalBasedTest {
readablePaths = Iterators.cycle(paths);
Set<String> childPaths = new HashSet<>();
for (String path : paths) {
- Iterables.addAll(childPaths,
Iterables.transform(root.getTree(path).getChildren(), Tree::getPath));
+ Iterables.transform(root.getTree(path).getChildren(),
Tree::getPath).forEach(childPaths::add);
}
readableChildPaths = Iterators.cycle(childPaths);
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimator.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimator.java
index a3d4706117..1f097c128f 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimator.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/progress/NodeCounterMBeanEstimator.java
@@ -22,7 +22,6 @@ package org.apache.jackrabbit.oak.plugins.index.progress;
import java.util.HashSet;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.index.counter.jmx.NodeCounter;
import org.apache.jackrabbit.oak.spi.filter.PathFilter;
@@ -92,8 +91,8 @@ public class NodeCounterMBeanEstimator implements
NodeCountEstimator {
return;
}
- Iterables.addAll(includes,
PathFilter.getStrings(idxState.getProperty(PROP_INCLUDED_PATHS), Set.of()));
- Iterables.addAll(excludes,
PathFilter.getStrings(idxState.getProperty(PROP_EXCLUDED_PATHS), Set.of()));
+
PathFilter.getStrings(idxState.getProperty(PROP_INCLUDED_PATHS),
Set.of()).forEach(includes::add);
+
PathFilter.getStrings(idxState.getProperty(PROP_EXCLUDED_PATHS),
Set.of()).forEach(excludes::add);
}
if (includes.isEmpty()) {
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/AbstractDecoratedNodeState.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/AbstractDecoratedNodeState.java
index a5a5798261..a284301da4 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/AbstractDecoratedNodeState.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/migration/AbstractDecoratedNodeState.java
@@ -96,7 +96,7 @@ public abstract class AbstractDecoratedNodeState extends
AbstractNodeState {
protected static PropertyState fixChildOrderPropertyState(NodeState
nodeState, PropertyState propertyState) {
if (propertyState != null &&
OAK_CHILD_ORDER.equals(propertyState.getName())) {
final Collection<String> childNodeNames = new ArrayList<String>();
- Iterables.addAll(childNodeNames, nodeState.getChildNodeNames());
+ nodeState.getChildNodeNames().forEach(childNodeNames::add);
final Iterable<String> values = Iterables.filter(
propertyState.getValue(Type.NAMES), x ->
childNodeNames.contains(x));
return PropertyStates.createProperty(OAK_CHILD_ORDER, values,
Type.NAMES);
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
index f1a6ec07f6..37e593b8c6 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/EffectiveType.java
@@ -29,7 +29,6 @@ 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.addAll;
import static org.apache.jackrabbit.guava.common.collect.Iterables.concat;
import static org.apache.jackrabbit.guava.common.collect.Iterables.contains;
import static org.apache.jackrabbit.JcrConstants.JCR_DEFAULTPRIMARYTYPE;
@@ -262,7 +261,7 @@ class EffectiveType {
Set<String> names = new HashSet<>();
for (NodeState type : types) {
names.add(type.getName(JCR_NODETYPENAME));
- addAll(names, type.getNames(REP_SUPERTYPES));
+ type.getNames(REP_SUPERTYPES).forEach(names::add);
}
return names;
}
@@ -308,7 +307,7 @@ class EffectiveType {
private Set<String> getNameSet(@NotNull String set) {
Set<String> names = new HashSet<>();
for (NodeState type : types) {
- addAll(names, type.getNames(set));
+ type.getNames(set).forEach(names::add);
}
return names;
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java
index 6346e6e6d0..43fc62a2bd 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypeRegistration.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.plugins.nodetype;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
import static org.apache.jackrabbit.guava.common.collect.Iterables.contains;
import static java.util.Collections.emptyList;
import static org.apache.jackrabbit.JcrConstants.JCR_CHILDNODEDEFINITION;
@@ -127,8 +126,8 @@ class TypeRegistration extends DefaultNodeStateDiff {
for (String name : SetUtils.union(changedTypes, removedTypes)) {
types.add(name);
NodeState type = beforeTypes.getChildNode(name);
- addAll(types, type.getNames(REP_PRIMARY_SUBTYPES));
- addAll(types, type.getNames(REP_MIXIN_SUBTYPES));
+ type.getNames(REP_PRIMARY_SUBTYPES).forEach(types::add);
+ type.getNames(REP_MIXIN_SUBTYPES).forEach(types::add);
}
return types;
}
@@ -314,7 +313,7 @@ class TypeRegistration extends DefaultNodeStateDiff {
private void mergeNameList(
NodeBuilder builder, NodeState state, String listName) {
Set<String> nameList = SetUtils.toLinkedSet(getNames(builder,
listName));
- Iterables.addAll(nameList,
state.getProperty(listName).getValue(NAMES));
+ state.getProperty(listName).getValue(NAMES).forEach(nameList::add);
builder.setProperty(listName, nameList, NAMES);
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
index f7afa7f689..28c737c1a2 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/query/ast/SelectorImpl.java
@@ -67,8 +67,6 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
-
/**
* A selector within a query.
*/
@@ -739,7 +737,7 @@ public class SelectorImpl extends SourceImpl {
if (type == Type.STRING) {
ArrayList<String> strings = new ArrayList<String>();
for (PropertyValue p : list) {
- Iterables.addAll(strings, p.getValue(Type.STRINGS));
+ p.getValue(Type.STRINGS).forEach(strings::add);
}
return PropertyValues.newString(strings);
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
index c7ce5a2c46..8f23ecd6aa 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
@@ -43,7 +43,6 @@ import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
import static org.apache.jackrabbit.JcrConstants.JCR_PRIMARYTYPE;
import static
org.apache.jackrabbit.oak.plugins.tree.TreeConstants.OAK_CHILD_ORDER;
@@ -77,7 +76,7 @@ final class PermissionStoreEditor implements
AccessControlConstants, PermissionC
Set<String> orderedChildNames =
SetUtils.toLinkedSet(node.getNames(OAK_CHILD_ORDER));
long n = orderedChildNames.size();
if (node.getChildNodeCount(n + 1) > n) {
- addAll(orderedChildNames, node.getChildNodeNames());
+ node.getChildNodeNames().forEach(orderedChildNames::add);
}
int index = 0;
diff --git
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
index 22709a42b7..71d1b4fb21 100644
---
a/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
+++
b/oak-jcr/src/main/java/org/apache/jackrabbit/oak/jcr/delegate/NodeDelegate.java
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.jcr.delegate;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
import static org.apache.jackrabbit.guava.common.collect.Iterables.contains;
import static org.apache.jackrabbit.guava.common.collect.Iterators.filter;
import static org.apache.jackrabbit.guava.common.collect.Iterators.transform;
@@ -172,7 +171,7 @@ public class NodeDelegate extends ItemDelegate {
Set<String> typeNames = new HashSet<>();
for (Tree type : TreeUtil.getEffectiveType(tree, typeRoot)) {
typeNames.add(TreeUtil.getName(type, JCR_NODETYPENAME));
- addAll(typeNames, TreeUtil.getNames(type, REP_SUPERTYPES));
+ TreeUtil.getNames(type,
REP_SUPERTYPES).forEach(typeNames::add);
}
for (Tree type : types) {
@@ -450,7 +449,7 @@ public class NodeDelegate extends ItemDelegate {
Set<String> typeNames = new LinkedHashSet<>();
for (Tree type : getNodeTypes(child, typeRoot)) {
typeNames.add(TreeUtil.getName(type, JCR_NODETYPENAME));
- addAll(typeNames, getNames(type, REP_SUPERTYPES));
+ getNames(type, REP_SUPERTYPES).forEach(typeNames::add);
}
Tree oldDefinition = findMatchingChildNodeDefinition(removed,
name, typeNames);
diff --git
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java
index 22c5e6098f..e0e4cb5c10 100644
---
a/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java
+++
b/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/binary/BinaryAccessIT.java
@@ -156,7 +156,7 @@ public class BinaryAccessIT extends AbstractBinaryAccessIT {
assertNotNull(upload);
List<URI> uris = new ArrayList<>();
- Iterables.addAll(uris, upload.getUploadURIs());
+ upload.getUploadURIs().forEach(uris::add);
// this follows the upload algorithm from BinaryUpload
if (content.size() / upload.getMaxPartSize() > uris.size()) {
diff --git
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
index ca0d22b140..259e16dcf1 100644
---
a/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
+++
b/oak-segment-tar/src/main/java/org/apache/jackrabbit/oak/segment/DefaultSegmentWriter.java
@@ -29,7 +29,6 @@ import static java.util.Objects.requireNonNull;
import static
org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
import static
org.apache.jackrabbit.guava.common.base.Preconditions.checkPositionIndex;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
import static org.apache.jackrabbit.oak.api.Type.BINARIES;
import static org.apache.jackrabbit.oak.api.Type.BINARY;
import static org.apache.jackrabbit.oak.api.Type.NAME;
@@ -433,7 +432,7 @@ public class DefaultSegmentWriter implements SegmentWriter {
List<MapEntry> list = new ArrayList<>();
for (MapRecord bucket : buckets) {
if (bucket != null) {
- addAll(list, bucket.getEntries());
+ bucket.getEntries().forEach(list::add);
}
}
return writeMapLeaf(level, list);
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 b57af7fee4..af50297d88 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
@@ -30,7 +30,6 @@ import java.util.Set;
import java.util.TreeSet;
import java.util.concurrent.TimeUnit;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.commons.collections.ListUtils;
import org.apache.jackrabbit.oak.commons.json.JsopStream;
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
@@ -683,7 +682,7 @@ public class Commit {
checkConflicts(op, doc);
} catch (ConflictException e) {
exceptions.add(e);
- Iterables.addAll(revisions, e.getConflictRevisions());
+ e.getConflictRevisions().forEach(revisions::add);
}
}
if (!exceptions.isEmpty()) {
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
index 1b254f9174..aaacd76f2b 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/DocumentSplitTest.java
@@ -888,7 +888,7 @@ public class DocumentSplitTest extends BaseDocumentMKTest {
}
Set<Revision> revs = new HashSet<>();
for (RevisionVector rv : revisions) {
- Iterables.addAll(revs, rv);
+ rv.forEach(revs::add);
}
revs.removeAll(doc.getValueMap("_deleted").keySet());
assertTrue("Missing _deleted entries on " + doc.getId() + ": " +
revs, revs.isEmpty());
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java
index d78262daf4..1fb1f35e49 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java
@@ -26,7 +26,6 @@ import java.util.Set;
import org.apache.jackrabbit.guava.common.base.Splitter;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalProperty;
import org.apache.jackrabbit.oak.plugins.document.spi.JournalPropertyBuilder;
@@ -306,7 +305,7 @@ public class ExternalChangesTest {
@Override
public void addSerializedProperty(@Nullable String s) {
if (s != null){
- Iterables.addAll(allProps.values, Splitter.on(',').split(s));
+ Splitter.on(',').split(s).forEach(allProps.values::add);
}
}
diff --git
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyClusterNodesTest.java
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyClusterNodesTest.java
index 91cf923a4e..b18a3cbdf8 100644
---
a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyClusterNodesTest.java
+++
b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/ManyClusterNodesTest.java
@@ -19,8 +19,6 @@ package org.apache.jackrabbit.oak.plugins.document;
import java.util.ArrayList;
import java.util.List;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
-
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.document.memory.MemoryDocumentStore;
@@ -72,7 +70,7 @@ public class ManyClusterNodesTest {
PropertyState p = test.getProperty("p");
List<String> values = new ArrayList<>();
if (p != null) {
- Iterables.addAll(values, p.getValue(Type.STRINGS));
+ p.getValue(Type.STRINGS).forEach(values::add);
}
values.add(value);
test.setProperty("p", values, Type.STRINGS);
diff --git
a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
index 938e17d95f..c91dbed78a 100644
---
a/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
+++
b/oak-store-spi/src/main/java/org/apache/jackrabbit/oak/plugins/memory/PropertyBuilder.java
@@ -24,7 +24,6 @@ import java.util.List;
import javax.jcr.PropertyType;
-import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
@@ -251,7 +250,7 @@ public class PropertyBuilder<T> {
@NotNull
public PropertyBuilder<T> addValues(Iterable<T> values) {
- Iterables.addAll(this.values, values);
+ values.forEach(this.values::add);
return this;
}
diff --git
a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
index db5bf90ebf..5447d3f44a 100644
---
a/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
+++
b/oak-upgrade/src/main/java/org/apache/jackrabbit/oak/upgrade/JackrabbitNodeState.java
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.upgrade;
import static
org.apache.jackrabbit.oak.commons.conditions.Validate.checkArgument;
import static java.util.Objects.requireNonNull;
-import static org.apache.jackrabbit.guava.common.collect.Iterables.addAll;
import static org.apache.jackrabbit.JcrConstants.JCR_FROZENMIXINTYPES;
import static org.apache.jackrabbit.JcrConstants.JCR_FROZENPRIMARYTYPE;
@@ -447,7 +446,7 @@ class JackrabbitNodeState extends AbstractNodeState {
}
property = properties.get(JCR_FROZENMIXINTYPES);
if (property != null && property.getType() == NAMES) {
- addAll(frozenMixins, property.getValue(NAMES));
+ property.getValue(NAMES).forEach(frozenMixins::add);
}
if (!isReferenceable.test(frozenPrimary, frozenMixins)) {
