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

[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 3f8ee76398 OAK-11297: remove usage of Guava Joiner - oak-benchmarks
3f8ee76398 is described below

commit 3f8ee76398606f4905032c707cc94c1ee3a066d8
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Sat Dec 7 14:14:41 2024 +0100

    OAK-11297: remove usage of Guava Joiner - oak-benchmarks
---
 .../java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java   | 9 +++------
 .../org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java    | 4 +---
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git 
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
 
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
index ce8264b7d7..099d8107e7 100644
--- 
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
+++ 
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/AbstractTest.java
@@ -33,7 +33,6 @@ import javax.jcr.Session;
 import javax.jcr.SimpleCredentials;
 import javax.security.auth.Subject;
 
-import org.apache.jackrabbit.guava.common.base.Joiner;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.math3.stat.descriptive.DescriptiveStatistics;
 import 
org.apache.commons.math3.stat.descriptive.SynchronizedDescriptiveStatistics;
@@ -277,15 +276,13 @@ public abstract class AbstractTest<T> extends Benchmark 
implements CSVResultGene
             String commentPattern = commaSeparated ? "#%s" : "    #%s";
             formatPattern = (String[])ArrayUtils.add(formatPattern, 
commentPattern);
         }
-        Joiner joiner = commaSeparated ? Joiner.on(',') : Joiner.on("  ");
-        return joiner.join(formatPattern);
+        return String.join(commaSeparated ? "," : "  ", formatPattern);
     }
 
     private String statsNamesJoined(boolean commaSeparated) {
-        Joiner joiner = commaSeparated ? Joiner.on(',') : Joiner.on("  ");
-        String names = joiner.join(statsNames());
+        String names = String.join(commaSeparated ? "," : "  ", statsNames());
         if (!commaSeparated) {
-            names =  " " + names;
+            names = " " + names;
         }
         return names;
     }
diff --git 
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
 
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
index 4af00e8e08..0782f78fba 100644
--- 
a/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
+++ 
b/oak-benchmarks/src/main/java/org/apache/jackrabbit/oak/benchmark/BundlingNodeTest.java
@@ -16,7 +16,6 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
 package org.apache.jackrabbit.oak.benchmark;
 
 import java.io.ByteArrayInputStream;
@@ -43,7 +42,6 @@ import javax.jcr.RepositoryException;
 import javax.jcr.Session;
 import javax.jcr.nodetype.NodeType;
 
-import org.apache.jackrabbit.guava.common.base.Joiner;
 import org.apache.jackrabbit.JcrConstants;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
 import org.apache.jackrabbit.commons.cnd.ParseException;
@@ -244,7 +242,7 @@ public class BundlingNodeTest extends 
AbstractTest<BundlingNodeTest.TestContext>
         }
         commentElements.add(contentNodeType);
         commentElements.add(bundlingMode.name());
-        return Joiner.on(',').join(commentElements);
+        return String.join(",", commentElements);
     }
 
     protected class TestContext {