BinaryRequestBody and ContentBody use InputStream.transferToOutputStream

Allow for optimization when underlying input stream (such as ByteArrayInputStream, ChannelInputStream) overrides transferTo(OutputStream) to avoid extra array allocations. See * https://bugs.openjdk.org/browse/JDK-8067661 * https://bugs.openjdk.org/browse/JDK-8265891 * https://bugs.openjdk.org/browse/JDK-8273038 * https://bugs.openjdk.org/browse/JDK-8279283 * https://bugs.openjdk.org/browse/JDK-8296431
palantir · Jul 28, 2023 · f74d3c9 · f74d3c9
1 parent 73102d0
commit f74d3c9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/...e-annotations/src/main/java/com/palantir/dialogue/annotations/InputStreamContentBody.java b/...e-annotations/src/main/java/com/palantir/dialogue/annotations/InputStreamContentBody.java
@@ -16,7 +16,6 @@
 
 package com.palantir.dialogue.annotations;
 
-import com.google.common.io.ByteStreams;
 import com.palantir.logsafe.Preconditions;
 import com.palantir.logsafe.UnsafeArg;
 import com.palantir.logsafe.logger.SafeLogger;
@@ -39,7 +38,7 @@ final class InputStreamContentBody implements ContentBody {
 
     @Override
     public void writeTo(OutputStream output) throws IOException {
-        ByteStreams.copy(inputStream, output);
+        inputStream.transferTo(output);
     }
 
     @Override

diff --git a/dialogue-client-verifier/src/test/java/com/palantir/verification/IntegrationTest.java b/dialogue-client-verifier/src/test/java/com/palantir/verification/IntegrationTest.java
@@ -144,8 +144,9 @@ public void stream_3_gigabytes() throws IOException {
 
         undertowHandler = exchange -> {
             exchange.getResponseHeaders().put(Headers.CONTENT_TYPE, "application/octet-stream");
-            InputStream bigInputStream = repeat(sample, limit);
-            ByteStreams.copy(bigInputStream, exchange.getOutputStream());
+            try (InputStream bigInputStream = repeat(sample, limit)) {
+                bigInputStream.transferTo(exchange.getOutputStream());
+            }
         };
 
         Stopwatch sw = Stopwatch.createStarted();

diff --git a/dialogue-target/src/main/java/com/palantir/dialogue/BinaryRequestBody.java b/dialogue-target/src/main/java/com/palantir/dialogue/BinaryRequestBody.java
@@ -16,7 +16,6 @@
 
 package com.palantir.dialogue;
 
-import com.google.common.io.ByteStreams;
 import com.palantir.logsafe.Preconditions;
 import java.io.Closeable;
 import java.io.IOException;
@@ -49,7 +48,7 @@ static BinaryRequestBody of(InputStream inputStream) {
             public void write(OutputStream requestBody) throws IOException {
                 Preconditions.checkState(!invoked, "Write has already been called");
                 invoked = true;
-                ByteStreams.copy(inputStream, requestBody);
+                inputStream.transferTo(requestBody);
             }
 
             @Override