Skip to content

Commit b41e68d

Browse files
committed
Revert "Wrap CrtS3RuntimeException to SdkServiceException"
1 parent 893b493 commit b41e68d

File tree

6 files changed

+3
-383
lines changed

6 files changed

+3
-383
lines changed

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/CrtErrorHandler.java

Lines changed: 0 additions & 117 deletions
This file was deleted.

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/CrtResponseDataConsumerAdapter.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public class CrtResponseDataConsumerAdapter<ReturnT> implements ResponseDataCons
3939
private final CompletableFuture<ReturnT> future;
4040
private final S3CrtDataPublisher publisher;
4141
private final ResponseHeadersHandler headerHandler;
42-
private final CrtErrorHandler errorHandler;
4342

4443
public CrtResponseDataConsumerAdapter(AsyncResponseTransformer<GetObjectResponse, ReturnT> transformer) {
4544
this(transformer, new S3CrtDataPublisher(), new ResponseHeadersHandler());
@@ -53,7 +52,6 @@ public CrtResponseDataConsumerAdapter(AsyncResponseTransformer<GetObjectResponse
5352
this.future = transformer.prepare();
5453
this.publisher = s3CrtDataPublisher;
5554
this.headerHandler = headersHandler;
56-
this.errorHandler = new CrtErrorHandler();
5755
}
5856

5957
public CompletableFuture<ReturnT> transformerFuture() {
@@ -89,9 +87,8 @@ public void onResponseData(ByteBuffer byteBuffer) {
8987
@Override
9088
public void onException(CrtRuntimeException e) {
9189
log.debug(() -> "An error occurred ", e);
92-
Exception transformException = errorHandler.transformException(e);
93-
transformer.exceptionOccurred(transformException);
94-
publisher.notifyError(transformException);
90+
transformer.exceptionOccurred(e);
91+
publisher.notifyError(e);
9592
}
9693

9794
@Override

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/internal/DefaultS3CrtAsyncClient.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
public final class DefaultS3CrtAsyncClient implements S3CrtAsyncClient {
3838
private final S3NativeClient s3NativeClient;
3939
private final S3NativeClientConfiguration configuration;
40-
private final CrtErrorHandler crtErrorHandler;
4140

4241
public DefaultS3CrtAsyncClient(DefaultS3CrtClientBuilder builder) {
4342
S3NativeClientConfiguration.Builder configBuilder =
@@ -59,15 +58,13 @@ public DefaultS3CrtAsyncClient(DefaultS3CrtClientBuilder builder) {
5958
configuration.partSizeBytes(),
6059
configuration.targetThroughputInGbps(),
6160
configuration.maxConcurrency());
62-
crtErrorHandler = new CrtErrorHandler();
6361
}
6462

6563
@SdkTestInternalApi
6664
DefaultS3CrtAsyncClient(S3NativeClientConfiguration configuration,
6765
S3NativeClient nativeClient) {
6866
this.configuration = configuration;
6967
this.s3NativeClient = nativeClient;
70-
crtErrorHandler = new CrtErrorHandler();
7168
}
7269

7370
@Override
@@ -99,7 +96,6 @@ public CompletableFuture<PutObjectResponse> putObject(PutObjectRequest putObject
9996
CompletableFuture<PutObjectResponse> returnFuture = new CompletableFuture<>();
10097

10198
com.amazonaws.s3.model.PutObjectRequest adaptedRequest = S3CrtPojoConversion.toCrtPutObjectRequest(putObjectRequest);
102-
CompletableFuture<PutObjectResponse> returnFuture = new CompletableFuture<>();
10399

104100
if (adaptedRequest.contentLength() == null && requestBody.contentLength().isPresent()) {
105101
adaptedRequest = adaptedRequest.toBuilder()

services-custom/s3-transfer-manager/src/test/java/software/amazon/awssdk/transfer/s3/internal/CrtErrorHandlerTest.java

Lines changed: 0 additions & 111 deletions
This file was deleted.

0 commit comments

Comments
 (0)