Handled Zoe's comments

Author: joviegas

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crossregion/S3CrossRegionAsyncClient.java

@@ -62,17 +62,9 @@ protected <T extends S3Request, ReturnT> CompletableFuture<ReturnT> invokeOperat
         operation.apply(request)
                  .whenComplete((r, t) -> {
                      if (t != null) {
-                         if (isS3RedirectException(t.getCause())) {
+                         if (isS3RedirectException(t)) {
                              bucketToRegionCache.remove(bucketName);
-                             Optional<String> bucketRegionFromException =
-                                 getBucketRegionFromException((S3Exception) t.getCause());
-
-                             if (bucketRegionFromException.isPresent()) {
-                                 sendRequestWithRightRegion(request, operation, bucketName, returnFuture,
-                                                            bucketRegionFromException);
-                             } else {
-                                 fetchRegionAndSendRequest(request, operation, bucketName, returnFuture);
-                             }
+                             requestWithCrossRegion(request, operation, bucketName, returnFuture, t);
                              return;
                          }
                          returnFuture.completeExceptionally(t);
@@ -83,6 +75,21 @@ protected <T extends S3Request, ReturnT> CompletableFuture<ReturnT> invokeOperat
         return returnFuture;
     }
 
+    private <T extends S3Request, ReturnT> void requestWithCrossRegion(T request,
+                                                                       Function<T, CompletableFuture<ReturnT>> operation,
+                                                                       String bucketName,
+                                                                       CompletableFuture<ReturnT> returnFuture,
+                                                                       Throwable t) {
+
+        Optional<String> bucketRegionFromException = getBucketRegionFromException((S3Exception) t.getCause());
+        if (bucketRegionFromException.isPresent()) {
+            sendRequestWithRightRegion(request, operation, bucketName, returnFuture,
+                                       bucketRegionFromException);
+        } else {
+            fetchRegionAndSendRequest(request, operation, bucketName, returnFuture);
+        }
+    }
+
     private <T extends S3Request, ReturnT> void fetchRegionAndSendRequest(T request,
                                                                           Function<T, CompletableFuture<ReturnT>> operation,
                                                                           String bucketName,
@@ -92,7 +99,7 @@ private <T extends S3Request, ReturnT> void fetchRegionAndSendRequest(T request,
         ((S3AsyncClient) delegate()).headBucket(b -> b.bucket(bucketName)).whenComplete((response,
                                                                                          throwable) -> {
             if (throwable != null) {
-                if (isS3RedirectException(throwable.getCause())) {
+                if (isS3RedirectException(throwable)) {
                     bucketToRegionCache.remove(bucketName);
                     Optional<String> bucketRegion = getBucketRegionFromException((S3Exception) throwable.getCause());
 

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crossregion/S3CrossRegionSyncClient.java

@@ -17,6 +17,7 @@
 
 import static software.amazon.awssdk.services.s3.internal.crossregion.utils.CrossRegionUtils.REDIRECT_STATUS_CODE;
 import static software.amazon.awssdk.services.s3.internal.crossregion.utils.CrossRegionUtils.getBucketRegionFromException;
+import static software.amazon.awssdk.services.s3.internal.crossregion.utils.CrossRegionUtils.isS3RedirectException;
 import static software.amazon.awssdk.services.s3.internal.crossregion.utils.CrossRegionUtils.requestWithDecoratedEndpointProvider;
 
 import java.util.Map;
@@ -65,7 +66,7 @@ protected <T extends S3Request, ReturnT> ReturnT invokeOperation(T request, Func
             }
             return operation.apply(request);
         } catch (S3Exception exception) {
-            if (exception.statusCode() == REDIRECT_STATUS_CODE) {
+            if (isS3RedirectException(exception)) {
                 updateCacheFromRedirectException(exception, bucketName);
                 return operation.apply(
                     requestWithDecoratedEndpointProvider(
@@ -88,7 +89,7 @@ private Region fetchBucketRegion(String bucketName) {
         try {
             ((S3Client) delegate()).headBucket(HeadBucketRequest.builder().bucket(bucketName).build());
         } catch (S3Exception exception) {
-            if (exception.statusCode() == REDIRECT_STATUS_CODE) {
+            if (isS3RedirectException(exception)) {
                 return Region.of(getBucketRegionFromException(exception).orElseThrow(() -> exception));
             }
             throw exception;

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/crossregion/utils/CrossRegionUtils.java

@@ -17,6 +17,7 @@
 
 
 import java.util.Optional;
+import java.util.concurrent.CompletionException;
 import java.util.function.Supplier;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.awscore.AwsRequestOverrideConfiguration;
@@ -42,7 +43,9 @@ public static Optional<String> getBucketRegionFromException(S3Exception exceptio
     }
 
     public static boolean isS3RedirectException(Throwable exception) {
-        return exception instanceof S3Exception && ((S3Exception) exception).statusCode() == REDIRECT_STATUS_CODE;
+        Throwable exceptionToBeChecked = exception instanceof CompletionException ? exception.getCause() : exception ;
+        return exceptionToBeChecked instanceof S3Exception
+               && ((S3Exception) exceptionToBeChecked).statusCode() == REDIRECT_STATUS_CODE;
     }