Fixed an issue where sdkRepsonse is not present in the ProgressSnapshot for upload and copy (#3585)

Author: zoewangg

services-custom/s3-transfer-manager/src/it/java/software/amazon/awssdk/transfer/s3/S3TransferManagerUploadIntegrationTest.java

@@ -82,6 +82,7 @@ void upload_file_SentCorrectly() throws IOException {
                 .isEqualTo(ChecksumUtils.computeCheckSum(obj));
         assertThat(obj.response().responseMetadata().requestId()).isNotNull();
         assertThat(obj.response().metadata()).containsEntry("foobar", "FOO BAR");
+        assertThat(fileUpload.progress().snapshot().sdkResponse()).isPresent();
     }
 
     @Test
@@ -105,5 +106,6 @@ void upload_asyncRequestBody_SentCorrectly() throws IOException {
         assertThat(ChecksumUtils.computeCheckSum(content.getBytes(StandardCharsets.UTF_8)))
             .isEqualTo(ChecksumUtils.computeCheckSum(obj));
         assertThat(obj.response().responseMetadata().requestId()).isNotNull();
+        assertThat(upload.progress().snapshot().sdkResponse()).isPresent();
     }
 }

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

@@ -164,6 +164,10 @@ public void registerCompletion(CompletableFuture<? extends CompletedObjectTransf
     private void transferComplete(CompletedObjectTransfer r) {
         listenerInvoker.transferComplete(context.copy(b -> {
             TransferProgressSnapshot snapshot = progress.snapshot();
+            if (!snapshot.sdkResponse().isPresent()) {
+                snapshot = progress.updateAndGet(p -> p.sdkResponse(r.response()));
+            }
+
             b.progressSnapshot(snapshot);
             b.completedTransfer(r);
         }));

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/model/CompletedCopy.java

@@ -38,6 +38,7 @@ private CompletedCopy(DefaultBuilder builder) {
         this.response = Validate.paramNotNull(builder.response, "response");
     }
 
+    @Override
     public CopyObjectResponse response() {
         return response;
     }

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/model/CompletedFileDownload.java

@@ -39,6 +39,7 @@ private CompletedFileDownload(DefaultBuilder builder) {
         this.response = Validate.paramNotNull(builder.response, "response");
     }
 
+    @Override
     public GetObjectResponse response() {
         return response;
     }

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/model/CompletedFileUpload.java

@@ -39,6 +39,7 @@ private CompletedFileUpload(DefaultBuilder builder) {
         this.response = Validate.paramNotNull(builder.response, "response");
     }
 
+    @Override
     public PutObjectResponse response() {
         return response;
     }

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/model/CompletedObjectTransfer.java

@@ -17,6 +17,7 @@
 
 import software.amazon.awssdk.annotations.SdkPreviewApi;
 import software.amazon.awssdk.annotations.SdkPublicApi;
+import software.amazon.awssdk.core.SdkResponse;
 
 /**
  * A completed single object transfer.
@@ -29,4 +30,11 @@
 @SdkPublicApi
 @SdkPreviewApi
 public interface CompletedObjectTransfer extends CompletedTransfer {
+
+    /**
+     * Return the {@link SdkResponse} associated with this transfer
+     */
+    default SdkResponse response() {
+        throw new UnsupportedOperationException();
+    }
 }

services-custom/s3-transfer-manager/src/main/java/software/amazon/awssdk/transfer/s3/model/CompletedUpload.java

@@ -39,6 +39,7 @@ private CompletedUpload(DefaultBuilder builder) {
         this.response = Validate.paramNotNull(builder.response, "response");
     }
 
+    @Override
     public PutObjectResponse response() {
         return response;
     }