This is an automated email from the ASF dual-hosted git repository. reschke pushed a commit to branch OAK-11297 in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit 10283fd122516ce082e83b7327d1c4ba91ae0515 Author: Julian Reschke <[email protected]> AuthorDate: Tue Dec 3 14:32:58 2024 +0100 OAK-11297: remove usage of Guava Joiner - oak-store-document --- .../jackrabbit/oak/plugins/document/VersionGarbageCollector.java | 6 ++---- .../oak/plugins/document/mongo/MongoVersionGCSupport.java | 4 +--- .../apache/jackrabbit/oak/plugins/document/ExternalChangesTest.java | 3 +-- .../jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java | 3 +-- 4 files changed, 5 insertions(+), 11 deletions(-) diff --git a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java index 92794e93d8..5e750c54a3 100644 --- a/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java +++ b/oak-store-document/src/main/java/org/apache/jackrabbit/oak/plugins/document/VersionGarbageCollector.java @@ -42,8 +42,6 @@ import java.util.function.Predicate; import java.util.function.Supplier; import java.util.stream.StreamSupport; -import org.apache.jackrabbit.guava.common.base.Joiner; - import org.apache.jackrabbit.guava.common.base.Stopwatch; import org.apache.jackrabbit.guava.common.collect.Iterators; @@ -2415,7 +2413,7 @@ public class VersionGarbageCollector { if (log.isTraceEnabled()) { StringBuilder sb = new StringBuilder("Performing batch deletion of documents with following ids. \n"); - Joiner.on(System.getProperty("line.separator")).appendTo(sb, deletionBatch.keySet()); + sb.append(String.join(System.getProperty("line.separator"), deletionBatch.keySet())); log.trace(sb.toString()); } @@ -2505,7 +2503,7 @@ public class VersionGarbageCollector { if (log.isDebugEnabled()) { StringBuilder sb = new StringBuilder("Performing batch deletion of previous documents with following ids. \n"); - Joiner.on(System.getProperty("line.separator")).appendTo(sb, deletionBatch); + sb.append(String.join(System.getProperty("line.separator"), deletionBatch)); log.debug(sb.toString()); } 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 04058f2d4d..1d6e535d78 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 @@ -75,8 +75,6 @@ import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.jackrabbit.guava.common.base.Joiner; - import com.mongodb.BasicDBObject; import com.mongodb.Block; import com.mongodb.client.FindIterable; @@ -481,7 +479,7 @@ public class MongoVersionGCSupport extends VersionGCSupport { .forEach((Block<BasicDBObject>) doc -> ids.add(getID(doc))); StringBuilder sb = new StringBuilder("Split documents with following ids were deleted as part of GC \n"); - Joiner.on(System.getProperty("line.separator")).appendTo(sb, ids); + sb.append(String.join(System.getProperty("line.separator"), ids)); LOG.debug(sb.toString()); } 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 77ce9f54d1..d78262daf4 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 @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.jackrabbit.guava.common.base.Joiner; import org.apache.jackrabbit.guava.common.base.Splitter; import org.apache.jackrabbit.guava.common.collect.Iterables; @@ -301,7 +300,7 @@ public class ExternalChangesTest { @Override public String buildAsString() { - return Joiner.on(",").join(allProps.values); + return String.join(",", allProps.values); } @Override diff --git a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java index 7ddcd850df..224822d44c 100644 --- a/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java +++ b/oak-store-document/src/test/java/org/apache/jackrabbit/oak/plugins/document/mongo/MongodProcessFactory.java @@ -26,7 +26,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.jackrabbit.guava.common.base.Joiner; import com.mongodb.MongoClient; import org.bson.Document; @@ -133,7 +132,7 @@ public class MongodProcessFactory extends ExternalResource { if (portsWithHost.isEmpty()) { return host; } - return Joiner.on(',').join(portsWithHost); + return String.join(" ", portsWithHost); } //----------------------------< internal >----------------------------------
