Remove retry logic from SplittingTransformer

Author: davidh44

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

@@ -25,10 +25,6 @@
 import software.amazon.awssdk.core.SplittingTransformerConfiguration;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
 import software.amazon.awssdk.core.async.SdkPublisher;
-import software.amazon.awssdk.core.exception.SdkException;
-import software.amazon.awssdk.core.exception.SdkServiceException;
-import software.amazon.awssdk.core.internal.retry.SdkDefaultRetrySetting;
-import software.amazon.awssdk.core.retry.RetryUtils;
 import software.amazon.awssdk.utils.CompletableFutureUtils;
 import software.amazon.awssdk.utils.Logger;
 import software.amazon.awssdk.utils.Validate;
@@ -344,32 +340,7 @@ public void exceptionOccurred(Throwable error) {
             if (!isFirstPart || onStreamCalled.get()) {
                 publisherToUpstream.error(error);
             }
-
-            if (!isRetryableError(error)) {
-                log.trace(() -> "error is non-retryable, forwarding upstream future to result future");
-                CompletableFutureUtils.forwardResultTo(upstreamFuture, resultFuture);
-            }
-        }
-    }
-
-    private boolean isRetryableError(Throwable error) {
-        if (error instanceof SdkException) {
-            SdkException ex = (SdkException) error;
-            return retryOnStatusCodes(ex)
-                || RetryUtils.isRetryableException(ex)
-                || RetryUtils.isClockSkewException(ex)
-                || RetryUtils.isClockSkewException(ex);
-
-        }
-        return false;
-    }
-
-    private static boolean retryOnStatusCodes(Throwable ex) {
-        if (ex instanceof SdkServiceException) {
-            SdkServiceException failure = (SdkServiceException) ex;
-            return SdkDefaultRetrySetting.RETRYABLE_STATUS_CODES.contains(failure.statusCode());
         }
-        return false;
     }
 
     /**

services/s3/pom.xml

@@ -128,12 +128,13 @@
             <artifactId>retries-spi</artifactId>
             <version>${awsjavasdk.version}</version>
         </dependency>
+        <!-- Test Dependencies -->
         <dependency>
             <groupId>software.amazon.awssdk</groupId>
             <artifactId>retries</artifactId>
+            <scope>test</scope>
             <version>${awsjavasdk.version}</version>
         </dependency>
-        <!-- Test Dependencies -->
         <dependency>
             <artifactId>commons-io</artifactId>
             <groupId>commons-io</groupId>

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

@@ -98,32 +98,6 @@ <T> void happyPath_shouldReceiveAllBodyPartInCorrectOrder(AsyncResponseTransform
         util.verifyCorrectAmountOfRequestsMade(amountOfPartToTest);
     }
 
-    @ParameterizedTest
-    @MethodSource("argumentsProvider")
-    <T> void errorOnFirstRequest_shouldCompleteExceptionally(AsyncResponseTransformerTestSupplier<T> supplier,
-                                                             int amountOfPartToTest,
-                                                             int partSize) {
-        stubFor(get(urlEqualTo(String.format("/%s/%s?partNumber=1", testBucket, testKey))).willReturn(
-            aResponse()
-                .withStatus(400)
-                .withBody("<Error><Code>400</Code><Message>test error message</Message></Error>")));
-        AsyncResponseTransformer<GetObjectResponse, T> transformer = supplier.transformer();
-        AsyncResponseTransformer.SplitResult<GetObjectResponse, T> split = transformer.split(
-            SplittingTransformerConfiguration.builder()
-                                             .bufferSizeInBytes(1024 * 32L)
-                                             .build());
-        Subscriber<AsyncResponseTransformer<GetObjectResponse, GetObjectResponse>> subscriber = new MultipartDownloaderSubscriber(
-            s3AsyncClient,
-            GetObjectRequest.builder()
-                            .bucket(testBucket)
-                            .key(testKey)
-                            .build());
-
-        split.publisher().subscribe(subscriber);
-        assertThatThrownBy(() -> split.resultFuture().join())
-            .hasMessageContaining("test error message");
-    }
-
     @ParameterizedTest
     @MethodSource("argumentsProvider")
     <T> void errorOnThirdRequest_shouldCompleteExceptionallyOnlyPartsGreaterThanTwo(