Merge pull request #572 from aws/staging/51aaee0c-a643-48b4-8edd-56a9c3cb3d72

Pull request: release <- staging/51aaee0c-a643-48b4-8edd-56a9c3cb3d72

Author: aws-sdk-java-automation

.changes/2.7.15.json

@@ -0,0 +1,26 @@
+{
+    "version": "2.7.15",
+    "date": "2019-07-30",
+    "entries": [
+        {
+            "type": "feature",
+            "category": "AWS Elemental MediaConvert",
+            "description": "MediaConvert adds support for specifying priority (-50 to 50) on jobs submitted to on demand or reserved queues"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Route 53",
+            "description": "Amazon Route 53 now supports the Middle East (Bahrain) Region (me-south-1) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Polly",
+            "description": "Amazon Polly adds support for Neural text-to-speech engine."
+        },
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Fixed the issue where `AsyncResponseHandler#prepare` was not invoked before `#onHeaders`. See [#1343](https://github.com/aws/aws-sdk-java-v2/issues/1343)."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,20 @@
+# __2.7.15__ __2019-07-30__
+## __AWS Elemental MediaConvert__
+  - ### Features
+    - MediaConvert adds support for specifying priority (-50 to 50) on jobs submitted to on demand or reserved queues
+
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Fixed the issue where `AsyncResponseHandler#prepare` was not invoked before `#onHeaders`. See [#1343](https://github.com/aws/aws-sdk-java-v2/issues/1343).
+
+## __Amazon Polly__
+  - ### Features
+    - Amazon Polly adds support for Neural text-to-speech engine.
+
+## __Amazon Route 53__
+  - ### Features
+    - Amazon Route 53 now supports the Middle East (Bahrain) Region (me-south-1) for latency records, geoproximity records, and private DNS for Amazon VPCs in that region.
+
 # __2.7.14__ __2019-07-29__
 ## __AWS CodeCommit__
   - ### 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.7.14</version>
+      <version>2.7.15</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.7.14</version>
+  <version>2.7.15</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.7.14</version>
+  <version>2.7.15</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.7.14</version>
+  <version>2.7.15</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.7.14</version>
+        <version>2.7.15</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.7.14</version>
+        <version>2.7.15</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.7.14</version>
+        <version>2.7.15</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.7.14</version>
+        <version>2.7.15</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.7.14</version>
+        <version>2.7.15</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.7.14</version>
+        <version>2.7.15</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.7.14</version>
+        <version>2.7.15</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.7.14</version>
+        <version>2.7.15</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

core/annotations/pom.xml

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

core/auth/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.7.14</version>
+        <version>2.7.15</version>
     </parent>
 
     <artifactId>auth</artifactId>

core/aws-core/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.7.14</version>
+        <version>2.7.15</version>
     </parent>
 
     <artifactId>aws-core</artifactId>

core/pom.xml

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

core/profiles/pom.xml

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

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.14</version>
+        <version>2.7.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.14</version>
+        <version>2.7.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.14</version>
+        <version>2.7.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.14</version>
+        <version>2.7.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.14</version>
+        <version>2.7.15</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

core/protocols/pom.xml

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

core/protocols/protocol-core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.7.14</version>
+        <version>2.7.15</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.7.14</version>
+        <version>2.7.15</version>
     </parent>
 
     <artifactId>regions</artifactId>

core/sdk-core/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.7.14</version>
+        <version>2.7.15</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>

core/sdk-core/src/main/java/software/amazon/awssdk/core/client/handler/BaseAsyncClientHandler.java

@@ -16,6 +16,7 @@
 package software.amazon.awssdk.core.client.handler;
 
 import static software.amazon.awssdk.core.interceptor.SdkInternalExecutionAttribute.ASYNC_RESPONSE_TRANSFORMER_FUTURE;
+import static software.amazon.awssdk.utils.FunctionalUtils.runAndLogError;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
@@ -39,9 +40,11 @@
 import software.amazon.awssdk.http.SdkHttpFullRequest;
 import software.amazon.awssdk.http.SdkHttpFullResponse;
 import software.amazon.awssdk.utils.CompletableFutureUtils;
+import software.amazon.awssdk.utils.Logger;
 
 @SdkProtectedApi
 public abstract class BaseAsyncClientHandler extends BaseClientHandler implements AsyncClientHandler {
+    private static final Logger log = Logger.loggerFor(BaseAsyncClientHandler.class);
     private final SdkClientConfiguration clientConfiguration;
     private final AmazonAsyncHttpClient client;
     private final Function<SdkHttpFullResponse, SdkHttpFullResponse> crc32Validator;
@@ -77,16 +80,16 @@ public <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> Complet
 
         // For streaming requests, prepare() should be called as early as possible to avoid NPE in client
         // See https://github.com/aws/aws-sdk-java-v2/issues/1268
-        CompletableFuture<ReturnT> asyncTransformerFuture = asyncResponseTransformer.prepare();
+        AsyncStreamingResponseHandler<OutputT, ReturnT> asyncStreamingResponseHandler =
+            new AsyncStreamingResponseHandler<>(asyncResponseTransformer);
+        CompletableFuture<ReturnT> asyncTransformerFuture = asyncStreamingResponseHandler.prepare();
 
         ExecutionContext context = createExecutionContext(executionParams);
         context.executionAttributes().putAttribute(ASYNC_RESPONSE_TRANSFORMER_FUTURE, asyncTransformerFuture);
 
         HttpResponseHandler<OutputT> decoratedResponseHandlers =
             decorateResponseHandlers(executionParams.getResponseHandler(), context);
-
-        AsyncStreamingResponseHandler<OutputT, ReturnT> asyncStreamingResponseHandler =
-            new AsyncStreamingResponseHandler<>(asyncResponseTransformer, decoratedResponseHandlers);
+        asyncStreamingResponseHandler.responseHandler(decoratedResponseHandlers);
 
         return doExecute(executionParams, context, asyncStreamingResponseHandler);
     }
@@ -143,6 +146,10 @@ private <InputT extends SdkRequest, OutputT extends SdkResponse, ReturnT> Comple
 
             return CompletableFutureUtils.forwardExceptionTo(exceptionTranslatedFuture, invokeFuture);
         } catch (Throwable t) {
+            runAndLogError(
+                log.logger(),
+                "Error thrown from TransformingAsyncResponseHandler#onError, ignoring.",
+                () -> asyncResponseHandler.onError(t));
             return CompletableFutureUtils.failedFuture(ThrowableUtils.asSdkException(t));
         }
     }

core/sdk-core/src/main/java/software/amazon/awssdk/core/internal/http/async/AsyncStreamingResponseHandler.java

@@ -31,16 +31,17 @@
  * Response handler for asynchronous streaming operations.
  */
 @SdkInternalApi
-public class AsyncStreamingResponseHandler<OutputT extends SdkResponse, ReturnT>
+public final class AsyncStreamingResponseHandler<OutputT extends SdkResponse, ReturnT>
     implements TransformingAsyncResponseHandler<ReturnT> {
 
     private final AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer;
-    private final HttpResponseHandler<OutputT> responseHandler;
-    private volatile CompletableFuture<ReturnT> transformFuture;
+    private volatile HttpResponseHandler<OutputT> responseHandler;
 
-    public AsyncStreamingResponseHandler(AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer,
-                                         HttpResponseHandler<OutputT> responseHandler) {
+    public AsyncStreamingResponseHandler(AsyncResponseTransformer<OutputT, ReturnT> asyncResponseTransformer) {
         this.asyncResponseTransformer = asyncResponseTransformer;
+    }
+
+    public void responseHandler(HttpResponseHandler<OutputT> responseHandler) {
         this.responseHandler = responseHandler;
     }
 
@@ -53,7 +54,7 @@ public void onHeaders(SdkHttpResponse response) {
 
             asyncResponseTransformer.onResponse(resp);
         } catch (Exception e) {
-            transformFuture.completeExceptionally(e);
+            asyncResponseTransformer.exceptionOccurred(e);
         }
     }
 
@@ -69,7 +70,6 @@ public void onError(Throwable error) {
 
     @Override
     public CompletableFuture<ReturnT> prepare() {
-        this.transformFuture = asyncResponseTransformer.prepare();
-        return transformFuture;
+        return asyncResponseTransformer.prepare();
     }
 }