Update the default retry strategy to standard from legacy

Author: joviegas

.changes/next-release/feature-AWSSDKforJavav2-8c493dd.json

@@ -0,0 +1,6 @@
+{
+    "type": "feature",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Update the default retry strategy to standard based on  [Modernizing the default retry strategy](https://aws.amazon.com/blogs/developer/updating-aws-sdk-defaults-aws-sts-service-endpoint-and-retry-strategy/)"
+}

core/sdk-core/src/main/java/software/amazon/awssdk/core/retry/RetryMode.java

@@ -130,7 +130,7 @@ public static Resolver resolver() {
      * Allows customizing the variables used during determination of a {@link RetryMode}. Created via {@link #resolver()}.
      */
     public static class Resolver {
-        private static final RetryMode SDK_DEFAULT_RETRY_MODE = LEGACY;
+        private static final RetryMode SDK_DEFAULT_RETRY_MODE = STANDARD;
 
         private Supplier<ProfileFile> profileFile;
         private String profileName;

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

@@ -76,7 +76,7 @@ public void cleanup() {
 
     private static Stream<Arguments> inputValues() {
         return Stream.of(
-            Arguments.of("Default values", null, Arrays.asList("D", "N", "P", "T")),
+            Arguments.of("Default values", null, Arrays.asList("E", "N", "P", "T")),
             Arguments.of("Account ID preferred mode ", AccountIdEndpointMode.PREFERRED, Arrays.asList("P", "T")),
             Arguments.of("Account ID disabled mode ", AccountIdEndpointMode.DISABLED, Arrays.asList("Q", "T")),
             Arguments.of("Account ID required mode ", AccountIdEndpointMode.REQUIRED, Arrays.asList("R", "T"))
@@ -98,6 +98,7 @@ void validate_metricsString_forDifferentConfigValues(String description,
         assertThatThrownBy(() -> clientBuilder.build().operationWithNoInputOrOutput(r -> {}).join()).hasMessageContaining("stop");
 
         String userAgent = assertAndGetUserAgentString();
+        System.out.println("userAgent "+userAgent);
         expectedMetrics.forEach(expectedMetric -> assertThat(userAgent).matches(METRIC_SEARCH_PATTERN.apply(expectedMetric)));
     }
 

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/ExceptionAttemptMessageBehaviorTest.java

@@ -88,8 +88,8 @@ public void exceptionMessage_ioException_includesMultipleAttempts() {
         SdkClientException exception = assertThrows(SdkClientException.class,
                                                     () -> callAllTypes(client));
 
-        assertThat(exception.getMessage()).contains("SDK Attempt Count: 4");
-        wireMock.verify(4, postRequestedFor(anyUrl()));
+        assertThat(exception.getMessage()).contains("SDK Attempt Count: 3");
+        wireMock.verify(3, postRequestedFor(anyUrl()));
     }
 
     @Test

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/retry/RetryStrategySetupUsingRetryMode.java

@@ -90,8 +90,8 @@ public void request_settingRetryModeInOverrideConfigurationConsumerRunTwice() {
 
         // Configuring the client using an unrelated plugin should not remember the previous settings.
         assertThrows(ProtocolRestJsonException.class, () -> callAllTypes(client, Collections.singletonList(unrelatedPlugin)));
-        // Four retries, the LEGACY retry strategy is back in.
-        verifyRequestCount(3 + 4);
+        // Four retries, the STANDARD retry strategy is back in.
+        verifyRequestCount(3 + 3);
     }
 
     @Test

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/serviceclientconfiguration/ServiceClientConfigurationTest.java

@@ -111,7 +111,7 @@ public void syncClient_serviceClientConfiguration_withoutOverrideConfiguration_s
         assertThat(overrideConfig.apiCallAttemptTimeout()).isNotPresent();
         assertThat(overrideConfig.apiCallTimeout()).isNotPresent();
         assertThat(overrideConfig.retryPolicy()).isNotPresent();
-        assertThat(overrideConfig.retryStrategy().get().maxAttempts()).isEqualTo(4);
+        assertThat(overrideConfig.retryStrategy().get().maxAttempts()).isEqualTo(3);
         assertThat(overrideConfig.defaultProfileFile()).hasValue(ProfileFile.defaultProfileFile());
         assertThat(overrideConfig.metricPublishers()).isEmpty();
     }
@@ -196,7 +196,7 @@ public void asyncClient_serviceClientConfiguration_withoutOverrideConfiguration_
         assertThat(overrideConfig.apiCallAttemptTimeout()).isNotPresent();
         assertThat(overrideConfig.apiCallTimeout()).isNotPresent();
         assertThat(overrideConfig.retryPolicy()).isNotPresent();
-        assertThat(overrideConfig.retryStrategy().get().maxAttempts()).isEqualTo(4);
+        assertThat(overrideConfig.retryStrategy().get().maxAttempts()).isEqualTo(3);
         assertThat(overrideConfig.defaultProfileFile()).hasValue(ProfileFile.defaultProfileFile());
         assertThat(overrideConfig.metricPublishers()).isEmpty();
     }

test/codegen-generated-classes-test/src/test/java/software/amazon/awssdk/services/serviceclientconfiguration/ServiceClientConfigurationUsingPluginsTest.java

@@ -102,7 +102,7 @@ void syncClient_serviceClientConfiguration_withoutOverrideConfiguration_shouldRe
         assertThat(overrideConfiguration.apiCallAttemptTimeout()).isNotPresent();
         assertThat(overrideConfiguration.apiCallTimeout()).isNotPresent();
         assertThat(overrideConfiguration.retryPolicy()).isNotPresent();
-        assertThat(overrideConfiguration.retryStrategy().get().maxAttempts()).isEqualTo(4);
+        assertThat(overrideConfiguration.retryStrategy().get().maxAttempts()).isEqualTo(3);
         assertThat(overrideConfiguration.defaultProfileFile()).hasValue(ProfileFile.defaultProfileFile());
         assertThat(overrideConfiguration.metricPublishers()).isEmpty();
     }
@@ -196,7 +196,7 @@ void asyncClient_serviceClientConfiguration_withoutOverrideConfiguration_shouldR
         assertThat(result.apiCallAttemptTimeout()).isNotPresent();
         assertThat(result.apiCallTimeout()).isNotPresent();
         assertThat(result.retryPolicy()).isNotPresent();
-        assertThat(result.retryStrategy().get().maxAttempts()).isEqualTo(4);
+        assertThat(result.retryStrategy().get().maxAttempts()).isEqualTo(3);
         assertThat(result.defaultProfileFile()).hasValue(ProfileFile.defaultProfileFile());
         assertThat(result.metricPublishers()).isEmpty();
     }