Merge pull request #700 from aws/staging/4ccd67b0-5ca3-46b4-81b0-9ce1357c4117

Pull request: release <- staging/4ccd67b0-5ca3-46b4-81b0-9ce1357c4117

Author: aws-sdk-java-automation

.changes/2.10.33.json

@@ -0,0 +1,16 @@
+{
+    "version": "2.10.33",
+    "date": "2019-12-11",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "This release allows customers to attach multiple Elastic Inference Accelerators to a single EC2 instance. It adds support for a Count parameter for each Elastic Inference Accelerator type you specify on the RunInstances and LaunchTemplate APIs."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "description": "Adds a `has*` method to requests and responses that have a List or Map property."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,12 @@
+# __2.10.33__ __2019-12-11__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Adds a `has*` method to requests and responses that have a List or Map property.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - This release allows customers to attach multiple Elastic Inference Accelerators to a single EC2 instance. It adds support for a Count parameter for each Elastic Inference Accelerator type you specify on the RunInstances and LaunchTemplate APIs.
+
 # __2.10.32__ __2019-12-10__
 ## __AWSKendraFrontendService__
   - ### Features

README.md

@@ -48,7 +48,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.10.32</version>
+      <version>2.10.33</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
@@ -82,12 +82,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.10.32</version>
+  <version>2.10.33</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.10.32</version>
+  <version>2.10.33</version>
 </dependency>
 ```
 
@@ -99,7 +99,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.10.32</version>
+  <version>2.10.33</version>
 </dependency>
 ```
 

aws-sdk-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.32</version>
+        <version>2.10.33</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom-internal/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.10.32</version>
+        <version>2.10.33</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

bom/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.32</version>
+        <version>2.10.33</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.10.32</version>
+        <version>2.10.33</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

codegen-lite-maven-plugin/pom.xml

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

codegen-lite/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.10.32</version>
+        <version>2.10.33</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.10.32</version>
+        <version>2.10.33</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.10.32</version>
+        <version>2.10.33</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

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

@@ -179,6 +179,7 @@ private MemberModel generateMemberModel(String c2jMemberName, Member c2jMemberDe
                 .withFluentEnumGetterMethodName(namingStrategy.getFluentEnumGetterMethodName(c2jMemberName, parentShape, shape))
                 .withFluentSetterMethodName(namingStrategy.getFluentSetterMethodName(c2jMemberName, parentShape, shape))
                 .withFluentEnumSetterMethodName(namingStrategy.getFluentEnumSetterMethodName(c2jMemberName, parentShape, shape))
+                .withExistenceCheckMethodName(namingStrategy.getExistenceCheckMethodName(c2jMemberName, parentShape))
                 .withBeanStyleGetterMethodName(namingStrategy.getBeanStyleGetterMethodName(c2jMemberName, parentShape, shape))
                 .withBeanStyleSetterMethodName(namingStrategy.getBeanStyleSetterMethodName(c2jMemberName, parentShape, shape));
         memberModel.setIdempotencyToken(c2jMemberDefinition.isIdempotencyToken());

codegen/src/main/java/software/amazon/awssdk/codegen/internal/DocumentationUtils.java

@@ -36,6 +36,11 @@ public final class DocumentationUtils {
 
     private static final String DEFAULT_GETTER_PARAM = "The value of the %s property for this object.";
 
+    private static final String DEFAULT_EXISTENCE_CHECK = "Returns true if the %s property was specified by the sender "
+                                                          + "(it may be empty), or false if the sender did not specify "
+                                                          + "the value (it will be empty). For responses returned by the SDK, "
+                                                          + "the sender is the AWS service.";
+
     private static final String DEFAULT_FLUENT_RETURN =
             "Returns a reference to this object so that method calls can be chained together.";
 
@@ -164,4 +169,8 @@ public static String defaultGetterParam() {
     public static String defaultFluentReturn() {
         return DEFAULT_FLUENT_RETURN;
     }
+
+    public static String defaultExistenceCheck() {
+        return DEFAULT_EXISTENCE_CHECK;
+    }
 }

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

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.codegen.model.intermediate;
 
 import static software.amazon.awssdk.codegen.internal.Constant.LF;
+import static software.amazon.awssdk.codegen.internal.DocumentationUtils.defaultExistenceCheck;
 import static software.amazon.awssdk.codegen.internal.DocumentationUtils.defaultFluentReturn;
 import static software.amazon.awssdk.codegen.internal.DocumentationUtils.defaultGetter;
 import static software.amazon.awssdk.codegen.internal.DocumentationUtils.defaultGetterParam;
@@ -24,11 +25,15 @@
 import static software.amazon.awssdk.codegen.internal.DocumentationUtils.stripHtmlTags;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.squareup.javapoet.ClassName;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import software.amazon.awssdk.codegen.internal.TypeUtils;
 import software.amazon.awssdk.core.SdkBytes;
 import software.amazon.awssdk.core.protocol.MarshallingType;
+import software.amazon.awssdk.core.util.SdkAutoConstructList;
+import software.amazon.awssdk.core.util.SdkAutoConstructMap;
 import software.amazon.awssdk.protocols.core.PathMarshaller;
 import software.amazon.awssdk.utils.StringUtils;
 
@@ -70,6 +75,8 @@ public class MemberModel extends DocumentationModel {
 
     private String fluentEnumSetterMethodName;
 
+    private String existenceCheckMethodName;
+
     private String beanStyleGetterName;
 
     private String beanStyleSetterName;
@@ -247,6 +254,19 @@ public MemberModel withFluentEnumSetterMethodName(String fluentEnumSetterMethodN
         return this;
     }
 
+    public String getExistenceCheckMethodName() {
+        return existenceCheckMethodName;
+    }
+
+    public void setExistenceCheckMethodName(String existenceCheckMethodName) {
+        this.existenceCheckMethodName = existenceCheckMethodName;
+    }
+
+    public MemberModel withExistenceCheckMethodName(String existenceCheckMethodName) {
+        setExistenceCheckMethodName(existenceCheckMethodName);
+        return this;
+    }
+
     public ReturnTypeModel getGetterModel() {
         return getterModel;
     }
@@ -408,6 +428,12 @@ public String getGetterDocumentation() {
             }
         }
 
+        if (getAutoConstructClassIfExists().isPresent()) {
+            appendParagraph(docBuilder,
+                            "You can use {@link #%s()} to see if a value was sent in this field.",
+                            getExistenceCheckMethodName());
+        }
+
         String variableDesc = StringUtils.isNotBlank(documentation) ? documentation : defaultGetterParam().replace("%s", name);
 
         docBuilder.append("@return ")
@@ -429,6 +455,10 @@ public String getFluentSetterDocumentation() {
                + getEnumDoc();
     }
 
+    public String getExistenceCheckDocumentation() {
+        return defaultExistenceCheck().replace("%s", name) + LF;
+    }
+
     public String getDefaultConsumerFluentSetterDocumentation() {
         return (StringUtils.isNotBlank(documentation) ? documentation : defaultSetter().replace("%s", name) + "\n")
                + LF
@@ -613,4 +643,14 @@ private void appendParagraph(StringBuilder builder, String content, Object... co
                .append("</p>")
                .append(LF);
     }
+
+    public Optional<ClassName> getAutoConstructClassIfExists() {
+        if (isList()) {
+            return Optional.of(ClassName.get(SdkAutoConstructList.class));
+        } else if (isMap()) {
+            return Optional.of(ClassName.get(SdkAutoConstructMap.class));
+        }
+
+        return Optional.empty();
+    }
 }

codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java

@@ -292,6 +292,13 @@ public String getFluentEnumGetterMethodName(String memberName, Shape parentShape
         return getterMethodName;
     }
 
+    @Override
+    public String getExistenceCheckMethodName(String memberName, Shape parentShape) {
+        String existenceCheckMethodName = Utils.unCapitalize(memberName);
+        existenceCheckMethodName = rewriteInvalidMemberName(existenceCheckMethodName, parentShape);
+        return String.format("has%s", Utils.capitalize(existenceCheckMethodName));
+    }
+
     @Override
     public String getBeanStyleGetterMethodName(String memberName, Shape parentShape, Shape c2jShape) {
         String fluentGetterMethodName = getFluentGetterMethodName(memberName, parentShape, c2jShape);

codegen/src/main/java/software/amazon/awssdk/codegen/naming/NamingStrategy.java

@@ -146,4 +146,13 @@ public interface NamingStrategy {
      * @return Name of field for {@link SdkField} pojo.
      */
     String getSdkFieldFieldName(MemberModel memberModel);
+
+    /**
+     * Names a method that would check for existence of the member in the response.
+     *
+     * @param memberName The member name to get the method name for.
+     * @param parentShape The shape containing the member.
+     * @return Name of an existence check method.
+     */
+    String getExistenceCheckMethodName(String memberName, Shape parentShape);
 }

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

@@ -233,12 +233,12 @@ private MethodSpec.Builder acceptMethodSpec(ClassName modelClass, ClassName resp
         return MethodSpec.methodBuilder("accept")
                          .addModifiers(PUBLIC)
                          .addJavadoc(new DocumentationBuilder()
-                                             .description("Calls the appropriate visit method depending on "
-                                                          + "the subtype of {@link $T}.")
-                                             .param("visitor", "Visitor to invoke.")
-                                             .build(), modelClass)
+                                         .description("Calls the appropriate visit method depending on "
+                                                      + "the subtype of {@link $T}.")
+                                         .param("visitor", "Visitor to invoke.")
+                                         .build(), modelClass)
                          .addParameter(responseHandlerClass
-                                               .nestedClass("Visitor"), "visitor");
+                                           .nestedClass("Visitor"), "visitor");
     }
 
     @Override
@@ -295,7 +295,7 @@ private TypeName responseBaseClass() {
 
     private ClassName exceptionBaseClass() {
         String customExceptionBase = intermediateModel.getCustomizationConfig()
-                .getSdkModeledExceptionBaseClassName();
+                                                      .getSdkModeledExceptionBaseClassName();
         if (customExceptionBase != null) {
             return poetExtensions.getModelClass(customExceptionBase);
         }
@@ -304,8 +304,8 @@ private ClassName exceptionBaseClass() {
 
     private TypeName toCopyableBuilderInterface() {
         return ParameterizedTypeName.get(ClassName.get(ToCopyableBuilder.class),
-                className().nestedClass("Builder"),
-                className());
+                                         className().nestedClass("Builder"),
+                                         className());
     }
 
     private List<MethodSpec> modelClassMethods() {
@@ -381,14 +381,16 @@ private Stream<MethodSpec> memberGetters(MemberModel member) {
             result.add(enumMemberGetter(member));
         }
 
+        member.getAutoConstructClassIfExists()
+              .ifPresent(autoConstructClass -> result.add(existenceCheckGetter(member, autoConstructClass)));
+
         result.add(memberGetter(member));
 
         return result.stream();
     }
 
     private boolean shouldGenerateEnumGetter(MemberModel member) {
         return member.getEnumType() != null || MemberCopierSpec.isEnumCopyAvailable(member);
-
     }
 
     private MethodSpec enumMemberGetter(MemberModel member) {
@@ -409,6 +411,20 @@ private MethodSpec memberGetter(MemberModel member) {
                          .build();
     }
 
+    private MethodSpec existenceCheckGetter(MemberModel member, ClassName autoConstructClass) {
+        return MethodSpec.methodBuilder(member.getExistenceCheckMethodName())
+                         .addJavadoc("$L", member.getExistenceCheckDocumentation())
+                         .addModifiers(PUBLIC)
+                         .returns(TypeName.BOOLEAN)
+                         .addCode(existenceCheckStatement(member, autoConstructClass))
+                         .build();
+    }
+
+    private CodeBlock existenceCheckStatement(MemberModel member, ClassName autoConstructClass) {
+        String variableName = member.getVariable().getVariableName();
+        return CodeBlock.of("return $N != null && !($N instanceof $T);", variableName, variableName, autoConstructClass);
+    }
+
     private CodeBlock enumGetterStatement(MemberModel member) {
         String fieldName = member.getVariable().getVariableName();
         if (member.isList() || member.isMap()) {