Undo cancel changes not required for low level client only

Author: alextwoods

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3CrtResponseHandlerAdapter.java

@@ -50,8 +50,6 @@
 public final class S3CrtResponseHandlerAdapter implements S3MetaRequestResponseHandler {
     private static final Logger log = Logger.loggerFor(S3CrtResponseHandlerAdapter.class);
     private static final Duration META_REQUEST_TIMEOUT = Duration.ofSeconds(10);
-    private static final int CRT_SUCCESSFUL_CANCEL = 14374;
-
     private final CompletableFuture<Void> resultFuture;
     private final SdkAsyncHttpResponseHandler responseHandler;
 
@@ -154,8 +152,6 @@ public int onResponseBody(ByteBuffer bodyBytesIn, long objectRangeStart, long ob
     public void onFinished(S3FinishedResponseContext context) {
         int crtCode = context.getErrorCode();
         log.debug(() -> "Request finished with code: " + crtCode);
-        initiateResponseHandling(initialHeadersResponse.build());
-
         if (crtCode != CRT.AWS_CRT_SUCCESS) {
             handleError(context);
         } else {
@@ -186,29 +182,11 @@ private void handleError(S3FinishedResponseContext context) {
 
         if (isServiceError(responseStatus) && errorPayload != null) {
             handleServiceError(responseStatus, headers, errorPayload);
-        } else if (crtCode == CRT_SUCCESSFUL_CANCEL) {
-            handleSuccessfulCancel(context, crtCode);
         } else {
             handleIoError(context, crtCode);
         }
     }
 
-    private void handleSuccessfulCancel(S3FinishedResponseContext context, int crtCode) {
-        if (!responseHandlingInitiated) {
-            responseHandlingInitiated = true;
-            responseHandler.onHeaders(initialHeadersResponse.build());
-        }
-
-        Throwable cause = context.getCause();
-
-        // TODO: Potentially subclass this exception
-        SdkClientException sdkClientException =
-            SdkClientException.create("Failed to send the request: " +
-                                      CRT.awsErrorString(crtCode), cause);
-        failResponseHandlerAndFuture(sdkClientException);
-        notifyResponsePublisherErrorIfNeeded(sdkClientException);
-    }
-
     private void handleIoError(S3FinishedResponseContext context, int crtCode) {
         Throwable cause = context.getCause();
 

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crt/S3MetaRequestPauseObservable.java

@@ -45,11 +45,5 @@ public void subscribe(S3MetaRequestWrapper request) {
     public ResumeToken pause() {
         return pause.apply(request);
     }
-
-    public void cancel() {
-        if (request != null) {
-            request.cancel();
-        }
-    }
 }