Correctly consider defaultRetryMode customization (#5365)

prevent the defaultRetryMode defined in customization.config from being overridden during codegen

Author: L-Applin

.changes/next-release/bugfix-AWSSDKforJavav2-6998579.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "prevent defaultRetryMode in customization.config from not being taken into account"
+}

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

@@ -176,7 +176,7 @@ private SdkClientConfiguration finalizeAwsConfiguration(SdkClientConfiguration c
                             .lazyOptionIfAbsent(AwsClientOption.DUALSTACK_ENDPOINT_ENABLED, this::resolveDualstackEndpointEnabled)
                             .lazyOptionIfAbsent(AwsClientOption.FIPS_ENDPOINT_ENABLED, this::resolveFipsEndpointEnabled)
                             .lazyOption(AwsClientOption.DEFAULTS_MODE, this::resolveDefaultsMode)
-                            .lazyOption(SdkClientOption.DEFAULT_RETRY_MODE, this::resolveDefaultRetryMode)
+                            .lazyOptionIfAbsent(SdkClientOption.DEFAULT_RETRY_MODE, this::resolveDefaultRetryMode)
                             .lazyOption(ServiceMetadataAdvancedOption.DEFAULT_S3_US_EAST_1_REGIONAL_ENDPOINT,
                                         this::resolveDefaultS3UsEast1RegionalEndpoint)
                             .lazyOptionIfAbsent(AwsClientOption.CREDENTIALS_IDENTITY_PROVIDER,

test/codegen-generated-classes-test/src/main/resources/codegen-resources/defaultretrymode/customization.config

@@ -0,0 +1,6 @@
+{
+    "defaultRetryMode": "STANDARD",
+
+    "useSraAuth": true,
+    "enableGenerateCompiledEndpointRules": true
+}

test/codegen-generated-classes-test/src/main/resources/codegen-resources/defaultretrymode/service-2.json

@@ -0,0 +1,37 @@
+{
+  "version":"2.0",
+  "metadata":{
+    "apiVersion":"2016-03-11",
+    "endpointPrefix":"defaultretrymodetest",
+    "jsonVersion":"1.1",
+    "protocol":"rest-json",
+    "serviceAbbreviation":"DefaultRetryModeTestService",
+    "serviceFullName":"AWS Default Retry Mode Test Service",
+    "serviceId":"DefaultRetryMode",
+    "signatureVersion":"v4",
+    "targetPrefix":"default-retry-mode-prefix",
+    "timestampFormat":"unixTimestamp",
+    "uid":"restjson-2016-03-11"
+  },
+  "operations":{
+    "OneOperation":{
+      "name":"OneOperation",
+      "http":{
+        "method":"POST",
+        "requestUri":"/test/uri"
+      },
+      "input":{"shape":"OneShape"}
+    }
+  },
+  "shapes": {
+    "OneShape": {
+      "type": "structure",
+      "members": {
+        "StringMember": {
+          "shape": "String"
+        }
+      }
+    },
+    "String":{"type":"string"}
+  }
+}

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/defaultsmode/DefaultRetryModeTest.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package software.amazon.awssdk.services.defaultsmode;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.core.retry.RetryMode;
+import software.amazon.awssdk.regions.Region;
+import software.amazon.awssdk.retries.LegacyRetryStrategy;
+import software.amazon.awssdk.retries.StandardRetryStrategy;
+import software.amazon.awssdk.services.defaultretrymode.DefaultRetryModeAsyncClient;
+import software.amazon.awssdk.services.defaultretrymode.DefaultRetryModeClient;
+
+public class DefaultRetryModeTest {
+
+    @Test
+    void defaultRetryModeSyncClient_whenSetInCustomization_shouldBeStandardByDefault() {
+        DefaultRetryModeClient client = DefaultRetryModeClient.builder()
+                                                              .region(Region.US_WEST_2)
+                                                              .build();
+        assertThat(client.serviceClientConfiguration().overrideConfiguration().retryStrategy().get())
+            .isInstanceOf(StandardRetryStrategy.class);
+    }
+
+    @Test
+    void defaultRetryModeAsyncClient_whenSetInCustomization_shouldBeStandardByDefault() {
+        DefaultRetryModeAsyncClient client = DefaultRetryModeAsyncClient.builder()
+                                                                        .region(Region.US_WEST_2)
+                                                                        .build();
+        assertThat(client.serviceClientConfiguration().overrideConfiguration().retryStrategy().get())
+            .isInstanceOf(StandardRetryStrategy.class);
+    }
+
+    @Test
+    void syncClient_overrideRetryStrategy_shouldOverride() {
+        DefaultRetryModeClient client =
+            DefaultRetryModeClient.builder()
+                                       .region(Region.US_WEST_2)
+                                       .overrideConfiguration(conf -> conf.retryStrategy(RetryMode.LEGACY))
+                                       .build();
+        assertThat(client.serviceClientConfiguration().overrideConfiguration().retryStrategy().get())
+            .isInstanceOf(LegacyRetryStrategy.class);
+
+    }
+
+    @Test
+    void asyncClient_overrideRetryStrategy_shouldOverride() {
+        DefaultRetryModeAsyncClient client =
+            DefaultRetryModeAsyncClient.builder()
+                                       .region(Region.US_WEST_2)
+                                       .overrideConfiguration(conf -> conf.retryStrategy(RetryMode.LEGACY))
+                                       .build();
+        assertThat(client.serviceClientConfiguration().overrideConfiguration().retryStrategy().get())
+            .isInstanceOf(LegacyRetryStrategy.class);
+    }
+}