Merge pull request #543 from aws/staging/66c3a79a-c1fa-4328-af74-9b46…

…b727c9d3

Pull request: release <- staging/66c3a79a-c1fa-4328-af74-9b46b727c9d3

.changes/2.5.71.json

@@ -0,0 +1,26 @@
+{
+    "version": "2.5.71",
+    "date": "2019-06-25",
+    "entries": [
+        {
+            "type": "bugfix",
+            "category": "AWS SDK for Java v2",
+            "description": "Only allows a single execution interceptor with the same class name to be included in loaded execution interceptors."
+        },
+        {
+            "type": "bugfix",
+            "category": "Amazon S3",
+            "description": "Fixes [#1196](https://github.com/aws/aws-sdk-java-v2/issues/1196) by changing S3 FilterRule enums to correctly model each enum as capitalized"
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Compute Cloud",
+            "description": "Starting today, you can use Traffic Mirroring to copy network traffic from an elastic network interface of Amazon EC2 instances and then send it to out-of-band security and monitoring appliances for content inspection, threat monitoring, and troubleshooting. These appliances can be deployed as individual instances, or as a fleet of instances behind a Network Load Balancer with a User Datagram Protocol (UDP) listener. Traffic Mirroring supports filters and packet truncation, so that you only extract the traffic of interest to monitor by using monitoring tools of your choice."
+        },
+        {
+            "type": "feature",
+            "category": "Amazon Elastic Kubernetes Service",
+            "description": "Changing Amazon EKS full service name to Amazon Elastic Kubernetes Service."
+        }
+    ]
+}

CHANGELOG.md

@@ -1,3 +1,20 @@
+# __2.5.71__ __2019-06-25__
+## __AWS SDK for Java v2__
+  - ### Bugfixes
+    - Only allows a single execution interceptor with the same class name to be included in loaded execution interceptors.
+
+## __Amazon Elastic Compute Cloud__
+  - ### Features
+    - Starting today, you can use Traffic Mirroring to copy network traffic from an elastic network interface of Amazon EC2 instances and then send it to out-of-band security and monitoring appliances for content inspection, threat monitoring, and troubleshooting. These appliances can be deployed as individual instances, or as a fleet of instances behind a Network Load Balancer with a User Datagram Protocol (UDP) listener. Traffic Mirroring supports filters and packet truncation, so that you only extract the traffic of interest to monitor by using monitoring tools of your choice.
+
+## __Amazon Elastic Kubernetes Service__
+  - ### Features
+    - Changing Amazon EKS full service name to Amazon Elastic Kubernetes Service.
+
+## __Amazon S3__
+  - ### Bugfixes
+    - Fixes [#1196](https://github.com/aws/aws-sdk-java-v2/issues/1196) by changing S3 FilterRule enums to correctly model each enum as capitalized
+
 # __2.5.70__ __2019-06-24__
 ## __AWS Resource Groups Tagging API__
   - ### Features

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.70</version>
+  <version>2.5.71</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.70</version>
+  <version>2.5.71</version>
 </dependency>
 <dependency>
   <groupId>software.amazon.awssdk</groupId>
   <artifactId>s3</artifactId>
-  <version>2.5.70</version>
+  <version>2.5.71</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.70</version>
+      <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</version>
     </parent>
     <artifactId>codegen</artifactId>
     <name>AWS Java SDK :: Code Generator</name>

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/ShapeModifiersProcessor.java

@@ -139,6 +139,16 @@ private void postprocessModifyMemberProperty(ShapeModel shapeModel, String membe
             enumModel.setName(modifyModel.getEmitEnumName());
         }
 
+        if (modifyModel.getEmitEnumValue() != null) {
+            EnumModel enumModel = shapeModel.findEnumModelByValue(memberName);
+            if (enumModel == null) {
+                throw new IllegalStateException(
+                        String.format("Cannot find enum [%s] in the intermediate model when processing "
+                                      + "customization config shapeModifiers.%s", memberName, memberName));
+            }
+            enumModel.setValue(modifyModel.getEmitEnumValue());
+        }
+
         if (modifyModel.getMarshallLocationName() != null) {
             MemberModel memberModel = shapeModel.findMemberModelByC2jName(memberName);
             memberModel.getHttp().setMarshallLocationName(modifyModel.getMarshallLocationName());

codegen/src/main/java/software/amazon/awssdk/codegen/model/config/customization/ModifyModelShapeModifier.java

@@ -25,6 +25,12 @@ public class ModifyModelShapeModifier {
      */
     private String emitEnumName;
 
+    /**
+     * The value for the enum to be used in the java class. This overrides the
+     * values computed by the code generator for the enum.
+     */
+    private String emitEnumValue;
+
     /**
      * Emit as a different primitive type. Used by AWS Budget Service to change string
      * to BigDecimal (see API-433).
@@ -51,6 +57,14 @@ public void setEmitEnumName(String emitEnumName) {
         this.emitEnumName = emitEnumName;
     }
 
+    public String getEmitEnumValue() {
+        return emitEnumValue;
+    }
+
+    public void setEmitEnumValue(String emitEnumValue) {
+        this.emitEnumValue = emitEnumValue;
+    }
+
     public String getMarshallLocationName() {
         return marshallLocationName;
     }

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

@@ -23,7 +23,7 @@
 public class EnumModel {
 
     /** The value for the enum field.*/
-    private final String value;
+    private String value;
     /** The name of the enum field. */
     private String name;
 
@@ -42,6 +42,10 @@ public void setName(String name) {
         this.name = name;
     }
 
+    public void setValue(String value) {
+        this.value = value;
+    }
+
     public String getValue() {
         return value;
     }

codegen/src/main/java/software/amazon/awssdk/codegen/naming/DefaultNamingStrategy.java

@@ -216,7 +216,7 @@ public String getResponseClassName(String operationName) {
     public String getVariableName(String name) {
         // Exclude keywords because they will not compile, and exclude reserved method names because they're frequently
         // used for local variable names.
-        if (RESERVED_KEYWORDS.contains(name) ||
+        if (isJavaKeyword(name) ||
             RESERVED_STRUCTURE_METHOD_NAMES.contains(name) ||
             RESERVED_EXCEPTION_METHOD_NAMES.contains(name)) {
             return unCapitalize(name + CONFLICTING_NAME_SUFFIX);

core/annotations/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>core</artifactId>
         <groupId>software.amazon.awssdk</groupId>
-        <version>2.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</version>
     </parent>
 
     <artifactId>core</artifactId>

core/profiles/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <groupId>software.amazon.awssdk</groupId>
         <artifactId>core</artifactId>
-        <version>2.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</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.5.70</version>
+        <version>2.5.71</version>
     </parent>
     <artifactId>sdk-core</artifactId>
     <name>AWS Java SDK :: SDK Core</name>

core/sdk-core/src/main/java/software/amazon/awssdk/core/interceptor/ClasspathInterceptorChainFactory.java

@@ -22,6 +22,7 @@
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Enumeration;
 import java.util.List;
@@ -47,19 +48,20 @@ public final class ClasspathInterceptorChainFactory {
      * @return A list of request handlers based on the handlers referenced in the specified resource.
      */
     public List<ExecutionInterceptor> getInterceptors(String resource) {
-        return createExecutionInterceptorsFromClasspath(resource);
+        return new ArrayList<>(createExecutionInterceptorsFromClasspath(resource));
     }
 
     /**
      * Load the global handlers by reading the global execution interceptors resource.
      */
     public List<ExecutionInterceptor> getGlobalInterceptors() {
-        return createExecutionInterceptorsFromClasspath(GLOBAL_INTERCEPTOR_PATH);
+        return new ArrayList<>(createExecutionInterceptorsFromClasspath(GLOBAL_INTERCEPTOR_PATH));
     }
 
-    private List<ExecutionInterceptor> createExecutionInterceptorsFromClasspath(String path) {
+    private Collection<ExecutionInterceptor> createExecutionInterceptorsFromClasspath(String path) {
         try {
-            return createExecutionInterceptorsFromResources(classLoader().getResources(path)).collect(Collectors.toList());
+            return createExecutionInterceptorsFromResources(classLoader().getResources(path))
+                .collect(Collectors.toMap(p -> p.getClass().getSimpleName(), p -> p, (p1, p2) -> p1)).values();
         } catch (IOException e) {
             throw SdkClientException.builder()
                                     .message("Unable to instantiate execution interceptor chain.")

http-client-spi/pom.xml

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