Enable setting multipart to true/false by defining it as a custom client context parameter

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/AsyncClientBuilderClass.java

@@ -81,7 +81,6 @@ public TypeSpec poetSpec() {
 
         MultipartCustomization multipartCustomization = model.getCustomizationConfig().getMultipartCustomization();
         if (multipartCustomization != null) {
-            builder.addMethod(multipartEnabledMethod(multipartCustomization));
             builder.addMethod(multipartConfigMethods(multipartCustomization));
         }
 
@@ -159,18 +158,6 @@ private MethodSpec tokenProviderMethod() {
                          .build();
     }
 
-    private MethodSpec multipartEnabledMethod(MultipartCustomization multipartCustomization) {
-        return MethodSpec.methodBuilder("multipartEnabled")
-                         .addAnnotation(Override.class)
-                         .addModifiers(Modifier.PUBLIC)
-                         .returns(builderInterfaceName)
-                         .addParameter(Boolean.class, "enabled")
-                         .addStatement("clientContextParams.put($N, enabled)",
-                                       multipartCustomization.getContextParamEnabledKey())
-                         .addStatement("return this")
-                         .build();
-    }
-
     private MethodSpec multipartConfigMethods(MultipartCustomization multipartCustomization) {
         ClassName mulitpartConfigClassName =
             PoetUtils.classNameFromFqcn(multipartCustomization.getMultipartConfigurationClass());

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

@@ -52,11 +52,7 @@ public static S3TransferManager createTransferManager(DefaultBuilder tmBuilder)
             return new CrtS3TransferManager(transferConfiguration, s3AsyncClient, isDefaultS3AsyncClient);
         }
 
-        if (s3AsyncClient.getClass().getName().equals("software.amazon.awssdk.services.s3.DefaultS3AsyncClient")) {
-            log.warn(() -> "The provided DefaultS3AsyncClient is not an instance of S3CrtAsyncClient, and thus multipart"
-                           + " upload/download feature is not enabled and resumable file upload is not supported. To benefit "
-                           + "from maximum throughput, consider using S3AsyncClient.crtBuilder().build() instead.");
-        } else {
+        if (!Boolean.TRUE.equals(s3AsyncClient.serviceClientConfiguration().multipartEnabled())) {
             log.debug(() -> "The provided S3AsyncClient is not an instance of S3CrtAsyncClient, and thus multipart"
                             + " upload/download feature may not be enabled and resumable file upload may not be supported.");
         }
@@ -68,7 +64,7 @@ private static Supplier<S3AsyncClient> defaultS3AsyncClient() {
         if (crtInClasspath()) {
             return S3AsyncClient::crtCreate;
         }
-        return S3AsyncClient::create;
+        return () -> S3AsyncClient.builder().multipartEnabled(true).build();
     }
 
     private static boolean crtInClasspath() {

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

@@ -17,12 +17,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.core.LogEvent;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.regions.Region;
@@ -35,33 +32,66 @@ class TransferManagerLoggingTest {
     @Test
     void transferManager_withCrtClient_shouldNotLogWarnMessages() {
 
-        try (S3AsyncClient s3Crt = S3AsyncClient.crtBuilder()
-                                                .region(Region.US_WEST_2)
-                                                .credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
-                                                .build();
-             LogCaptor logCaptor = LogCaptor.create(Level.WARN);
-             S3TransferManager tm = S3TransferManager.builder().s3Client(s3Crt).build()) {
+        try (S3AsyncClient s3AsyncClient = S3AsyncClient.crtBuilder()
+                                                        .region(Region.US_WEST_2)
+                                                        .credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
+                                                        .build();
+             LogCaptor logCaptor = LogCaptor.create(Level.DEBUG);
+             S3TransferManager tm = S3TransferManager.builder().s3Client(s3AsyncClient).build()) {
             List<LogEvent> events = logCaptor.loggedEvents();
             assertThat(events).isEmpty();
         }
     }
 
     @Test
-    void transferManager_withJavaClient_shouldLogWarnMessage() {
+    void transferManager_withCustomJavaClientWhenMultiPartEnabledIsNull_shouldLogDebugMessage() {
+        try (S3AsyncClient s3AsyncClient = S3AsyncClient.builder()
+                                                        .region(Region.US_WEST_2)
+                                                        .credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
+                                                        .build();
+             LogCaptor logCaptor = LogCaptor.create(Level.DEBUG);
+             S3TransferManager tm = S3TransferManager.builder().s3Client(s3AsyncClient).build()) {
+            List<LogEvent> events = logCaptor.loggedEvents();
+            assertLogged(events, Level.DEBUG, "The provided S3AsyncClient is not an instance of S3CrtAsyncClient, and thus multipart"
+                                              + " upload/download feature may not be enabled and resumable file upload may not be supported.");
+        }
+    }
 
+    @Test
+    void transferManager_withCustomJavaClientWhenMultiPartEnabledIsFalse_shouldLogDebugMessage() {
+        try (S3AsyncClient s3AsyncClient = S3AsyncClient.builder()
+                                                        .region(Region.US_WEST_2)
+                                                        .credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
+                                                        .multipartEnabled(false)
+                                                        .build();
+             LogCaptor logCaptor = LogCaptor.create(Level.DEBUG);
+             S3TransferManager tm = S3TransferManager.builder().s3Client(s3AsyncClient).build()) {
+            List<LogEvent> events = logCaptor.loggedEvents();
+            assertLogged(events, Level.DEBUG, "The provided S3AsyncClient is not an instance of S3CrtAsyncClient, and thus multipart"
+                                              + " upload/download feature may not be enabled and resumable file upload may not be supported.");
+        }
+    }
 
+    @Test
+    void transferManager_withDefaultJavaClient_shouldNotLogDebugMessage() {
+        try (LogCaptor logCaptor = LogCaptor.create(Level.DEBUG);
+             S3TransferManager tm = S3TransferManager.builder().build()) {
+            List<LogEvent> events = logCaptor.loggedEvents();
+            assertThat(events).isEmpty();
+        }
+    }
+
+    @Test
+    void transferManager_withCustomJavaClientMultiPartEnabled_shouldNotLogDebugMessage() {
         try (S3AsyncClient s3Crt = S3AsyncClient.builder()
                                                 .region(Region.US_WEST_2)
                                                 .credentialsProvider(() -> AwsBasicCredentials.create("foo", "bar"))
+                                                .multipartEnabled(true)
                                                 .build();
-             LogCaptor logCaptor = LogCaptor.create(Level.WARN);
+             LogCaptor logCaptor = LogCaptor.create(Level.DEBUG);
              S3TransferManager tm = S3TransferManager.builder().s3Client(s3Crt).build()) {
             List<LogEvent> events = logCaptor.loggedEvents();
-            assertLogged(events, Level.WARN, "The provided DefaultS3AsyncClient is not an instance of S3CrtAsyncClient, and "
-                                             + "thus multipart upload/download feature is not enabled and resumable file upload"
-                                             + " is "
-                                             + "not supported. To benefit from maximum throughput, consider using "
-                                             + "S3AsyncClient.crtBuilder().build() instead.");
+            assertThat(events).isEmpty();
         }
     }
 
@@ -72,4 +102,4 @@ private static void assertLogged(List<LogEvent> events, org.apache.logging.log4j
         assertThat(msg).isEqualTo(message);
         assertThat(event.getLevel()).isEqualTo(level);
     }
-}
+}

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/client/S3AsyncClientDecorator.java

@@ -33,8 +33,6 @@
 public class S3AsyncClientDecorator {
     public static final AttributeMap.Key<MultipartConfiguration> MULTIPART_CONFIGURATION_KEY =
         new AttributeMap.Key<MultipartConfiguration>(MultipartConfiguration.class){};
-    public static final AttributeMap.Key<Boolean> MULTIPART_ENABLED_KEY =
-        new AttributeMap.Key<Boolean>(Boolean.class){};
 
     public S3AsyncClientDecorator() {
     }
@@ -62,7 +60,7 @@ private Predicate<S3AsyncClient> isCrossRegionEnabledAsync(AttributeMap clientCo
     }
 
     private Predicate<S3AsyncClient> isMultipartEnable(AttributeMap clientContextParams) {
-        Boolean multipartEnabled = clientContextParams.get(MULTIPART_ENABLED_KEY);
+        Boolean multipartEnabled = clientContextParams.get(S3ClientContextParams.MULTIPART_ENABLED);
         return client -> multipartEnabled != null && multipartEnabled.booleanValue();
     }
-}
+}

services/s3/src/main/resources/codegen-resources/customization.config

@@ -241,7 +241,6 @@
     "multipartConfigurationClass": "software.amazon.awssdk.services.s3.multipart.MultipartConfiguration",
     "multipartConfigMethodDoc": "Configuration for multipart operation of this client.",
     "multipartEnableMethodDoc": "Enables automatic conversion of put and copy method to their equivalent multipart operation.",
-    "contextParamEnabledKey": "S3AsyncClientDecorator.MULTIPART_ENABLED_KEY",
     "contextParamConfigKey": "S3AsyncClientDecorator.MULTIPART_CONFIGURATION_KEY"
   },
   "interceptors": [
@@ -271,6 +270,10 @@
     "CrossRegionAccessEnabled":{
       "documentation":"Enables cross-region bucket access for this client",
       "type":"boolean"
+    },
+    "multipartEnabled":{
+      "documentation":"Enables automatic conversion of put and copy method to their equivalent multipart operation.",
+      "type":"boolean"
     }
   },
   "endpointAuthSchemeConfig": {
@@ -285,4 +288,4 @@
   },
   "useSraAuth": true,
   "enableGenerateCompiledEndpointRules": true
-}
+}