AWS SDK for Java 1.11.116

jiangsen · Apr 6, 2017 · 6486b8a · 6486b8a
1 parent 729830b
commit 6486b8a
Show file tree

Hide file tree

Showing 154 changed files with 4,395 additions and 837 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# __1.11.116__ __2017-04-05__
+## __Amazon ElastiCache__
+  - ### Features
+    - ElastiCache added support for testing the Elasticache Multi-AZ feature with Automatic Failover.
+
 # __1.11.115__ __2017-04-04__
 ## __Amazon CloudWatch__
   - ### Features

diff --git a/README.md b/README.md
@@ -45,7 +45,7 @@ dependencies.
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-bom</artifactId>
-      <version>1.11.115</version>
+      <version>1.11.116</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>

diff --git a/aws-java-sdk-acm/pom.xml b/aws-java-sdk-acm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-acm</artifactId>

diff --git a/aws-java-sdk-api-gateway/pom.xml b/aws-java-sdk-api-gateway/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-api-gateway</artifactId>

diff --git a/aws-java-sdk-applicationautoscaling/pom.xml b/aws-java-sdk-applicationautoscaling/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-applicationautoscaling</artifactId>

diff --git a/aws-java-sdk-appstream/pom.xml b/aws-java-sdk-appstream/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-appstream</artifactId>

diff --git a/aws-java-sdk-autoscaling/pom.xml b/aws-java-sdk-autoscaling/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-autoscaling</artifactId>

diff --git a/aws-java-sdk-batch/pom.xml b/aws-java-sdk-batch/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-batch</artifactId>

diff --git a/aws-java-sdk-bom/pom.xml b/aws-java-sdk-bom/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-bom</artifactId>

diff --git a/aws-java-sdk-budgets/pom.xml b/aws-java-sdk-budgets/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-budgets</artifactId>

diff --git a/aws-java-sdk-bundle/pom.xml b/aws-java-sdk-bundle/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.amazonaws</groupId>
         <artifactId>aws-java-sdk-pom</artifactId>
-        <version>1.11.116-SNAPSHOT</version>
+        <version>1.11.116</version>
     </parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-bundle</artifactId>
@@ -24,7 +24,7 @@
         <artifactId>aws-java-sdk</artifactId>
         <groupId>com.amazonaws</groupId>
         <optional>false</optional>
-        <version>1.11.116-SNAPSHOT</version>
+        <version>1.11.116</version>
     </dependency>
 </dependencies>
 

diff --git a/aws-java-sdk-clouddirectory/pom.xml b/aws-java-sdk-clouddirectory/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-clouddirectory</artifactId>

diff --git a/aws-java-sdk-cloudformation/pom.xml b/aws-java-sdk-cloudformation/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudformation</artifactId>

diff --git a/aws-java-sdk-cloudfront/pom.xml b/aws-java-sdk-cloudfront/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudfront</artifactId>

diff --git a/aws-java-sdk-cloudhsm/pom.xml b/aws-java-sdk-cloudhsm/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudhsm</artifactId>

diff --git a/aws-java-sdk-cloudsearch/pom.xml b/aws-java-sdk-cloudsearch/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudsearch</artifactId>

diff --git a/aws-java-sdk-cloudtrail/pom.xml b/aws-java-sdk-cloudtrail/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudtrail</artifactId>

diff --git a/aws-java-sdk-cloudwatch/pom.xml b/aws-java-sdk-cloudwatch/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudwatch</artifactId>

diff --git a/aws-java-sdk-cloudwatchmetrics/pom.xml b/aws-java-sdk-cloudwatchmetrics/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cloudwatchmetrics</artifactId>

diff --git a/aws-java-sdk-code-generator/pom.xml b/aws-java-sdk-code-generator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-code-generator</artifactId>

diff --git a/aws-java-sdk-codebuild/pom.xml b/aws-java-sdk-codebuild/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codebuild</artifactId>

diff --git a/aws-java-sdk-codecommit/pom.xml b/aws-java-sdk-codecommit/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codecommit</artifactId>

diff --git a/aws-java-sdk-codedeploy/pom.xml b/aws-java-sdk-codedeploy/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codedeploy</artifactId>

diff --git a/aws-java-sdk-codegen-maven-plugin/pom.xml b/aws-java-sdk-codegen-maven-plugin/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codegen-maven-plugin</artifactId>

diff --git a/aws-java-sdk-codepipeline/pom.xml b/aws-java-sdk-codepipeline/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-codepipeline</artifactId>

diff --git a/aws-java-sdk-cognitoidentity/pom.xml b/aws-java-sdk-cognitoidentity/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cognitoidentity</artifactId>

diff --git a/aws-java-sdk-cognitoidp/pom.xml b/aws-java-sdk-cognitoidp/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cognitoidp</artifactId>

diff --git a/aws-java-sdk-cognitosync/pom.xml b/aws-java-sdk-cognitosync/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-cognitosync</artifactId>

diff --git a/aws-java-sdk-config/pom.xml b/aws-java-sdk-config/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-config</artifactId>

diff --git a/aws-java-sdk-core/pom.xml b/aws-java-sdk-core/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-java-sdk-pom</artifactId>
-    <version>1.11.116-SNAPSHOT</version>
+    <version>1.11.116</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-core</artifactId>

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/policy/Policy.java b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/policy/Policy.java
@@ -14,16 +14,15 @@
  */
 package com.amazonaws.auth.policy;
 
+import com.amazonaws.auth.policy.internal.JsonPolicyReader;
+import com.amazonaws.auth.policy.internal.JsonPolicyWriter;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import com.amazonaws.auth.policy.internal.JsonPolicyReader;
-import com.amazonaws.auth.policy.internal.JsonPolicyWriter;
-
 /**
  * An AWS access control policy is a object that acts as a container for one or
  * more statements, which specify fine grained rules for allowing or denying
@@ -214,7 +213,10 @@ public String toJson() {
     }
 
     /**
-     * Returns an AWS access control policy object generated from JSON string.
+     * Returns an AWS access control policy object generated from JSON string. This will automatically strip all dashes from
+     * AWS principal IDs, because AWS account IDs must not contain dashes. If this behavior isn't desirable (eg. because you are
+     * using IAM AWS principal IDs with dashes in the name), you may disable this behavior by specifying custom JSON policy reader
+     * options in {@link #fromJson(String, PolicyReaderOptions)}.
      *
      * @param jsonString
      *            The JSON string representation of this AWS access control policy.
@@ -226,7 +228,26 @@ public String toJson() {
      *      converted to an AWS policy object.
      */
     public static Policy fromJson(String jsonString) {
-        return new JsonPolicyReader().createPolicyFromJsonString(jsonString);
+        return fromJson(jsonString, new PolicyReaderOptions());
+    }
+
+    /**
+     * Returns an AWS access control policy object generated from JSON string. Allows configuring options for the JSON policy
+     * reader (for example, to disable the stripping of dashes in the principal ID).
+     *
+     * @param jsonString
+     *            The JSON string representation of this AWS access control policy.
+     * @param options
+     *            Configuration for the JSON policy reader that affects the way in which it converts the JSON configuration.
+     *
+     * @return An AWS access control policy object.
+     *
+     * @throws IllegalArgumentException
+     *      If the specified JSON string is null or invalid and cannot be
+     *      converted to an AWS policy object.
+     */
+    public static Policy fromJson(String jsonString, PolicyReaderOptions options) {
+        return new JsonPolicyReader(options).createPolicyFromJsonString(jsonString);
     }
 
     private void assignUniqueStatementIds() {

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/auth/policy/PolicyReaderOptions.java b/aws-java-sdk-core/src/main/java/com/amazonaws/auth/policy/PolicyReaderOptions.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2010-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * A copy of the License is located at
+ *
+ *  http://aws.amazon.com/apache2.0
+ *
+ * or in the "license" file accompanying this file. This file is distributed
+ * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ * express or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+
+package com.amazonaws.auth.policy;
+
+/**
+ * Options that affect the way in which {@link Policy#fromJson(String, PolicyReaderOptions)} will generate a Policy.
+ */
+public class PolicyReaderOptions {
+    private boolean stripAwsPrincipalIdHyphensEnabled = true;
+
+    /**
+     * Whether AWS account IDs should have hyphens removed in their name.
+     */
+    public boolean isStripAwsPrincipalIdHyphensEnabled() {
+        return stripAwsPrincipalIdHyphensEnabled;
+    }
+
+    /**
+     * Configure whether hyphens should be stripped from the AWS principal IDs that are read from the JSON-formatted
+     * policy document. This is useful because AWS account IDs must be specified without hyphens, but the user may not be
+     * aware that hyphens should not be used when configuring their policy.
+     *
+     * This behavior may be undesirable when using IAM AWS principal IDs, which may contain hyphens. In that case, this
+     * option may be explicitly disabled. If this is set to false, you must remove hyphens from your AWS principal IDs
+     * manually.
+     *
+     * By default, this is enabled (true).
+     */
+    public void setStripAwsPrincipalIdHyphensEnabled(boolean stripAwsPrincipalIdHyphensEnabled) {
+        this.stripAwsPrincipalIdHyphensEnabled = stripAwsPrincipalIdHyphensEnabled;
+    }
+
+    /**
+     * Fluent-style setter for {@link #setStripAwsPrincipalIdHyphensEnabled(boolean)} that returns "this" for chaining.
+     */
+    public PolicyReaderOptions withStripAwsPrincipalIdHyphensEnabled(boolean stripAwsPrincipalIdHyphensEnabled) {
+        setStripAwsPrincipalIdHyphensEnabled(stripAwsPrincipalIdHyphensEnabled);
+        return this;
+    }
+}