changed disableExpect100ContinueForPuts to expectContinueEnabled after api surface review discussions

Author: joviegas

.changes/next-release/feature-AmazonS3-7a01820.json

@@ -2,5 +2,5 @@
     "type": "feature",
     "category": "Amazon S3",
     "contributor": "",
-    "description": "Added `disableExpect100ContinueForPuts` to `S3Configuration` to control the `Expect: 100-continue` header on PutObject and UploadPart requests. When set to `true`, the SDK stops adding the header. For Apache HTTP client users, to have `ApacheHttpClient.builder().expectContinueEnabled()` fully control the header, set `disableExpect100ContinueForPuts(true)` on `S3Configuration`."
+    "description": "Added `expectContinueEnabled` to `S3Configuration` to control the `Expect: 100-continue` header on PutObject and UploadPart requests. When set to `false`, the SDK stops adding the header. For Apache HTTP client users, to have `ApacheHttpClient.builder().expectContinueEnabled()` fully control the header, set `expectContinueEnabled(false)` on `S3Configuration`."
 }

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

@@ -72,16 +72,17 @@ public final class S3Configuration implements ServiceConfiguration, ToCopyableBu
     private static final boolean DEFAULT_CHUNKED_ENCODING_ENABLED = true;
 
     /**
-     * By default, Expect: 100-continue is sent for {@link PutObjectRequest} and {@link UploadPartRequest}.
+     * By default, the SDK sends the {@code Expect: 100-continue} header for {@link PutObjectRequest}
+     * and {@link UploadPartRequest}.
      */
-    private static final boolean DEFAULT_DISABLE_EXPECT_100_CONTINUE_FOR_PUTS = false;
+    private static final boolean DEFAULT_EXPECT_CONTINUE_ENABLED = true;
 
     private final FieldWithDefault<Boolean> pathStyleAccessEnabled;
     private final FieldWithDefault<Boolean> accelerateModeEnabled;
     private final FieldWithDefault<Boolean> dualstackEnabled;
     private final FieldWithDefault<Boolean> checksumValidationEnabled;
     private final FieldWithDefault<Boolean> chunkedEncodingEnabled;
-    private final FieldWithDefault<Boolean> disableExpect100ContinueForPuts;
+    private final FieldWithDefault<Boolean> expectContinueEnabled;
     private final Boolean useArnRegionEnabled;
     private final Boolean multiRegionEnabled;
     private final FieldWithDefault<Supplier<ProfileFile>> profileFile;
@@ -94,8 +95,8 @@ private S3Configuration(DefaultS3ServiceConfigurationBuilder builder) {
         this.checksumValidationEnabled = FieldWithDefault.create(builder.checksumValidationEnabled,
                                                                  DEFAULT_CHECKSUM_VALIDATION_ENABLED);
         this.chunkedEncodingEnabled = FieldWithDefault.create(builder.chunkedEncodingEnabled, DEFAULT_CHUNKED_ENCODING_ENABLED);
-        this.disableExpect100ContinueForPuts =
-            FieldWithDefault.create(builder.disableExpect100ContinueForPuts, DEFAULT_DISABLE_EXPECT_100_CONTINUE_FOR_PUTS);
+        this.expectContinueEnabled = FieldWithDefault.create(builder.expectContinueEnabled,
+                                                             DEFAULT_EXPECT_CONTINUE_ENABLED);
         this.profileFile = FieldWithDefault.create(builder.profileFile, ProfileFile::defaultProfileFile);
         this.profileName = FieldWithDefault.create(builder.profileName,
                                                    ProfileFileSystemSetting.AWS_PROFILE.getStringValueOrThrow());
@@ -226,23 +227,23 @@ public boolean chunkedEncodingEnabled() {
     }
 
     /**
-     * Returns whether the S3 SDK client's explicit setting of the {@code Expect: 100-continue} header is disabled for
+     * Returns whether the S3 SDK client's explicit setting of the {@code Expect: 100-continue} header is enabled for
      * {@link PutObjectRequest} and {@link UploadPartRequest}. This controls whether the SDK adds the header during
      * request interceptor processing.
      * <p>
      * By default, the SDK sends the {@code Expect: 100-continue} header for these operations, allowing the server to
-     * reject the request before the client sends the full payload. Setting this to {@code true} disables this behavior.
+     * reject the request before the client sends the full payload. Setting this to {@code false} disables this behavior.
      * <p>
      * <b>Note:</b> When using the Apache HTTP client, the Apache client also independently adds the
      * {@code Expect: 100-continue} header by default via its own {@code expectContinueEnabled} setting. To fully
      * suppress the header on the wire, you must also disable it on the Apache HTTP client builder using
      * {@code ApacheHttpClient.builder().expectContinueEnabled(false)}.
      *
-     * @return True if the Expect: 100-continue header is disabled for put operations.
-     * @see S3Configuration.Builder#disableExpect100ContinueForPuts(Boolean)
+     * @return True if the Expect: 100-continue header is enabled.
+     * @see S3Configuration.Builder#expectContinueEnabled(Boolean)
      */
-    public boolean disableExpect100ContinueForPuts() {
-        return disableExpect100ContinueForPuts.value();
+    public boolean expectContinueEnabled() {
+        return expectContinueEnabled.value();
     }
 
     /**
@@ -275,7 +276,7 @@ public Builder toBuilder() {
                 .pathStyleAccessEnabled(pathStyleAccessEnabled.valueOrNullIfDefault())
                 .checksumValidationEnabled(checksumValidationEnabled.valueOrNullIfDefault())
                 .chunkedEncodingEnabled(chunkedEncodingEnabled.valueOrNullIfDefault())
-                .disableExpect100ContinueForPuts(disableExpect100ContinueForPuts.valueOrNullIfDefault())
+                .expectContinueEnabled(expectContinueEnabled.valueOrNullIfDefault())
                 .useArnRegionEnabled(useArnRegionEnabled)
                 .profileFile(profileFile.valueOrNullIfDefault())
                 .profileName(profileName.valueOrNullIfDefault());
@@ -385,26 +386,25 @@ public interface Builder extends CopyableBuilder<Builder, S3Configuration> {
          */
         Builder chunkedEncodingEnabled(Boolean chunkedEncodingEnabled);
 
-        Boolean disableExpect100ContinueForPuts();
+        Boolean expectContinueEnabled();
 
         /**
-         * Option to disable the S3 SDK client's explicit setting of the {@code Expect: 100-continue} header for
-         * {@link PutObjectRequest} and {@link UploadPartRequest}. This controls whether the SDK adds the header
-         * during request interceptor processing.
+         * Option to enable or disable the S3 SDK client's explicit setting of the {@code Expect: 100-continue} header
+         * for {@link PutObjectRequest} and {@link UploadPartRequest}.
          * <p>
          * By default, the SDK sends the {@code Expect: 100-continue} header for these operations, allowing the server to
-         * reject the request before the client sends the full payload. Setting this to {@code true} disables this behavior.
+         * reject the request before the client sends the full payload. Setting this to {@code false} disables this behavior.
          * <p>
          * <b>Note:</b> When using the Apache HTTP client, the Apache client also independently adds the
          * {@code Expect: 100-continue} header by default via its own {@code expectContinueEnabled} setting. To fully
          * suppress the header on the wire, you must also disable it on the Apache HTTP client builder using
          * {@code ApacheHttpClient.builder().expectContinueEnabled(false)}.
          * <p>
-         * Disabled by default (i.e., the header is sent).
+         * Enabled by default (i.e., the header is sent).
          *
-         * @see S3Configuration#disableExpect100ContinueForPuts()
+         * @see S3Configuration#expectContinueEnabled()
          */
-        Builder disableExpect100ContinueForPuts(Boolean disableExpect100ContinueForPuts);
+        Builder expectContinueEnabled(Boolean expectContinueEnabled);
 
         Boolean useArnRegionEnabled();
 
@@ -474,7 +474,7 @@ static final class DefaultS3ServiceConfigurationBuilder implements Builder {
         private Boolean pathStyleAccessEnabled;
         private Boolean checksumValidationEnabled;
         private Boolean chunkedEncodingEnabled;
-        private Boolean disableExpect100ContinueForPuts;
+        private Boolean expectContinueEnabled;
         private Boolean useArnRegionEnabled;
         private Boolean multiRegionEnabled;
         private Supplier<ProfileFile> profileFile;
@@ -552,22 +552,22 @@ public Builder chunkedEncodingEnabled(Boolean chunkedEncodingEnabled) {
         }
 
         @Override
-        public Boolean disableExpect100ContinueForPuts() {
-            return disableExpect100ContinueForPuts;
+        public Boolean expectContinueEnabled() {
+            return expectContinueEnabled;
         }
 
         public void setChunkedEncodingEnabled(Boolean chunkedEncodingEnabled) {
             chunkedEncodingEnabled(chunkedEncodingEnabled);
         }
 
         @Override
-        public Builder disableExpect100ContinueForPuts(Boolean disableExpect100ContinueForPuts) {
-            this.disableExpect100ContinueForPuts = disableExpect100ContinueForPuts;
+        public Builder expectContinueEnabled(Boolean expectContinueEnabled) {
+            this.expectContinueEnabled = expectContinueEnabled;
             return this;
         }
 
-        public void setDisableExpect100ContinueForPuts(Boolean disableExpect100ContinueForPuts) {
-            disableExpect100ContinueForPuts(disableExpect100ContinueForPuts);
+        public void setExpectContinueEnabled(Boolean expectContinueEnabled) {
+            expectContinueEnabled(expectContinueEnabled);
         }
 
         @Override

services/s3/src/main/java/software/amazon/awssdk/services/s3/internal/handlers/StreamingRequestInterceptor.java

@@ -29,7 +29,7 @@
 
 /**
  * Interceptor to add an 'Expect: 100-continue' header to the HTTP Request if it represents a PUT Object or Upload Part
- * request. This behavior can be disabled via {@link S3Configuration#disableExpect100ContinueForPuts()}.
+ * request. This behavior can be disabled via {@link S3Configuration#expectContinueEnabled()}.
  */
 @SdkInternalApi
 //TODO: This should be generalized for all streaming requests
@@ -68,7 +68,7 @@ private boolean shouldAddExpectContinueHeader(Context.ModifyHttpRequest context,
     private boolean isExpect100ContinueDisabled(ExecutionAttributes executionAttributes) {
         ServiceConfiguration serviceConfig = executionAttributes.getAttribute(SdkExecutionAttribute.SERVICE_CONFIG);
         if (serviceConfig instanceof S3Configuration) {
-            return ((S3Configuration) serviceConfig).disableExpect100ContinueForPuts();
+            return !((S3Configuration) serviceConfig).expectContinueEnabled();
         }
         return false;
     }

services/s3/src/test/java/software/amazon/awssdk/services/s3/S3ConfigurationTest.java

@@ -46,7 +46,7 @@ public void createConfiguration_minimal() {
         assertThat(config.multiRegionEnabled()).isEqualTo(true);
         assertThat(config.pathStyleAccessEnabled()).isEqualTo(false);
         assertThat(config.useArnRegionEnabled()).isEqualTo(false);
-        assertThat(config.disableExpect100ContinueForPuts()).isEqualTo(false);
+        assertThat(config.expectContinueEnabled()).isEqualTo(true);
     }
 
     @Test

services/s3/src/test/java/software/amazon/awssdk/services/s3/functionaltests/Expect100ContinueHeaderTest.java

@@ -71,7 +71,7 @@
  * These tests verify the header is correctly omitted for zero-length bodies and included for
  * non-empty bodies in both sync and async S3 operations.
  * <p>
- * Also verifies that {@link S3Configuration#disableExpect100ContinueForPuts()} suppresses the header
+ * Also verifies that {@link S3Configuration#expectContinueEnabled()} suppresses the header
  * for all put operations regardless of body content, across all HTTP client types.
  */
 @WireMockTest(httpsEnabled = true)
@@ -218,12 +218,12 @@ void asyncOperation_whenPublisherNonEmptyBody_shouldSendExpectHeader(
     }
 
     // -----------------------------------------------------------------------
-    // disableExpect100ContinueForPuts: parameterized across HTTP client types
+    // expectContinueEnabled: parameterized across HTTP client types
     // -----------------------------------------------------------------------
 
     @ParameterizedTest(name = "PutObject: {0}")
-    @MethodSource("expectContinueDisableConfigProvider")
-    void putObject_whenDisableExpect100ContinueConfigured_shouldMatchExpectedBehavior(
+    @MethodSource("expectContinueConfigProvider")
+    void putObject_whenExpectContinueConfigured_shouldMatchExpectedBehavior(
             String testName, String clientType, S3Configuration config,
             boolean expectHeaderPresent, WireMockRuntimeInfo wmRuntimeInfo) throws Exception {
         stubAnyPutRequest();
@@ -232,8 +232,8 @@ void putObject_whenDisableExpect100ContinueConfigured_shouldMatchExpectedBehavio
     }
 
     @ParameterizedTest(name = "UploadPart: {0}")
-    @MethodSource("expectContinueDisableConfigProvider")
-    void uploadPart_whenDisableExpect100ContinueConfigured_shouldMatchExpectedBehavior(
+    @MethodSource("expectContinueConfigProvider")
+    void uploadPart_whenExpectContinueConfigured_shouldMatchExpectedBehavior(
             String testName, String clientType, S3Configuration config,
             boolean expectHeaderPresent, WireMockRuntimeInfo wmRuntimeInfo) throws Exception {
         stubAnyPutRequest();
@@ -284,41 +284,41 @@ private void executeS3Operation(String clientType, WireMockRuntimeInfo wmInfo,
     // Test data providers
     // -----------------------------------------------------------------------
 
-    private static Stream<Arguments> expectContinueDisableConfigProvider() {
+    private static Stream<Arguments> expectContinueConfigProvider() {
         S3Configuration disabledConfig = S3Configuration.builder()
-                                                        .disableExpect100ContinueForPuts(true)
+                                                        .expectContinueEnabled(false)
                                                         .build();
         S3Configuration enabledConfig = S3Configuration.builder()
-                                                       .disableExpect100ContinueForPuts(false)
+                                                       .expectContinueEnabled(true)
                                                        .build();
 
         return Stream.of(
-            // Apache: default expectContinueEnabled=true — both interceptor and Apache add the header
+            // Apache: default — both interceptor and Apache add the header
             Arguments.of("Apache - default config", "APACHE", null, true),
-            Arguments.of("Apache - S3Config disabled=false", "APACHE", enabledConfig, true),
-            // Apache: S3Config disabled stops the interceptor, but Apache still adds the header independently
-            Arguments.of("Apache - S3Config disabled=true (Apache still adds)", "APACHE", disabledConfig, true),
-            // Apache with expectContinueEnabled=false + S3Config disabled: fully suppressed
-            Arguments.of("Apache(ec=false) + S3Config disabled=true", "APACHE_EC_DISABLED", disabledConfig, false),
-            // Apache with expectContinueEnabled=true + S3Config disabled: Apache still adds the header independently
-            Arguments.of("Apache(ec=true) + S3Config disabled=true", "APACHE_EC_ENABLED", disabledConfig, true),
+            Arguments.of("Apache - S3Config enabled=true", "APACHE", enabledConfig, true),
+            // Apache: S3Config enabled=false stops the interceptor, but Apache still adds the header independently
+            Arguments.of("Apache - S3Config enabled=false (Apache still adds)", "APACHE", disabledConfig, true),
+            // Apache with ec=false + S3Config enabled=false: fully suppressed
+            Arguments.of("Apache(ec=false) + S3Config enabled=false", "APACHE_EC_DISABLED", disabledConfig, false),
+            // Apache with ec=true + S3Config enabled=false: Apache still adds the header independently
+            Arguments.of("Apache(ec=true) + S3Config enabled=false", "APACHE_EC_ENABLED", disabledConfig, true),
 
             // URL Connection: only the interceptor adds the header
             Arguments.of("UrlConnection - default config", "URL_CONNECTION", null, true),
-            Arguments.of("UrlConnection - S3Config disabled=true", "URL_CONNECTION", disabledConfig, false),
+            Arguments.of("UrlConnection - S3Config enabled=false", "URL_CONNECTION", disabledConfig, false),
 
             // CRT sync (generic HTTP client): only the interceptor adds the header
             Arguments.of("CrtSync - default config", "CRT_SYNC", null, true),
-            Arguments.of("CrtSync - S3Config disabled=true", "CRT_SYNC", disabledConfig, false),
+            Arguments.of("CrtSync - S3Config enabled=false", "CRT_SYNC", disabledConfig, false),
 
             // Netty: only the interceptor adds the header
             Arguments.of("Netty - default config", "NETTY", null, true),
-            Arguments.of("Netty - S3Config disabled=false", "NETTY", enabledConfig, true),
-            Arguments.of("Netty - S3Config disabled=true", "NETTY", disabledConfig, false),
+            Arguments.of("Netty - S3Config enabled=true", "NETTY", enabledConfig, true),
+            Arguments.of("Netty - S3Config enabled=false", "NETTY", disabledConfig, false),
 
             // CRT async (generic HTTP client): only the interceptor adds the header
             Arguments.of("CrtAsync - default config", "CRT_ASYNC", null, true),
-            Arguments.of("CrtAsync - S3Config disabled=true", "CRT_ASYNC", disabledConfig, false)
+            Arguments.of("CrtAsync - S3Config enabled=false", "CRT_ASYNC", disabledConfig, false)
         );
     }