Merge pull request #1996 from aws/staging/8b8f7545-42c3-49c6-943a-8172cf5f7391

Pull request: release <- staging/8b8f7545-42c3-49c6-943a-8172cf5f7391

Author: aws-sdk-java-automation

.changes/2.17.176.json

@@ -0,0 +1,24 @@
+{
+    "version": "2.17.176",
+    "date": "2022-04-22",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Fix to ignore empty strings while marshalling list of strings in header field."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "contributor": "",
+            "description": "Adds support for waiters that automatically poll for a deleted NAT Gateway until it reaches the deleted state."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Chime SDK Meetings",
+            "contributor": "",
+            "description": "Include additional exceptions types."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,16 @@
+# __2.17.176__ __2022-04-22__
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Fix to ignore empty strings while marshalling list of strings in header field.
+
+## __Amazon Chime SDK Meetings__
+  - ### Features
+    - Include additional exceptions types.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Adds support for waiters that automatically poll for a deleted NAT Gateway until it reaches the deleted state.
+
 # __2.17.175__ __2022-04-21__
 ## __AWS Glue__
   - ### 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.17.175</version>
+      <version>2.17.176</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.17.175</version>
+  <version>2.17.176</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.17.175</version>
+  <version>2.17.176</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.17.175</version>
+  <version>2.17.176</version>
 </dependency>
 ```
 

archetypes/archetype-app-quickstart/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>archetypes</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</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.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

core/annotations/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/arns/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/auth-crt/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
 
     <artifactId>auth-crt</artifactId>

core/auth/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
 
     <artifactId>auth</artifactId>

core/aws-core/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

core/json-utils/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/metrics-spi/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
 
     <artifactId>core</artifactId>

core/profiles/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
 
     <artifactId>profiles</artifactId>

core/protocols/aws-cbor-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-json-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-json-protocol/src/main/java/software/amazon/awssdk/protocols/json/internal/marshall/HeaderMarshaller.java

@@ -27,6 +27,7 @@
 import software.amazon.awssdk.core.traits.ListTrait;
 import software.amazon.awssdk.protocols.core.ValueToStringConverter;
 import software.amazon.awssdk.utils.BinaryUtils;
+import software.amazon.awssdk.utils.StringUtils;
 
 @SdkInternalApi
 public final class HeaderMarshaller {
@@ -51,13 +52,16 @@ public final class HeaderMarshaller {
         = new SimpleHeaderMarshaller<>(JsonProtocolMarshaller.INSTANT_VALUE_TO_STRING);
 
     public static final JsonMarshaller<List<?>> LIST = (list, context, paramName, sdkField) -> {
-        // Null or empty lists cannot be meaningfully (or safely) represented in an HTTP header message since header-fields must 
+        // Null or empty lists cannot be meaningfully (or safely) represented in an HTTP header message since header-fields must
         // typically have a non-empty field-value. https://datatracker.ietf.org/doc/html/rfc7230#section-3.2
         if (isNullOrEmpty(list)) {
             return;
         }
         SdkField memberFieldInfo = sdkField.getRequiredTrait(ListTrait.class).memberFieldInfo();
         for (Object listValue : list) {
+            if (shouldSkipElement(listValue)) {
+                continue;
+            }
             JsonMarshaller marshaller = context.marshallerRegistry().getMarshaller(MarshallLocation.HEADER, listValue);
             marshaller.marshall(listValue, context, paramName, memberFieldInfo);
         }
@@ -66,6 +70,10 @@ public final class HeaderMarshaller {
     private HeaderMarshaller() {
     }
 
+    private static boolean shouldSkipElement(Object element) {
+        return element instanceof String && StringUtils.isBlank((String) element);
+    }
+
     private static class SimpleHeaderMarshaller<T> implements JsonMarshaller<T> {
 
         private final ValueToStringConverter.ValueToString<T> converter;

core/protocols/aws-query-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-xml-protocol/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/aws-xml-protocol/src/main/java/software/amazon/awssdk/protocols/xml/internal/marshall/HeaderMarshaller.java

@@ -25,6 +25,7 @@
 import software.amazon.awssdk.core.protocol.MarshallLocation;
 import software.amazon.awssdk.core.traits.ListTrait;
 import software.amazon.awssdk.protocols.core.ValueToStringConverter;
+import software.amazon.awssdk.utils.StringUtils;
 
 @SdkInternalApi
 public final class HeaderMarshaller {
@@ -78,11 +79,18 @@ public void marshall(List<?> list, XmlMarshallerContext context, String paramNam
             }
             SdkField memberFieldInfo = sdkField.getRequiredTrait(ListTrait.class).memberFieldInfo();
             for (Object listValue : list) {
+                if (shouldSkipElement(listValue)) {
+                    continue;
+                }
                 XmlMarshaller marshaller = context.marshallerRegistry().getMarshaller(MarshallLocation.HEADER, listValue);
                 marshaller.marshall(listValue, context, paramName, memberFieldInfo);
             }
         }
 
+        private boolean shouldSkipElement(Object element) {
+            return element instanceof String && StringUtils.isBlank((String) element);
+        }
+
         @Override
         protected boolean shouldEmit(List list) {
             // Null or empty lists cannot be meaningfully (or safely) represented in an HTTP header message since header-fields

core/protocols/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/protocol-core/pom.xml

@@ -20,7 +20,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/regions/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.17.175</version>
+        <version>2.17.176</version>
     </parent>
 
     <artifactId>regions</artifactId>