Merge pull request #544 from aws/staging/ca1f986f-55eb-49fb-8bf5-40af…

…c7d8e32d Pull request: release <- staging/ca1f986f-55eb-49fb-8bf5-40afc7d8e32d
aws · Jun 26, 2019 · 20f2920 · 20f2920
2 parents 7e51693 + 1b63273
commit 20f2920
Show file tree

Hide file tree

Showing 235 changed files with 816 additions and 395 deletions.
diff --git a/.changes/2.6.0.json b/.changes/2.6.0.json
@@ -0,0 +1,26 @@
+{
+    "version": "2.6.0",
+    "date": "2019-06-26",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Modify the types of Part#size and ObjectVersion#size from Integer to Long. This is a breaking change for customers who are using the size() method."
+        },
+        {
+            "type": "feature",
+            "category": "AmazonApiGatewayV2",
+            "description": "You can now perform tag operations on ApiGatewayV2 Resources (typically associated with WebSocket APIs)"
+        },
+        {
+            "type": "feature",
+            "category": "AWS CodeCommit",
+            "description": "This release supports better exception handling for merges."
+        },
+        {
+            "type": "bugfix",
+            "category": "Netty NIO Http Client",
+            "description": "Completes the response normally when subscription is cancelled from the subscriber and not invoke `SdkAsyncHttpResponseHandler#onError` from the publisher."
+        }
+    ]
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# __2.6.0__ __2019-06-26__
+## __AWS CodeCommit__
+  - ### Features
+    - This release supports better exception handling for merges.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Modify the types of Part#size and ObjectVersion#size from Integer to Long. This is a breaking change for customers who are using the size() method.
+
+## __AmazonApiGatewayV2__
+  - ### Features
+    - You can now perform tag operations on ApiGatewayV2 Resources (typically associated with WebSocket APIs)
+
+## __Netty NIO Http Client__
+  - ### Bugfixes
+    - Completes the response normally when subscription is cancelled from the subscriber and not invoke `SdkAsyncHttpResponseHandler#onError` from the publisher.
+
 # __2.5.71__ __2019-06-25__
 ## __AWS SDK for Java v2__
   - ### Bugfixes

diff --git a/README.md b/README.md
@@ -46,7 +46,7 @@ You can import the whole SDK into your project (includes all services) as follow
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>aws-sdk-java</artifactId>
-  <version>2.5.71</version>
+  <version>2.6.0</version>
 </dependency>
 ```
 
@@ -58,12 +58,12 @@ Alternatively you can add dependencies for the specific services you use only:
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>ec2</artifactId>
-  <version>2.5.71</version>
+  <version>2.6.0</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.5.71</version>
+  <version>2.6.0</version>
 </dependency>
 ```
 
@@ -77,7 +77,7 @@ To automatically manage module versions (currently all modules have the same ver
     <dependency>
       <groupId>software.amazon.awssdk</groupId>
       <artifactId>bom</artifactId>
-      <version>2.5.71</version>
+      <version>2.6.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

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

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

diff --git a/bom/pom.xml b/bom/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.71</version>
+        <version>2.6.0</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.5.71</version>
+        <version>2.6.0</version>
     </parent>
     <artifactId>bundle</artifactId>
     <packaging>jar</packaging>

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

diff --git a/codegen-lite/pom.xml b/codegen-lite/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.71</version>
+        <version>2.6.0</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.5.71</version>
+        <version>2.6.0</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.5.71</version>
+        <version>2.6.0</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

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

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

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

diff --git a/.../java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformer.java b/.../java/software/amazon/awssdk/awscore/eventstream/EventStreamAsyncResponseTransformer.java
@@ -431,6 +431,11 @@ public void request(long l) {
                     @Override
                     public void cancel() {
                         dataSubscription.cancel();
+
+                        // Need to complete the futures, otherwise the downstream subscriber will never
+                        // get notified
+                        future.complete(null);
+                        transformFuture.complete(null);
                     }
                 });
             } else {

diff --git a/.../src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandler.java b/.../src/main/java/software/amazon/awssdk/awscore/eventstream/EventStreamResponseHandler.java
@@ -50,7 +50,7 @@ public interface EventStreamResponseHandler<ResponseT, EventT> {
      *
      * <p>
      * If at any time the subscriber wishes to stop receiving data, it may call {@link Subscription#cancel()}. This
-     * will be treated as a failure of the response and the {@link #exceptionOccurred(Throwable)} callback will be invoked.
+     * will <b>NOT</b> be treated as a failure of the response and the response will be completed normally.
      * </p>
      *
      * <p>This callback may never be called if the response has no content or if an error occurs.</p>
@@ -102,7 +102,8 @@ interface Builder<ResponseT, EventT, SubBuilderT> {
         SubBuilderT onError(Consumer<Throwable> consumer);
 
         /**
-         * Action to invoke when the event stream completes.
+         * Action to invoke when the event stream completes. This will only be invoked
+         * when all events are being received.
          *
          * @param runnable Action to run on the completion of the event stream.
          * @return This builder for method chaining.

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.5.71</version>
+        <version>2.6.0</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.5.71</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>profiles</artifactId>

diff --git a/core/protocols/aws-cbor-protocol/pom.xml b/core/protocols/aws-cbor-protocol/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</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
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

diff --git a/core/protocols/protocol-core/pom.xml b/core/protocols/protocol-core/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>protocols</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</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.5.71</version>
+        <version>2.6.0</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.5.71</version>
+        <version>2.6.0</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>

diff --git a/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/SdkPublisher.java b/core/sdk-core/src/main/java/software/amazon/awssdk/core/async/SdkPublisher.java
@@ -111,7 +111,8 @@ default SdkPublisher<List<T>> buffer(int bufferSize) {
 
     /**
      * Limit the number of published events and cancel the subscription after that limit has been reached. The limit
-     * may never be reached if the downstream publisher doesn't have many events to publish.
+     * may never be reached if the downstream publisher doesn't have many events to publish. Once it reaches the limit,
+     * subsequent requests will be ignored.
      *
      * @param limit Number of events to publish.
      * @return New publisher that will only publish up to the specified number of events.

diff --git a/http-client-spi/pom.xml b/http-client-spi/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</version>
     </parent>
     <artifactId>http-client-spi</artifactId>
     <name>AWS Java SDK :: HTTP Client Interface</name>

diff --git a/http-clients/apache-client/pom.xml b/http-clients/apache-client/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</version>
     </parent>
 
     <artifactId>apache-client</artifactId>

diff --git a/http-clients/netty-nio-client/pom.xml b/http-clients/netty-nio-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/...-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java b/...-client/src/main/java/software/amazon/awssdk/http/nio/netty/internal/ResponseHandler.java
@@ -240,7 +240,7 @@ private void onCancel() {
                     try {
                         SdkCancellationException e = new SdkCancellationException(
                                 "Subscriber cancelled before all events were published");
-                        requestContext.handler().onError(e);
+                        log.warn("Subscriber cancelled before all events were published");
                         executeFuture.completeExceptionally(e);
                     } finally {
                         runAndLogError("Could not release channel back to the pool",

diff --git a/http-clients/pom.xml b/http-clients/pom.xml
@@ -21,7 +21,7 @@
     <parent>
         <artifactId>aws-sdk-java-pom</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/http-clients/url-connection-client/pom.xml b/http-clients/url-connection-client/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>http-clients</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.71</version>
+        <version>2.6.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/pom.xml b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>software.amazon.awssdk</groupId>
     <artifactId>aws-sdk-java-pom</artifactId>
-    <version>2.5.71</version>
+    <version>2.6.0</version>
     <packaging>pom</packaging>
     <name>AWS Java SDK :: Parent</name>
     <description>The Amazon Web Services SDK for Java provides Java APIs

diff --git a/release-scripts/pom.xml b/release-scripts/pom.xml
@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.5.71</version>
+        <version>2.6.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>release-scripts</artifactId>