Address PR comments

Author: sugmanue

core/aws-core/src/main/java/software/amazon/awssdk/awscore/client/builder/AwsDefaultClientBuilder.java

@@ -15,6 +15,9 @@
 
 package software.amazon.awssdk.awscore.client.builder;
 
+import static software.amazon.awssdk.core.client.config.SdkClientOption.CONFIGURED_RETRY_CONFIGURATOR;
+import static software.amazon.awssdk.core.client.config.SdkClientOption.CONFIGURED_RETRY_MODE;
+import static software.amazon.awssdk.core.client.config.SdkClientOption.CONFIGURED_RETRY_STRATEGY;
 import static software.amazon.awssdk.core.client.config.SdkClientOption.RETRY_STRATEGY;
 
 import java.net.URI;
@@ -197,8 +200,7 @@ protected final SdkClientConfiguration setOverrides(SdkClientConfiguration confi
         if (overrideConfig == null) {
             return configuration;
         }
-        SdkClientConfiguration.Builder builder = configuration.toBuilder()
-                                                              .putAll(overrideConfig);
+        SdkClientConfiguration.Builder builder = configuration.toBuilder();
         overrideConfig.retryStrategy().ifPresent(retryStrategy -> builder.option(RETRY_STRATEGY, retryStrategy));
         overrideConfig.retryMode().ifPresent(retryMode -> builder.option(RETRY_STRATEGY,
                                                                          AwsRetryStrategy.forRetryMode(retryMode)));
@@ -207,6 +209,11 @@ protected final SdkClientConfiguration setOverrides(SdkClientConfiguration confi
             configurator.accept(defaultBuilder);
             builder.option(RETRY_STRATEGY, defaultBuilder.build());
         });
+        builder.putAll(overrideConfig)
+        // Forget anything we configured in the override configuration else it might be re-applied.
+        builder.option(CONFIGURED_RETRY_MODE, null);
+        builder.option(CONFIGURED_RETRY_STRATEGY, null);
+        builder.option(CONFIGURED_RETRY_CONFIGURATOR, null);
         return builder.build();
     }
 

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/config/ClientOverrideConfiguration.java

@@ -486,12 +486,17 @@ default Builder retryPolicy(RetryMode retryMode) {
 
         /**
          * Configure the retry strategy that should be used when handling failure cases.
+         *
+         * <p>
+         * Note that retryStrategy options are mutually exclusive
          */
         Builder retryStrategy(RetryStrategy retryStrategy);
 
         /**
          * Configure the retry mode used to resolve the corresponding {@link RetryStrategy} that should be used when handling
          * failure cases.
+         * <p>
+         * Note that retryStrategy options are mutually exclusive
          *
          * @see RetryMode
          */
@@ -511,6 +516,8 @@ default Builder retryStrategy(RetryMode retryMode) {
          *
          * <p>
          * Defaults to {@link RetryMode#LEGACY} if no configuration setting is found.
+         * <p>
+         * Note that retryStrategy options are mutually exclusive
          */
         default Builder retryStrategy(Consumer<RetryStrategy.Builder<?, ?>> configurator) {
             throw new UnsupportedOperationException();