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 9c4507a3b3 OAK-11297: remove usage of Guava Joiner - oak-commons
9c4507a3b3 is described below
commit 9c4507a3b3d14d9a97651412fa393ece19630e8c
Author: Julian Reschke <[email protected]>
AuthorDate: Sat Dec 7 12:14:32 2024 +0100
OAK-11297: remove usage of Guava Joiner - oak-commons
---
.../jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java | 7 +++----
.../org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java | 3 +--
.../org/apache/jackrabbit/oak/commons/sort/StringSortTest.java | 6 ++----
3 files changed, 6 insertions(+), 10 deletions(-)
diff --git
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
index f8da2e9ec4..8011eb15b6 100644
---
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
+++
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileLineDifferenceIteratorTest.java
@@ -35,7 +35,6 @@ import java.util.TreeSet;
import java.util.function.Function;
import org.apache.commons.io.LineIterator;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.base.Splitter;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
@@ -109,7 +108,7 @@ public class FileLineDifferenceIteratorTest {
remove(marked, 3, 2);
// without escaping, the line breaks will be resolved
- assertDiff(Joiner.on(",").join(marked), Joiner.on(",").join(all),
+ assertDiff(String.join(",", marked), String.join(",", all),
asList("/a", "c", "/a/b"));
}
@@ -120,7 +119,7 @@ public class FileLineDifferenceIteratorTest {
List<String> marked = escape(getLineBreakStrings());
List<String> diff = remove(marked, 3, 2);
- assertDiff(Joiner.on(",").join(marked), Joiner.on(",").join(all),
diff);
+ assertDiff(String.join(",", marked), String.join(",", all), diff);
}
@Test
@@ -174,7 +173,7 @@ public class FileLineDifferenceIteratorTest {
private static LineIterator lineItr(String seq) {
Iterable<String> seqItr = Splitter.on(',').trimResults().split(seq);
- String lines =
Joiner.on(System.getProperty("line.separator")).join(seqItr);
+ String lines = String.join(System.getProperty("line.separator"),
seqItr);
return new LineIterator(new StringReader(lines));
}
diff --git
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
index 47530a471b..d943bfd596 100644
---
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
+++
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/ExternalSortTest.java
@@ -18,7 +18,6 @@ package org.apache.jackrabbit.oak.commons.sort;
import net.jpountz.lz4.LZ4FrameInputStream;
import net.jpountz.lz4.LZ4FrameOutputStream;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.io.Files;
import org.apache.jackrabbit.guava.common.primitives.Ints;
import org.apache.jackrabbit.oak.commons.Compression;
@@ -488,7 +487,7 @@ public class ExternalSortTest {
Function<String, TestLine> stringToType = line -> line != null ? new
TestLine(line) : null;
Function<TestLine, String> typeToString = tl -> tl != null ? tl.line :
null;
- String testData = Joiner.on('\n').join(transform(testLines, tl ->
tl.line));
+ String testData = String.join("\n", transform(testLines, tl ->
tl.line));
File testFile = folder.newFile();
try (BufferedWriter bufferedWriter = Files.newWriter(testFile,
charset)) {
bufferedWriter.write(testData);
diff --git
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
index fb902893ba..f419be958a 100644
---
a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
+++
b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/sort/StringSortTest.java
@@ -16,7 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.jackrabbit.oak.commons.sort;
import java.io.IOException;
@@ -29,7 +28,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import org.apache.jackrabbit.guava.common.base.Joiner;
import org.apache.jackrabbit.guava.common.collect.Collections2;
import org.apache.jackrabbit.guava.common.collect.ImmutableList;
import org.junit.Test;
@@ -127,7 +125,7 @@ public class StringSortTest {
if (permutation){
List<String> newRoots = new ArrayList<String>();
for (List<String> permuts :
Collections2.orderedPermutations(rootPaths)){
- newRoots.add(Joiner.on("").join(permuts));
+ newRoots.add(String.join("", permuts));
}
rootPaths = newRoots;
}
@@ -150,7 +148,7 @@ public class StringSortTest {
}
private static String createId(Iterable<String> pathElements){
- return "/" + Joiner.on('/').join(pathElements);
+ return "/" + String.join("/", pathElements);
}
private static class PathComparator implements Comparator<String>,
Serializable {
