Fix the maximum retry count send to the service (was off by 1) (#2694)

Author: millems

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/pipeline/stages/utils/RetryableStageHelper.java

@@ -146,7 +146,7 @@ public void logBackingOff(Duration backoffDelay) {
      */
     public SdkHttpFullRequest requestToSend() {
         return request.toBuilder()
-                      .putHeader(SDK_RETRY_INFO_HEADER, "attempt=" + attemptNumber + "; max=" + retryPolicy.numRetries())
+                      .putHeader(SDK_RETRY_INFO_HEADER, "attempt=" + attemptNumber + "; max=" + (retryPolicy.numRetries() + 1))
                       .build();
     }
 

pom.xml

@@ -146,7 +146,7 @@
         <exec-maven-plugin.version>1.6.0</exec-maven-plugin.version>
         <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
         <build-helper-maven-plugin.version>3.0.0</build-helper-maven-plugin.version>
-        <japicmp-maven-plugin.version>0.14.4</japicmp-maven-plugin.version>
+        <japicmp-maven-plugin.version>0.15.3</japicmp-maven-plugin.version>
 
         <!-- These properties are used by Step functions for its dependencies -->
         <json-path.version>2.4.0</json-path.version>

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

@@ -18,6 +18,7 @@
 import java.net.URI;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonAsyncClient;
 import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClient;
@@ -30,6 +31,7 @@ public class AsyncRetryHeaderTest extends RetryHeaderTestSuite<MockAsyncHttpClie
     public AsyncRetryHeaderTest() {
         super(new MockAsyncHttpClient());
         client = ProtocolRestJsonAsyncClient.builder()
+                                            .overrideConfiguration(c -> c.retryPolicy(RetryMode.STANDARD))
                                             .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid", "skid")))
                                             .region(Region.US_EAST_1)
                                             .endpointOverride(URI.create("http://localhost"))

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

@@ -18,6 +18,7 @@
 import java.net.URI;
 import software.amazon.awssdk.auth.credentials.AwsBasicCredentials;
 import software.amazon.awssdk.auth.credentials.StaticCredentialsProvider;
+import software.amazon.awssdk.core.retry.RetryMode;
 import software.amazon.awssdk.regions.Region;
 import software.amazon.awssdk.services.protocolrestjson.ProtocolRestJsonClient;
 import software.amazon.awssdk.testutils.service.http.MockSyncHttpClient;
@@ -28,12 +29,13 @@ public class SyncRetryHeaderTest extends RetryHeaderTestSuite<MockSyncHttpClient
     public SyncRetryHeaderTest() {
         super(new MockSyncHttpClient());
         client = ProtocolRestJsonClient.builder()
-                                       .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid",
-                                                                                                                        "skid")))
-                                       .region(Region.US_EAST_1)
-                                       .endpointOverride(URI.create("http://localhost"))
-                                       .httpClient(mockHttpClient)
-                                       .build();
+            .overrideConfiguration(c -> c.retryPolicy(RetryMode.STANDARD))
+                                         .credentialsProvider(StaticCredentialsProvider.create(AwsBasicCredentials.create("akid",
+                                                                                                                          "skid")))
+                                         .region(Region.US_EAST_1)
+                                         .endpointOverride(URI.create("http://localhost"))
+                                         .httpClient(mockHttpClient)
+                                         .build();
     }
 
     @Override