Remove TODOs and change default targetThroughputInGbps to 10 (#3634)

* Remove TODOs and change default targetThroughputInGbps to 10

Author: zoewangg

.changes/next-release/feature-AmazonS3TransferManager-4cd146b.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "Amazon S3 Transfer Manager",
+    "contributor": "",
+    "description": "Change default `targetThroughputInGbps` from 5 to 10"
+}

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/builder/SdkDefaultClientBuilder.java

@@ -380,9 +380,6 @@ protected AttributeMap childHttpConfig() {
      * Finalize which async executor service will be used for the created client. The default async executor
      * service has at least 8 core threads and can scale up to at least 64 threads when needed depending
      * on the number of processors available.
-     *
-     * This uses the same default executor in S3NativeClientConfiguration#resolveAsyncFutureCompletionExecutor.
-     * Make sure you update that method if you update the defaults here.
      */
     private Executor resolveAsyncFutureCompletionExecutor(SdkClientConfiguration config) {
         Supplier<Executor> defaultExecutor = () -> {

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

@@ -693,8 +693,8 @@ interface Builder {
          * {@link S3AsyncClient} if not provided.
          *
          * <p>
-         * It's highly recommended using {@link S3AsyncClient#crtBuilder()} to create an {@link S3AsyncClient} instance to benefit
-         * from multipart upload/download feature and maximum throughput.
+         * It's highly recommended to use {@link S3AsyncClient#crtBuilder()} to create an {@link S3AsyncClient} instance to
+         * benefit from multipart upload/download feature and maximum throughput.
          *
          * <p>
          * Note: the provided {@link S3AsyncClient} will not be closed when the transfer manager is closed; it must be closed by
@@ -709,11 +709,10 @@ interface Builder {
         /**
          * Specifies the executor that {@link S3TransferManager} will use to execute background tasks before handing them off to
          * the underlying S3 async client, such as visiting file tree in a
-         * {@link S3TransferManager#uploadDirectory(UploadDirectoryRequest)}
-         * operation
+         * {@link S3TransferManager#uploadDirectory(UploadDirectoryRequest)} operation.
          *
          * <p>
-         * The SDK will create an executor if not provided
+         * The SDK will create an executor if not provided.
          *
          * <p>
          * <b>This executor must be shut down by the user when it is ready to be disposed. The SDK will not close the executor

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

@@ -41,13 +41,10 @@ public final class TransferConfigurationOption<T> extends AttributeMap.Key<T> {
 
     private static final int DEFAULT_UPLOAD_DIRECTORY_MAX_DEPTH = Integer.MAX_VALUE;
 
-    private static final Boolean DEFAULT_UPLOAD_DIRECTORY_FOLLOW_SYMBOLIC_LINKS = Boolean.FALSE;
-
-    // TODO: revisit default settings before GA
     public static final AttributeMap TRANSFER_MANAGER_DEFAULTS = AttributeMap
         .builder()
         .put(UPLOAD_DIRECTORY_MAX_DEPTH, DEFAULT_UPLOAD_DIRECTORY_MAX_DEPTH)
-        .put(UPLOAD_DIRECTORY_FOLLOW_SYMBOLIC_LINKS, DEFAULT_UPLOAD_DIRECTORY_FOLLOW_SYMBOLIC_LINKS)
+        .put(UPLOAD_DIRECTORY_FOLLOW_SYMBOLIC_LINKS, false)
         .build();
 
     private final String name;

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

@@ -78,7 +78,6 @@ public void close() {
         options.close();
     }
 
-    // TODO: revisit this before GA
     private Executor defaultExecutor() {
         int maxPoolSize = 100;
         ThreadPoolExecutor executor = new ThreadPoolExecutor(0, maxPoolSize,

services/s3/src/main/java/software/amazon/awssdk/services/s3/S3CrtAsyncClientBuilder.java

@@ -90,7 +90,7 @@ public interface S3CrtAsyncClientBuilder extends SdkBuilder<S3CrtAsyncClientBuil
      * on various factors such as the network bandwidth of the environment and the configured {@link #maxConcurrency}.
      *
      * <p>
-     * By default, it is 5Gbps
+     * By default, it is 10 Gbps
      *
      * @param targetThroughputInGbps the target throughput in Gbps
      * @return this builder for method chaining.

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

@@ -19,7 +19,6 @@
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.credentials.AwsCredentialsProvider;
 import software.amazon.awssdk.auth.credentials.DefaultCredentialsProvider;
-import software.amazon.awssdk.core.client.config.ClientAsyncConfiguration;
 import software.amazon.awssdk.crt.auth.credentials.CredentialsProvider;
 import software.amazon.awssdk.crt.io.ClientBootstrap;
 import software.amazon.awssdk.regions.providers.DefaultAwsRegionProviderChain;
@@ -31,7 +30,7 @@
 @SdkInternalApi
 public class S3NativeClientConfiguration implements SdkAutoCloseable {
     private static final long DEFAULT_PART_SIZE_IN_BYTES = 8L * 1024 * 1024;
-    private static final long DEFAULT_TARGET_THROUGHPUT_IN_GBPS = 5;
+    private static final long DEFAULT_TARGET_THROUGHPUT_IN_GBPS = 10;
 
     private final String signingRegion;
     private final ClientBootstrap clientBootstrap;
@@ -118,14 +117,13 @@ public void close() {
     }
 
     public static final class Builder {
-        public Long readBufferSizeInBytes;
+        private Long readBufferSizeInBytes;
         private String signingRegion;
         private AwsCredentialsProvider credentialsProvider;
         private Long partSizeInBytes;
         private Double targetThroughputInGbps;
         private Integer maxConcurrency;
         private URI endpointOverride;
-        private ClientAsyncConfiguration asynConfiguration;
         private Boolean checksumValidationEnabled;
 
         private Builder() {