AWS SDK for Java 1.11.49

aws · Oct 28, 2016 · 8c0a537 · 8c0a537
1 parent d324f45
commit 8c0a537
Show file tree

Hide file tree

Showing 91 changed files with 173 additions and 140 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,18 +5,18 @@ jdk:
   - openjdk6
   - oraclejdk8
 env:
-  - MODULES_TO_SKIP=\!aws-java-sdk-osgi
-  - MODULES_TO_SKIP=\!aws-java-sdk-osgi,\!aws-java-sdk-code-generator,\!aws-java-sdk-codegen-maven-plugin
+  - MODULES_TO_SKIP=\!aws-java-sdk-osgi MAVEN_OPTS=-XX:MaxPermSize=256m
+  - MODULES_TO_SKIP=\!aws-java-sdk-osgi,\!aws-java-sdk-code-generator,\!aws-java-sdk-codegen-maven-plugin MAVEN_OPTS=-XX:MaxPermSize=256m
 matrix:
   exclude:
     - jdk: openjdk6
-      env: MODULES_TO_SKIP=\!aws-java-sdk-osgi
+      env: MODULES_TO_SKIP=\!aws-java-sdk-osgi MAVEN_OPTS=-XX:MaxPermSize=256m
     - jdk: openjdk7
-      env: MODULES_TO_SKIP=\!aws-java-sdk-osgi
+      env: MODULES_TO_SKIP=\!aws-java-sdk-osgi MAVEN_OPTS=-XX:MaxPermSize=256m
     - jdk: oraclejdk7
-      env: MODULES_TO_SKIP=\!aws-java-sdk-osgi
+      env: MODULES_TO_SKIP=\!aws-java-sdk-osgi MAVEN_OPTS=-XX:MaxPermSize=256m
     - jdk: oraclejdk8
-      env: MODULES_TO_SKIP=\!aws-java-sdk-osgi,\!aws-java-sdk-code-generator,\!aws-java-sdk-codegen-maven-plugin
+      env: MODULES_TO_SKIP=\!aws-java-sdk-osgi,\!aws-java-sdk-code-generator,\!aws-java-sdk-codegen-maven-plugin MAVEN_OPTS=-XX:MaxPermSize=256m
 
 notifications:
   email:

diff --git a/README.md b/README.md
@@ -40,7 +40,7 @@ dependencies.
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-java-sdk-bom</artifactId>
-      <version>1.11.48</version>
+      <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-applicationautoscaling</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.49-SNAPSHOT</version>
+    <version>1.11.49</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-autoscaling</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-budgets</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-code-generator</artifactId>
@@ -22,7 +22,7 @@
         <artifactId>aws-java-sdk-core</artifactId>
         <groupId>com.amazonaws</groupId>
         <optional>false</optional>
-        <version>1.11.49-SNAPSHOT</version>
+        <version>1.11.49</version>
     </dependency>
     <dependency>
         <artifactId>org.eclipse.jdt.core</artifactId>

diff --git a/...va-sdk-code-generator/src/main/java/com/amazonaws/codegen/emitters/JavaCodeFormatter.java b/...va-sdk-code-generator/src/main/java/com/amazonaws/codegen/emitters/JavaCodeFormatter.java
@@ -32,7 +32,7 @@
  * Formats the generated java source code. Uses Eclipse JDT core plugin from the Eclipse SDK.
  */
 @SuppressWarnings("unchecked")
-class JavaCodeFormatter {
+public class JavaCodeFormatter {
 
     private final CodeFormatter codeFormatter;
 
@@ -62,15 +62,15 @@ class JavaCodeFormatter {
         // Formats custom file headers if provided
         DEFAULT_FORMATTER_OPTIONS
                 .put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_FORMAT_HEADER,
-                     DefaultCodeFormatterConstants.TRUE);
+                        DefaultCodeFormatterConstants.TRUE);
         DEFAULT_FORMATTER_OPTIONS.put(DefaultCodeFormatterConstants.FORMATTER_LINE_SPLIT, "160");
         DEFAULT_FORMATTER_OPTIONS.put(DefaultCodeFormatterConstants.FORMATTER_COMMENT_LINE_LENGTH, "120");
     }
 
     /**
      * Creates a JavaCodeFormatter using the default formatter options.
      */
-    JavaCodeFormatter() {
+    public JavaCodeFormatter() {
         this(new HashMap<>());
     }
 
@@ -80,7 +80,7 @@ class JavaCodeFormatter {
      *
      * @param overrideOptions user provided options to apply on top of defaults
      */
-    private JavaCodeFormatter(final Map<String, Object> overrideOptions) {
+    public JavaCodeFormatter(final Map<String, Object> overrideOptions) {
         Map formatterOptions = new HashMap<>(DEFAULT_FORMATTER_OPTIONS);
         if (overrideOptions != null) {
             formatterOptions.putAll(overrideOptions);
@@ -90,7 +90,7 @@ private JavaCodeFormatter(final Map<String, Object> overrideOptions) {
                 ToolFactory.M_FORMAT_EXISTING);
     }
 
-    String format(String contents) {
+    public String format(String contents) {
         final TextEdit edit = codeFormatter.format(
                 CodeFormatter.K_COMPILATION_UNIT
                         | CodeFormatter.F_INCLUDE_COMMENTS, contents, 0,

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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</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.49-SNAPSHOT</version>
+    <version>1.11.49</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-core</artifactId>

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/protocol/json/JsonContent.java b/aws-java-sdk-core/src/main/java/com/amazonaws/protocol/json/JsonContent.java
@@ -66,7 +66,7 @@ private JsonContent(byte[] rawJsonContent, ObjectMapper mapper) {
 
     private static JsonNode parseJsonContent(byte[] rawJsonContent, ObjectMapper mapper) {
         if (rawJsonContent == null) {
-            return null;
+            return mapper.createObjectNode();
         }
         try {
             return mapper.readTree(rawJsonContent);

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/retry/PredefinedBackoffStrategies.java b/aws-java-sdk-core/src/main/java/com/amazonaws/retry/PredefinedBackoffStrategies.java
@@ -40,7 +40,12 @@ public class PredefinedBackoffStrategies {
     /** Default base sleep time for DynamoDB. **/
     static final int DYNAMODB_DEFAULT_BASE_DELAY = 25;
 
-    /** Maximum retry limit.  Avoids integer overflow issues. **/
+    /**
+     *  Maximum retry limit. Avoids integer overflow issues.
+     *
+     *  NOTE: If the value is greater than 30, there can be integer overflow
+     *  issues during delay calculation.
+     *  **/
     private static final int MAX_RETRIES = 30;
 
     public static class FullJitterBackoffStrategy implements RetryPolicy.BackoffStrategy {
@@ -59,9 +64,8 @@ public FullJitterBackoffStrategy(final int baseDelay,
         public long delayBeforeNextRetry(AmazonWebServiceRequest originalRequest,
                                          AmazonClientException exception,
                                          int retriesAttempted) {
-            int ceil = (retriesAttempted > MAX_RETRIES) ? maxBackoffTime :
-                    Math.min(baseDelay * (1 << retriesAttempted), maxBackoffTime);
-            return random.nextInt(ceil + 1);
+            int ceil = calculateExponentialDelay(retriesAttempted, baseDelay, maxBackoffTime);
+            return random.nextInt(ceil);
         }
     }
 
@@ -81,8 +85,7 @@ public EqualJitterBackoffStrategy(final int baseDelay,
         public long delayBeforeNextRetry(AmazonWebServiceRequest originalRequest,
                                         AmazonClientException exception,
                                         int retriesAttempted) {
-            int ceil = (retriesAttempted > MAX_RETRIES) ? maxBackoffTime
-                    : Math.min(maxBackoffTime, baseDelay * (1 << retriesAttempted));
+            int ceil = calculateExponentialDelay(retriesAttempted, baseDelay, maxBackoffTime);
             return (ceil / 2) + random.nextInt((ceil / 2) + 1);
         }
     }
@@ -102,11 +105,15 @@ public ExponentialBackoffStrategy(final int baseDelay,
         public long delayBeforeNextRetry(AmazonWebServiceRequest originalRequest,
                                          AmazonClientException exception,
                                          int retriesAttempted) {
-            return (retriesAttempted > MAX_RETRIES) ? maxBackoffTime :
-                    Math.min(((1 << retriesAttempted) * baseDelay), maxBackoffTime);
+            return calculateExponentialDelay(retriesAttempted, baseDelay, maxBackoffTime);
         }
     }
 
+    private static int calculateExponentialDelay(int retriesAttempted, int baseDelay, int maxBackoffTime) {
+        int retries = Math.min(retriesAttempted, MAX_RETRIES);
+        return (int) Math.min((1L << retries) * baseDelay, maxBackoffTime);
+    }
+
     /** A private class that implements the default back-off strategy. **/
     static class SDKDefaultBackoffStrategy implements RetryPolicy.BackoffStrategy {
 

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java b/aws-java-sdk-core/src/main/java/com/amazonaws/transform/JsonErrorUnmarshaller.java
@@ -39,10 +39,8 @@ public class JsonErrorUnmarshaller extends AbstractErrorUnmarshaller<JsonNode> {
     private final String handledErrorCode;
 
     /**
-     * @param exceptionClass
-     *            Exception class this unmarshaller will attempt to deserialize error response into
-     * @param handledErrorCode
-     *            AWS error code that this unmarshaller handles. Pass null to handle all exceptions
+     * @param exceptionClass   Exception class this unmarshaller will attempt to deserialize error response into
+     * @param handledErrorCode AWS error code that this unmarshaller handles. Pass null to handle all exceptions
      */
     public JsonErrorUnmarshaller(Class<? extends AmazonServiceException> exceptionClass, String handledErrorCode) {
         super(exceptionClass);
@@ -55,8 +53,7 @@ public AmazonServiceException unmarshall(JsonNode jsonContent) throws Exception
     }
 
     /**
-     * @param actualErrorCode
-     *            Actual AWS error code found in the error response.
+     * @param actualErrorCode Actual AWS error code found in the error response.
      * @return True if the actualErrorCode can be handled by this unmarshaller, false otherwise
      */
     public boolean matchErrorCode(String actualErrorCode) {

diff --git a/aws-java-sdk-core/src/main/resources/com/amazonaws/partitions/endpoints.json b/aws-java-sdk-core/src/main/resources/com/amazonaws/partitions/endpoints.json
@@ -248,7 +248,8 @@
             "us-east-1": {},
             "us-east-2": {},
             "us-west-2": {},
-            "ap-southeast-1": {}
+            "ap-southeast-1": {},
+            "ap-southeast-2": {}
           }
         },
         "cognito-identity": {

diff --git a/aws-java-sdk-core/src/main/resources/com/amazonaws/sdk/versionInfo.properties b/aws-java-sdk-core/src/main/resources/com/amazonaws/sdk/versionInfo.properties
@@ -1,3 +1,3 @@
-#Tue Oct 25 19:08:34 UTC 2016
+#Fri Oct 28 01:55:07 UTC 2016
 platform=java
-version=1.11.48
+version=1.11.49