Sugmanue/sra retries merge 2.25.70 snapshot

.brazil.json

@@ -41,6 +41,8 @@
         "http-auth-aws": { "packageName": "AwsJavaSdk-Core-HttpAuthAws" },
         "http-auth-aws-crt": { "packageName": "AwsJavaSdk-Core-HttpAuthAwsCrt" },
         "http-auth-aws-eventstream": { "packageName": "AwsJavaSdk-Core-HttpAuthAwsEventStream" },
+        "retries-spi": { "packageName": "AwsJavaSdk-Core-RetriesSpi" },
+        "retries": { "packageName": "AwsJavaSdk-Core-Retries" },
 
         "dynamodb": { "packageName": "AwsJavaSdk-DynamoDb" },
         "waf": { "packageName": "AwsJavaSdk-Waf" },

.changes/next-release/bugfix-AWSSDKforJavav2-85d899c.json

@@ -0,0 +1,6 @@
+{
+    "type": "bugfix",
+    "category": "AWS SDK for Java v2",
+    "contributor": "",
+    "description": "Fixed an issue in async client where the future would get stuck if there is a server error and the server fails to return response body that matches with the content length specified in the response header. See [#4354](https://github.com/aws/aws-sdk-java-v2/issues/4354)"
+}

.changes/next-release/feature-AWSSDKforJavav2-b456b1c.json

@@ -0,0 +1,6 @@
+{
+    "category": "AWS SDK for Java v2", 
+    "contributor": "sugmanue", 
+    "type": "feature", 
+    "description": "Adds the new module retries API module"
+}

bom/pom.xml

@@ -172,6 +172,16 @@
                 <artifactId>http-client-spi</artifactId>
                 <version>${awsjavasdk.version}</version>
             </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>retries</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>software.amazon.awssdk</groupId>
+                <artifactId>retries-spi</artifactId>
+                <version>${awsjavasdk.version}</version>
+            </dependency>
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
                 <artifactId>apache-client</artifactId>

build-tools/src/main/java/software/amazon/awssdk/buildtools/findbugs/ToBuilderIsCorrect.java

@@ -212,11 +212,15 @@ public void visit(Method method) {
             }
         } else if (isBuildable && method.getName().equals("toBuilder") && method.getSignature().startsWith("()")) {
             // This is a buildable toBuilder
-            constructorsInvokedFromToBuilder.computeIfAbsent(getDottedClassName(), n -> new HashMap<>());
-            toBuilderModifiedFields.computeIfAbsent(getDottedClassName(), n -> new HashMap<>());
+            String dottedClassName = getDottedClassName();
+            constructorsInvokedFromToBuilder.computeIfAbsent(dottedClassName, n -> new HashMap<>());
+            toBuilderModifiedFields.computeIfAbsent(dottedClassName, n -> new HashMap<>());
             inBuildableToBuilder = true;
             inBuilderConstructor = false;
-
+            if (method.isAbstract()) {
+                // Ignore abstract toBuilder methods, we will still validate the actual implementations.
+                ignoredBuildables.add(dottedClassName);
+            }
             registerIgnoredFields();
         } else {
             inBuildableToBuilder = false;

codegen/src/main/java/software/amazon/awssdk/codegen/AddExceptionShapes.java

@@ -44,9 +44,10 @@ private Map<String, ShapeModel> constructExceptionShapes() {
         // Java shape models, to be constructed
         Map<String, ShapeModel> javaShapes = new HashMap<>();
 
-        for (Map.Entry<String, Shape> shape : getServiceModel().getShapes().entrySet()) {
-            if (shape.getValue().isException()) {
-                String errorShapeName = shape.getKey();
+        for (Map.Entry<String, Shape> kvp : getServiceModel().getShapes().entrySet()) {
+            if (kvp.getValue().isException()) {
+                Shape shape = kvp.getValue();
+                String errorShapeName = kvp.getKey();
                 String javaClassName = getNamingStrategy().getExceptionName(errorShapeName);
 
                 ShapeModel exceptionShapeModel = generateShapeModel(javaClassName,
@@ -55,8 +56,10 @@ private Map<String, ShapeModel> constructExceptionShapes() {
                 exceptionShapeModel.setType(ShapeType.Exception.getValue());
                 exceptionShapeModel.setErrorCode(getErrorCode(errorShapeName));
                 exceptionShapeModel.setHttpStatusCode(getHttpStatusCode(errorShapeName));
+                exceptionShapeModel.withIsRetryable(shape.isRetryable());
+                exceptionShapeModel.withIsThrottling(shape.isThrottling());
                 if (exceptionShapeModel.getDocumentation() == null) {
-                    exceptionShapeModel.setDocumentation(shape.getValue().getDocumentation());
+                    exceptionShapeModel.setDocumentation(shape.getDocumentation());
                 }
 
                 javaShapes.put(javaClassName, exceptionShapeModel);

codegen/src/main/java/software/amazon/awssdk/codegen/AddShapes.java

@@ -87,6 +87,8 @@ protected final ShapeModel generateShapeModel(String javaClassName, String shape
         shapeModel.withXmlNamespace(shape.getXmlNamespace());
         shapeModel.withIsUnion(shape.isUnion());
         shapeModel.withIsFault(shape.isFault());
+        shapeModel.withIsRetryable(shape.isRetryable());
+        shapeModel.withIsThrottling(shape.isThrottling());
 
         boolean hasHeaderMember = false;
         boolean hasStatusCodeMember = false;

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/CustomizationConfig.java

@@ -142,6 +142,11 @@ public class CustomizationConfig {
      */
     private String customRetryPolicy;
 
+    /**
+     * Custom Retry strategy
+     */
+    private String customRetryStrategy;
+
     private boolean skipSyncClientGeneration;
 
     /**
@@ -533,10 +538,18 @@ public String getCustomRetryPolicy() {
         return customRetryPolicy;
     }
 
+    public String getCustomRetryStrategy() {
+        return customRetryStrategy;
+    }
+
     public void setCustomRetryPolicy(String customRetryPolicy) {
         this.customRetryPolicy = customRetryPolicy;
     }
 
+    public void setCustomRetryStrategy(String customRetryStrategy) {
+        this.customRetryStrategy = customRetryStrategy;
+    }
+
     public boolean isSkipSyncClientGeneration() {
         return skipSyncClientGeneration;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java

@@ -203,6 +203,10 @@ public String getCustomRetryPolicy() {
         return customizationConfig.getCustomRetryPolicy();
     }
 
+    public String getCustomRetryStrategy() {
+        return customizationConfig.getCustomRetryStrategy();
+    }
+
     public String getSdkModeledExceptionBaseFqcn() {
         return String.format("%s.%s",
                              metadata.getFullModelPackageName(),

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java

@@ -75,6 +75,9 @@ public class ShapeModel extends DocumentationModel implements HasDeprecation {
 
     private boolean union;
 
+    private boolean retryable;
+    private boolean throttling;
+
     public ShapeModel() {
     }
 
@@ -648,4 +651,22 @@ public ShapeModel withIsFault(boolean fault) {
         this.fault = fault;
         return this;
     }
+
+    public boolean isRetryable() {
+        return retryable;
+    }
+
+    public ShapeModel withIsRetryable(boolean retryable) {
+        this.retryable = retryable;
+        return this;
+    }
+
+    public boolean isThrottling() {
+        return throttling;
+    }
+
+    public ShapeModel withIsThrottling(boolean throttling) {
+        this.throttling = throttling;
+        return this;
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/model/service/RetryableTrait.java

@@ -0,0 +1,33 @@
+/*
+ * 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.codegen.model.service;
+
+public class RetryableTrait {
+
+    private Boolean throttling;
+
+    public void setThrottling(boolean throttling) {
+        this.throttling = throttling;
+    }
+
+    public Boolean getThrottling() {
+        return throttling;
+    }
+
+    public boolean isThrottling() {
+        return Boolean.TRUE.equals(throttling);
+    }
+}

codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Shape.java

@@ -78,6 +78,8 @@ public class Shape {
 
     private boolean union;
 
+    private RetryableTrait retryable;
+
     public boolean isFault() {
         return fault;
     }
@@ -345,4 +347,16 @@ public boolean isUnion() {
     public void setUnion(boolean union) {
         this.union = union;
     }
+
+    public void setRetryable(RetryableTrait retryable) {
+        this.retryable = retryable;
+    }
+
+    public boolean isRetryable() {
+        return retryable != null;
+    }
+
+    public boolean isThrottling() {
+        return retryable != null && retryable.isThrottling();
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/builder/BaseClientBuilderClass.java

@@ -424,6 +424,12 @@ private MethodSpec finalizeServiceConfigurationMethod() {
                             PoetUtils.classNameFromFqcn(model.getCustomizationConfig().getCustomRetryPolicy()));
         }
 
+        if (StringUtils.isNotBlank(model.getCustomizationConfig().getCustomRetryStrategy())) {
+            builder.addCode(".option($1T.RETRY_STRATEGY, $2T.resolveRetryStrategy(config))",
+                            SdkClientOption.class,
+                            PoetUtils.classNameFromFqcn(model.getCustomizationConfig().getCustomRetryStrategy()));
+        }
+
         if (StringUtils.isNotBlank(clientConfigClassName)) {
             builder.addCode(".option($T.SERVICE_CONFIGURATION, finalServiceConfig)", SdkClientOption.class);
         }

codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/AwsServiceModel.java

@@ -34,6 +34,7 @@
 import com.squareup.javapoet.WildcardTypeName;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
@@ -437,6 +438,7 @@ private List<MethodSpec> modelClassMethods() {
                 methodSpecs.add(builderMethod());
                 methodSpecs.add(serializableBuilderClass());
                 methodSpecs.addAll(memberGetters());
+                methodSpecs.addAll(retryableOverrides());
                 break;
             default:
                 methodSpecs.addAll(addModifier(memberGetters(), FINAL));
@@ -689,6 +691,28 @@ private CodeBlock getterStatement(MemberModel model) {
         return CodeBlock.of("return $N;", modelVariable.getVariableName());
     }
 
+    private List<MethodSpec> retryableOverrides() {
+        if (shapeModel.isRetryable()) {
+            MethodSpec isRetryable = MethodSpec.methodBuilder("isRetryableException")
+                                               .addAnnotation(Override.class)
+                                               .addModifiers(PUBLIC)
+                                               .returns(TypeName.BOOLEAN)
+                                               .addStatement("return true")
+                                               .build();
+            if (shapeModel.isThrottling()) {
+                MethodSpec isThrottling = MethodSpec.methodBuilder("isThrottlingException")
+                                                   .addAnnotation(Override.class)
+                                                   .addModifiers(PUBLIC)
+                                                   .returns(TypeName.BOOLEAN)
+                                                   .addStatement("return true")
+                                                   .build();
+                return Arrays.asList(isRetryable, isThrottling);
+            }
+            return Arrays.asList(isRetryable);
+        }
+        return emptyList();
+    }
+
     private List<TypeSpec> nestedModelClassTypes() {
         List<TypeSpec> nestedClasses = new ArrayList<>();
         switch (shapeModel.getShapeType()) {

codegen/src/test/java/software/amazon/awssdk/codegen/poet/model/RetryableExceptionClassSpecTest.java

@@ -0,0 +1,61 @@
+/*
+ * 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.codegen.poet.model;
+
+import static org.hamcrest.MatcherAssert.assertThat;
+import static software.amazon.awssdk.codegen.poet.PoetMatchers.generatesTo;
+
+import java.io.File;
+import java.io.IOException;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.Test;
+import software.amazon.awssdk.codegen.C2jModels;
+import software.amazon.awssdk.codegen.IntermediateModelBuilder;
+import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
+import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
+import software.amazon.awssdk.codegen.model.intermediate.ShapeType;
+import software.amazon.awssdk.codegen.model.service.ServiceModel;
+import software.amazon.awssdk.codegen.poet.ClassSpec;
+import software.amazon.awssdk.codegen.utils.ModelLoaderUtils;
+
+public class RetryableExceptionClassSpecTest {
+    private static IntermediateModel intermediateModel;
+
+    @BeforeAll
+    public static void setUp() throws IOException {
+        File serviceModelFile =
+            new File(RetryableExceptionClassSpecTest.class.getResource("exceptions/service-2.json").getFile());
+        File customizationConfigFile = new File(RetryableExceptionClassSpecTest.class.getResource("exceptions/customization.config")
+                                                                                     .getFile());
+        intermediateModel = new IntermediateModelBuilder(
+            C2jModels.builder()
+                     .serviceModel(ModelLoaderUtils.loadModel(ServiceModel.class, serviceModelFile))
+                     .customizationConfig(ModelLoaderUtils.loadModel(CustomizationConfig.class, customizationConfigFile))
+                     .build())
+            .build();
+    }
+
+    @Test
+    public void serviceCodegen_withErrorsWithRetryableTrait_ShouldOverrideIsRetryableAndIsThrottling() {
+        intermediateModel.getShapes().forEach((name, shape) -> {
+            if (shape.getShapeType() == ShapeType.Exception) {
+                ClassSpec spec = new AwsServiceModel(intermediateModel, shape);
+                assertThat(spec, generatesTo( "exceptions/" + name.toLowerCase() + ".java"));
+            }
+        });
+    }
+
+}

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/sra/test-client-builder-class.java

@@ -6,6 +6,7 @@
 import java.util.Map;
 import software.amazon.MyServiceHttpConfig;
 import software.amazon.MyServiceRetryPolicy;
+import software.amazon.MyServiceRetryStrategy;
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.credentials.TokenUtils;
@@ -153,6 +154,7 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
                .option(AwsClientOption.DUALSTACK_ENDPOINT_ENABLED, finalServiceConfig.dualstackEnabled())
                .option(AwsClientOption.FIPS_ENDPOINT_ENABLED, finalServiceConfig.fipsModeEnabled())
                .option(SdkClientOption.RETRY_POLICY, MyServiceRetryPolicy.resolveRetryPolicy(config))
+               .option(SdkClientOption.RETRY_STRATEGY, MyServiceRetryStrategy.resolveRetryStrategy(config))
                .option(SdkClientOption.SERVICE_CONFIGURATION, finalServiceConfig);
         return builder.build();
     }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/builder/test-client-builder-class.java

@@ -4,6 +4,7 @@
 import java.util.List;
 import software.amazon.MyServiceHttpConfig;
 import software.amazon.MyServiceRetryPolicy;
+import software.amazon.MyServiceRetryStrategy;
 import software.amazon.awssdk.annotations.Generated;
 import software.amazon.awssdk.annotations.SdkInternalApi;
 import software.amazon.awssdk.auth.credentials.TokenUtils;
@@ -146,6 +147,7 @@ protected final SdkClientConfiguration finalizeServiceConfiguration(SdkClientCon
                .option(AwsClientOption.DUALSTACK_ENDPOINT_ENABLED, finalServiceConfig.dualstackEnabled())
                .option(AwsClientOption.FIPS_ENDPOINT_ENABLED, finalServiceConfig.fipsModeEnabled())
                .option(SdkClientOption.RETRY_POLICY, MyServiceRetryPolicy.resolveRetryPolicy(config))
+               .option(SdkClientOption.RETRY_STRATEGY, MyServiceRetryStrategy.resolveRetryStrategy(config))
                .option(SdkClientOption.SERVICE_CONFIGURATION, finalServiceConfig);
         return builder.build();
     }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/json/customization.config

@@ -10,6 +10,7 @@
       "hasFipsProperty": true
     },
     "customRetryPolicy": "software.amazon.MyServiceRetryPolicy",
+    "customRetryStrategy": "software.amazon.MyServiceRetryStrategy",
     "verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
     "excludedSimpleMethods" : [
         "eventStreamOperation"

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/rest-json/customization.config

@@ -14,6 +14,7 @@
       "hasAccelerateModeEnabledProperty":true
     },
     "customRetryPolicy": "software.amazon.MyServiceRetryPolicy",
+    "customRetryStrategy": "software.amazon.MyServiceRetryStrategy",
     "verifiedSimpleMethods" : ["paginatedOperationWithResultKey"],
     "excludedSimpleMethods" : [
         "eventStreamOperation"

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/model/exceptions/customization.config

@@ -0,0 +1,2 @@
+{}
+