Merge pull request #1273 from aws/staging/dccf4bda-05b8-470d-9e9e-c92…

…e6adfda29 Pull request: release <- staging/dccf4bda-05b8-470d-9e9e-c92e6adfda29
aws · Apr 14, 2021 · cb78c49 · cb78c49
2 parents e83f757 + 5e8d6dc
commit cb78c49
Show file tree

Hide file tree

Showing 327 changed files with 626 additions and 338 deletions.
diff --git a/.changes/2.16.42.json b/.changes/2.16.42.json
@@ -0,0 +1,36 @@
+{
+    "version": "2.16.42",
+    "date": "2021-04-14",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "Amazon Route 53",
+            "contributor": "",
+            "description": "Documentation updates for route53"
+        },
+        {
+            "type": "feature",
+            "category": "AWS MediaConnect",
+            "contributor": "",
+            "description": "For flows that use Listener protocols, you can now easily locate an output's outbound IP address for a private internet. Additionally, MediaConnect now supports the Waiters feature that makes it easier to poll for the status of a flow until it reaches its desired state."
+        },
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Add a new Optional getter for the content length of RequestBody, also add a new fromContentProvider method allowing contentLength to be null."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Config",
+            "contributor": "",
+            "description": "Add exception for DeleteRemediationConfiguration and DescribeRemediationExecutionStatus"
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeStar connections",
+            "contributor": "",
+            "description": "This release adds tagging support for CodeStar Connections Host resources"
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,24 @@
+# __2.16.42__ __2021-04-14__
+## __AWS CodeStar connections__
+  - ### Features
+    - This release adds tagging support for CodeStar Connections Host resources
+
+## __AWS Config__
+  - ### Features
+    - Add exception for DeleteRemediationConfiguration and DescribeRemediationExecutionStatus
+
+## __AWS MediaConnect__
+  - ### Features
+    - For flows that use Listener protocols, you can now easily locate an output's outbound IP address for a private internet. Additionally, MediaConnect now supports the Waiters feature that makes it easier to poll for the status of a flow until it reaches its desired state.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Add a new Optional getter for the content length of RequestBody, also add a new fromContentProvider method allowing contentLength to be null.
+
+## __Amazon Route 53__
+  - ### Features
+    - Documentation updates for route53
+
 # __2.16.41__ __2021-04-13__
 ## __AWS Comprehend Medical__
   - ### 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.41</version>
+      <version>2.16.42</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.41</version>
+  <version>2.16.42</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.16.41</version>
+  <version>2.16.42</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.41</version>
+  <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</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.41</version>
+        <version>2.16.42</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

diff --git a/core/annotations/pom.xml b/core/annotations/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/arns/pom.xml b/core/arns/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/auth/pom.xml b/core/auth/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
 
     <artifactId>auth</artifactId>

diff --git a/core/aws-core/pom.xml b/core/aws-core/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

diff --git a/core/metrics-spi/pom.xml b/core/metrics-spi/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/pom.xml b/core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
 
     <artifactId>core</artifactId>

diff --git a/core/profiles/pom.xml b/core/profiles/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
 
     <artifactId>profiles</artifactId>

diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/aws-ion-protocol/pom.xml b/core/protocols/aws-ion-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/aws-json-protocol/pom.xml b/core/protocols/aws-json-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/aws-query-protocol/pom.xml b/core/protocols/aws-query-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/aws-xml-protocol/pom.xml b/core/protocols/aws-xml-protocol/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...tocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlWriter.java b/...tocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/XmlWriter.java
@@ -193,6 +193,8 @@ private String escapeXmlEntities(String s) {
             s = s.replace("&apos;", "'");
             s = s.replace("&lt;", "<");
             s = s.replace("&gt;", ">");
+            s = s.replace("&#x0D;", "\r");
+            s = s.replace("&#x0A;", "\n");
             // Ampersands should always be the last to unescape
             s = s.replace("&amp;", "&");
         }
@@ -202,6 +204,8 @@ private String escapeXmlEntities(String s) {
         s = s.replace("'", "&apos;");
         s = s.replace("<", "&lt;");
         s = s.replace(">", "&gt;");
+        s = s.replace("\r", "&#x0D;");
+        s = s.replace("\n", "&#x0A;");
         return s;
     }
 

diff --git a/core/protocols/pom.xml b/core/protocols/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/core/regions/pom.xml b/core/regions/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
 
     <artifactId>regions</artifactId>

diff --git a/core/sdk-core/pom.xml b/core/sdk-core/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.16.41</version>
+        <version>2.16.42</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>

diff --git a/...c/main/java/software/amazon/awssdk/core/runtime/transform/StreamingRequestMarshaller.java b/...c/main/java/software/amazon/awssdk/core/runtime/transform/StreamingRequestMarshaller.java
@@ -17,7 +17,6 @@
 
 import static software.amazon.awssdk.http.Header.CONTENT_TYPE;
 
-import java.util.Optional;
 import software.amazon.awssdk.annotations.SdkProtectedApi;
 import software.amazon.awssdk.core.internal.transform.AbstractStreamingRequestMarshaller;
 import software.amazon.awssdk.core.sync.RequestBody;
@@ -56,7 +55,7 @@ public SdkHttpFullRequest marshall(T in) {
         // Currently, SDK always require content length in RequestBody. So we always
         // send Content-Length header for sync APIs
         // This change will be useful if SDK relaxes the content-length requirement in RequestBody
-        addHeaders(marshalled, Optional.of(requestBody.contentLength()), requiresLength, transferEncoding, useHttp2);
+        addHeaders(marshalled, requestBody.optionalContentLength(), requiresLength, transferEncoding, useHttp2);
 
         return marshalled.build();
     }