Remove download consumer builder because it's confusing (#3599)

Author: zoewangg

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

@@ -19,7 +19,6 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Executor;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import software.amazon.awssdk.annotations.SdkPreviewApi;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.annotations.ThreadSafe;
@@ -304,30 +303,19 @@ default FileDownload resumeDownloadFile(Consumer<ResumableFileDownload.Builder>
      * @param downloadRequest the download request, containing a {@link GetObjectRequest} and {@link AsyncResponseTransformer}
      * @param <ResultT>       The type of data the {@link AsyncResponseTransformer} produces
      * @return A {@link Download} that can be used to track the ongoing transfer
-     * @see #download(Function)
      * @see #downloadFile(DownloadFileRequest)
      */
     default <ResultT> Download<ResultT> download(DownloadRequest<ResultT> downloadRequest) {
         throw new UnsupportedOperationException();
     }
 
-    /**
-     * This is a convenience method that creates an instance of the {@link DownloadRequest} builder, avoiding the need to create
-     * one manually via {@link DownloadRequest#builder()}.
-     *
-     * @see #download(DownloadRequest)
-     */
-    default <ResultT> Download<ResultT> download(Function<DownloadRequest.UntypedBuilder,
-        DownloadRequest.TypedBuilder<ResultT>> request) {
-        return download(DownloadRequest.builder().applyMutation(request).build());
-    }
-
     /**
      * Uploads a local file to an object in S3. For non-file-based uploads, you may use {@link #upload(UploadRequest)} instead.
      * <p>
      * Users can monitor the progress of the transfer by attaching a {@link TransferListener}. The provided
      * {@link LoggingTransferListener} logs a basic progress bar; users can also implement their own listeners.
      *
+     * Upload a local file to an object in S3. For non-file-based uploads, you may use {@link #upload(UploadRequest)} instead.
      * <p>
      * <b>Usage Example:</b>
      * {@snippet :

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

@@ -21,7 +21,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import software.amazon.awssdk.annotations.SdkPreviewApi;
 import software.amazon.awssdk.annotations.SdkPublicApi;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
@@ -33,7 +32,6 @@
 import software.amazon.awssdk.utils.ToString;
 import software.amazon.awssdk.utils.Validate;
 import software.amazon.awssdk.utils.builder.CopyableBuilder;
-import software.amazon.awssdk.utils.builder.SdkBuilder;
 import software.amazon.awssdk.utils.builder.ToCopyableBuilder;
 
 /**
@@ -209,18 +207,9 @@ default UntypedBuilder getObjectRequest(Consumer<GetObjectRequest.Builder> getOb
          * @see AsyncResponseTransformer
          */
         <T> TypedBuilder<T> responseTransformer(AsyncResponseTransformer<GetObjectResponse, T> responseTransformer);
-
-        /**
-         * Like {@link SdkBuilder#applyMutation(Consumer)}, but accepts a {@link Function} that upgrades this {@link
-         * UntypedBuilder} to a {@link TypedBuilder}. Therefore, the function must also call {@link
-         * #responseTransformer(AsyncResponseTransformer)} to specify the generic type.
-         */
-        default <T> TypedBuilder<T> applyMutation(Function<UntypedBuilder, TypedBuilder<T>> mutator) {
-            return mutator.apply(this);
-        }
     }
 
-    private static class DefaultUntypedBuilder implements UntypedBuilder {
+    private static final class DefaultUntypedBuilder implements UntypedBuilder {
         private GetObjectRequest getObjectRequest;
         private List<TransferListener> transferListeners;
 

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

@@ -32,6 +32,7 @@
 import software.amazon.awssdk.core.ResponseBytes;
 import software.amazon.awssdk.core.async.AsyncRequestBody;
 import software.amazon.awssdk.core.async.AsyncResponseTransformer;
+import software.amazon.awssdk.core.async.ResponsePublisher;
 import software.amazon.awssdk.services.s3.internal.crt.S3CrtAsyncClient;
 import software.amazon.awssdk.services.s3.model.CopyObjectRequest;
 import software.amazon.awssdk.services.s3.model.CopyObjectResponse;
@@ -48,6 +49,7 @@
 import software.amazon.awssdk.transfer.s3.model.DownloadDirectoryRequest;
 import software.amazon.awssdk.transfer.s3.model.DownloadFileRequest;
 import software.amazon.awssdk.transfer.s3.S3TransferManager;
+import software.amazon.awssdk.transfer.s3.model.DownloadRequest;
 import software.amazon.awssdk.transfer.s3.model.UploadDirectoryRequest;
 import software.amazon.awssdk.transfer.s3.model.UploadFileRequest;
 
@@ -206,13 +208,13 @@ void download_cancel_shouldForwardCancellation() {
         CompletableFuture<GetObjectResponse> s3CrtFuture = new CompletableFuture<>();
         when(mockS3Crt.getObject(any(GetObjectRequest.class), any(AsyncResponseTransformer.class)))
             .thenReturn(s3CrtFuture);
+        DownloadRequest<ResponseBytes<GetObjectResponse>> downloadRequest =
+            DownloadRequest.builder()
+                           .getObjectRequest(g -> g.bucket("bucket").key("key"))
+                           .responseTransformer(AsyncResponseTransformer.toBytes()).build();
 
         CompletableFuture<CompletedDownload<ResponseBytes<GetObjectResponse>>> future =
-            tm.download(d -> d
-                  .getObjectRequest(g -> g.bucket("bucket")
-                                          .key("key"))
-                  .responseTransformer(AsyncResponseTransformer.toBytes()))
-              .completionFuture();
+            tm.download(downloadRequest).completionFuture();
         future.cancel(true);
         assertThat(s3CrtFuture).isCancelled();
     }
@@ -236,8 +238,14 @@ void objectLambdaArnBucketProvided_shouldThrowException() {
                                    .completionFuture().join())
             .hasMessageContaining("support S3 Object Lambda resources").hasCauseInstanceOf(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> tm.download(b -> b.getObjectRequest(p -> p.bucket(objectLambdaArn).key("key"))
-                                                   .responseTransformer(AsyncResponseTransformer.toBytes()))
+
+        DownloadRequest<ResponseBytes<GetObjectResponse>> downloadRequest =
+            DownloadRequest.builder()
+                           .getObjectRequest(g -> g.bucket(objectLambdaArn).key("key"))
+                           .responseTransformer(AsyncResponseTransformer.toBytes())
+                           .build();
+
+        assertThatThrownBy(() -> tm.download(downloadRequest)
                                    .completionFuture().join())
             .hasMessageContaining("support S3 Object Lambda resources").hasCauseInstanceOf(IllegalArgumentException.class);
 
@@ -280,9 +288,12 @@ void mrapArnProvided_shouldThrowException() {
                                    .completionFuture().join())
             .hasMessageContaining("multi-region access point ARN").hasCauseInstanceOf(IllegalArgumentException.class);
 
-        assertThatThrownBy(() -> tm.download(b -> b.getObjectRequest(p -> p.bucket(mrapArn).key("key"))
-                                                   .responseTransformer(AsyncResponseTransformer.toBytes()))
-                                   .completionFuture().join())
+        DownloadRequest<ResponseBytes<GetObjectResponse>> downloadRequest =
+            DownloadRequest.builder()
+                           .getObjectRequest(g -> g.bucket(mrapArn).key("key"))
+                           .responseTransformer(AsyncResponseTransformer.toBytes()).build();
+
+        assertThatThrownBy(() -> tm.download(downloadRequest).completionFuture().join())
             .hasMessageContaining("multi-region access point ARN").hasCauseInstanceOf(IllegalArgumentException.class);
 
         assertThatThrownBy(() -> tm.uploadDirectory(b -> b.bucket(mrapArn)