AWS SDK for Java 1.11.40

jonathanrico · Oct 5, 2016 · 3aadef0 · 3aadef0
1 parent 67aff58
commit 3aadef0
Show file tree

Hide file tree

Showing 96 changed files with 489 additions and 272 deletions.
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.39</version>
+      <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-bom</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+    <version>1.11.40</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.40-SNAPSHOT</version>
+        <version>1.11.40</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
@@ -41,10 +41,9 @@ public class JavaCodeFormatter {
     static {
         DEFAULT_FORMATTER_OPTIONS = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
 
-        DEFAULT_FORMATTER_OPTIONS.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_6);
-        DEFAULT_FORMATTER_OPTIONS.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM,
-                JavaCore.VERSION_1_6);
-        DEFAULT_FORMATTER_OPTIONS.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_6);
+        DEFAULT_FORMATTER_OPTIONS.put(JavaCore.COMPILER_COMPLIANCE, JavaCore.VERSION_1_8);
+        DEFAULT_FORMATTER_OPTIONS.put(JavaCore.COMPILER_CODEGEN_TARGET_PLATFORM, JavaCore.VERSION_1_8);
+        DEFAULT_FORMATTER_OPTIONS.put(JavaCore.COMPILER_SOURCE, JavaCore.VERSION_1_8);
         DEFAULT_FORMATTER_OPTIONS.put(DefaultCodeFormatterConstants.FORMATTER_TAB_CHAR,
                 JavaCore.SPACE);
         DEFAULT_FORMATTER_OPTIONS.put(

diff --git a/...-sdk-code-generator/src/main/java/com/amazonaws/codegen/naming/DefaultNamingStrategy.java b/...-sdk-code-generator/src/main/java/com/amazonaws/codegen/naming/DefaultNamingStrategy.java
@@ -20,8 +20,8 @@
 import com.amazonaws.codegen.model.service.ServiceModel;
 import com.amazonaws.util.StringUtils;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashSet;
+import java.util.Set;
 
 import static com.amazonaws.codegen.internal.Constants.EXCEPTION_CLASS_SUFFIX;
 import static com.amazonaws.codegen.internal.Constants.FAULT_CLASS_SUFFIX;
@@ -37,14 +37,13 @@
  */
 public class DefaultNamingStrategy implements NamingStrategy {
 
-    private final static List<String> reservedKeywords = new ArrayList<String>() {{
+    private final static Set<String> reservedKeywords = new HashSet<String>() {{
         add("return");
         add("public");
         add("private");
         add("class");
         add("static");
         add("protected");
-        add("return");
         add("string");
         add("boolean");
         add("integer");

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

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/SDKGlobalConfiguration.java b/aws-java-sdk-core/src/main/java/com/amazonaws/SDKGlobalConfiguration.java
@@ -211,6 +211,18 @@ public class SDKGlobalConfiguration {
      */
     public static final String AWS_CBOR_DISABLE_SYSTEM_PROPERTY = "com.amazonaws.sdk.disableCbor";
 
+    /**
+     * Environment variable to disable Ion binary protocol. This forces the request
+     * to be sent over the wire as Ion text.
+     */
+    public static final String AWS_ION_BINARY_DISABLE_ENV_VAR = "AWS_ION_BINARY_DISABLE";
+
+    /**
+     * System property to disable Ion binary protocol. This forces the request to be sent over the wire
+     * as Ion text
+     */
+    public static final String AWS_ION_BINARY_DISABLE_SYSTEM_PROPERTY = "com.amazonaws.sdk.disableIonBinary";
+
     /**
      * @deprecated by {@link SDKGlobalTime#setGlobalTimeOffset(int)}
      */
@@ -240,6 +252,11 @@ public static boolean isCborDisabled() {
                 isPropertyEnabled(System.getenv(AWS_CBOR_DISABLE_ENV_VAR));
     }
 
+    public static boolean isIonBinaryDisabled() {
+        return isPropertyEnabled(System.getProperty(AWS_ION_BINARY_DISABLE_SYSTEM_PROPERTY)) ||
+                isPropertyEnabled(System.getenv(AWS_ION_BINARY_DISABLE_ENV_VAR));
+    }
+
     private static boolean isPropertyEnabled(final String property) {
         if (property == null || property.equalsIgnoreCase("false")) {
             return false;

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolver.java b/aws-java-sdk-core/src/main/java/com/amazonaws/protocol/json/JsonContentTypeResolver.java
@@ -23,9 +23,14 @@
 interface JsonContentTypeResolver {
 
     /**
-     * Content type resolver implementation for Ion enabled services.
+     * Content type resolver implementation for Ion-enabled services.
      */
-    JsonContentTypeResolver ION = new JsonContentTypeResolverImpl("application/x-amz-ion-");
+    JsonContentTypeResolver ION_BINARY = new JsonContentTypeResolverImpl("application/x-amz-ion-");
+
+    /**
+     * Content type resolver implementation for debugging Ion-enabled services.
+     */
+    JsonContentTypeResolver ION_TEXT = new JsonContentTypeResolverImpl("text/x-amz-ion-");
 
     /**
      * Content type resolver implementation for CBOR enabled services.

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/protocol/json/SdkIonGenerator.java b/aws-java-sdk-core/src/main/java/com/amazonaws/protocol/json/SdkIonGenerator.java
@@ -22,21 +22,21 @@
 import java.util.Date;
 
 import com.amazonaws.AmazonClientException;
+import com.amazonaws.annotation.SdkInternalApi;
 import com.amazonaws.util.BinaryUtils;
 import software.amazon.ion.IonType;
 import software.amazon.ion.IonWriter;
 import software.amazon.ion.Timestamp;
-import software.amazon.ion.system.IonBinaryWriterBuilder;
+import software.amazon.ion.system.IonWriterBuilder;
 
-class SdkIonGenerator implements StructuredJsonGenerator {
+@SdkInternalApi
+abstract class SdkIonGenerator implements StructuredJsonGenerator {
     private final String contentType;
-    private final ByteArrayOutputStream bytes;
-    private final IonWriter writer;
+    protected final IonWriter writer;
 
-    public SdkIonGenerator(IonBinaryWriterBuilder writerBuilder, String contentType) {
+    private SdkIonGenerator(IonWriter writer, String contentType) {
+        this.writer = writer;
         this.contentType = contentType;
-        this.bytes = new ByteArrayOutputStream();
-        this.writer = writerBuilder.build(bytes);
     }
 
     @Override
@@ -196,17 +196,35 @@ public StructuredJsonGenerator writeValue(BigInteger value) {
     }
 
     @Override
-    public byte[] getBytes() {
-        try {
-            writer.finish();
-        } catch (IOException e) {
-            throw new AmazonClientException(e);
-        }
-        return bytes.toByteArray();
-    }
+    public abstract byte[] getBytes();
 
     @Override
     public String getContentType() {
         return contentType;
     }
+
+    public static SdkIonGenerator create(IonWriterBuilder builder, String contentType) {
+        ByteArrayOutputStream bytes = new ByteArrayOutputStream();
+        IonWriter writer = builder.build(bytes);
+        return new ByteArraySdkIonGenerator(bytes, writer, contentType);
+    }
+
+    private static class ByteArraySdkIonGenerator extends SdkIonGenerator {
+        private final ByteArrayOutputStream bytes;
+
+        public ByteArraySdkIonGenerator(ByteArrayOutputStream bytes, IonWriter writer, String contentType) {
+            super(writer, contentType);
+            this.bytes = bytes;
+        }
+
+        @Override
+        public byte[] getBytes() {
+            try {
+                writer.finish();
+            } catch (IOException e) {
+                throw new AmazonClientException(e);
+            }
+            return bytes.toByteArray();
+        }
+    }
 }