Merge pull request #1888 from dagnir/1877

Remove unnecessary copy

Author: dagnir

.changes/next-release/bugfix-AWSSDKforJavav2-9e5b030.json

@@ -0,0 +1,5 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "description": "Avoid unnecessary copying in `AsyncRequestBody.fromBytes()`"
+}

core/sdk-core/pom.xml

@@ -172,6 +172,11 @@
             <version>${awsjavasdk.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.reactivex.rxjava2</groupId>
+            <artifactId>rxjava</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
     <build>
         <plugins>

core/sdk-core/src/main/java/software/amazon/awssdk/core/async/AsyncRequestBody.java

@@ -20,7 +20,6 @@
 import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Path;
-import java.util.Arrays;
 import java.util.Optional;
 import org.reactivestreams.Publisher;
 import org.reactivestreams.Subscriber;
@@ -138,7 +137,7 @@ static AsyncRequestBody fromString(String string) {
      * @return AsyncRequestBody instance.
      */
     static AsyncRequestBody fromBytes(byte[] bytes) {
-        return new ByteArrayAsyncRequestBody(Arrays.copyOf(bytes, bytes.length));
+        return new ByteArrayAsyncRequestBody(bytes);
     }
 
     /**

core/sdk-core/src/test/java/software/amazon/awssdk/core/async/AsyncRequestBodyTest.java

@@ -19,6 +19,7 @@
 
 import com.google.common.jimfs.Configuration;
 import com.google.common.jimfs.Jimfs;
+import io.reactivex.Flowable;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
@@ -31,6 +32,7 @@
 import org.junit.runners.Parameterized;
 import org.reactivestreams.Subscriber;
 import software.amazon.awssdk.http.async.SimpleSubscriber;
+import software.amazon.awssdk.utils.BinaryUtils;
 
 @RunWith(Parameterized.class)
 public class AsyncRequestBodyTest {
@@ -93,4 +95,17 @@ public void onComplete() {
         done.await();
         assertThat(sb.toString()).isEqualTo(testString);
     }
+
+    @Test
+    public void fromBytes_byteArrayNotNull_createsCopy() {
+        byte[] original = {0x1, 0x2, 0x3, 0x4};
+        byte[] toModify = new byte[original.length];
+        System.arraycopy(original, 0, toModify, 0, original.length);
+        AsyncRequestBody body = AsyncRequestBody.fromBytes(toModify);
+        for (int i = 0; i < toModify.length; ++i) {
+            toModify[i]++;
+        }
+        ByteBuffer publishedBb = Flowable.fromPublisher(body).toList().blockingGet().get(0);
+        assertThat(BinaryUtils.copyAllBytesFrom(publishedBb)).isEqualTo(original);
+    }
 }