Merge pull request #399 from aws/staging/af22de82-0b36-4baf-8188-a4af27780aca

Pull request: release <- staging/af22de82-0b36-4baf-8188-a4af27780aca

Author: millems

.changes/2.4.0.json

@@ -0,0 +1,66 @@
+{
+    "date": "2019-02-04",
+    "version": "2.4.0",
+    "entries": [
+        {
+            "category": "Amazon WorkSpaces",
+            "type": "feature",
+            "description": "This release sets ClientProperties as a required parameter."
+        },
+        {
+            "category": "AWS SDK for Java v2",
+            "type": "feature",
+            "description": "Updated service endpoint metadata."
+        },
+        {
+            "category": "AWS SDK for Java v2",
+            "type": "feature",
+            "description": "Add support for `connectionTimeToLive`, `connectionMaxIdleTime` and `useIdleConnectionReaper` to the netty HTTP client."
+        },
+        {
+            "category": "AWS SDK for Java v2",
+            "type": "feature",
+            "description": "Enable `useIdleConnectionReaper` by default for Netty and Apache."
+        },
+        {
+            "category": "AWS SDK for Java v2",
+            "type": "bugfix",
+            "description": "Reduced netty client logging noise, by logging at a DEBUG level (instead of WARN) when encountering IO errors on channels not currently in use and not logging the whole stack trace."
+        },
+        {
+            "category": "Amazon EC2 Container Service",
+            "type": "feature",
+            "description": "This release of Amazon Elastic Container Service (Amazon ECS) introduces support for GPU workloads by enabling you to create clusters with GPU-enabled container instances."
+        },
+        {
+            "category": "Netty NIO HTTP Client",
+            "type": "feature",
+            "description": "Allows customers to enable wire logging with the Netty client at debug level."
+        },
+        {
+            "category": "AWS SDK for Java v2",
+            "type": "bugfix",
+            "description": "Added a new handler ([#1041](https://github.com/aws/aws-sdk-java-v2/issues/1041)) to close channels which have triggered an SslCloseCompletionEvent and are no longer usable per [#452](https://github.com/aws/aws-sdk-java-v2/issues/452)."
+        },
+        {
+            "category": "AWS CodeCommit",
+            "type": "feature",
+            "description": "This release supports a more graceful handling of the error case when a repository is not associated with a pull request ID in a merge request in AWS CodeCommit."
+        },
+        {
+            "category": "AWS SDK for Java v2",
+            "type": "bugfix",
+            "description": "Removed broken client methods: `BackupClient#getSupportedResourceTypes()` and `PinpointSmsVoiceClient.listConfigurationSets()`."
+        },
+        {
+            "category": "Application Auto Scaling",
+            "type": "feature",
+            "description": "Documentation updates for application-autoscaling"
+        },
+        {
+            "category": "AWS SDK for Java v2",
+            "type": "bugfix",
+            "description": "Fix the deadlock issue in `EventStreamAsyncResponseTransformer` for event streaming operations triggered in an edge case where customer subscriber signals `Subscription#request` the same time as `SdkPublisher` signals `Subscriber#onComplete`"
+        }
+    ]
+}

.github/PULL_REQUEST_TEMPLATE.md

@@ -31,7 +31,7 @@
 - [ ] I have added tests to cover my changes
 - [ ] All new and existing tests passed
 - [ ] A short description of the change has been added to the **CHANGELOG**
-- [ ] My change is to implement 1.11 parity feature and I have updated [LaunchChangelog](../docs/LaunchChangelog.md)
+- [ ] My change is to implement 1.11 parity feature and I have updated [LaunchChangelog](https://github.com/aws/aws-sdk-java-v2/blob/master/docs/LaunchChangelog.md)
 
 ## License
 <!--- The SDK is released under the Apache 2.0 license (http://aws.amazon.com/apache2.0/), so any code you submit will be released under that license -->

CHANGELOG.md

@@ -1,3 +1,36 @@
+# __2.4.0__ __2019-02-04__
+## __AWS CodeCommit__
+  - ### Features
+    - This release supports a more graceful handling of the error case when a repository is not associated with a pull request ID in a merge request in AWS CodeCommit.
+
+## __AWS SDK for Java v2__
+  - ### Features
+    - Add support for `connectionTimeToLive`, `connectionMaxIdleTime` and `useIdleConnectionReaper` to the netty HTTP client.
+    - Enable `useIdleConnectionReaper` by default for Netty and Apache.
+    - Updated service endpoint metadata.
+
+  - ### Bugfixes
+    - Added a new handler ([#1041](https://github.com/aws/aws-sdk-java-v2/issues/1041)) to close channels which have triggered an SslCloseCompletionEvent and are no longer usable per [#452](https://github.com/aws/aws-sdk-java-v2/issues/452).
+    - Fix the deadlock issue in `EventStreamAsyncResponseTransformer` for event streaming operations triggered in an edge case where customer subscriber signals `Subscription#request` the same time as `SdkPublisher` signals `Subscriber#onComplete`
+    - Reduced netty client logging noise, by logging at a DEBUG level (instead of WARN) when encountering IO errors on channels not currently in use and not logging the whole stack trace.
+    - Removed broken client methods: `BackupClient#getSupportedResourceTypes()` and `PinpointSmsVoiceClient.listConfigurationSets()`.
+
+## __Amazon EC2 Container Service__
+  - ### Features
+    - This release of Amazon Elastic Container Service (Amazon ECS) introduces support for GPU workloads by enabling you to create clusters with GPU-enabled container instances.
+
+## __Amazon WorkSpaces__
+  - ### Features
+    - This release sets ClientProperties as a required parameter.
+
+## __Application Auto Scaling__
+  - ### Features
+    - Documentation updates for application-autoscaling
+
+## __Netty NIO HTTP Client__
+  - ### Features
+    - Allows customers to enable wire logging with the Netty client at debug level.
+
 # __2.3.9__ __2019-01-25__
 ## __AWS CodeCommit__
   - ### Features

README.md

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

aws-sdk-java/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>aws-sdk-java-pom</artifactId>
-        <version>2.3.9</version>
+        <version>2.4.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>aws-sdk-java</artifactId>

bom/pom.xml

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

codegen/src/main/java/software/amazon/awssdk/codegen/IntermediateModelBuilder.java

@@ -45,6 +45,7 @@
 import software.amazon.awssdk.codegen.model.service.ServiceModel;
 import software.amazon.awssdk.codegen.naming.DefaultNamingStrategy;
 import software.amazon.awssdk.codegen.naming.NamingStrategy;
+import software.amazon.awssdk.utils.CollectionUtils;
 
 /**
  * Builds an intermediate model to be used by the templates from the service model and
@@ -247,24 +248,24 @@ private void linkAuthorizationToRequestShapeForAwsProtocol(AuthType authType, Sh
     }
 
     private void setSimpleMethods(IntermediateModel model) {
-        model.getOperations().entrySet().forEach(m -> {
-
-            ShapeModel inputShape = m.getValue().getInputShape();
-            String methodName = m.getValue().getMethodName();
-            CustomizationConfig config = model.getCustomizationConfig();
-
-            if (inputShape.getRequired() == null
-                && !config.getBlacklistedSimpleMethods().contains(methodName)
-                && !(config.getBlacklistedSimpleMethods().size() == 1 && config.getBlacklistedSimpleMethods().get(0).equals("*"))
-                && !m.getValue().hasStreamingInput()
-                && !m.getValue().hasStreamingOutput()) {
-
-                if (!methodName.matches(Constant.APPROVED_SIMPLE_METHOD_VERBS) &&
-                    !config.getVerifiedSimpleMethods().contains(methodName)) {
-                    // TODO: How do we prevent these from being missed before services launch?
-                    log.warn("Simple method encountered that is not approved or blacklisted: " + methodName);
-                } else {
-                    inputShape.setSimpleMethod(true);
+        CustomizationConfig config = model.getCustomizationConfig();
+        model.getOperations().values().forEach(operation -> {
+            ShapeModel inputShape = operation.getInputShape();
+            String methodName = operation.getMethodName();
+
+            if (config.getVerifiedSimpleMethods().contains(methodName)) {
+                inputShape.setSimpleMethod(true);
+            } else {
+                inputShape.setSimpleMethod(false);
+
+                boolean methodIsNotBlacklisted = !config.getBlacklistedSimpleMethods().contains(methodName) ||
+                                                 config.getBlacklistedSimpleMethods().stream().noneMatch(m -> m.equals("*"));
+                boolean methodHasNoRequiredMembers = !CollectionUtils.isNullOrEmpty(inputShape.getRequired());
+                boolean methodIsNotStreaming = !operation.isStreaming();
+                boolean methodHasSimpleMethodVerb = methodName.matches(Constant.APPROVED_SIMPLE_METHOD_VERBS);
+
+                if (methodIsNotBlacklisted && methodHasNoRequiredMembers && methodIsNotStreaming && methodHasSimpleMethodVerb) {
+                    log.warn("A potential simple method exists that isn't whitelisted or blacklisted: " + methodName);
                 }
             }
         });

codegen/src/main/java/software/amazon/awssdk/codegen/model/intermediate/IntermediateModel.java

@@ -15,8 +15,6 @@
 
 package software.amazon.awssdk.codegen.model.intermediate;
 
-import static software.amazon.awssdk.codegen.internal.Constant.APPROVED_SIMPLE_METHOD_VERBS;
-
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -37,12 +35,6 @@
 import software.amazon.awssdk.utils.IoUtils;
 
 public final class IntermediateModel {
-
-    /**
-     * This is used for all service clients unless overridden in the Customizations file.
-     */
-    private static final String DEFAULT_CLIENT_CONFIG_FACTORY = "LegacyClientConfigurationFactory";
-
     private final Metadata metadata;
 
     private final Map<String, OperationModel> operations;
@@ -203,8 +195,6 @@ private String getResponseMetadataClassName() {
     public List<OperationModel> simpleMethodsRequiringTesting() {
         return getOperations().values().stream()
                               .filter(v -> v.getInputShape().isSimpleMethod())
-                              .filter(v -> !getCustomizationConfig().getVerifiedSimpleMethods().contains(v.getMethodName()))
-                              .filter(v -> v.getMethodName().matches(APPROVED_SIMPLE_METHOD_VERBS))
                               .collect(Collectors.toList());
     }