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/06/15 15:20:09 UTC
[jackrabbit-oak] branch trunk updated: OAK-10247: oak-commons: remove Guava from public API - remove remaining uses and add to shaded version to Profiler ignore list (#986)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/trunk by this push:
new b8b7c35df8 OAK-10247: oak-commons: remove Guava from public API - remove remaining uses and add to shaded version to Profiler ignore list (#986)
b8b7c35df8 is described below
commit b8b7c35df823eeca4a99105754a58264b64174ca
Author: Julian Reschke <re...@apache.org>
AuthorDate: Thu Jun 15 17:20:04 2023 +0200
OAK-10247: oak-commons: remove Guava from public API - remove remaining uses and add to shaded version to Profiler ignore list (#986)
---
.../java/org/apache/jackrabbit/oak/commons/FileIOUtils.java | 10 ----------
.../main/java/org/apache/jackrabbit/oak/commons/Profiler.java | 1 +
.../jackrabbit/oak/commons/io/BurnOnCloseFileIterator.java | 3 ++-
.../org/apache/jackrabbit/oak/commons/io/LazyInputStream.java | 3 ++-
.../org/apache/jackrabbit/oak/commons/FileIOUtilsTest.java | 11 ++++++-----
5 files changed, 11 insertions(+), 17 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
index b65df1f0b2..e464f16ce5 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
@@ -66,16 +66,6 @@ public final class FileIOUtils {
}
};
- /**
- * @deprecated use {@link Function#identity()} instead
- */
- @Deprecated(since = "1.20.0", forRemoval = true)
- public final static com.google.common.base.Function<String, String> passThruTransformer = new com.google.common.base.Function<String, String>() {
- @Nullable @Override public String apply(@Nullable String input) {
- return input;
- }
- };
-
/**
* Sorts the given file externally using the {@link #lexComparator} and removes duplicates.
*
diff --git a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Profiler.java b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Profiler.java
index f614f7966e..7d06dd315b 100644
--- a/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Profiler.java
+++ b/oak-commons/src/main/java/org/apache/jackrabbit/oak/commons/Profiler.java
@@ -65,6 +65,7 @@ public class Profiler implements Runnable {
"sun," +
"com.sun.," +
"com.google.common.," +
+ "org.apache.jackrabbit.oak.guava.common.," +
"com.mongodb.," +
"org.bson"
).split(",");
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 7ece4899aa..f38c154a3c 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
@@ -30,6 +30,7 @@ import java.util.Iterator;
import java.util.function.Function;
import org.apache.commons.io.LineIterator;
+import org.apache.jackrabbit.guava.common.collect.AbstractIterator;
import org.apache.jackrabbit.oak.commons.FileIOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -93,7 +94,7 @@ public class BurnOnCloseFileIterator<T> implements Closeable, Iterator<T> {
});
}
- private static class Impl<T> extends com.google.common.collect.AbstractIterator<T> implements Closeable {
+ private static class Impl<T> extends 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
index a0fb2a28d4..f486b92c15 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
@@ -25,13 +25,14 @@ import java.io.InputStream;
import java.util.function.Supplier;
import org.apache.commons.io.input.ClosedInputStream;
+import org.apache.jackrabbit.guava.common.io.ByteSource;
/**
* * This input stream delays accessing the {@link InputStream} until the first byte is read
*/
public class LazyInputStream extends FilterInputStream {
- private final com.google.common.io.ByteSource byteSource;
+ private final ByteSource byteSource;
private final Supplier<InputStream> inputStreamSupplier;
private boolean opened;
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 672c6849c2..c172dd429f 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
@@ -60,7 +60,9 @@ import java.util.Random;
import java.util.Set;
import org.apache.commons.io.FileUtils;
+import org.apache.jackrabbit.guava.common.base.Function;
import org.apache.jackrabbit.guava.common.base.Splitter;
+import org.apache.jackrabbit.guava.common.collect.Iterators;
import org.apache.jackrabbit.guava.common.collect.Sets;
import org.apache.jackrabbit.guava.common.primitives.Longs;
import org.jetbrains.annotations.Nullable;
@@ -69,7 +71,6 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.rules.TemporaryFolder;
-
/**
* Tests for {@link FileIOUtils}
*/
@@ -189,21 +190,21 @@ public class FileIOUtilsTest {
for (int i = 0; i < numEntries; i++) {
entries[i] = r.nextLong();
}
-
+
Iterator<Long> boxedEntries = Longs.asList(entries).iterator();
- Iterator<String> hexEntries = com.google.common.collect.Iterators.transform(boxedEntries, new com.google.common.base.Function<Long, String>() {
+ Iterator<String> hexEntries = Iterators.transform(boxedEntries, new Function<Long, String>() {
@Nullable @Override public String apply(@Nullable Long input) {
return Long.toHexString(input);
}
});
File f = assertWrite(hexEntries, false, numEntries);
-
+
Comparator<String> prefixComparator = new Comparator<String>() {
@Override public int compare(String s1, String s2) {
return s1.substring(0, 3).compareTo(s2.substring(0, 3));
}
};
-
+
sort(f, prefixComparator);
BufferedReader reader =
new BufferedReader(new InputStreamReader(new FileInputStream(f), UTF_8));