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 b3cb44e7ef OAK-11551 : replaced Guava's Iterables.toString with
oak-commons util (#2142)
b3cb44e7ef is described below
commit b3cb44e7efc8f039ac45111935ce4970de27375f
Author: Rishabh Kumar <[email protected]>
AuthorDate: Thu Mar 6 23:50:46 2025 +0530
OAK-11551 : replaced Guava's Iterables.toString with oak-commons util
(#2142)
Co-authored-by: Rishabh Kumar <[email protected]>
---
.../jackrabbit/oak/plugins/index/property/RecursiveDelete.java | 3 ++-
.../org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java | 3 ++-
.../java/org/apache/jackrabbit/oak/security/user/UserImporter.java | 5 +++--
.../org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java | 3 ++-
.../index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java | 3 ++-
.../indexer/document/incrementalstore/IncrementalStoreBuilder.java | 3 ++-
.../solr/configuration/nodestate/NodeStateSolrServerProvider.java | 3 ++-
.../solr/configuration/nodestate/OakSolrNodeStateConfiguration.java | 3 ++-
.../jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java | 5 +++--
.../document/persistentCache/async/InvalidateCacheAction.java | 3 ++-
10 files changed, 22 insertions(+), 12 deletions(-)
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java
index 78317d638b..25f5cd3734 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/property/RecursiveDelete.java
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.guava.common.base.Stopwatch;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.spi.commit.CommitHook;
import org.apache.jackrabbit.oak.spi.commit.CommitInfo;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
@@ -65,7 +66,7 @@ public class RecursiveDelete {
save(path, currentSize, false);
}
- String pathDetails = Iterables.toString(paths);
+ String pathDetails = IterableUtils.toString(paths);
save(pathDetails, currentSize, true);
log.debug("Removed subtree under [{}] with {} child nodes " +
"in {} ({} saves)", pathDetails, numRemoved, w, mergeCount);
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java
index 9d04f5af70..2659f17240 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/nodetype/TypePredicate.java
@@ -24,6 +24,7 @@ import java.util.function.Predicate;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.commons.collections.SetUtils;
import org.apache.jackrabbit.oak.commons.collections.StreamUtils;
import org.apache.jackrabbit.oak.spi.state.ChildNodeEntry;
@@ -205,6 +206,6 @@ public class TypePredicate implements Predicate<NodeState> {
@Override
public String toString() {
- return Iterables.toString(names);
+ return IterableUtils.toString(names);
}
}
diff --git
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
index 8708d94f84..ed151ecba0 100644
---
a/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
+++
b/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
@@ -31,6 +31,7 @@ import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Root;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.commons.collections.MapUtils;
import org.apache.jackrabbit.oak.commons.conditions.Validate;
import org.apache.jackrabbit.oak.namepath.NamePathMapper;
@@ -625,14 +626,14 @@ class UserImporter implements ProtectedPropertyImporter,
ProtectedNodeImporter,
if (!toRemove.isEmpty()) {
Set<String> failed =
gr.removeMembers(toRemove.keySet().toArray(new String[0]));
if (!failed.isEmpty()) {
- handleFailure("Failed removing members " +
Iterables.toString(failed) + " to " + gr);
+ handleFailure("Failed removing members " +
IterableUtils.toString(failed) + " to " + gr);
}
}
if (!toAdd.isEmpty()) {
Set<String> failed = gr.addMembers(toAdd.keySet().toArray(new
String[0]));
if (!failed.isEmpty()) {
- handleFailure("Failed add members " +
Iterables.toString(failed) + " to " + gr);
+ handleFailure("Failed add members " +
IterableUtils.toString(failed) + " to " + gr);
}
}
diff --git
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
index 555bcd3bbc..d3c4273ab3 100644
---
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
+++
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndex.java
@@ -34,6 +34,7 @@ import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Result.SizePrecision;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.commons.conditions.Validate;
import org.apache.jackrabbit.oak.plugins.index.cursor.Cursors;
import org.apache.jackrabbit.oak.plugins.index.cursor.PathCursor;
@@ -1230,7 +1231,7 @@ public class LuceneIndex implements
AdvanceFulltextQueryIndex {
return PropertyValues.newDouble(currentRow.score);
}
if (QueryConstants.REP_SPELLCHECK.equals(columnName) ||
QueryConstants.REP_SUGGEST.equals(columnName)) {
- return
PropertyValues.newString(Iterables.toString(currentRow.suggestWords));
+ return
PropertyValues.newString(IterableUtils.toString(currentRow.suggestWords));
}
if (QueryConstants.REP_EXCERPT.equals(columnName)) {
return PropertyValues.newString(currentRow.excerpt);
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
index 4f3d5df35a..9ffae2d484 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/FlatFileNodeStoreBuilder.java
@@ -23,6 +23,7 @@ import com.mongodb.MongoClientURI;
import org.apache.commons.lang3.StringUtils;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.commons.Compression;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.commons.conditions.Validate;
import org.apache.jackrabbit.oak.index.IndexHelper;
import org.apache.jackrabbit.oak.index.IndexerSupport;
@@ -414,7 +415,7 @@ public class FlatFileNodeStoreBuilder {
}
private void logFlags() {
- log.info("Preferred path elements are {}",
Iterables.toString(preferredPathElements));
+ log.info("Preferred path elements are {}",
IterableUtils.toString(preferredPathElements));
log.info("Compression enabled while sorting : {} ({})",
IndexStoreUtils.compressionEnabled(), OAK_INDEXER_USE_ZIP);
log.info("LZ4 enabled for compression algorithm : {} ({})",
IndexStoreUtils.useLZ4(), OAK_INDEXER_USE_LZ4);
log.info("Sort strategy : {} ({})", sortStrategyType,
OAK_INDEXER_SORT_STRATEGY_TYPE);
diff --git
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreBuilder.java
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreBuilder.java
index 99e310c63e..15a277a66d 100644
---
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreBuilder.java
+++
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/incrementalstore/IncrementalStoreBuilder.java
@@ -20,6 +20,7 @@ package
org.apache.jackrabbit.oak.index.indexer.document.incrementalstore;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.commons.Compression;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.index.IndexHelper;
import org.apache.jackrabbit.oak.index.indexer.document.CompositeException;
import org.apache.jackrabbit.oak.index.indexer.document.indexstore.IndexStore;
@@ -148,7 +149,7 @@ public class IncrementalStoreBuilder {
private void logFlags() {
log.info("Preferred path elements {}, compression enabled {},
algorithm {}",
- Iterables.toString(preferredPathElements),
+ IterableUtils.toString(preferredPathElements),
IndexStoreUtils.compressionEnabled(),
IndexStoreUtils.useLZ4());
}
diff --git
a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerProvider.java
b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerProvider.java
index 49879afb59..2a7181b61e 100644
---
a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerProvider.java
+++
b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/NodeStateSolrServerProvider.java
@@ -19,6 +19,7 @@ package
org.apache.jackrabbit.oak.plugins.index.solr.configuration.nodestate;
import java.io.IOException;
import org.apache.jackrabbit.guava.common.collect.Iterables;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.solr.client.solrj.SolrClient;
@@ -86,7 +87,7 @@ public class NodeStateSolrServerProvider implements
SolrServerProvider {
@Override
public String toString() {
return "NodeStateSolrServerProvider{" +
- "nodeStateChildren=" +
Iterables.toString(nodeState.getChildNodeNames()) +
+ "nodeStateChildren=" +
IterableUtils.toString(nodeState.getChildNodeNames()) +
", provider=" + provider +
'}';
}
diff --git
a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
index 376b431c58..b918588c37 100644
---
a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
+++
b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/nodestate/OakSolrNodeStateConfiguration.java
@@ -23,6 +23,7 @@ import java.util.Locale;
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.commons.collections.IterableUtils;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
import
org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationDefaults;
import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndex;
@@ -243,7 +244,7 @@ public class OakSolrNodeStateConfiguration implements
OakSolrConfiguration {
@Override
public String toString() {
return "OakSolrNodeStateConfiguration{" +
- "definitionChildren=" +
Iterables.toString(definition.getChildNodeNames()) +
+ "definitionChildren=" +
IterableUtils.toString(definition.getChildNodeNames()) +
'}';
}
diff --git
a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
index e4bfb3b650..750743eb75 100644
---
a/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
+++
b/oak-solr-core/src/main/java/org/apache/jackrabbit/oak/plugins/index/solr/query/SolrQueryIndex.java
@@ -25,6 +25,7 @@ import org.apache.jackrabbit.JcrConstants;
import org.apache.jackrabbit.oak.api.PropertyValue;
import org.apache.jackrabbit.oak.api.Result.SizePrecision;
import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
import org.apache.jackrabbit.oak.commons.json.JsopWriter;
import org.apache.jackrabbit.oak.plugins.index.cursor.PathCursor;
@@ -779,7 +780,7 @@ public class SolrQueryIndex implements FulltextQueryIndex,
QueryIndex.AdvanceFul
String value;
if (fieldValues != null && fieldValues.size() > 0) {
if (fieldValues.size() > 1) {
- value = Iterables.toString(fieldValues);
+ value = IterableUtils.toString(fieldValues);
} else {
Object fieldValue =
currentRow.doc.getFieldValue(columnName);
if (fieldValue != null) {
@@ -789,7 +790,7 @@ public class SolrQueryIndex implements FulltextQueryIndex,
QueryIndex.AdvanceFul
}
}
} else {
- value = Iterables.toString(Collections.emptyList());
+ value =
IterableUtils.toString(Collections.emptyList());
}
return PropertyValues.newString(value);
}
diff --git
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/async/InvalidateCacheAction.java
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/async/InvalidateCacheAction.java
index 16dcdf1d8d..c4f0caf61e 100644
---
a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/async/InvalidateCacheAction.java
+++
b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/persistentCache/async/InvalidateCacheAction.java
@@ -21,6 +21,7 @@ import java.util.Map;
import org.apache.jackrabbit.guava.common.collect.Iterables;
import org.apache.jackrabbit.oak.cache.CacheValue;
+import org.apache.jackrabbit.oak.commons.collections.IterableUtils;
import
org.apache.jackrabbit.oak.plugins.document.persistentCache.PersistentCache;
/**
@@ -71,6 +72,6 @@ class InvalidateCacheAction<K extends CacheValue, V extends
CacheValue>
@Override
public String toString() {
- return new
StringBuilder("InvalidateCacheAction").append(Iterables.toString(keys)).toString();
+ return new
StringBuilder("InvalidateCacheAction").append(IterableUtils.toString(keys)).toString();
}
}
\ No newline at end of file
