AWS SDK for Android 2.2.20

Author: AWS

CHANGELOG.md

@@ -1,5 +1,22 @@
 # Change Log - AWS SDK for Android
 
+## [Release 2.2.20](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.2.20) (06/27/2016)
+
+### New Features
+- **Amazon Web Services**: Introducing new AWS region Asia Pacific (Mumbai) region, endpoint ap-south-1.
+
+### Improvements
+- **Amazon Web Services**: General service updates and documentation improvements.
+- **API Gateway**: Expose client configuration through ApiFactory. [#158](https://github.com/aws/aws-sdk-android/issues/158)
+- **Amazon Web Services**: Service clients are now generated with a new code gen system. Some trivial changes are listed below
+ - List members in POJO are defaulted to null instead of an empty list to align with map members. Please perform null check to avoid NPE. When marshalling a list member, a null list will be omitted and an empty list will result in an empty array.
+ - In `ListRecordsRequest` of Cognito Sync, the data type of `lastSyncCount` is changed from String to Long and that of `maxResult` from String to Integer.
+ - In DynamoDB, the method `setKey(java.util.Map.Entry<String, AttributeValue> hashKey, java.util.Map.Entry<String, AttributeValue> rangeKey)` is removed from `GetItemRequest`, `UpdateItemRequest`, `DeleteItemRequest`, and `DeleteRequest`. Use `addKeyEntry(String key, AttributeValue value)` instead. `setExclusiveStartKey(java.util.Map.Entry<String, AttributeValue> hashKey, java.util.Map.Entry<String, AttributeValue> rangeKey)` is also removed from `QueryRequest` and `ScanRequest`. The alternative is `addExclusiveStartKeyEntry(String key, AttributeValue value)`.
+
+### Bug Fixes
+- **API Gateway**: Fixed a bug where user agent is overwritten by `ApiHandler`. [#159](https://github.com/aws/aws-sdk-android/issues/159) 
+
+
 ## [Release 2.2.19](https://github.com/aws/aws-sdk-android/releases/tag/release_v2.2.19) (06/23/2016)
 
 ### New Features

aws-android-sdk-apigateway-core/pom.xml

@@ -12,15 +12,15 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-android-sdk-pom</artifactId>
-    <version>2.2.19</version>
+    <version>2.2.20</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-android-sdk-core</artifactId>
       <optional>false</optional>
-      <version>2.2.19</version>
+      <version>2.2.20</version>
     </dependency>
   </dependencies>
 

aws-android-sdk-apigateway-core/src/main/java/com/amazonaws/mobileconnectors/apigateway/ApiClientHandler.java

@@ -82,17 +82,32 @@ class ApiClientHandler implements InvocationHandler {
     @Override
     public Object invoke(Object proxy, Method method, Object[] args)
             throws Throwable {
-        Request<?> request = buildRequest(method, args);
-
-        ExecutionContext context = new ExecutionContext();
-        context.setContextUserAgent(apiName);
-        HttpRequest httpRequest = requestFactory.createHttpRequest(request, clientConfiguration,
-                context);
+        HttpRequest httpRequest = createHttpRequest(method, args);
         HttpResponse response = client.execute(httpRequest);
 
         return handleResponse(response, method);
     }
 
+    /**
+     * Build a {@link HttpRequest} object for the given method.
+     *
+     * @param method method that annotated with {@link Operation}
+     * @param args arguments of the method
+     * @return a {@link HttpRequest} object
+     */
+    HttpRequest createHttpRequest(Method method, Object[] args) {
+        Request<?> request = buildRequest(method, args);
+
+        ExecutionContext context = new ExecutionContext();
+        String userAgent = apiName;
+        if (request.getHeaders().containsKey("User-Agent")) {
+            // append it to execution context
+            userAgent += " " + request.getHeaders().get("User-Agent");
+        }
+        context.setContextUserAgent(userAgent);
+        return requestFactory.createHttpRequest(request, clientConfiguration, context);
+    }
+
     /**
      * Build a {@link Request} object for the given method.
      *

aws-android-sdk-autoscaling/pom.xml

@@ -12,15 +12,15 @@
   <parent>
     <groupId>com.amazonaws</groupId>
     <artifactId>aws-android-sdk-pom</artifactId>
-    <version>2.2.19</version>
+    <version>2.2.20</version>
   </parent>
 
   <dependencies>
     <dependency>
       <groupId>com.amazonaws</groupId>
       <artifactId>aws-android-sdk-core</artifactId>
       <optional>false</optional>
-      <version>2.2.19</version>
+      <version>2.2.20</version>
     </dependency>
   </dependencies>
 

aws-android-sdk-autoscaling/src/main/java/com/amazonaws/services/autoscaling/AmazonAutoScaling.java

@@ -41,7 +41,7 @@
 public class AttachInstancesRequest extends AmazonWebServiceRequest implements Serializable {
 
     /**
-     * One or more EC2 instance IDs.
+     * One or more instance IDs.
      */
     private com.amazonaws.internal.ListWithAutoConstructFlag<String> instanceIds;
 
@@ -55,9 +55,9 @@ public class AttachInstancesRequest extends AmazonWebServiceRequest implements S
     private String autoScalingGroupName;
 
     /**
-     * One or more EC2 instance IDs.
+     * One or more instance IDs.
      *
-     * @return One or more EC2 instance IDs.
+     * @return One or more instance IDs.
      */
     public java.util.List<String> getInstanceIds() {
         if (instanceIds == null) {
@@ -68,9 +68,9 @@ public java.util.List<String> getInstanceIds() {
     }
 
     /**
-     * One or more EC2 instance IDs.
+     * One or more instance IDs.
      *
-     * @param instanceIds One or more EC2 instance IDs.
+     * @param instanceIds One or more instance IDs.
      */
     public void setInstanceIds(java.util.Collection<String> instanceIds) {
         if (instanceIds == null) {
@@ -83,11 +83,11 @@ public void setInstanceIds(java.util.Collection<String> instanceIds) {
     }
 
     /**
-     * One or more EC2 instance IDs.
+     * One or more instance IDs.
      * <p>
      * Returns a reference to this object so that method calls can be chained together.
      *
-     * @param instanceIds One or more EC2 instance IDs.
+     * @param instanceIds One or more instance IDs.
      *
      * @return A reference to this updated object so that method calls can be chained
      *         together.
@@ -101,11 +101,11 @@ public AttachInstancesRequest withInstanceIds(String... instanceIds) {
     }
 
     /**
-     * One or more EC2 instance IDs.
+     * One or more instance IDs.
      * <p>
      * Returns a reference to this object so that method calls can be chained together.
      *
-     * @param instanceIds One or more EC2 instance IDs.
+     * @param instanceIds One or more instance IDs.
      *
      * @return A reference to this updated object so that method calls can be chained
      *         together.

aws-android-sdk-autoscaling/src/main/java/com/amazonaws/services/autoscaling/AmazonAutoScalingAsync.java

@@ -0,0 +1,191 @@
+/*
+ * Copyright 2010-2016 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.services.autoscaling.model;
+
+import java.io.Serializable;
+
+import com.amazonaws.AmazonWebServiceRequest;
+
+/**
+ * Container for the parameters to the {@link com.amazonaws.services.autoscaling.AmazonAutoScaling#attachLoadBalancerTargetGroups(AttachLoadBalancerTargetGroupsRequest) AttachLoadBalancerTargetGroups operation}.
+ * 
+ *
+ * @see com.amazonaws.services.autoscaling.AmazonAutoScaling#attachLoadBalancerTargetGroups(AttachLoadBalancerTargetGroupsRequest)
+ */
+public class AttachLoadBalancerTargetGroupsRequest extends AmazonWebServiceRequest implements Serializable {
+
+    private String autoScalingGroupName;
+
+    private com.amazonaws.internal.ListWithAutoConstructFlag<String> targetGroupARNs;
+
+    /**
+     * Returns the value of the AutoScalingGroupName property for this
+     * object.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Length: </b>1 - 1600<br/>
+     * <b>Pattern: </b>[&#92;u0020-&#92;uD7FF&#92;uE000-&#92;uFFFD&#92;uD800&#92;uDC00-&#92;uDBFF&#92;uDFFF\r\n\t]*<br/>
+     *
+     * @return The value of the AutoScalingGroupName property for this object.
+     */
+    public String getAutoScalingGroupName() {
+        return autoScalingGroupName;
+    }
+    
+    /**
+     * Sets the value of the AutoScalingGroupName property for this object.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Length: </b>1 - 1600<br/>
+     * <b>Pattern: </b>[&#92;u0020-&#92;uD7FF&#92;uE000-&#92;uFFFD&#92;uD800&#92;uDC00-&#92;uDBFF&#92;uDFFF\r\n\t]*<br/>
+     *
+     * @param autoScalingGroupName The new value for the AutoScalingGroupName property for this object.
+     */
+    public void setAutoScalingGroupName(String autoScalingGroupName) {
+        this.autoScalingGroupName = autoScalingGroupName;
+    }
+    
+    /**
+     * Sets the value of the AutoScalingGroupName property for this object.
+     * <p>
+     * Returns a reference to this object so that method calls can be chained together.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Length: </b>1 - 1600<br/>
+     * <b>Pattern: </b>[&#92;u0020-&#92;uD7FF&#92;uE000-&#92;uFFFD&#92;uD800&#92;uDC00-&#92;uDBFF&#92;uDFFF\r\n\t]*<br/>
+     *
+     * @param autoScalingGroupName The new value for the AutoScalingGroupName property for this object.
+     *
+     * @return A reference to this updated object so that method calls can be chained
+     *         together.
+     */
+    public AttachLoadBalancerTargetGroupsRequest withAutoScalingGroupName(String autoScalingGroupName) {
+        this.autoScalingGroupName = autoScalingGroupName;
+        return this;
+    }
+
+    /**
+     * Returns the value of the TargetGroupARNs property for this object.
+     *
+     * @return The value of the TargetGroupARNs property for this object.
+     */
+    public java.util.List<String> getTargetGroupARNs() {
+        if (targetGroupARNs == null) {
+              targetGroupARNs = new com.amazonaws.internal.ListWithAutoConstructFlag<String>();
+              targetGroupARNs.setAutoConstruct(true);
+        }
+        return targetGroupARNs;
+    }
+    
+    /**
+     * Sets the value of the TargetGroupARNs property for this object.
+     *
+     * @param targetGroupARNs The new value for the TargetGroupARNs property for this object.
+     */
+    public void setTargetGroupARNs(java.util.Collection<String> targetGroupARNs) {
+        if (targetGroupARNs == null) {
+            this.targetGroupARNs = null;
+            return;
+        }
+        com.amazonaws.internal.ListWithAutoConstructFlag<String> targetGroupARNsCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(targetGroupARNs.size());
+        targetGroupARNsCopy.addAll(targetGroupARNs);
+        this.targetGroupARNs = targetGroupARNsCopy;
+    }
+    
+    /**
+     * Sets the value of the TargetGroupARNs property for this object.
+     * <p>
+     * Returns a reference to this object so that method calls can be chained together.
+     *
+     * @param targetGroupARNs The new value for the TargetGroupARNs property for this object.
+     *
+     * @return A reference to this updated object so that method calls can be chained
+     *         together.
+     */
+    public AttachLoadBalancerTargetGroupsRequest withTargetGroupARNs(String... targetGroupARNs) {
+        if (getTargetGroupARNs() == null) setTargetGroupARNs(new java.util.ArrayList<String>(targetGroupARNs.length));
+        for (String value : targetGroupARNs) {
+            getTargetGroupARNs().add(value);
+        }
+        return this;
+    }
+    
+    /**
+     * Sets the value of the TargetGroupARNs property for this object.
+     * <p>
+     * Returns a reference to this object so that method calls can be chained together.
+     *
+     * @param targetGroupARNs The new value for the TargetGroupARNs property for this object.
+     *
+     * @return A reference to this updated object so that method calls can be chained
+     *         together.
+     */
+    public AttachLoadBalancerTargetGroupsRequest withTargetGroupARNs(java.util.Collection<String> targetGroupARNs) {
+        if (targetGroupARNs == null) {
+            this.targetGroupARNs = null;
+        } else {
+            com.amazonaws.internal.ListWithAutoConstructFlag<String> targetGroupARNsCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(targetGroupARNs.size());
+            targetGroupARNsCopy.addAll(targetGroupARNs);
+            this.targetGroupARNs = targetGroupARNsCopy;
+        }
+
+        return this;
+    }
+
+    /**
+     * Returns a string representation of this object; useful for testing and
+     * debugging.
+     *
+     * @return A string representation of this object.
+     *
+     * @see java.lang.Object#toString()
+     */
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("{");
+        if (getAutoScalingGroupName() != null) sb.append("AutoScalingGroupName: " + getAutoScalingGroupName() + ",");
+        if (getTargetGroupARNs() != null) sb.append("TargetGroupARNs: " + getTargetGroupARNs() );
+        sb.append("}");
+        return sb.toString();
+    }
+    
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int hashCode = 1;
+        
+        hashCode = prime * hashCode + ((getAutoScalingGroupName() == null) ? 0 : getAutoScalingGroupName().hashCode()); 
+        hashCode = prime * hashCode + ((getTargetGroupARNs() == null) ? 0 : getTargetGroupARNs().hashCode()); 
+        return hashCode;
+    }
+    
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) return true;
+        if (obj == null) return false;
+
+        if (obj instanceof AttachLoadBalancerTargetGroupsRequest == false) return false;
+        AttachLoadBalancerTargetGroupsRequest other = (AttachLoadBalancerTargetGroupsRequest)obj;
+        
+        if (other.getAutoScalingGroupName() == null ^ this.getAutoScalingGroupName() == null) return false;
+        if (other.getAutoScalingGroupName() != null && other.getAutoScalingGroupName().equals(this.getAutoScalingGroupName()) == false) return false; 
+        if (other.getTargetGroupARNs() == null ^ this.getTargetGroupARNs() == null) return false;
+        if (other.getTargetGroupARNs() != null && other.getTargetGroupARNs().equals(this.getTargetGroupARNs()) == false) return false; 
+        return true;
+    }
+    
+}
+