(jackrabbit-oak) branch OAK-11297 updated: OAK-11297: remove usage of Guava Joiner - oak-run-commons

[reschke]

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


The following commit(s) were added to refs/heads/OAK-11297 by this push:
     new e495b49f65 OAK-11297: remove usage of Guava Joiner - oak-run-commons
e495b49f65 is described below

commit e495b49f652a582be6ac9fdcf8c2e5b48a92ad8e
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Fri Dec 6 08:36:16 2024 +0100

    OAK-11297: remove usage of Guava Joiner - oak-run-commons
---
 .../oak/index/indexer/document/flatfile/NodeStateEntryWriter.java    | 5 +----
 .../jackrabbit/oak/index/indexer/document/flatfile/TestUtils.java    | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntryWriter.java
 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntryWriter.java
index 0804ef1ab3..4769d30f46 100644
--- 
a/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntryWriter.java
+++ 
b/oak-run-commons/src/main/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/NodeStateEntryWriter.java
@@ -16,10 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.jackrabbit.oak.index.indexer.document.flatfile;
 
-import org.apache.jackrabbit.guava.common.base.Joiner;
 import org.apache.jackrabbit.oak.api.PropertyState;
 import org.apache.jackrabbit.oak.commons.json.JsopBuilder;
 import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntry;
@@ -39,7 +37,6 @@ public class NodeStateEntryWriter {
     public static final char DELIMITER_CHAR = '|';
     private final JsopBuilder jw = new JsopBuilder();
     private final JsonSerializer serializer;
-    private final Joiner pathJoiner = Joiner.on('/');
     private final boolean includeChildOrder;
 
     //TODO Possible optimizations
@@ -67,7 +64,7 @@ public class NodeStateEntryWriter {
         int pathStringSize = 
pathElements.stream().mapToInt(String::length).sum();
         StringBuilder sb = new StringBuilder(nodeStateAsJson.length() + 
pathStringSize + pathElements.size() + 1);
         sb.append('/');
-        pathJoiner.appendTo(sb, pathElements);
+        sb.append(String.join("/", pathElements));
         sb.append(DELIMITER_CHAR).append(nodeStateAsJson);
         return sb.toString();
     }
diff --git 
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TestUtils.java
 
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TestUtils.java
index 9373ab4333..e9d5b483b5 100644
--- 
a/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TestUtils.java
+++ 
b/oak-run-commons/src/test/java/org/apache/jackrabbit/oak/index/indexer/document/flatfile/TestUtils.java
@@ -16,10 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.jackrabbit.oak.index.indexer.document.flatfile;
 
-import org.apache.jackrabbit.guava.common.base.Joiner;
 import org.apache.jackrabbit.guava.common.collect.Iterables;
 import org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntry;
 import 
org.apache.jackrabbit.oak.index.indexer.document.NodeStateEntry.NodeStateEntryBuilder;
@@ -56,8 +54,7 @@ public class TestUtils {
                 .map(p -> copyOf(elements(p)))
                 .sorted(comparator)
                 .collect(toList());
-        Joiner j = Joiner.on('/');
-        return copy.stream().map(e -> "/" + j.join(e)).collect(toList());
+        return copy.stream().map(e -> "/" + String.join("/", 
e)).collect(toList());
     }
 
     static CountingIterable<NodeStateEntry> createList(Set<String> preferred, 
List<String> paths) {