Prefer Java 9 InputStream.readAllBytes

gaul · Nov 24, 2024 · 83bc9f7 · 83bc9f7
1 parent 595a7f9
commit 83bc9f7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/src/main/java/org/gaul/s3proxy/NullBlobStore.java b/src/main/java/org/gaul/s3proxy/NullBlobStore.java
@@ -28,7 +28,6 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.hash.HashCode;
 import com.google.common.io.ByteSource;
-import com.google.common.io.ByteStreams;
 import com.google.common.primitives.Longs;
 
 import org.jclouds.blobstore.BlobStore;
@@ -81,7 +80,7 @@ public Blob getBlob(String container, String name, GetOptions options) {
 
         byte[] array;
         try (InputStream is = blob.getPayload().openStream()) {
-            array = ByteStreams.toByteArray(is);
+            array = is.readAllBytes();
         } catch (IOException ioe) {
             throw new RuntimeException(ioe);
         }

diff --git a/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java b/src/main/java/org/gaul/s3proxy/S3ProxyHandler.java
@@ -577,8 +577,8 @@ public final void doHandle(HttpServletRequest baseRequest,
                     } else {
                         // buffer the entire stream to calculate digest
                         // why input stream read contentlength of header?
-                        payload = ByteStreams.toByteArray(ByteStreams.limit(
-                                is, v4MaxNonChunkedRequestSize + 1));
+                        payload = ByteStreams.limit(is, v4MaxNonChunkedRequestSize + 1)
+                                .readAllBytes();
                         if (payload.length == v4MaxNonChunkedRequestSize + 1) {
                             throw new S3Exception(
                                     S3ErrorCode.MAX_MESSAGE_LENGTH_EXCEEDED);