This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch OAK-11417
in repository https://gitbox.apache.org/repos/asf/jackrabbit-oak.git
The following commit(s) were added to refs/heads/OAK-11417 by this push:
new 8959d9224f OAK-11417: Remove usage of Guava ByteStreams - oak-lucene
8959d9224f is described below
commit 8959d9224fa893000e3da459f325a9c1344c8059
Author: Julian Reschke <resc...@apache.org>
AuthorDate: Tue Jan 21 16:42:44 2025 +0100
OAK-11417: Remove usage of Guava ByteStreams - oak-lucene
---
.../index/lucene/directory/IndexConsistencyChecker.java | 6 +++---
.../plugins/index/lucene/directory/OakBufferedIndexFile.java | 11 +++++------
.../plugins/index/lucene/directory/OakStreamingIndexFile.java | 3 +--
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java
index cca100bac1..316c661095 100644
---
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java
+++
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/IndexConsistencyChecker.java
@@ -23,6 +23,7 @@ import java.io.File;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.io.OutputStream;
import java.io.PrintStream;
import java.io.PrintWriter;
import java.io.StringWriter;
@@ -32,7 +33,6 @@ import java.util.List;
import javax.jcr.PropertyType;
import org.apache.jackrabbit.guava.common.base.Stopwatch;
-import org.apache.jackrabbit.guava.common.io.ByteStreams;
import org.apache.jackrabbit.guava.common.io.Closer;
import org.apache.jackrabbit.guava.common.io.CountingInputStream;
import org.apache.commons.io.FileUtils;
@@ -390,7 +390,7 @@ public class IndexConsistencyChecker {
try{
InputStream is = blob.getNewStream();
CountingInputStream cis = new CountingInputStream(is);
- IOUtils.copyLarge(cis, ByteStreams.nullOutputStream());
+ IOUtils.copyLarge(cis, OutputStream.nullOutputStream());
if (cis.getCount() != blob.length()){
String msg = String.format("Invalid blob %s. Length mismatch -
expected ${%d} -> found ${%d}",
@@ -430,7 +430,7 @@ public class IndexConsistencyChecker {
private final Logger log;
public LoggingPrintStream(Logger log) {
- super(ByteStreams.nullOutputStream());
+ super(OutputStream.nullOutputStream());
this.log = log;
}
diff --git
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
index 17df1ce82d..f0e2e971b0 100644
---
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
+++
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakBufferedIndexFile.java
@@ -23,10 +23,10 @@ import java.io.SequenceInputStream;
import java.util.ArrayList;
import java.util.List;
-import org.apache.jackrabbit.guava.common.io.ByteStreams;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
+import org.apache.jackrabbit.oak.commons.IOUtils;
import org.apache.jackrabbit.oak.commons.StringUtils;
import org.apache.jackrabbit.oak.commons.collections.ListUtils;
import org.apache.jackrabbit.oak.commons.conditions.Validate;
@@ -164,12 +164,11 @@ class OakBufferedIndexFile implements OakIndexFile {
Validate.checkState(!blobModified);
int n = (int) Math.min(blobSize, length - (long)i * blobSize);
- InputStream stream = data.get(i).getNewStream();
- try {
- ByteStreams.readFully(stream, blob, 0, n);
- } finally {
- stream.close();
+
+ try (InputStream stream = data.get(i).getNewStream()) {
+ IOUtils.readFully(stream, blob, 0, n);
}
+
index = i;
}
}
diff --git
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
index 8874b88c28..0e7fb5d45d 100644
---
a/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
+++
b/oak-lucene/src/main/java/org/apache/jackrabbit/oak/plugins/index/lucene/directory/OakStreamingIndexFile.java
@@ -21,7 +21,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.SequenceInputStream;
-import org.apache.jackrabbit.guava.common.io.ByteStreams;
import org.apache.commons.io.IOUtils;
import org.apache.jackrabbit.oak.api.Blob;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -232,7 +231,7 @@ class OakStreamingIndexFile implements OakIndexFile,
AutoCloseable {
}
setupInputStream();
- int readCnt = ByteStreams.read(blobInputStream, b, offset, len);
+ int readCnt = IOUtils.read(blobInputStream, b, offset, len);
if (readCnt < len) {
String msg = String.format("Couldn't read byte range request for
[%s][%s], " +
"position: %d, file length: %d, len: %d. Actual read bytes
%d",
