Merge pull request #1299 from aws/staging/19912570-4507-4433-8b7c-6143387c7c90

Pull request: release <- staging/19912570-4507-4433-8b7c-6143387c7c90

Author: aws-sdk-java-automation

.changes/2.16.46.json

@@ -0,0 +1,42 @@
+{
+    "version": "2.16.46",
+    "date": "2021-04-22",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon DynamoDB",
+            "contributor": "",
+            "description": "Fixed bean-based marshalling for model builder types containing complex collections."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SecurityHub",
+            "contributor": "",
+            "description": "Replaced the term \"master\" with \"administrator\". Added new actions to replace AcceptInvitation, GetMasterAccount, and DisassociateFromMasterAccount. In Member, replaced MasterId with AdministratorId."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Forecast Service",
+            "contributor": "",
+            "description": "This release adds EstimatedTimeRemaining minutes field to the DescribeDatasetImportJob, DescribePredictor, DescribeForecast API response which denotes the time remaining to complete the job IN_PROGRESS."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "ndejaco2",
+            "description": "This feature adds client and request overrides of execution attributes prior to request invocation."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Cognito Identity Provider",
+            "contributor": "",
+            "description": "Documentation updates for cognito-idp"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon ElastiCache",
+            "contributor": "",
+            "description": "This release introduces log delivery of Redis slow log from Amazon ElastiCache."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,33 @@
+# __2.16.46__ __2021-04-22__
+## __AWS SDK for Java v2__
+  - ### Features
+    - This feature adds client and request overrides of execution attributes prior to request invocation.
+        - Contributed by: [@ndejaco2](https://github.com/ndejaco2)
+
+## __AWS SecurityHub__
+  - ### Features
+    - Replaced the term "master" with "administrator". Added new actions to replace AcceptInvitation, GetMasterAccount, and DisassociateFromMasterAccount. In Member, replaced MasterId with AdministratorId.
+
+## __Amazon Cognito Identity Provider__
+  - ### Features
+    - Documentation updates for cognito-idp
+
+## __Amazon DynamoDB__
+  - ### Bugfixes
+    - Fixed bean-based marshalling for model builder types containing complex collections.
+
+## __Amazon ElastiCache__
+  - ### Features
+    - This release introduces log delivery of Redis slow log from Amazon ElastiCache.
+
+## __Amazon Forecast Service__
+  - ### Features
+    - This release adds EstimatedTimeRemaining minutes field to the DescribeDatasetImportJob, DescribePredictor, DescribeForecast API response which denotes the time remaining to complete the job IN_PROGRESS.
+
+## __Contributors__
+Special thanks to the following contributors to this release: 
+
+[@ndejaco2](https://github.com/ndejaco2)
 # __2.16.45__ __2021-04-21__
 ## __AWS CloudFormation__
   - ### Features

README.md

@@ -52,7 +52,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.16.45</version>
+      <version>2.16.46</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -86,12 +86,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.16.45</version>
+  <version>2.16.46</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.16.45</version>
+  <version>2.16.46</version>
 </dependency>
 ```
 
@@ -103,7 +103,7 @@ You can import the whole SDK into your project (includes *ALL* services). Please
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.16.45</version>
+  <version>2.16.46</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/archetype-lambda/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

archetypes/archetype-tools/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

archetypes/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

aws-sdk-java/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

bundle/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

codegen-lite/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

codegen-maven-plugin/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

codegen/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.45</version>
+        <version>2.16.46</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

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

@@ -31,6 +31,7 @@
 import java.util.Optional;
 import software.amazon.awssdk.codegen.internal.TypeUtils;
 import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.SdkField;
 import software.amazon.awssdk.core.protocol.MarshallingType;
 import software.amazon.awssdk.core.util.SdkAutoConstructList;
 import software.amazon.awssdk.core.util.SdkAutoConstructMap;
@@ -615,15 +616,26 @@ public boolean hasBuilder() {
     }
 
     @JsonIgnore
-    public boolean isCollectionWithBuilderMember() {
-        return (isList() && getListModel().getListMemberModel() != null && getListModel().getListMemberModel().hasBuilder()) ||
-               (isMap() && getMapModel().getValueModel() != null && getMapModel().getValueModel().hasBuilder());
+    public boolean containsBuildable() {
+        return containsBuildable(true);
     }
 
-    @JsonIgnore
-    public boolean isCollectionWithNestedBuilderMember() {
-        return isList() && getListModel().getListMemberModel() != null && getListModel().isMap() &&
-               getListModel().getListMemberModel().getMapModel().getValueModel().hasBuilder();
+    private boolean containsBuildable(boolean root) {
+        if (!root && hasBuilder()) {
+            return true;
+        }
+
+        if (isList()) {
+            return getListModel().getListMemberModel().containsBuildable(false);
+        }
+
+        if (isMap()) {
+            MapModel mapModel = getMapModel();
+            return mapModel.getKeyModel().containsBuildable(false) ||
+                   mapModel.getValueModel().containsBuildable(false);
+        }
+
+        return false;
     }
 
     @JsonIgnore

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

@@ -15,23 +15,21 @@
 
 package software.amazon.awssdk.codegen.poet.model;
 
+import static software.amazon.awssdk.codegen.poet.model.TypeProvider.ShapeTransformation.USE_BUILDER_IMPL;
+
 import com.squareup.javapoet.ClassName;
 import com.squareup.javapoet.CodeBlock;
 import com.squareup.javapoet.MethodSpec;
 import com.squareup.javapoet.ParameterSpec;
-import com.squareup.javapoet.ParameterizedTypeName;
 import com.squareup.javapoet.TypeName;
-import java.nio.ByteBuffer;
-import java.util.Collection;
-import java.util.Map;
 import java.util.Optional;
 import java.util.stream.Collectors;
 import javax.lang.model.element.Modifier;
 import software.amazon.awssdk.codegen.model.intermediate.IntermediateModel;
-import software.amazon.awssdk.codegen.model.intermediate.MapModel;
 import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
 import software.amazon.awssdk.codegen.model.intermediate.ShapeModel;
 import software.amazon.awssdk.codegen.poet.PoetExtensions;
+import software.amazon.awssdk.codegen.poet.model.TypeProvider.TypeNameOptions;
 import software.amazon.awssdk.core.SdkBytes;
 
 /**
@@ -125,8 +123,8 @@ protected CodeBlock copySetterBuilderBody() {
                                   "this.$1N = $1N != null ? $1N.build() : null",
                                   serviceModelCopiers.copyMethodName());
         }
-        if (memberModel.isCollectionWithBuilderMember() || memberModel.isCollectionWithNestedBuilderMember()) {
-            return copySetterBody("this.$1N = $2T.$3N($1N)", null, serviceModelCopiers.builderCopyMethodName());
+        if (memberModel.containsBuildable()) {
+            return copySetterBody("this.$1N = $2T.$3N($1N)", null, serviceModelCopiers.copyFromBuilderMethodName());
         }
         return copySetterBody();
     }
@@ -170,60 +168,11 @@ protected ParameterSpec memberAsParameter() {
     }
 
     protected ParameterSpec memberAsBeanStyleParameter() {
-        if (memberModel.hasBuilder()) {
-            TypeName builderName = poetExtensions.getModelClass(memberModel.getC2jShape()).nestedClass("BuilderImpl");
-            return ParameterSpec.builder(builderName, fieldName()).build();
-        }
-
-        if (memberModel.isList()) {
-            if (memberModel.isCollectionWithNestedBuilderMember()) {
-                MapModel nestedMapModel = memberModel.getListModel().getListMemberModel().getMapModel();
-                TypeName nestedMapKeyType = typeProvider.getTypeNameForSimpleType(nestedMapModel.getKeyModel()
-                                                                                                .getVariable()
-                                                                                                .getVariableType());
-                ClassName nestedMapValueType = poetExtensions.getModelClass(nestedMapModel.getValueModel().getC2jShape());
-                TypeName nestedMapReturnType = ParameterizedTypeName.get(ClassName.get(Map.class),
-                                                                         nestedMapKeyType,
-                                                                         nestedMapValueType.nestedClass("BuilderImpl"));
-                TypeName listType = ParameterizedTypeName.get(ClassName.get(Collection.class), nestedMapReturnType);
-                return ParameterSpec.builder(listType, fieldName()).build();
-            }
-
-            MemberModel listMember = memberModel.getListModel().getListMemberModel();
-
-            if (hasBuilder(listMember)) {
-                TypeName memberName = poetExtensions.getModelClass(listMember.getC2jShape()).nestedClass("BuilderImpl");
-                TypeName listType = ParameterizedTypeName.get(ClassName.get(Collection.class), memberName);
-                return ParameterSpec.builder(listType, fieldName()).build();
-            } else if (listMember.isSdkBytesType()) {
-                TypeName listType = ParameterizedTypeName.get(Collection.class, ByteBuffer.class);
-                return ParameterSpec.builder(listType, fieldName()).build();
-            }
-        }
-
-        if (memberModel.isMap()) {
-            MemberModel keyModel = memberModel.getMapModel().getKeyModel();
-            TypeName keyType = typeProvider.getTypeNameForSimpleType(keyModel.getVariable().getVariableType());
-            MemberModel valueModel = memberModel.getMapModel().getValueModel();
-            TypeName valueType = null;
-
-            if (hasBuilder(valueModel)) {
-                valueType = poetExtensions.getModelClass(valueModel.getC2jShape()).nestedClass("BuilderImpl");
-            } else if (valueModel.isSdkBytesType()) {
-                valueType = TypeName.get(ByteBuffer.class);
-            }
-
-            if (valueType != null) {
-                TypeName mapType = ParameterizedTypeName.get(ClassName.get(Map.class), keyType, valueType);
-                return ParameterSpec.builder(mapType, fieldName()).build();
-            }
-        }
-
-        if (memberModel.isSdkBytesType()) {
-            return ParameterSpec.builder(ByteBuffer.class, fieldName()).build();
-        }
-
-        return memberAsParameter();
+        TypeName type = typeProvider.typeName(memberModel, new TypeNameOptions().shapeTransformation(USE_BUILDER_IMPL)
+                                                                                .useSubtypeWildcardsForCollections(true)
+                                                                                .useCollectionForList(true)
+                                                                                .useByteBufferTypes(true));
+        return ParameterSpec.builder(type, fieldName()).build();
     }
 
     protected ShapeModel shapeModel() {
@@ -259,9 +208,4 @@ private CodeBlock copySetterBody(String copyAssignment, String regularAssignment
                                                      .build())
                           .orElseGet(() -> CodeBlock.builder().addStatement(regularAssignment, fieldName()).build());
     }
-
-    private boolean hasBuilder(MemberModel model) {
-        return model != null && model.hasBuilder();
-    }
-
 }

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

@@ -39,7 +39,7 @@ class AccessorsFactory {
         this.shapeModel = shapeModel;
         this.typeProvider = typeProvider;
         this.intermediateModel = intermediateModel;
-        this.getterHelper = new BeanGetterHelper(poetExtensions, typeProvider);
+        this.getterHelper = new BeanGetterHelper(poetExtensions, new ServiceModelCopiers(intermediateModel), typeProvider);
     }
 
     public MethodSpec beanStyleGetter(MemberModel memberModel) {