Skip to content

Commit

Permalink
AWS SDK for Java 1.7.12
Browse files Browse the repository at this point in the history
  • Loading branch information
AWS committed May 30, 2014
1 parent 91471bb commit ca1d940
Show file tree
Hide file tree
Showing 417 changed files with 7,340 additions and 11,297 deletions.
2 changes: 1 addition & 1 deletion META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: AWS SDK for Java
Bundle-SymbolicName: com.amazonaws.sdk;singleton:=true
Bundle-Version: 1.7.11
Bundle-Version: 1.7.12
Bundle-Vendor: Amazon Technologies, Inc
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Require-Bundle: org.apache.commons.codec;bundle-version="1.3.0",
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<artifactId>aws-java-sdk</artifactId>
<packaging>jar</packaging>
<name>AWS SDK for Java</name>
<version>1.7.11</version>
<version>1.7.12</version>
<description>The Amazon Web Services SDK for Java provides Java APIs for building software on AWS' cost-effective, scalable, and reliable infrastructure products. The AWS Java SDK allows developers to code against APIs for all of Amazon's infrastructure web services (Amazon S3, Amazon EC2, Amazon SQS, Amazon Relational Database Service, Amazon AutoScaling, etc).</description>
<url>https://aws.amazon.com/sdkforjava</url>

Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/amazonaws/auth/AbstractAWSSigner.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,11 @@
import javax.crypto.Mac;
import javax.crypto.spec.SecretKeySpec;

import org.apache.commons.codec.binary.Base64;

import com.amazonaws.AmazonClientException;
import com.amazonaws.Request;
import com.amazonaws.SDKGlobalConfiguration;
import com.amazonaws.internal.SdkDigestInputStream;
import com.amazonaws.util.Base64;
import com.amazonaws.util.HttpUtils;
import com.amazonaws.util.StringInputStream;

Expand Down Expand Up @@ -67,7 +66,7 @@ protected String signAndBase64Encode(byte[] data, String key, SigningAlgorithm a
throws AmazonClientException {
try {
byte[] signature = sign(data, key.getBytes(UTF8), algorithm);
return new String(Base64.encodeBase64(signature));
return Base64.encodeAsString(signature);
} catch (Exception e) {
throw new AmazonClientException("Unable to calculate a request signature: " + e.getMessage(), e);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,15 +207,13 @@ public DescribeAutoScalingGroupsResult describeAutoScalingGroups(DescribeAutoSca
/**
* <p>
* Enables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of enabled metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of enabled metrics with the <code>Metrics</code> parameter.
* </p>
* <p>
* Auto Scaling metrics collection can be turned on only if the
* <code>InstanceMonitoring</code> flag, in the Auto Scaling group's
* launch configuration, is set to <code>True</code> .
*
* </p>
*
* @param enableMetricsCollectionRequest Container for the necessary
Expand Down Expand Up @@ -603,8 +601,8 @@ public PutScalingPolicyResult putScalingPolicy(PutScalingPolicyRequest putScalin
*
* </p>
* <p>
* A new <code>PutNotificationConfiguration</code> overwrites an existing
* configuration.
* A new <code>PutNotificationConfiguration</code> overwrites an
* existing configuration.
* </p>
*
* @param putNotificationConfigurationRequest Container for the necessary
Expand Down Expand Up @@ -749,10 +747,10 @@ public DescribeAutoScalingNotificationTypesResult describeAutoScalingNotificatio
* Creates new tags or updates existing tags for an Auto Scaling group.
* </p>
* <p>
* <b>NOTE:</b> A tag's definition is composed of a resource ID, resource
* type, key and value, and the propagate flag. Value and the propagate
* flag are optional parameters. See the Request Parameters for more
* information.
* <b>NOTE:</b> A tag's definition is composed of a resource ID,
* resource type, key and value, and the propagate flag. Value and the
* propagate flag are optional parameters. See the Request Parameters for
* more information.
* </p>
* <p>
* For information on creating tags for your Auto Scaling group, see
Expand Down Expand Up @@ -909,9 +907,8 @@ public void deleteAutoScalingGroup(DeleteAutoScalingGroupRequest deleteAutoScali
/**
* <p>
* Disables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of affected metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of affected metrics with the <code>Metrics</code> parameter.
* </p>
*
* @param disableMetricsCollectionRequest Container for the necessary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -235,15 +235,13 @@ public Future<DescribeAutoScalingGroupsResult> describeAutoScalingGroupsAsync(De
/**
* <p>
* Enables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of enabled metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of enabled metrics with the <code>Metrics</code> parameter.
* </p>
* <p>
* Auto Scaling metrics collection can be turned on only if the
* <code>InstanceMonitoring</code> flag, in the Auto Scaling group's
* launch configuration, is set to <code>True</code> .
*
* </p>
*
* @param enableMetricsCollectionRequest Container for the necessary
Expand All @@ -269,15 +267,13 @@ public Future<Void> enableMetricsCollectionAsync(EnableMetricsCollectionRequest
/**
* <p>
* Enables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of enabled metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of enabled metrics with the <code>Metrics</code> parameter.
* </p>
* <p>
* Auto Scaling metrics collection can be turned on only if the
* <code>InstanceMonitoring</code> flag, in the Auto Scaling group's
* launch configuration, is set to <code>True</code> .
*
* </p>
*
* @param enableMetricsCollectionRequest Container for the necessary
Expand Down Expand Up @@ -1112,8 +1108,8 @@ public Future<PutScalingPolicyResult> putScalingPolicyAsync(PutScalingPolicyRequ
*
* </p>
* <p>
* A new <code>PutNotificationConfiguration</code> overwrites an existing
* configuration.
* A new <code>PutNotificationConfiguration</code> overwrites an
* existing configuration.
* </p>
*
* @param putNotificationConfigurationRequest Container for the necessary
Expand Down Expand Up @@ -1148,8 +1144,8 @@ public Future<Void> putNotificationConfigurationAsync(PutNotificationConfigurati
*
* </p>
* <p>
* A new <code>PutNotificationConfiguration</code> overwrites an existing
* configuration.
* A new <code>PutNotificationConfiguration</code> overwrites an
* existing configuration.
* </p>
*
* @param putNotificationConfigurationRequest Container for the necessary
Expand Down Expand Up @@ -1465,10 +1461,10 @@ public Future<DescribeAutoScalingNotificationTypesResult> describeAutoScalingNot
* Creates new tags or updates existing tags for an Auto Scaling group.
* </p>
* <p>
* <b>NOTE:</b> A tag's definition is composed of a resource ID, resource
* type, key and value, and the propagate flag. Value and the propagate
* flag are optional parameters. See the Request Parameters for more
* information.
* <b>NOTE:</b> A tag's definition is composed of a resource ID,
* resource type, key and value, and the propagate flag. Value and the
* propagate flag are optional parameters. See the Request Parameters for
* more information.
* </p>
* <p>
* For information on creating tags for your Auto Scaling group, see
Expand Down Expand Up @@ -1500,10 +1496,10 @@ public Future<Void> createOrUpdateTagsAsync(CreateOrUpdateTagsRequest createOrUp
* Creates new tags or updates existing tags for an Auto Scaling group.
* </p>
* <p>
* <b>NOTE:</b> A tag's definition is composed of a resource ID, resource
* type, key and value, and the propagate flag. Value and the propagate
* flag are optional parameters. See the Request Parameters for more
* information.
* <b>NOTE:</b> A tag's definition is composed of a resource ID,
* resource type, key and value, and the propagate flag. Value and the
* propagate flag are optional parameters. See the Request Parameters for
* more information.
* </p>
* <p>
* For information on creating tags for your Auto Scaling group, see
Expand Down Expand Up @@ -1820,9 +1816,8 @@ public Future<Void> deleteAutoScalingGroupAsync(DeleteAutoScalingGroupRequest de
/**
* <p>
* Disables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of affected metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of affected metrics with the <code>Metrics</code> parameter.
* </p>
*
* @param disableMetricsCollectionRequest Container for the necessary
Expand All @@ -1848,9 +1843,8 @@ public Future<Void> disableMetricsCollectionAsync(DisableMetricsCollectionReques
/**
* <p>
* Disables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of affected metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of affected metrics with the <code>Metrics</code> parameter.
* </p>
*
* @param disableMetricsCollectionRequest Container for the necessary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -517,15 +517,13 @@ public DescribeAutoScalingGroupsResult call() throws Exception {
/**
* <p>
* Enables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of enabled metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of enabled metrics with the <code>Metrics</code> parameter.
* </p>
* <p>
* Auto Scaling metrics collection can be turned on only if the
* <code>InstanceMonitoring</code> flag, in the Auto Scaling group's
* launch configuration, is set to <code>True</code> .
*
* </p>
*
* @param enableMetricsCollectionRequest Container for the necessary
Expand Down Expand Up @@ -558,15 +556,13 @@ public Void call() throws Exception {
/**
* <p>
* Enables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of enabled metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of enabled metrics with the <code>Metrics</code> parameter.
* </p>
* <p>
* Auto Scaling metrics collection can be turned on only if the
* <code>InstanceMonitoring</code> flag, in the Auto Scaling group's
* launch configuration, is set to <code>True</code> .
*
* </p>
*
* @param enableMetricsCollectionRequest Container for the necessary
Expand Down Expand Up @@ -1688,8 +1684,8 @@ public PutScalingPolicyResult call() throws Exception {
*
* </p>
* <p>
* A new <code>PutNotificationConfiguration</code> overwrites an existing
* configuration.
* A new <code>PutNotificationConfiguration</code> overwrites an
* existing configuration.
* </p>
*
* @param putNotificationConfigurationRequest Container for the necessary
Expand Down Expand Up @@ -1731,8 +1727,8 @@ public Void call() throws Exception {
*
* </p>
* <p>
* A new <code>PutNotificationConfiguration</code> overwrites an existing
* configuration.
* A new <code>PutNotificationConfiguration</code> overwrites an
* existing configuration.
* </p>
*
* @param putNotificationConfigurationRequest Container for the necessary
Expand Down Expand Up @@ -2167,10 +2163,10 @@ public DescribeAutoScalingNotificationTypesResult call() throws Exception {
* Creates new tags or updates existing tags for an Auto Scaling group.
* </p>
* <p>
* <b>NOTE:</b> A tag's definition is composed of a resource ID, resource
* type, key and value, and the propagate flag. Value and the propagate
* flag are optional parameters. See the Request Parameters for more
* information.
* <b>NOTE:</b> A tag's definition is composed of a resource ID,
* resource type, key and value, and the propagate flag. Value and the
* propagate flag are optional parameters. See the Request Parameters for
* more information.
* </p>
* <p>
* For information on creating tags for your Auto Scaling group, see
Expand Down Expand Up @@ -2209,10 +2205,10 @@ public Void call() throws Exception {
* Creates new tags or updates existing tags for an Auto Scaling group.
* </p>
* <p>
* <b>NOTE:</b> A tag's definition is composed of a resource ID, resource
* type, key and value, and the propagate flag. Value and the propagate
* flag are optional parameters. See the Request Parameters for more
* information.
* <b>NOTE:</b> A tag's definition is composed of a resource ID,
* resource type, key and value, and the propagate flag. Value and the
* propagate flag are optional parameters. See the Request Parameters for
* more information.
* </p>
* <p>
* For information on creating tags for your Auto Scaling group, see
Expand Down Expand Up @@ -2627,9 +2623,8 @@ public Void call() throws Exception {
/**
* <p>
* Disables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of affected metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of affected metrics with the <code>Metrics</code> parameter.
* </p>
*
* @param disableMetricsCollectionRequest Container for the necessary
Expand Down Expand Up @@ -2662,9 +2657,8 @@ public Void call() throws Exception {
/**
* <p>
* Disables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of affected metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of affected metrics with the <code>Metrics</code> parameter.
* </p>
*
* @param disableMetricsCollectionRequest Container for the necessary
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -364,15 +364,13 @@ public DescribeAutoScalingGroupsResult describeAutoScalingGroups(DescribeAutoSca
/**
* <p>
* Enables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of enabled metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of enabled metrics with the <code>Metrics</code> parameter.
* </p>
* <p>
* Auto Scaling metrics collection can be turned on only if the
* <code>InstanceMonitoring</code> flag, in the Auto Scaling group's
* launch configuration, is set to <code>True</code> .
*
* </p>
*
* @param enableMetricsCollectionRequest Container for the necessary
Expand Down Expand Up @@ -942,8 +940,8 @@ public PutScalingPolicyResult putScalingPolicy(PutScalingPolicyRequest putScalin
*
* </p>
* <p>
* A new <code>PutNotificationConfiguration</code> overwrites an existing
* configuration.
* A new <code>PutNotificationConfiguration</code> overwrites an
* existing configuration.
* </p>
*
* @param putNotificationConfigurationRequest Container for the necessary
Expand Down Expand Up @@ -1162,10 +1160,10 @@ public DescribeAutoScalingNotificationTypesResult describeAutoScalingNotificatio
* Creates new tags or updates existing tags for an Auto Scaling group.
* </p>
* <p>
* <b>NOTE:</b> A tag's definition is composed of a resource ID, resource
* type, key and value, and the propagate flag. Value and the propagate
* flag are optional parameters. See the Request Parameters for more
* information.
* <b>NOTE:</b> A tag's definition is composed of a resource ID,
* resource type, key and value, and the propagate flag. Value and the
* propagate flag are optional parameters. See the Request Parameters for
* more information.
* </p>
* <p>
* For information on creating tags for your Auto Scaling group, see
Expand Down Expand Up @@ -1384,9 +1382,8 @@ public void deleteAutoScalingGroup(DeleteAutoScalingGroupRequest deleteAutoScali
/**
* <p>
* Disables monitoring of group metrics for the Auto Scaling group
* specified in <code>AutoScalingGroupName</code> .
* You can specify the list of affected metrics with the
* <code>Metrics</code> parameter.
* specified in <code>AutoScalingGroupName</code> . You can specify the
* list of affected metrics with the <code>Metrics</code> parameter.
* </p>
*
* @param disableMetricsCollectionRequest Container for the necessary
Expand Down
Loading

0 comments on commit ca1d940

Please sign in to comment.