Merge pull request #1508 from aws/staging/0e98db51-e3f2-4ad9-bc9b-dec…

…41408062a Pull request: release <- staging/0e98db51-e3f2-4ad9-bc9b-dec41408062a
aws · Jul 1, 2021 · 0bdcfa8 · 0bdcfa8
2 parents 062c39d + 74ff870
commit 0bdcfa8
Show file tree

Hide file tree

Showing 369 changed files with 5,149 additions and 621 deletions.
diff --git a/.changes/2.16.94.json b/.changes/2.16.94.json
@@ -0,0 +1,30 @@
+{
+    "version": "2.16.94",
+    "date": "2021-07-01",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Simple Queue Service",
+            "contributor": "",
+            "description": "Documentation updates for Amazon SQS."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon SageMaker Service",
+            "contributor": "",
+            "description": "SageMaker model registry now supports up to 5 containers and associated environment variables."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "Adding a new reserved field to support future infrastructure improvements for Amazon EC2 Fleet."
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# __2.16.94__ __2021-07-01__
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Adding a new reserved field to support future infrastructure improvements for Amazon EC2 Fleet.
+
+## __Amazon SageMaker Service__
+  - ### Features
+    - SageMaker model registry now supports up to 5 containers and associated environment variables.
+
+## __Amazon Simple Queue Service__
+  - ### Features
+    - Documentation updates for Amazon SQS.
+
 # __2.16.93__ __2021-06-30__
 ## __AWS Cloud Map__
   - ### Features

diff --git a/README.md b/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.93</version>
+      <version>2.16.94</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.93</version>
+  <version>2.16.94</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.16.93</version>
+  <version>2.16.94</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.93</version>
+  <version>2.16.94</version>
 </dependency>
 ```
 

diff --git a/archetypes/archetype-app-quickstart/pom.xml b/archetypes/archetype-app-quickstart/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/archetypes/archetype-lambda/pom.xml b/archetypes/archetype-lambda/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetype-lambda</artifactId>

diff --git a/archetypes/archetype-tools/pom.xml b/archetypes/archetype-tools/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/archetypes/pom.xml b/archetypes/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>archetypes</artifactId>

diff --git a/aws-sdk-java/pom.xml b/aws-sdk-java/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

diff --git a/bom-internal/pom.xml b/bom-internal/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>bom</artifactId>

diff --git a/bundle/pom.xml b/bundle/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

diff --git a/codegen-lite-maven-plugin/pom.xml b/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.93</version>
+        <version>2.16.94</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-lite-maven-plugin</artifactId>

diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
     </parent>
     <artifactId>codegen-lite</artifactId>
     <name>AWS Java SDK :: Code Generator Lite</name>

diff --git a/codegen-maven-plugin/pom.xml b/codegen-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>codegen-maven-plugin</artifactId>

diff --git a/codegen/pom.xml b/codegen/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.16.93</version>
+        <version>2.16.94</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/internal/TypeUtils.java b/codegen/src/main/java/software/amazon/awssdk/codegen/internal/TypeUtils.java
@@ -31,6 +31,7 @@
 import software.amazon.awssdk.codegen.model.service.Shape;
 import software.amazon.awssdk.codegen.naming.NamingStrategy;
 import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.document.Document;
 
 /**
  * Used to determine the Java types for the service model.
@@ -68,6 +69,7 @@ public static final class TypeKey {
         DATA_TYPE_MAPPINGS.put("biginteger", BigInteger.class.getName());
         DATA_TYPE_MAPPINGS.put("list", List.class.getSimpleName());
         DATA_TYPE_MAPPINGS.put("map", Map.class.getSimpleName());
+        DATA_TYPE_MAPPINGS.put("document", Document.class.getName());
         DATA_TYPE_MAPPINGS.put(TypeKey.LIST_INTERFACE, List.class.getName());
         DATA_TYPE_MAPPINGS.put(TypeKey.LIST_DEFAULT_IMPL, ArrayList.class.getName());
         DATA_TYPE_MAPPINGS.put(TypeKey.MAP_INTERFACE, Map.class.getName());
@@ -85,6 +87,7 @@ public static final class TypeKey {
         MARSHALLING_TYPE_MAPPINGS.put("InputStream", "STREAM");
         MARSHALLING_TYPE_MAPPINGS.put("Short", "SHORT");
         MARSHALLING_TYPE_MAPPINGS.put(null, "NULL");
+        MARSHALLING_TYPE_MAPPINGS.put("Document", "DOCUMENT");
     }
 
     private final NamingStrategy namingStrategy;
@@ -133,6 +136,10 @@ public String getJavaDataType(Map<String, Shape> shapes, String shapeName,
 
         String shapeType = shape.getType();
 
+        if (shape.isDocument()) {
+            return DATA_TYPE_MAPPINGS.get("document");
+        }
+
         if (Structure.getName().equals(shapeType)) {
             return namingStrategy.getShapeClassName(shapeName);
         } else if (List.getName().equals(shapeType)) {

diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/ShapeModel.java
@@ -68,6 +68,8 @@ public class ShapeModel extends DocumentationModel implements HasDeprecation {
 
     private XmlNamespace xmlNamespace;
 
+    private boolean document;
+
     public ShapeModel() {
     }
 
@@ -582,4 +584,13 @@ public ShapeModel withXmlNamespace(XmlNamespace xmlNamespace) {
     public void setXmlNamespace(XmlNamespace xmlNamespace) {
         this.xmlNamespace = xmlNamespace;
     }
+
+    public boolean isDocument() {
+        return document;
+    }
+
+    public ShapeModel withIsDocument(boolean document) {
+        this.document = document;
+        return this;
+    }
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Shape.java b/codegen/src/main/java/software/amazon/awssdk/codegen/model/service/Shape.java
@@ -70,6 +70,8 @@ public class Shape {
 
     private XmlNamespace xmlNamespace;
 
+    private boolean document;
+
     public boolean isFault() {
         return fault;
     }
@@ -298,4 +300,12 @@ public void setXmlNamespace(XmlNamespace xmlNamespace) {
         this.xmlNamespace = xmlNamespace;
     }
 
+    public boolean isDocument() {
+        return document;
+    }
+
+    public void setDocument(boolean document) {
+        this.document = document;
+    }
+
 }
diff --git a/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/TypeProvider.java b/codegen/src/main/java/software/amazon/awssdk/codegen/poet/model/TypeProvider.java
@@ -36,6 +36,7 @@
 import software.amazon.awssdk.codegen.model.intermediate.MemberModel;
 import software.amazon.awssdk.codegen.poet.PoetExtensions;
 import software.amazon.awssdk.core.SdkBytes;
+import software.amazon.awssdk.core.document.Document;
 
 /**
  * Helper class for resolving Poet {@link TypeName}s for use in model classes.
@@ -94,7 +95,8 @@ public TypeName getTypeNameForSimpleType(String simpleType) {
                 BigDecimal.class,
                 SdkBytes.class,
                 InputStream.class,
-                Instant.class)
+                Instant.class,
+                Document.class)
                 .filter(cls -> cls.getName().equals(simpleType) || cls.getSimpleName().equals(simpleType))
                 .map(ClassName::get)
                 .findFirst()