Address PR comments

Author: sugmanue

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

@@ -192,7 +192,8 @@ private SdkClientConfiguration finalizeAwsConfiguration(SdkClientConfiguration c
     /**
      * Apply the client override configuration to the provided configuration.
      */
-    protected SdkClientConfiguration setOverrides(SdkClientConfiguration configuration) {
+    @Override
+    protected final SdkClientConfiguration setOverrides(SdkClientConfiguration configuration) {
         if (overrideConfig == null) {
             return configuration;
         }

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

@@ -484,18 +484,20 @@ default Builder retryPolicy(RetryMode retryMode) {
 
         RetryPolicy retryPolicy();
 
+        /**
+         * Configure the retry strategy that should be used when handling failure cases.
+         */
+        Builder retryStrategy(RetryStrategy retryStrategy);
+
         /**
          * Configure the retry mode used to resolve the corresponding {@link RetryStrategy} that should be used when handling
          * failure cases.
          *
          * @see RetryMode
          */
-        Builder retryStrategy(RetryMode retryMode);
-
-        /**
-         * Configure the retry strategy that should be used when handling failure cases.
-         */
-        Builder retryStrategy(RetryStrategy retryStrategy);
+        default Builder retryStrategy(RetryMode retryMode) {
+            throw new UnsupportedOperationException();
+        }
 
         /**
          * Configure a consumer to customize the default retry strategy. The default retry strategy is obtained by using the
@@ -510,7 +512,9 @@ default Builder retryPolicy(RetryMode retryMode) {
          * <p>
          * Defaults to {@link RetryMode#LEGACY} if no configuration setting is found.
          */
-        Builder retryStrategy(Consumer<RetryStrategy.Builder<?, ?>> configurator);
+        default Builder retryStrategy(Consumer<RetryStrategy.Builder<?, ?>> configurator) {
+            throw new UnsupportedOperationException();
+        }
 
         RetryStrategy retryStrategy();
 

pom.xml

@@ -645,7 +645,7 @@
                             <includeModule>profiles</includeModule>
                             <includeModule>protocols</includeModule>
                             <includeModule>regions</includeModule>
-                            <!-- <includeModule>sdk-core</includeModule> -->
+                            <includeModule>sdk-core</includeModule>
                             <includeModule>http-client-spi</includeModule>
                             <includeModule>apache-client</includeModule>
                             <includeModule>netty-nio-client</includeModule>