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 2023/03/24 17:37:27 UTC
[jackrabbit-oak] 03/03: OAK-9989: test in oak-commons
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-9989-base
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
commit b8def001e0ab79357da9be63df93cb50c8df2d1d
Author: Julian Reschke <ju...@gmx.de>
AuthorDate: Fri Mar 24 18:37:12 2023 +0100
OAK-9989: test in oak-commons
---
oak-commons/pom.xml | 7 ++++++
.../apache/jackrabbit/oak/commons/FileIOUtils.java | 27 +++++++++++-----------
.../apache/jackrabbit/oak/commons/PathUtils.java | 2 +-
.../apache/jackrabbit/oak/commons/StringUtils.java | 4 ++--
.../oak/commons/TimeDurationFormatter.java | 4 ++--
.../apache/jackrabbit/oak/commons/UUIDUtils.java | 2 +-
.../oak/commons/io/BurnOnCloseFileIterator.java | 2 +-
.../oak/commons/io/FileLineDifferenceIterator.java | 8 +++----
.../jackrabbit/oak/commons/io/LazyInputStream.java | 5 ++--
.../jackrabbit/oak/commons/sort/EscapeUtils.java | 2 +-
.../jackrabbit/oak/commons/sort/StringSort.java | 4 ++--
.../apache/jackrabbit/oak/commons/CIHelper.java | 4 ++--
.../jackrabbit/oak/commons/FileIOUtilsTest.java | 20 ++++++++--------
.../commons/FileLineDifferenceIteratorTest.java | 10 ++++----
.../apache/jackrabbit/oak/commons/IOUtilsTest.java | 2 +-
.../jackrabbit/oak/commons/PathUtilsTest.java | 2 +-
.../jackrabbit/oak/commons/StringUtilsTest.java | 2 +-
.../oak/commons/junit/LogCustomizer.java | 2 +-
.../oak/commons/sort/ExternalSortTest.java | 10 ++++----
.../oak/commons/sort/StringSortTest.java | 8 +++----
20 files changed, 66 insertions(+), 61 deletions(-)
diff --git a/oak-commons/pom.xml b/oak-commons/pom.xml
index 1646f5c011..ab07ec4fa8 100644
--- a/oak-commons/pom.xml
+++ b/oak-commons/pom.xml
@@ -88,6 +88,7 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+
<dependency>
<groupId>org.jetbrains</groupId>
<artifactId>annotations</artifactId>
@@ -101,11 +102,17 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-jcr-commons</artifactId>
<version>${jackrabbit.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-wrapped-guava</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<!-- Test dependencies -->
<dependency>
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
index 1e6a6b64e4..13c98ba31a 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/FileIOUtils.java
@@ -31,11 +31,10 @@ import java.util.List;
import java.util.Set;
import java.util.function.Function;
-import com.google.common.base.Charsets;
-import com.google.common.base.Strings;
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.PeekingIterator;
+import org.apache.jackrabbit.oak.guava.common.base.Charsets;
+import org.apache.jackrabbit.oak.guava.common.base.Strings;
+import org.apache.jackrabbit.oak.guava.common.collect.Iterators;
+import org.apache.jackrabbit.oak.guava.common.collect.PeekingIterator;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.LineIterator;
import org.jetbrains.annotations.NotNull;
@@ -43,13 +42,13 @@ import org.jetbrains.annotations.Nullable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.collect.Sets.newHashSet;
-import static com.google.common.io.Closeables.close;
-import static com.google.common.io.FileWriteMode.APPEND;
-import static com.google.common.io.Files.asByteSink;
-import static com.google.common.io.Files.move;
-import static com.google.common.io.Files.newWriter;
+import static org.apache.jackrabbit.oak.guava.common.base.Charsets.UTF_8;
+import static org.apache.jackrabbit.oak.guava.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.oak.guava.common.io.Closeables.close;
+import static org.apache.jackrabbit.oak.guava.common.io.FileWriteMode.APPEND;
+import static org.apache.jackrabbit.oak.guava.common.io.Files.asByteSink;
+import static org.apache.jackrabbit.oak.guava.common.io.Files.move;
+import static org.apache.jackrabbit.oak.guava.common.io.Files.newWriter;
import static java.io.File.createTempFile;
import static org.apache.commons.io.FileUtils.forceDelete;
import static org.apache.commons.io.IOUtils.closeQuietly;
@@ -395,7 +394,7 @@ public final class FileIOUtils {
* @deprecated use {@link org.apache.jackrabbit.oak.commons.io.FileLineDifferenceIterator} instead
*/
@Deprecated(since = "1.20.0", forRemoval = true)
- public static class FileLineDifferenceIterator extends AbstractIterator<String> implements Closeable {
+ public static class FileLineDifferenceIterator extends com.google.common.collect.AbstractIterator<String> implements Closeable {
private final PeekingIterator<String> peekMarked;
private final LineIterator marked;
private final LineIterator all;
@@ -494,7 +493,7 @@ public final class FileIOUtils {
* @deprecated use {@link org.apache.jackrabbit.oak.commons.io.BurnOnCloseFileIterator} instead
*/
@Deprecated(since = "1.20.0", forRemoval = true)
- public static class BurnOnCloseFileIterator<T> extends AbstractIterator<T> implements Closeable {
+ public static class BurnOnCloseFileIterator<T> extends com.google.common.collect.AbstractIterator<T> implements Closeable {
private final Logger log = LoggerFactory.getLogger(getClass());
private final LineIterator iterator;
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
index 03822fb155..12ab1f2018 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/PathUtils.java
@@ -16,7 +16,7 @@
*/
package org.apache.jackrabbit.oak.commons;
-import static com.google.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.oak.guava.common.collect.Sets.newHashSet;
import java.util.Iterator;
import java.util.NoSuchElementException;
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
index 287fa6aa3a..4c19574c71 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/StringUtils.java
@@ -16,8 +16,8 @@
*/
package org.apache.jackrabbit.oak.commons;
-import static com.google.common.base.Preconditions.checkArgument;
-import static com.google.common.base.Preconditions.checkNotNull;
+import static org.apache.jackrabbit.oak.guava.common.base.Preconditions.checkArgument;
+import static org.apache.jackrabbit.oak.guava.common.base.Preconditions.checkNotNull;
import org.jetbrains.annotations.NotNull;
import org.slf4j.Logger;
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/TimeDurationFormatter.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/TimeDurationFormatter.java
index 8b8de10730..c937172a33 100755
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/TimeDurationFormatter.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/TimeDurationFormatter.java
@@ -22,8 +22,8 @@ import java.util.Locale;
import java.util.Map;
import java.util.concurrent.TimeUnit;
-import com.google.common.base.Stopwatch;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.oak.guava.common.base.Stopwatch;
+import org.apache.jackrabbit.oak.guava.common.collect.Maps;
/**
* Format a time duration as human-readable string, inspired by
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
index bf7969b085..0131d2dc3a 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/UUIDUtils.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.commons;
import java.util.UUID;
-import com.google.common.base.Charsets;
+import org.apache.jackrabbit.oak.guava.common.base.Charsets;
import org.jetbrains.annotations.NotNull;
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/BurnOnCloseFileIterator.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/BurnOnCloseFileIterator.java
index 78d5e19e82..03294b49bb 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/BurnOnCloseFileIterator.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/BurnOnCloseFileIterator.java
@@ -34,7 +34,7 @@ import org.apache.jackrabbit.oak.commons.FileIOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.AbstractIterator;
+import org.apache.jackrabbit.oak.guava.common.collect.AbstractIterator;
/**
* Implements a {@link java.io.Closeable} wrapper over a {@link LineIterator}.
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java
index 733c36fdc6..33ca301560 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/FileLineDifferenceIterator.java
@@ -17,7 +17,7 @@
package org.apache.jackrabbit.oak.commons.io;
-import static com.google.common.base.Charsets.UTF_8;
+import static org.apache.jackrabbit.oak.guava.common.base.Charsets.UTF_8;
import static org.apache.jackrabbit.oak.commons.IOUtils.closeQuietly;
import java.io.BufferedWriter;
@@ -32,9 +32,9 @@ import org.apache.commons.io.LineIterator;
import org.apache.jackrabbit.oak.commons.FileIOUtils;
import org.jetbrains.annotations.Nullable;
-import com.google.common.collect.AbstractIterator;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.PeekingIterator;
+import org.apache.jackrabbit.oak.guava.common.collect.AbstractIterator;
+import org.apache.jackrabbit.oak.guava.common.collect.Iterators;
+import org.apache.jackrabbit.oak.guava.common.collect.PeekingIterator;
/**
* FileLineDifferenceIterator class which iterates over the difference of 2 files line by line.
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/LazyInputStream.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/LazyInputStream.java
index a50aba3fc7..75a11f7def 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/LazyInputStream.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/LazyInputStream.java
@@ -24,7 +24,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.util.function.Supplier;
-import com.google.common.io.ByteSource;
import org.apache.commons.io.input.ClosedInputStream;
import org.apache.jackrabbit.oak.commons.GuavaDeprecation;
@@ -33,7 +32,7 @@ import org.apache.jackrabbit.oak.commons.GuavaDeprecation;
*/
public class LazyInputStream extends FilterInputStream {
- private final ByteSource byteSource;
+ private final com.google.common.io.ByteSource byteSource;
private final Supplier<InputStream> inputStreamSupplier;
private boolean opened;
@@ -48,7 +47,7 @@ public class LazyInputStream extends FilterInputStream {
* @deprecated Use {@link #LazyInputStream(Supplier)} instead
*/
@Deprecated(since = "1.20.0", forRemoval = true)
- public LazyInputStream(ByteSource byteSource) {
+ public LazyInputStream(com.google.common.io.ByteSource byteSource) {
super(null);
this.byteSource = byteSource;
this.inputStreamSupplier = null;
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
index 5c13bf2efd..a74bc080f4 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/EscapeUtils.java
@@ -20,7 +20,7 @@
package org.apache.jackrabbit.oak.commons.sort;
-import static com.google.common.base.Preconditions.checkState;
+import static org.apache.jackrabbit.oak.guava.common.base.Preconditions.checkState;
import org.jetbrains.annotations.Nullable;
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
index 04216e321a..1c0e7fcdb2 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/sort/StringSort.java
@@ -37,8 +37,8 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-import com.google.common.base.Charsets;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.oak.guava.common.base.Charsets;
+import org.apache.jackrabbit.oak.guava.common.collect.Lists;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.LineIterator;
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
index 4eaf7826a8..6a4810b549 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/CIHelper.java
@@ -19,11 +19,11 @@
package org.apache.jackrabbit.oak.commons;
-import static com.google.common.base.Objects.equal;
+import static org.apache.jackrabbit.oak.guava.common.base.Objects.equal;
import static java.lang.Boolean.parseBoolean;
import static java.lang.System.getenv;
-import com.google.common.base.StandardSystemProperty;
+import org.apache.jackrabbit.oak.guava.common.base.StandardSystemProperty;
/**
* Utility class for ITs to determine the environment running in.
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
index a708a321ae..d48bc22c70 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
@@ -39,11 +39,11 @@ import java.util.Locale;
import java.util.Random;
import java.util.Set;
-import com.google.common.base.Function;
-import com.google.common.base.Splitter;
-import com.google.common.collect.Iterators;
-import com.google.common.collect.Sets;
-import com.google.common.primitives.Longs;
+import org.apache.jackrabbit.oak.guava.common.base.Function;
+import org.apache.jackrabbit.oak.guava.common.base.Splitter;
+import org.apache.jackrabbit.oak.guava.common.collect.Iterators;
+import org.apache.jackrabbit.oak.guava.common.collect.Sets;
+import org.apache.jackrabbit.oak.guava.common.primitives.Longs;
import org.apache.commons.io.FileUtils;
import org.apache.jackrabbit.oak.commons.FileIOUtils.BurnOnCloseFileIterator;
import org.jetbrains.annotations.Nullable;
@@ -52,10 +52,10 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.collect.Lists.newArrayList;
-import static com.google.common.collect.Sets.newHashSet;
-import static com.google.common.collect.Sets.union;
+import static org.apache.jackrabbit.oak.guava.common.base.Charsets.UTF_8;
+import static org.apache.jackrabbit.oak.guava.common.collect.Lists.newArrayList;
+import static org.apache.jackrabbit.oak.guava.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.oak.guava.common.collect.Sets.union;
import static org.apache.jackrabbit.oak.commons.FileIOUtils.append;
import static org.apache.jackrabbit.oak.commons.FileIOUtils.copy;
import static org.apache.jackrabbit.oak.commons.FileIOUtils.lexComparator;
@@ -116,7 +116,7 @@ public class FileIOUtilsTest {
Set<String> actual = newHashSet("a", "z", "e", "b");
File f = folder.newFile();
- int count = writeStrings(added.iterator(), f, false, new Function<String, String>() {
+ int count = writeStrings(added.iterator(), f, false, new com.google.common.base.Function<String, String>() {
@Nullable @Override public String apply(@Nullable String input) {
return Splitter.on("-").trimResults().omitEmptyStrings().splitToList(input).get(0);
}
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 f7f8681871..92d9803b15 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
@@ -29,11 +29,11 @@ import java.util.Random;
import java.util.TreeSet;
import java.util.function.Function;
-import com.google.common.base.Joiner;
-import com.google.common.base.Splitter;
-import com.google.common.base.StandardSystemProperty;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.oak.guava.common.base.Joiner;
+import org.apache.jackrabbit.oak.guava.common.base.Splitter;
+import org.apache.jackrabbit.oak.guava.common.base.StandardSystemProperty;
+import org.apache.jackrabbit.oak.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.oak.guava.common.collect.Lists;
import org.apache.commons.io.LineIterator;
import org.apache.jackrabbit.oak.commons.io.FileLineDifferenceIterator;
import org.jetbrains.annotations.Nullable;
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/IOUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/IOUtilsTest.java
index 2292870b83..04e18b5117 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/IOUtilsTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/IOUtilsTest.java
@@ -30,7 +30,7 @@ import java.nio.ByteBuffer;
import java.util.Random;
import java.util.concurrent.atomic.AtomicInteger;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.oak.guava.common.collect.Lists;
import junit.framework.TestCase;
/**
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathUtilsTest.java
index ffe6d8c151..b6c4b5b79d 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathUtilsTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/PathUtilsTest.java
@@ -24,7 +24,7 @@ import junit.framework.TestCase;
import org.junit.Assert;
import org.junit.Test;
-import static com.google.common.collect.Sets.newHashSet;
+import static org.apache.jackrabbit.oak.guava.common.collect.Sets.newHashSet;
/**
* Test the PathUtils class.
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/StringUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/StringUtilsTest.java
index 059f229a15..9f0f0c2037 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/StringUtilsTest.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/StringUtilsTest.java
@@ -21,7 +21,7 @@ import static org.junit.Assert.fail;
import java.util.Map;
-import com.google.common.collect.Maps;
+import org.apache.jackrabbit.oak.guava.common.collect.Maps;
import org.junit.Test;
/**
diff --git a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
index 2593c98650..ff4a4f5a20 100644
--- a/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
+++ b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/junit/LogCustomizer.java
@@ -31,7 +31,7 @@ import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.AppenderBase;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.oak.guava.common.collect.Lists;
/**
* The LogCustomizer allows to enable log level for a specific logger and/or
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 629c29eb66..e1efdc5cd8 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
@@ -16,10 +16,10 @@
*/
package org.apache.jackrabbit.oak.commons.sort;
-import com.google.common.base.Charsets;
-import com.google.common.base.Joiner;
-import com.google.common.io.Files;
-import com.google.common.primitives.Ints;
+import org.apache.jackrabbit.oak.guava.common.base.Charsets;
+import org.apache.jackrabbit.oak.guava.common.base.Joiner;
+import org.apache.jackrabbit.oak.guava.common.io.Files;
+import org.apache.jackrabbit.oak.guava.common.primitives.Ints;
import net.jpountz.lz4.LZ4FrameInputStream;
import net.jpountz.lz4.LZ4FrameOutputStream;
import org.apache.jackrabbit.oak.commons.Compression;
@@ -47,7 +47,7 @@ import java.util.List;
import java.util.Scanner;
import java.util.function.Function;
-import static com.google.common.collect.Iterables.transform;
+import static org.apache.jackrabbit.oak.guava.common.collect.Iterables.transform;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
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 fd15c880d1..0d6cca1285 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
@@ -29,10 +29,10 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import com.google.common.base.Joiner;
-import com.google.common.collect.Collections2;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
+import org.apache.jackrabbit.oak.guava.common.base.Joiner;
+import org.apache.jackrabbit.oak.guava.common.collect.Collections2;
+import org.apache.jackrabbit.oak.guava.common.collect.ImmutableList;
+import org.apache.jackrabbit.oak.guava.common.collect.Lists;
import org.junit.Test;
import static org.junit.Assert.assertEquals;