Merge pull request #1012 from aws/staging/c63a8c63-77e4-4671-8373-ed7…

…341c1996b

Pull request: release <- staging/c63a8c63-77e4-4671-8373-ed7341c1996b

.changes/2.15.16.json

@@ -0,0 +1,18 @@
+{
+    "version": "2.15.16",
+    "date": "2020-10-27",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS SDK for Java v2",
+            "contributor": "",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "type": "feature",
+            "category": "AWS Glue",
+            "contributor": "",
+            "description": "AWS Glue machine learning transforms now support encryption-at-rest for labels and trained models."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,12 @@
+# __2.15.16__ __2020-10-27__
+## __AWS Glue__
+  - ### Features
+    - AWS Glue machine learning transforms now support encryption-at-rest for labels and trained models.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Updated service endpoint metadata.
+
 # __2.15.15__ __2020-10-26__
 ## __AWS SDK for Java v2__
   - ### Features

README.md

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

archetypes/archetype-lambda/pom.xml

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

archetypes/pom.xml

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

codegen/src/main/java/software/amazon/awssdk/codegen/poet/client/specs/XmlProtocolSpec.java

@@ -170,6 +170,7 @@ public CodeBlock asyncExecutionHandler(IntermediateModel intermediateModel, Oper
                      .add(".withOperationName(\"$N\")\n", opModel.getOperationName())
                      .add(".withMarshaller($L)\n", asyncMarshaller(intermediateModel, opModel, marshaller, "protocolFactory"))
                      .add(".withCombinedResponseHandler(responseHandler)\n")
+                     .add(hostPrefixExpression(opModel))
                      .add(".withMetricCollector(apiCallMetricCollector)\n")
                      .add(asyncRequestBody(opModel))
                      .add(HttpChecksumRequiredTrait.putHttpChecksumAttribute(opModel));

codegen/src/test/java/software/amazon/awssdk/codegen/poet/ClientTestModels.java

@@ -59,6 +59,20 @@ public static IntermediateModel queryServiceModels() {
         return new IntermediateModelBuilder(models).build();
     }
 
+    public static IntermediateModel xmlServiceModels() {
+        File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/xml/service-2.json").getFile());
+        File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/xml/customization.config").getFile());
+
+
+        C2jModels models = C2jModels
+            .builder()
+            .serviceModel(getServiceModel(serviceModel))
+            .customizationConfig(getCustomizationConfig(customizationModel))
+            .build();
+
+        return new IntermediateModelBuilder(models).build();
+    }
+
     public static IntermediateModel endpointDiscoveryModels() {
         File serviceModel = new File(ClientTestModels.class.getResource("client/c2j/endpointdiscovery/service-2.json").getFile());
         File customizationModel = new File(ClientTestModels.class.getResource("client/c2j/endpointdiscovery/customization.config").getFile());

codegen/src/test/java/software/amazon/awssdk/codegen/poet/client/PoetClientFunctionalTests.java

@@ -65,6 +65,19 @@ public void asyncClientClassQuery() throws Exception {
         assertThat(syncClientClass, generatesTo("test-query-async-client-class.java"));
     }
 
+    @Test
+    public void syncClientClassXml() throws Exception {
+        SyncClientClass syncClientClass = createSyncClientClass(ClientTestModels.xmlServiceModels());
+        assertThat(syncClientClass, generatesTo("test-xml-client-class.java"));
+    }
+
+
+    @Test
+    public void asyncClientClassXml() throws Exception {
+        AsyncClientClass syncClientClass = createAsyncClientClass(ClientTestModels.xmlServiceModels());
+        assertThat(syncClientClass, generatesTo("test-xml-async-client-class.java"));
+    }
+
     private SyncClientClass createSyncClientClass(IntermediateModel model) {
         return new SyncClientClass(GeneratorTaskParams.create(model, "sources/", "tests/"));
     }

codegen/src/test/resources/software/amazon/awssdk/codegen/poet/client/c2j/xml/customization.config

@@ -0,0 +1,5 @@
+{
+    "authPolicyActions" : {
+        "skip" : true
+    }
+}