Address comments

Author: davidh44

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

@@ -165,12 +165,12 @@ private void handleSubscriptionCancel() {
                 return;
             }
 
-            CompletableFuture<ResponseBytes<ResponseT>> upstreamPrepareFuture = upstreamResponseTransformer.prepare();
-            CompletableFutureUtils.forwardResultTo(upstreamPrepareFuture, resultFuture);
+            try {
+                CompletableFuture<ResponseBytes<ResponseT>> upstreamPrepareFuture = upstreamResponseTransformer.prepare();
+                CompletableFutureUtils.forwardResultTo(upstreamPrepareFuture, resultFuture);
 
-            upstreamResponseTransformer.onResponse(responseT.get());
+                upstreamResponseTransformer.onResponse(responseT.get());
 
-            try {
                 buffers.keySet().stream().sorted().forEach(index -> {
                     publisherToUpstream.send(buffers.get(index)).exceptionally(ex -> {
                         resultFuture.completeExceptionally(SdkClientException.create("unexpected error occurred", ex));

services/s3/src/main/java/software/amazon/awssdk/services/s3/multipart/MultipartConfiguration.java

@@ -164,8 +164,8 @@ public interface Builder extends CopyableBuilder<Builder, MultipartConfiguration
          * <p>
          * Default value: If not specified, the SDK will use the equivalent of four parts worth of memory, so 32 Mib by default.
          * <p>
-         * This setting is not supported and will be ignored when downloading to a byte array, i.e., when providing a
-         * {@link ByteArrayAsyncResponseTransformer}.
+         * This setting does not apply if you are using an {@link AsyncResponseTransformer} implementation that downloads the
+         * object into memory such as {@link AsyncResponseTransformer#toBytes}
          *
          * @param apiCallBufferSizeInBytes the value of the maximum memory usage.
          * @return an instance of this builder.

services/s3/src/test/java/software/amazon/awssdk/services/s3/internal/multipart/S3MultipartClientGetObjectWiremockTest.java

@@ -60,6 +60,7 @@
 import software.amazon.awssdk.core.internal.async.FileAsyncResponseTransformer;
 import software.amazon.awssdk.core.internal.async.InputStreamResponseTransformer;
 import software.amazon.awssdk.core.internal.async.PublisherAsyncResponseTransformer;
+import software.amazon.awssdk.core.internal.async.SplittingTransformer;
 import software.amazon.awssdk.http.nio.netty.NettyNioAsyncHttpClient;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.s3.S3AsyncClient;
@@ -142,7 +143,7 @@ public <T> void errorOnThirdPart_shouldCompleteExceptionallyOnlyPartsGreaterThan
     }
 
     @ParameterizedTest
-    @MethodSource("responseTransformers")
+    @MethodSource("nonRetryableResponseTransformers")
     public <T> void errorOnFirstPart_shouldFail(AsyncResponseTransformerTestSupplier<T> supplier) {
         stubFor(get(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, KEY))).willReturn(
             aResponse()
@@ -155,8 +156,8 @@ public <T> void errorOnFirstPart_shouldFail(AsyncResponseTransformerTestSupplier
     }
 
     @ParameterizedTest
-    @MethodSource("responseTransformers")
-    public <T> void ioError_shouldFailAndNotRetry(AsyncResponseTransformerTestSupplier<T> supplier) {
+    @MethodSource("nonRetryableResponseTransformers")
+    public <T> void nonRetryableResponseTransformers_ioErrorOnFirstPart_shouldFailAndNotRetry(AsyncResponseTransformerTestSupplier<T> supplier) {
         stubFor(get(urlEqualTo(String.format("/%s/%s?partNumber=1", BUCKET, KEY)))
                     .willReturn(aResponse()
                                     .withFault(Fault.CONNECTION_RESET_BY_PEER)));
@@ -175,7 +176,7 @@ public <T> void ioError_shouldFailAndNotRetry(AsyncResponseTransformerTestSuppli
     }
 
     @ParameterizedTest
-    @MethodSource("responseTransformers")
+    @MethodSource("nonRetryableResponseTransformers")
     public void getObject_single500WithinMany200s_shouldNotRetryError(AsyncResponseTransformerTestSupplier<?> transformerSupplier) {
         List<CompletableFuture<?>> futures = new ArrayList<>();
 
@@ -243,14 +244,16 @@ private static Stream<Arguments> partSizeAndTransformerParams() {
 
 
     /**
-     * Testing {@link PublisherAsyncResponseTransformer}, {@link InputStreamResponseTransformer}, and
+     * Testing response transformers that are not retryable when
+     * {@link AsyncResponseTransformer#split(SplittingTransformerConfiguration)} is invoked and used with
+     * {@link SplittingTransformer} - {@link PublisherAsyncResponseTransformer}, {@link InputStreamResponseTransformer}, and
      * {@link FileAsyncResponseTransformer}
      * <p>
      *
      * Retry for multipart download is supported for {@link ByteArrayAsyncResponseTransformer}, tested in
      * {@link S3MultipartClientGetObjectRetryBehaviorWiremockTest}.
      */
-    private static Stream<AsyncResponseTransformerTestSupplier<?>> responseTransformers() {
+    private static Stream<AsyncResponseTransformerTestSupplier<?>> nonRetryableResponseTransformers() {
         return Stream.of(new AsyncResponseTransformerTestSupplier.InputStreamArtSupplier(),
                          new AsyncResponseTransformerTestSupplier.PublisherArtSupplier(),
                          new AsyncResponseTransformerTestSupplier.FileArtSupplier());