AWS SDK for Java 1.11.51

aws · Nov 3, 2016 · fdb972d · fdb972d
1 parent fd1bd43
commit fdb972d
Show file tree

Hide file tree

Showing 184 changed files with 35,565 additions and 12,216 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.50</version>
+      <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+        <version>1.11.51</version>
     </dependency>
     <dependency>
         <artifactId>org.eclipse.jdt.core</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</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.51-SNAPSHOT</version>
+    <version>1.11.51</version>
   </parent>
   <groupId>com.amazonaws</groupId>
   <artifactId>aws-java-sdk-core</artifactId>

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/http/AmazonHttpClient.java b/aws-java-sdk-core/src/main/java/com/amazonaws/http/AmazonHttpClient.java
@@ -528,14 +528,21 @@ RequestExecutionBuilder errorResponseHandler(
          */
         <Output> Response<Output> execute(HttpResponseHandler<Output> responseHandler);
 
+        /**
+         * Executes the request with the given configuration; not handling response.
+         *
+         * @return Void response
+         */
+        Response<Void> execute();
+
     }
 
     private class RequestExecutionBuilderImpl implements RequestExecutionBuilder {
 
         private Request<?> request;
         private RequestConfig requestConfig;
         private HttpResponseHandler<AmazonServiceException> errorResponseHandler;
-        private ExecutionContext executionContext;
+        private ExecutionContext executionContext = new ExecutionContext();
 
         @Override
         public RequestExecutionBuilder request(Request<?> request) {
@@ -565,15 +572,21 @@ public RequestExecutionBuilder requestConfig(RequestConfig requestConfig) {
 
         @Override
         public <Output> Response<Output> execute(HttpResponseHandler<Output> responseHandler) {
+            RequestConfig config = requestConfig != null ? requestConfig : new AmazonWebServiceRequestAdapter(request.getOriginalRequest());
             return new RequestExecutor<Output>(request,
-                                               requestConfig,
+                                               config,
                                                getNonNullResponseHandler(errorResponseHandler),
                                                getNonNullResponseHandler(responseHandler),
                                                executionContext,
                                                getRequestHandlers()
             ).execute();
         }
 
+        @Override
+        public Response<Void> execute() {
+            return execute(null);
+        }
+
         private List<RequestHandler2> getRequestHandlers() {
             List<RequestHandler2> requestHandler2s = executionContext.getRequestHandler2s();
             if (requestHandler2s == null) {

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/http/DefaultErrorResponseHandler.java b/aws-java-sdk-core/src/main/java/com/amazonaws/http/DefaultErrorResponseHandler.java
@@ -34,6 +34,8 @@
 
 import javax.xml.parsers.ParserConfigurationException;
 
+import static com.amazonaws.http.AmazonHttpClient.HEADER_SDK_TRANSACTION_ID;
+
 /**
  * Implementation of HttpResponseHandler that handles only error responses from Amazon Web Services.
  * A list of unmarshallers is passed into the constructor, and while handling a response, each
@@ -79,7 +81,7 @@ public AmazonServiceException handle(HttpResponse errorResponse) throws Exceptio
 
     private AmazonServiceException createAse(HttpResponse errorResponse) throws Exception {
         // Try to parse the error response as XML
-        final Document document = parseContentAsXml(errorResponse.getContent());
+        final Document document = documentFromContent(errorResponse.getContent(), idString(errorResponse));
 
         /*
          * We need to select which exception unmarshaller is the correct one to
@@ -98,18 +100,50 @@ private AmazonServiceException createAse(HttpResponse errorResponse) throws Exce
         return null;
     }
 
-    private Document parseContentAsXml(InputStream content) throws ParserConfigurationException,
+    private Document documentFromContent(InputStream content, String idString) throws ParserConfigurationException, SAXException, IOException {
-                                                                   SAXException, IOException {
         try {
-            return XpathUtils.documentFrom(IOUtils.toString(content));
+            return parseXml(contentToString(content, idString), idString);
         } catch (Exception e) {
-            log.info("Unable to parse HTTP response content.", e);
             // Generate an empty document to make the unmarshallers happy. Ultimately the default
             // unmarshaller will be called to unmarshall into the service base exception.
             return XpathUtils.documentFrom("<empty/>");
         }
     }
 
+    private String contentToString(InputStream content, String idString) throws Exception {
+        try {
+            return IOUtils.toString(content);
+        } catch (Exception e) {
+            log.info(String.format("Unable to read input stream to string (%s)", idString), e);
+            throw e;
+        }
+    }
+
+    private Document parseXml(String xml, String idString) throws Exception {
+        try {
+            return XpathUtils.documentFrom(xml);
+        } catch (Exception e) {
+            log.info(String.format("Unable to parse HTTP response (%s) content to XML document '%s' ", idString, xml), e);
+            throw e;
+        }
+    }
+
+    private String idString(HttpResponse errorResponse) {
+        StringBuilder idString = new StringBuilder();
+        try {
+            if (errorResponse.getRequest().getHeaders().containsKey(HEADER_SDK_TRANSACTION_ID)) {
+                idString.append("Invocation Id:").append(errorResponse.getRequest().getHeaders().get(HEADER_SDK_TRANSACTION_ID));
+            }
+            if (errorResponse.getHeaders().containsKey(X_AMZN_REQUEST_ID_HEADER)) {
+                if (idString.length() > 0) { idString.append(", "); }
+                idString.append("Request Id:").append(errorResponse.getHeaders().get(X_AMZN_REQUEST_ID_HEADER));
+            }
+        } catch (NullPointerException npe){
+            log.info("Error getting Request or Invocation ID from response", npe);
+        }
+        return idString.length() > 0 ? idString.toString() : "Unknown";
+    }
+
     /**
      * Since this response handler completely consumes all the data from the underlying HTTP
      * connection during the handle method, we don't need to keep the HTTP connection open.

diff --git a/aws-java-sdk-core/src/main/java/com/amazonaws/http/ExecutionContext.java b/aws-java-sdk-core/src/main/java/com/amazonaws/http/ExecutionContext.java
@@ -202,7 +202,7 @@ public static class Builder {
         private boolean useRequestMetrics;
         private List<RequestHandler2> requestHandler2s;
         private AmazonWebServiceClient awsClient;
-        private SignerProvider signerProvider;
+        private SignerProvider signerProvider = new NoOpSignerProvider();
 
         private Builder() {}