You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by re...@apache.org on 2024/12/03 12:42:07 UTC

(jackrabbit-oak) 01/01: OAK-11297: remove usage of Guava Joiner - oak-upgrade

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 4b52e3169f53247485b9ea6cceca8146e0887117
Author: Julian Reschke <re...@apache.org>
AuthorDate: Tue Dec 3 13:41:50 2024 +0100

    OAK-11297: remove usage of Guava Joiner - oak-upgrade
---
 .../java/org/apache/jackrabbit/oak/upgrade/CopyCheckpointsTest.java   | 3 +--
 .../org/apache/jackrabbit/oak/upgrade/IgnoreMissingBinariesTest.java  | 3 +--
 .../org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java    | 4 +---
 .../org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java  | 3 +--
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyCheckpointsTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyCheckpointsTest.java
index 7da4316883..ac6e394e49 100644
--- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyCheckpointsTest.java
+++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/CopyCheckpointsTest.java
@@ -16,7 +16,6 @@
  */
 package org.apache.jackrabbit.oak.upgrade;
 
-import org.apache.jackrabbit.guava.common.base.Joiner;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.apache.jackrabbit.oak.upgrade.cli.AbstractOak2OakTest;
 import org.apache.jackrabbit.oak.upgrade.cli.OakUpgrade;
@@ -132,7 +131,7 @@ public class CopyCheckpointsTest extends AbstractOak2OakTest {
         }
 
         String[] args = getArgs();
-        log.info("oak2oak {}", Joiner.on(' ').join(args));
+        log.info("oak2oak {}", String.join(" ", args));
         try {
             MigrationCliArguments cliArgs = new MigrationCliArguments(OptionParserFactory.create().parse(args));
             MigrationOptions options = new MigrationOptions(cliArgs);
diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IgnoreMissingBinariesTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IgnoreMissingBinariesTest.java
index 75d00eae3c..4d0be6d5c0 100644
--- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IgnoreMissingBinariesTest.java
+++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/IgnoreMissingBinariesTest.java
@@ -18,7 +18,6 @@
  */
 package org.apache.jackrabbit.oak.upgrade;
 
-import org.apache.jackrabbit.guava.common.base.Joiner;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.apache.jackrabbit.oak.upgrade.cli.AbstractOak2OakTest;
 import org.apache.jackrabbit.oak.upgrade.cli.OakUpgrade;
@@ -59,7 +58,7 @@ public class IgnoreMissingBinariesTest extends AbstractOak2OakTest {
         assertTrue(new File(blob.getDirectory(), "0c/07/02/0c0702b43bfcc7c0bb1329a10bbc6d5c5ef15856afd714c1331495b95f65b292").delete());
 
         String[] args = getArgs();
-        log.info("oak2oak {}", Joiner.on(' ').join(args));
+        log.info("oak2oak {}", String.join(" ", args));
         OakUpgrade.main(args);
 
         createSession();
diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
index 97145a2aef..4f4308df94 100644
--- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
+++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/AbstractOak2OakTest.java
@@ -66,8 +66,6 @@ import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import org.apache.jackrabbit.guava.common.base.Joiner;
-
 public abstract class AbstractOak2OakTest {
 
     private static final Logger log = LoggerFactory.getLogger(AbstractOak2OakTest.class);
@@ -105,7 +103,7 @@ public abstract class AbstractOak2OakTest {
         }
 
         String[] args = getArgs();
-        log.info("oak2oak {}", Joiner.on(' ').join(args));
+        log.info("oak2oak {}", String.join(" ", args));
         OakUpgrade.main(args);
         createSession();
     }
diff --git a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java
index 94f94409cd..a864169ebe 100644
--- a/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java
+++ b/oak-upgrade/src/test/java/org/apache/jackrabbit/oak/upgrade/cli/blob/CopyBinariesTest.java
@@ -24,7 +24,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.apache.jackrabbit.guava.common.base.Joiner;
 import org.apache.jackrabbit.oak.spi.state.NodeStore;
 import org.apache.jackrabbit.oak.upgrade.cli.AbstractOak2OakTest;
 import org.apache.jackrabbit.oak.upgrade.cli.OakUpgrade;
@@ -188,7 +187,7 @@ public class CopyBinariesTest extends AbstractOak2OakTest {
         }
 
         String[] args = getArgs();
-        log.info("oak2oak {}", Joiner.on(' ').join(args));
+        log.info("oak2oak {}", String.join(" ", args));
         try {
             MigrationCliArguments cliArgs = new MigrationCliArguments(OptionParserFactory.create().parse(args));
             MigrationOptions options = new MigrationOptions(cliArgs);