OAK-10164: oak-commons: prepare for switch to shaded guava

apache · Mar 28, 2023 · ca578ca · ca578ca
1 parent 5359461
commit ca578ca
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
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
@@ -33,7 +33,6 @@
 
 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.commons.io.FileUtils;
@@ -395,7 +394,7 @@ public int compare(String s1, String s2) {
      * @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 @@ private String computeNextDiff() {
      * @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/io/BurnOnCloseFileIterator.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/io/BurnOnCloseFileIterator.java
@@ -34,8 +34,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.AbstractIterator;
-
 /**
  * Implements a {@link java.io.Closeable} wrapper over a {@link LineIterator}.
  * Also has a transformer to transform the output. If the underlying file is
@@ -95,7 +93,7 @@ public String apply(String s) {
         });
     }
 
-    private static class Impl<T> extends AbstractIterator<T> implements Closeable {
+    private static class Impl<T> extends com.google.common.collect.AbstractIterator<T> implements Closeable {
         private final Iterator<String> iterator;
         private final Function<String, T> transformer;
         private final File backingFile;

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
@@ -24,7 +24,6 @@
 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 @@
  */
 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 LazyInputStream(Supplier<InputStream> inputStreamSupplier) {
      * @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/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java b/oak-commons/src/test/java/org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java
@@ -39,7 +39,6 @@
 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;
@@ -116,7 +115,7 @@ public void writeCustomReadOrgStringsDeprecated() throws Exception {
         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);
             }
@@ -211,7 +210,7 @@ public void sortLargeFileWithCustomComparatorTest() throws IOException {
         }
 
         Iterator<Long> boxedEntries = Longs.asList(entries).iterator();
-        Iterator<String> hexEntries = Iterators.transform(boxedEntries, new Function<Long, String>() {
+        Iterator<String> hexEntries = Iterators.transform(boxedEntries, new com.google.common.base.Function<Long, String>() {
                     @Nullable @Override public String apply(@Nullable Long input) {
                         return Long.toHexString(input);
                     }