( this, R.layout.user_list_item, this.labels );
+ setListAdapter( arrayAdapter );
+
+ ListView lv = getListView();
+ lv.setOnItemLongClickListener( new OnItemLongClickListener() {
+
+ @Override
+ public boolean onItemLongClick( AdapterView av, View v, int pos, long id ) {
+ return onLongListItemClick( v, pos, id );
+ }
+ } );
+
+ Toast toast = Toast.makeText( this, "Tap and hold to delete users", Toast.LENGTH_LONG );
+ toast.show();
+
+ }
+ catch ( Exception e ) {
+ Log.e( TAG, Log.getStackTraceString( e ) );
+ }
+ }
+
+ @Override
+ protected void onListItemClick( ListView l, View v, int position, long id ) {
+
+ Intent intent = new Intent( UserListActivity.this, UserActivity.class );
+ intent.putExtra( "USER_NO", items.get( position ).get( "userNo" ).getN() );
+ startActivity( intent );
+ }
+
+ protected boolean onLongListItemClick( View v, int position, long id ) {
+
+ DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() {
+
+ @Override
+ public void onClick( DialogInterface dialog, int which ) {
+ switch ( which ) {
+ case DialogInterface.BUTTON_POSITIVE:
+
+ UserListActivity.this.runOnUiThread( new Runnable() {
+
+ public void run() {
+ DynamoDBManager.deleteUser( items.get( currentPosition ).get( "userNo" ) );
+ items.remove( currentPosition );
+ labels.remove( currentPosition );
+ arrayAdapter.notifyDataSetChanged();
+ }
+ } );
+
+ break;
+
+ case DialogInterface.BUTTON_NEGATIVE:
+ // Do nothing
+ break;
+ }
+ }
+ };
+
+ AlertDialog.Builder builder = new AlertDialog.Builder( this );
+ builder.setMessage( "Do you want to delete this user?" ).setPositiveButton( "Yes", dialogClickListener ).setNegativeButton( "No", dialogClickListener ).show();
+
+ currentPosition = position;
+
+ return true;
+ }
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/demo/UserPreferenceDemoActivity.java b/samples/UserPreference/src/com/amazon/aws/demo/UserPreferenceDemoActivity.java
new file mode 100644
index 00000000..94deba7f
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/demo/UserPreferenceDemoActivity.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.demo;
+
+import com.amazon.aws.tvmclient.AmazonClientManager;
+import com.amazon.aws.tvmclient.PropertyLoader;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+import android.widget.TextView;
+import android.widget.Toast;
+
+public class UserPreferenceDemoActivity extends Activity {
+
+ private static final String TAG = "UserPreferenceDemoActivity";
+ public static AmazonClientManager clientManager = null;
+
+ @Override
+ public void onCreate( Bundle savedInstanceState ) {
+
+ super.onCreate( savedInstanceState );
+ setContentView( R.layout.main );
+
+ // Create AmazonClientManager with SharedPreference
+ clientManager = new AmazonClientManager( getSharedPreferences( "com.amazon.aws.demo.AWSDemo", Context.MODE_PRIVATE ) );
+
+ TextView tvmUrlTextView = (TextView) findViewById( R.id.tvm_url_text_view );
+ tvmUrlTextView.setText( PropertyLoader.getInstance().getTokenVendingMachineURL() );
+
+ TextView sslEnabledTextView = (TextView) findViewById( R.id.ssl_enabled_text_view );
+ sslEnabledTextView.setText( PropertyLoader.getInstance().useSSL() ? "YES" : "NO" );
+
+ final Button createTableBttn = (Button) findViewById( R.id.create_table_bttn );
+ createTableBttn.setOnClickListener( new View.OnClickListener() {
+
+ public void onClick( View v ) {
+ Log.i( TAG, "createTableBttn clicked." );
+
+ String tableStatus = DynamoDBManager.getTestTableStatus();
+ if ( tableStatus.length() == 0 ) {
+ DynamoDBManager.createTable();
+ }
+ else {
+ Toast.makeText( UserPreferenceDemoActivity.this, "The test table already exists.\nTable Status: " + tableStatus, Toast.LENGTH_LONG ).show();
+ }
+ }
+ } );
+
+ final Button insertUsersBttn = (Button) findViewById( R.id.insert_users_bttn );
+ insertUsersBttn.setOnClickListener( new View.OnClickListener() {
+
+ public void onClick( View v ) {
+ Log.i( TAG, "insertUsersBttn clicked." );
+
+ String tableStatus = DynamoDBManager.getTestTableStatus();
+ if ( DynamoDBManager.getTestTableStatus().equalsIgnoreCase( "ACTIVE" ) ) {
+ DynamoDBManager.insertUsers();
+ }
+ else {
+ Toast.makeText( UserPreferenceDemoActivity.this, "The test table is not ready yet.\nTable Status: " + tableStatus, Toast.LENGTH_LONG ).show();
+ }
+ }
+ } );
+
+ final Button listUsersBttn = (Button) findViewById( R.id.list_users_bttn );
+ listUsersBttn.setOnClickListener( new View.OnClickListener() {
+
+ public void onClick( View v ) {
+ Log.i( TAG, "listUsersBttn clicked." );
+
+ String tableStatus = DynamoDBManager.getTestTableStatus();
+ if ( DynamoDBManager.getTestTableStatus().equalsIgnoreCase( "ACTIVE" ) ) {
+ startActivity( new Intent( UserPreferenceDemoActivity.this, UserListActivity.class ) );
+ }
+ else {
+ Toast.makeText( UserPreferenceDemoActivity.this, "The test table is not ready yet.\nTable Status: " + tableStatus, Toast.LENGTH_LONG ).show();
+ }
+ }
+ } );
+
+ final Button deleteTableBttn = (Button) findViewById( R.id.delete_table_bttn );
+ deleteTableBttn.setOnClickListener( new View.OnClickListener() {
+
+ public void onClick( View v ) {
+ Log.i( TAG, "deleteTableBttn clicked." );
+
+ String tableStatus = DynamoDBManager.getTestTableStatus();
+ if ( DynamoDBManager.getTestTableStatus().equalsIgnoreCase( "ACTIVE" ) ) {
+ DynamoDBManager.cleanUp();
+ }
+ else {
+ Toast.makeText( UserPreferenceDemoActivity.this, "The test table is not ready yet.\nTable Status: " + tableStatus, Toast.LENGTH_LONG ).show();
+ }
+ }
+ } );
+
+ }
+}
\ No newline at end of file
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/AESEncryption.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/AESEncryption.java
new file mode 100644
index 00000000..303ecd98
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/AESEncryption.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+import java.security.AlgorithmParameters;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.SecretKeySpec;
+import javax.crypto.spec.IvParameterSpec;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.Hex;
+
+public class AESEncryption {
+
+ public static final String ENCRYPTION_ALGORITHM = "AES/CBC/PKCS5Padding";
+
+ public static String unwrap( String cipherText, String key ) throws Exception {
+ byte[] dataToDecrypt = Base64.decodeBase64( cipherText.getBytes() );
+ byte[] iv = new byte[ 16 ];
+ byte[] data = new byte[ dataToDecrypt.length - 16 ];
+
+ System.arraycopy( dataToDecrypt, 0, iv, 0, 16 );
+ System.arraycopy( dataToDecrypt, 16, data, 0, dataToDecrypt.length - 16 );
+
+ byte[] plainText = decrypt( data, key, iv );
+ return new String( plainText );
+ }
+
+ public static byte[] decrypt( byte[] cipherBytes, String key, byte[] iv ) throws Exception {
+ Cipher cipher = Cipher.getInstance( ENCRYPTION_ALGORITHM );
+ AlgorithmParameters params = AlgorithmParameters.getInstance( "AES" );
+ params.init( new IvParameterSpec( iv ) );
+ cipher.init( Cipher.DECRYPT_MODE, getKey( key ), params );
+ return cipher.doFinal( cipherBytes );
+ }
+
+ private static SecretKeySpec getKey( String key ) throws Exception {
+ return new SecretKeySpec( Hex.decodeHex( key.toCharArray() ), "AES" );
+ }
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/AmazonClientManager.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/AmazonClientManager.java
new file mode 100644
index 00000000..8f1933e6
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/AmazonClientManager.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+import android.content.SharedPreferences;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.services.dynamodb.AmazonDynamoDBClient;
+
+import android.util.Log;
+
+/**
+ * This class is used to get clients to the various AWS services. Before accessing a client the credentials should be checked to ensure validity.
+ */
+public class AmazonClientManager {
+
+ private static final String LOG_TAG = "AmazonClientManager";
+
+ private AmazonDynamoDBClient ddb = null;
+ private SharedPreferences sharedPreferences = null;
+
+ public AmazonClientManager( SharedPreferences settings ) {
+ this.sharedPreferences = settings;
+ }
+
+ public AmazonDynamoDBClient ddb() {
+ validateCredentials();
+ return ddb;
+ }
+
+ public boolean hasCredentials() {
+ return PropertyLoader.getInstance().hasCredentials();
+ }
+
+ public Response validateCredentials() {
+ Response ableToGetToken = Response.SUCCESSFUL;
+
+ if ( AmazonSharedPreferencesWrapper.areCredentialsExpired( this.sharedPreferences ) ) {
+ Log.i( LOG_TAG, "Credentials were expired." );
+
+ clearCredentials();
+
+ AmazonTVMClient tvm = new AmazonTVMClient( this.sharedPreferences, PropertyLoader.getInstance().getTokenVendingMachineURL(), PropertyLoader.getInstance().useSSL() );
+ ableToGetToken = tvm.anonymousRegister();
+ if ( ableToGetToken.requestWasSuccessful() ) {
+ ableToGetToken = tvm.getToken();
+ }
+ }
+
+ if ( ableToGetToken.requestWasSuccessful() && ddb == null ) {
+ Log.i( LOG_TAG, "Creating New Credentials." );
+
+ AWSCredentials credentials = AmazonSharedPreferencesWrapper.getCredentialsFromSharedPreferences( this.sharedPreferences );
+
+ ddb = new AmazonDynamoDBClient( credentials );
+ }
+
+ return ableToGetToken;
+ }
+
+ public void clearCredentials() {
+ ddb = null;
+ }
+
+ public void wipe() {
+ AmazonSharedPreferencesWrapper.wipe( this.sharedPreferences );
+ }
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/AmazonSharedPreferencesWrapper.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/AmazonSharedPreferencesWrapper.java
new file mode 100644
index 00000000..4147d275
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/AmazonSharedPreferencesWrapper.java
@@ -0,0 +1,118 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+import android.content.SharedPreferences;
+
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.BasicSessionCredentials;
+
+/**
+ * This utility class is used to store content in Android's Shared Preferences. For maximum security the preferences should be private.
+ */
+public class AmazonSharedPreferencesWrapper {
+
+ private static final String AWS_ACCESS_KEY = "AWS_ACCESS_KEY";
+ private static final String AWS_SECRET_KEY = "AWS_SECRET_KEY";
+ private static final String AWS_SECURITY_TOKEN = "AWS_SECURITY_TOKEN";
+ private static final String AWS_EXPIRATION_DATE = "AWS_EXPIRATION_DATE";
+
+ private static final String AWS_DEVICE_UID = "AWS_DEVICE_UID";
+ private static final String AWS_DEVICE_KEY = "AWS_DEVICE_KEY";
+
+ /**
+ * Set all of the Shared Preferences used by the Token Vending Machine to null. This function is useful if the user needs/wants to log out to
+ * clear any user specific information.
+ */
+ public static void wipe( SharedPreferences sharedPreferences ) {
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_DEVICE_UID, null );
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_DEVICE_KEY, null );
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_ACCESS_KEY, null );
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_SECRET_KEY, null );
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_SECURITY_TOKEN, null );
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_EXPIRATION_DATE, null );
+ }
+
+ /**
+ * Stores the UID and Key that were registered in the Shared Preferences. The UID and Key and used to encrypt/decrypt the Token that is returned
+ * from the Token Vending Machine.
+ */
+ public static void registerDeviceId( SharedPreferences sharedPreferences, String uid, String key ) {
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_DEVICE_UID, uid );
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_DEVICE_KEY, key );
+ }
+
+ /**
+ * Returns the current UID stored in Shared Preferences.
+ */
+ public static String getUidForDevice( SharedPreferences sharedPreferences ) {
+ return AmazonSharedPreferencesWrapper.getValueFromSharedPreferences( sharedPreferences, AWS_DEVICE_UID );
+ }
+
+ /**
+ * Returns the current Key stored in Shared Preferences.
+ */
+ public static String getKeyForDevice( SharedPreferences sharedPreferences ) {
+ return AmazonSharedPreferencesWrapper.getValueFromSharedPreferences( sharedPreferences, AWS_DEVICE_KEY );
+ }
+
+ /**
+ * Gets the AWS Access Key, AWS Secret Key and Security Token currently stored in Shared Preferences. Then creates a Credentials object and
+ * returns that object.
+ */
+ public static AWSCredentials getCredentialsFromSharedPreferences( SharedPreferences sharedPreferences ) {
+ String accessKey = AmazonSharedPreferencesWrapper.getValueFromSharedPreferences( sharedPreferences, AWS_ACCESS_KEY );
+ String secretKey = AmazonSharedPreferencesWrapper.getValueFromSharedPreferences( sharedPreferences, AWS_SECRET_KEY );
+ String securityToken = AmazonSharedPreferencesWrapper.getValueFromSharedPreferences( sharedPreferences, AWS_SECURITY_TOKEN );
+
+ return new BasicSessionCredentials( accessKey, secretKey, securityToken );
+ }
+
+ /**
+ * Checks if the current Token's expiration date stored in Shared Preferences has expired. A token that has expired or will expire in fifteen
+ * minutes or less is considered expired.
+ */
+ public static boolean areCredentialsExpired( SharedPreferences sharedPreferences ) {
+ String expirationDate = AmazonSharedPreferencesWrapper.getValueFromSharedPreferences( sharedPreferences, AWS_EXPIRATION_DATE );
+ if ( expirationDate == null ) {
+ return true;
+ }
+ else {
+ long timeInSeconds = Long.parseLong( expirationDate );
+ return ( timeInSeconds < ( System.currentTimeMillis() + 15 * 60 * 100 ) );
+ }
+ }
+
+ /**
+ * Stores the four pieces of information associated with a Token in the Shared Preferences.
+ */
+ public static void storeCredentialsInSharedPreferences( SharedPreferences sharedPreferences, String accessKey, String secretKey, String securityToken, String expirationDate ) {
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_ACCESS_KEY, accessKey );
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_SECRET_KEY, secretKey );
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_SECURITY_TOKEN, securityToken );
+ AmazonSharedPreferencesWrapper.storeValueInSharedPreferences( sharedPreferences, AWS_EXPIRATION_DATE, expirationDate );
+ }
+
+ protected static void storeValueInSharedPreferences( SharedPreferences sharedPreferences, String key, String value ) {
+ SharedPreferences.Editor editor = sharedPreferences.edit();
+ editor.putString( key, value );
+ editor.commit();
+ }
+
+ protected static String getValueFromSharedPreferences( SharedPreferences sharedPreferences, String key ) {
+ return sharedPreferences.getString( key, null );
+ }
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/AmazonTVMClient.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/AmazonTVMClient.java
new file mode 100644
index 00000000..e1acf3ff
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/AmazonTVMClient.java
@@ -0,0 +1,143 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+import org.apache.commons.codec.binary.Hex;
+
+import java.security.SecureRandom;
+
+import android.content.SharedPreferences;
+import android.util.Log;
+
+/**
+ * This class is uzsed to communicate with the Token Vending Machine specific for this application.
+ */
+public class AmazonTVMClient {
+
+ private static final String LOG_TAG = "AmazonTVMClient";
+
+ /**
+ * The endpoint for the Token Vending Machine to connect to.
+ */
+ private String endpoint;
+
+ /**
+ * Use SSL when making connections to the Token Vending Machine.
+ */
+ private boolean useSSL;
+
+ /**
+ * The shared preferences where credentials are other aws access information is stored.
+ */
+ private SharedPreferences sharedPreferences;
+
+ public AmazonTVMClient( SharedPreferences sharedPreferences, String endpoint, boolean useSSL ) {
+ this.endpoint = this.getEndpointDomainName( endpoint.toLowerCase() );
+ this.useSSL = useSSL;
+ this.sharedPreferences = sharedPreferences;
+ }
+
+ /**
+ * Anonymously register the current application/device with the Token Vending Machine.
+ */
+ public Response anonymousRegister() {
+ Response response = Response.SUCCESSFUL;
+ if ( AmazonSharedPreferencesWrapper.getUidForDevice( this.sharedPreferences ) == null ) {
+ String uid = this.generateRandomString();
+ String key = this.generateRandomString();
+
+ RegisterDeviceRequest registerDeviceRequest = new RegisterDeviceRequest( this.endpoint, this.useSSL, uid, key );
+ ResponseHandler handler = new ResponseHandler();
+
+ response = this.processRequest( registerDeviceRequest, handler );
+ if ( response.requestWasSuccessful() ) {
+ AmazonSharedPreferencesWrapper.registerDeviceId( this.sharedPreferences, uid, key );
+ }
+ }
+
+ return response;
+ }
+
+ /**
+ * Gets a token from the Token Vending Machine. The registered key is used to secure the communication.
+ */
+ public Response getToken() {
+ String uid = AmazonSharedPreferencesWrapper.getUidForDevice( this.sharedPreferences );
+ String key = AmazonSharedPreferencesWrapper.getKeyForDevice( this.sharedPreferences );
+
+ Request getTokenRequest = new GetTokenRequest( this.endpoint, this.useSSL, uid, key );
+ ResponseHandler handler = new GetTokenResponseHandler( key );
+
+ GetTokenResponse getTokenResponse = (GetTokenResponse) this.processRequest( getTokenRequest, handler );
+ if ( getTokenResponse.requestWasSuccessful() ) {
+ AmazonSharedPreferencesWrapper.storeCredentialsInSharedPreferences( this.sharedPreferences, getTokenResponse.getAccessKey(), getTokenResponse.getSecretKey(),
+ getTokenResponse.getSecurityToken(), getTokenResponse.getExpirationDate() );
+ }
+
+ return getTokenResponse;
+ }
+
+ /**
+ * Process Request
+ */
+ protected Response processRequest( Request request, ResponseHandler handler ) {
+ Response response = null;
+ int retries = 2;
+ do {
+ response = TokenVendingMachineService.sendRequest( request, handler );
+ if ( response.requestWasSuccessful() ) {
+ return response;
+ }
+ else {
+ Log.w( LOG_TAG, "Request to Token Vending Machine failed with Code: [" + response.getResponseCode() + "] Message: [" + response.getResponseMessage() + "]" );
+ }
+ }
+ while ( retries-- > 0 );
+
+ return response;
+ }
+
+ /**
+ * Creates a 128-bit random string.
+ */
+ public String generateRandomString() {
+ SecureRandom random = new SecureRandom();
+ byte[] randomBytes = random.generateSeed( 16 );
+ String randomString = new String( Hex.encodeHex( randomBytes ) );
+ return randomString;
+ }
+
+ private String getEndpointDomainName( String endpoint ) {
+ int startIndex = 0;
+ int endIndex = 0;
+
+ if ( endpoint.startsWith( "http://" ) || endpoint.startsWith( "https://" ) ) {
+ startIndex = endpoint.indexOf( "://" ) + 3;
+ }
+ else {
+ startIndex = 0;
+ }
+
+ if ( endpoint.charAt( endpoint.length() - 1 ) == '/' ) {
+ endIndex = endpoint.length() - 1;
+ }
+ else {
+ endIndex = endpoint.length();
+ }
+
+ return endpoint.substring( startIndex, endIndex );
+ }
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/AwsCredentials.properties b/samples/UserPreference/src/com/amazon/aws/tvmclient/AwsCredentials.properties
new file mode 100644
index 00000000..4d9eea3e
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/AwsCredentials.properties
@@ -0,0 +1,15 @@
+#========================================================================
+# Enter the configuration for your Token Vending Machine.
+#========================================================================
+
+# This is the the DNS domain name of the endpoint your Token Vending
+# Machine is running. (For example, if your TVM is running at
+# http://mytvm.elasticbeanstalk.com this parameter should be set to
+# mytvm.elasticbeanstalk.com.)
+tokenVendingMachineURL=CHANGE ME
+
+# This indiciates whether or not the TVM is supports SSL connections.
+useSSL=false
+
+testTableName=TestUserPereference
+#========================================================================
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/GetTokenRequest.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/GetTokenRequest.java
new file mode 100644
index 00000000..8d945563
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/GetTokenRequest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+import com.amazonaws.util.HttpUtils;
+
+public class GetTokenRequest extends Request {
+
+ private final String endpoint;
+ private final String uid;
+ private final String key;
+ private final boolean useSSL;
+
+ public GetTokenRequest( final String endpoint, final boolean useSSL, final String uid, final String key ) {
+ this.endpoint = endpoint;
+ this.useSSL = useSSL;
+ this.uid = uid;
+ this.key = key;
+ }
+
+ public String buildRequestUrl() {
+ StringBuilder builder = new StringBuilder( ( this.useSSL ? "https://" : "http://" ) );
+ builder.append( this.endpoint );
+ builder.append( "/" );
+
+ String timestamp = Utilities.getTimestamp();
+ String signature = Utilities.getSignature( timestamp, key );
+
+ builder.append( "gettoken" );
+ builder.append( "?uid=" + HttpUtils.urlEncode( this.uid, false ) );
+ builder.append( "×tamp=" + HttpUtils.urlEncode( timestamp, false ) );
+ builder.append( "&signature=" + HttpUtils.urlEncode( signature, false ) );
+
+ return builder.toString();
+ }
+
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/GetTokenResponse.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/GetTokenResponse.java
new file mode 100644
index 00000000..3b3da3df
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/GetTokenResponse.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+public class GetTokenResponse extends Response {
+
+ private final String accessKey;
+ private final String secretKey;
+ private final String securityToken;
+ private final String expirationDate;
+
+ public GetTokenResponse( final int responseCode, final String responseMessage ) {
+ super( responseCode, responseMessage );
+ this.accessKey = null;
+ this.secretKey = null;
+ this.securityToken = null;
+ this.expirationDate = null;
+ }
+
+ public GetTokenResponse( final String accessKey, final String secretKey, final String securityToken, final String expirationDate ) {
+ super( 200, null );
+ this.accessKey = accessKey;
+ this.secretKey = secretKey;
+ this.securityToken = securityToken;
+ this.expirationDate = expirationDate;
+ }
+
+ public String getAccessKey() {
+ return this.accessKey;
+ }
+
+ public String getSecretKey() {
+ return this.secretKey;
+ }
+
+ public String getSecurityToken() {
+ return this.securityToken;
+ }
+
+ public String getExpirationDate() {
+ return this.expirationDate;
+ }
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/GetTokenResponseHandler.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/GetTokenResponseHandler.java
new file mode 100644
index 00000000..6c908a83
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/GetTokenResponseHandler.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+public class GetTokenResponseHandler extends ResponseHandler {
+
+ private final String key;
+
+ public GetTokenResponseHandler( final String key ) {
+ this.key = key;
+ }
+
+ public Response handleResponse( int responseCode, String responseBody ) {
+ if ( responseCode == 200 ) {
+ try {
+ String json = AESEncryption.unwrap( responseBody, this.key );
+ String accessKey = Utilities.extractElement( json, "accessKey" );
+ String secretKey = Utilities.extractElement( json, "secretKey" );
+ String securityToken = Utilities.extractElement( json, "securityToken" );
+ String expirationDate = Utilities.extractElement( json, "expirationDate" );
+
+ return new GetTokenResponse( accessKey, secretKey, securityToken, expirationDate );
+ }
+ catch ( Exception exception ) {
+ return new GetTokenResponse( 500, exception.getMessage() );
+ }
+ }
+ else {
+ return new GetTokenResponse( responseCode, responseBody );
+ }
+ }
+
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/PropertyLoader.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/PropertyLoader.java
new file mode 100644
index 00000000..491ad11c
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/PropertyLoader.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+import java.util.Properties;
+import android.util.Log;
+
+public class PropertyLoader {
+
+ private boolean hasCredentials = false;
+ private String tokenVendingMachineURL = null;
+ private boolean useSSL = false;
+ private String testTableName = null;
+
+ private static PropertyLoader instance = null;
+
+ public static PropertyLoader getInstance() {
+ if ( instance == null ) {
+ instance = new PropertyLoader();
+ }
+
+ return instance;
+ }
+
+ public PropertyLoader() {
+ try {
+ Properties properties = new Properties();
+ properties.load( this.getClass().getResourceAsStream( "AwsCredentials.properties" ) );
+
+ this.tokenVendingMachineURL = properties.getProperty( "tokenVendingMachineURL" );
+ this.useSSL = Boolean.parseBoolean( properties.getProperty( "useSSL" ) );
+ this.testTableName = properties.getProperty( "testTableName" );
+
+ if ( this.tokenVendingMachineURL == null || this.tokenVendingMachineURL.equals( "" ) || this.tokenVendingMachineURL.equals( "CHANGEME" ) || this.testTableName.equals( "" ) ) {
+ this.tokenVendingMachineURL = null;
+ this.useSSL = false;
+ this.hasCredentials = false;
+ this.testTableName = null;
+ }
+ else {
+ this.hasCredentials = true;
+ }
+ }
+ catch ( Exception exception ) {
+ Log.e( "PropertyLoader", "Unable to read property file." );
+ }
+ }
+
+ public boolean hasCredentials() {
+ return this.hasCredentials;
+ }
+
+ public String getTokenVendingMachineURL() {
+ return this.tokenVendingMachineURL;
+ }
+
+ public boolean useSSL() {
+ return this.useSSL;
+ }
+
+ public String getTestTableName() {
+ return this.testTableName;
+ }
+
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/RegisterDeviceRequest.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/RegisterDeviceRequest.java
new file mode 100644
index 00000000..e2887e21
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/RegisterDeviceRequest.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+import com.amazonaws.util.HttpUtils;
+
+public class RegisterDeviceRequest extends Request {
+
+ private final String endpoint;
+ private final String uid;
+ private final String key;
+ private final boolean useSSL;
+
+ public RegisterDeviceRequest( final String endpoint, final boolean useSSL, final String uid, final String key ) {
+ this.endpoint = endpoint;
+ this.useSSL = useSSL;
+ this.uid = uid;
+ this.key = key;
+ }
+
+ public String buildRequestUrl() {
+ StringBuilder builder = new StringBuilder( ( this.useSSL ? "https://" : "http://" ) );
+ builder.append( this.endpoint );
+ builder.append( "/" );
+ builder.append( "registerdevice" );
+ builder.append( "?uid=" + HttpUtils.urlEncode( this.uid, false ) );
+ builder.append( "&key=" + HttpUtils.urlEncode( this.key, false ) );
+
+ return builder.toString();
+ }
+
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/Request.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/Request.java
new file mode 100644
index 00000000..0937e6d9
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/Request.java
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+public abstract class Request {
+
+ public abstract String buildRequestUrl();
+
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/Response.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/Response.java
new file mode 100644
index 00000000..eaa51379
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/Response.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+public class Response {
+
+ public static final Response SUCCESSFUL = new Response( 200, "OK" );
+
+ private final int responseCode;
+ private final String responseMessage;
+
+ public Response( final int responseCode, final String responseMessage ) {
+ this.responseCode = responseCode;
+ this.responseMessage = responseMessage;
+ }
+
+ public boolean requestWasSuccessful() {
+ return this.getResponseCode() == 200;
+ }
+
+ public int getResponseCode() {
+ return this.responseCode;
+ }
+
+ public String getResponseMessage() {
+ return this.responseMessage;
+ }
+
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/ResponseHandler.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/ResponseHandler.java
new file mode 100644
index 00000000..ca293bd3
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/ResponseHandler.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+public class ResponseHandler {
+
+ public Response handleResponse( int responseCode, String responseBody ) {
+ return new Response( responseCode, responseBody );
+ }
+
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/TokenVendingMachineService.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/TokenVendingMachineService.java
new file mode 100644
index 00000000..72f1049f
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/TokenVendingMachineService.java
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.IOException;
+
+import java.net.HttpURLConnection;
+import java.net.URL;
+
+import android.util.Log;
+
+public class TokenVendingMachineService {
+
+ private static final String LOG_TAG = "TokenVendingMachineService";
+ private static final String ERROR = "Internal Server Error";
+
+ public static Response sendRequest( Request request, ResponseHandler reponseHandler ) {
+ int responseCode = 0;
+ String responseBody = null;
+ String requestUrl = null;
+ try {
+ requestUrl = request.buildRequestUrl();
+
+ Log.i( LOG_TAG, "Sending Request : [" + requestUrl + "]" );
+
+ URL url = new URL( requestUrl );
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+
+ responseCode = connection.getResponseCode();
+ responseBody = TokenVendingMachineService.getResponse( connection );
+ Log.i( LOG_TAG, "Response : [" + responseBody + "]" );
+
+ return reponseHandler.handleResponse( responseCode, responseBody );
+ }
+ catch ( IOException exception ) {
+ Log.w( LOG_TAG, exception );
+ if ( exception.getMessage().equals( "Received authentication challenge is null" ) ) {
+ return reponseHandler.handleResponse( 401, "Unauthorized token request" );
+ }
+ else {
+ return reponseHandler.handleResponse( 404, "Unable to reach resource at [" + requestUrl + "]" );
+ }
+ }
+ catch ( Exception exception ) {
+ Log.w( LOG_TAG, exception );
+ return reponseHandler.handleResponse( responseCode, responseBody );
+ }
+ }
+
+ protected static String getResponse( HttpURLConnection connection ) {
+ ByteArrayOutputStream baos = new ByteArrayOutputStream( 1024 );
+ InputStream inputStream = null;
+ try {
+ baos = new ByteArrayOutputStream( 1024 );
+ int length = 0;
+ byte[] buffer = new byte[ 1024 ];
+
+ if ( connection.getResponseCode() == 200 ) {
+ inputStream = connection.getInputStream();
+ }
+ else {
+ inputStream = connection.getErrorStream();
+ }
+
+ while ( ( length = inputStream.read( buffer ) ) != -1 ) {
+ baos.write( buffer, 0, length );
+ }
+
+ return baos.toString();
+ }
+ catch ( Exception exception ) {
+ Log.w( LOG_TAG, exception );
+ return ERROR;
+ }
+ finally {
+ try {
+ baos.close();
+ }
+ catch ( Exception exception ) {
+ Log.w( LOG_TAG, exception );
+ }
+ }
+ }
+}
diff --git a/samples/UserPreference/src/com/amazon/aws/tvmclient/Utilities.java b/samples/UserPreference/src/com/amazon/aws/tvmclient/Utilities.java
new file mode 100644
index 00000000..044f3dfa
--- /dev/null
+++ b/samples/UserPreference/src/com/amazon/aws/tvmclient/Utilities.java
@@ -0,0 +1,67 @@
+/*
+ * Copyright 2010-2012 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.amazon.aws.tvmclient;
+
+import java.util.Date;
+
+import com.amazonaws.AmazonClientException;
+import com.amazonaws.Request;
+import com.amazonaws.auth.AbstractAWSSigner;
+import com.amazonaws.auth.AWSCredentials;
+import com.amazonaws.auth.AWSSessionCredentials;
+import com.amazonaws.auth.SigningAlgorithm;
+import com.amazonaws.util.DateUtils;
+
+public class Utilities {
+
+ public static String getTimestamp() {
+ return new DateUtils().formatIso8601Date( new Date() );
+ }
+
+ public static String extractElement( String json, String element ) {
+ boolean hasElement = ( json.indexOf( element ) != -1 );
+ if ( hasElement ) {
+ int elementIndex = json.indexOf( element );
+ int startIndex = json.indexOf( "\"", elementIndex );
+ int endIndex = json.indexOf( "\"", startIndex + 1 );
+
+ return json.substring( startIndex + 1, endIndex );
+ }
+
+ return null;
+ }
+
+ public static String getSignature( String dataToSign, String key ) {
+ return new Signer().getSignature( dataToSign, key );
+ }
+
+ static class Signer extends AbstractAWSSigner {
+
+ public void sign( Request request, AWSCredentials credentials ) throws AmazonClientException {}
+
+ protected void addSessionCredentials( Request request, AWSSessionCredentials credentials ) {}
+
+ public String getSignature( String dataToSign, String key ) {
+ try {
+ return super.signAndBase64Encode( dataToSign.getBytes( "UTF-8" ), key, SigningAlgorithm.HmacSHA256 );
+ }
+ catch ( Exception exception ) {
+ return null;
+ }
+ }
+ }
+
+}
diff --git a/src/com/amazonaws/AmazonClientException.java b/src/com/amazonaws/AmazonClientException.java
index 4e3d9637..66bed6fe 100644
--- a/src/com/amazonaws/AmazonClientException.java
+++ b/src/com/amazonaws/AmazonClientException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/AmazonServiceException.java b/src/com/amazonaws/AmazonServiceException.java
index c32aa5d4..f1f6dfeb 100644
--- a/src/com/amazonaws/AmazonServiceException.java
+++ b/src/com/amazonaws/AmazonServiceException.java
@@ -1,12 +1,12 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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
@@ -32,7 +32,7 @@ public class AmazonServiceException extends AmazonClientException {
/**
* Indicates who is responsible (if known) for a failed request.
- *
+ *
* For example, if a client is using an invalid AWS access key,
* the returned exception will indicate that there is an error in the
* request the caller is sending. Retrying that same request will *not*
@@ -50,7 +50,7 @@ public class AmazonServiceException extends AmazonClientException {
* problem occurred while processing the request on the service side.
* Service errors will be accompanied by an HTTP error code in the 5xx
* range.
- *
+ *
*
Finally, if there isn't enough information to determine who's
* fault the error response is, an Unknown ErrorType will be set.
*/
@@ -66,17 +66,17 @@ public enum ErrorType {
* reporting an error to AWS support team.
*/
private String requestId;
-
+
/**
* The AWS error code represented by this exception (ex:
- * InvalidParameterValue).
+ * InvalidParameterValue).
*/
private String errorCode;
/**
* Indicates (if known) whether this exception was the fault of the caller
* or the service.
- *
+ *
* @see ErrorType
*/
private ErrorType errorType = ErrorType.Unknown;
@@ -91,7 +91,7 @@ public enum ErrorType {
/**
* Constructs a new AmazonServiceException with the specified message.
- *
+ *
* @param message
* An error message describing what went wrong.
*/
@@ -102,7 +102,7 @@ public AmazonServiceException(String message) {
/**
* Constructs a new AmazonServiceException with the specified message and
* exception indicating the root cause.
- *
+ *
* @param message
* An error message describing what went wrong.
* @param cause
@@ -111,10 +111,10 @@ public AmazonServiceException(String message) {
public AmazonServiceException(String message, Exception cause) {
super(message, cause);
}
-
+
/**
* Sets the AWS requestId for this exception.
- *
+ *
* @param requestId
* The unique identifier for the service request the caller made.
*/
@@ -125,7 +125,7 @@ public void setRequestId(String requestId) {
/**
* Returns the AWS request ID that uniquely identifies the service request
* the caller made.
- *
+ *
* @return The AWS request ID that uniquely identifies the service request
* the caller made.
*/
@@ -135,7 +135,7 @@ public String getRequestId() {
/**
* Sets the name of the service that sent this error response.
- *
+ *
* @param serviceName
* The name of the service that sent this error response.
*/
@@ -145,16 +145,16 @@ public void setServiceName(String serviceName) {
/**
* Returns the name of the service that sent this error response.
- *
+ *
* @return The name of the service that sent this error response.
*/
public String getServiceName() {
return serviceName;
}
-
+
/**
* Sets the AWS error code represented by this exception.
- *
+ *
* @param errorCode
* The AWS error code represented by this exception.
*/
@@ -164,7 +164,7 @@ public void setErrorCode(String errorCode) {
/**
* Returns the AWS error code represented by this exception.
- *
+ *
* @return The AWS error code represented by this exception.
*/
public String getErrorCode() {
@@ -175,7 +175,7 @@ public String getErrorCode() {
* Sets the type of error represented by this exception (sender, receiver,
* or unknown), indicating if this exception was the caller's fault, or the
* service's fault.
- *
+ *
* @param errorType
* The type of error represented by this exception (sender or
* receiver), indicating if this exception was the caller's fault
@@ -188,7 +188,7 @@ public void setErrorType(ErrorType errorType) {
/**
* Indicates who is responsible for this exception (caller, service,
* or unknown).
- *
+ *
* @return A value indicating who is responsible for this exception (caller, service, or unknown).
*/
public ErrorType getErrorType() {
@@ -197,7 +197,7 @@ public ErrorType getErrorType() {
/**
* Sets the HTTP status code that was returned with this service exception.
- *
+ *
* @param statusCode
* The HTTP status code that was returned with this service
* exception.
@@ -209,7 +209,7 @@ public void setStatusCode(int statusCode) {
/**
* Returns the HTTP status code that was returned with this service
* exception.
- *
+ *
* @return The HTTP status code that was returned with this service
* exception.
*/
@@ -220,12 +220,13 @@ public int getStatusCode() {
/**
* Returns a string summary of the details of this exception including the
* HTTP status code, AWS request ID, AWS error code and error message.
- *
+ *
* @see java.lang.Throwable#toString()
*/
@Override
public String toString() {
- return "Status Code: " + getStatusCode() + ", "
+ return "Status Code: " + getStatusCode() + ", "
+ + "AWS Service: " + getServiceName() + ", "
+ "AWS Request ID: " + getRequestId() + ", "
+ "AWS Error Code: " + getErrorCode() + ", "
+ "AWS Error Message: " + getMessage();
diff --git a/src/com/amazonaws/AmazonWebServiceClient.java b/src/com/amazonaws/AmazonWebServiceClient.java
index e777a61e..829c9eea 100644
--- a/src/com/amazonaws/AmazonWebServiceClient.java
+++ b/src/com/amazonaws/AmazonWebServiceClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -39,14 +39,15 @@ public abstract class AmazonWebServiceClient {
protected URI endpoint;
/** The client configuration */
- protected final ClientConfiguration clientConfiguration;
+ protected ClientConfiguration clientConfiguration;
/** Low level client for sending requests to AWS services. */
- protected final AmazonHttpClient client;
+ protected AmazonHttpClient client;
/** Optional request handlers for additional request processing. */
protected final List requestHandlers;
+
/**
* Constructs a new AmazonWebServiceClient object using the specified
* configuration.
@@ -100,6 +101,11 @@ public void setEndpoint(String endpoint) throws IllegalArgumentException {
}
}
+ public void setConfiguration(ClientConfiguration clientConfiguration) {
+ this.clientConfiguration = clientConfiguration;
+ client = new AmazonHttpClient(clientConfiguration);
+ }
+
/**
* Shuts down this client object, releasing any resources that might be held
* open. This is an optional method, and callers are not expected to call
@@ -154,7 +160,7 @@ protected HttpRequest convertToHttpRequest(Request request, HttpMethodNam
public void addRequestHandler(RequestHandler requestHandler) {
requestHandlers.add(requestHandler);
}
-
+
/**
* Removes a request handler from the list of registered handlers that are run
* as part of a request's lifecycle.
@@ -171,5 +177,5 @@ protected ExecutionContext createExecutionContext() {
ExecutionContext executionContext = new ExecutionContext(requestHandlers);
return executionContext;
}
-
+
}
diff --git a/src/com/amazonaws/AmazonWebServiceRequest.java b/src/com/amazonaws/AmazonWebServiceRequest.java
index fb758034..828c99c6 100644
--- a/src/com/amazonaws/AmazonWebServiceRequest.java
+++ b/src/com/amazonaws/AmazonWebServiceRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/AmazonWebServiceResponse.java b/src/com/amazonaws/AmazonWebServiceResponse.java
index 22f27231..e15c4912 100644
--- a/src/com/amazonaws/AmazonWebServiceResponse.java
+++ b/src/com/amazonaws/AmazonWebServiceResponse.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/ClientConfiguration.java b/src/com/amazonaws/ClientConfiguration.java
index fad49d13..ad3f66a0 100644
--- a/src/com/amazonaws/ClientConfiguration.java
+++ b/src/com/amazonaws/ClientConfiguration.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -21,9 +21,18 @@
*/
public class ClientConfiguration {
+ /** The default timeout for a connected socket. */
+ public static final int DEFAULT_SOCKET_TIMEOUT = 50 * 1000;
+
+ /** The default max connection pool size. */
+ public static final int DEFAULT_MAX_CONNECTIONS = 50;
+
/** The default HTTP user agent header for AWS Java SDK clients. */
public static final String DEFAULT_USER_AGENT = VersionInfoUtils.getUserAgent();
+ /** The default maximum number of retries for error responses. */
+ public static final int DEFAULT_MAX_RETRIES = 3;
+
/** The HTTP user agent header passed with all HTTP requests. */
private String userAgent = DEFAULT_USER_AGENT;
@@ -31,7 +40,7 @@ public class ClientConfiguration {
* The maximum number of times that a retryable failed request (ex: a 5xx
* response from a service) will be retried.
*/
- private int maxErrorRetry = 3;
+ private int maxErrorRetry = DEFAULT_MAX_RETRIES;
/**
* The protocol to use when connecting to Amazon Web Services.
@@ -60,14 +69,14 @@ public class ClientConfiguration {
private String proxyWorkstation = null;
/** The maximum number of open HTTP connections. */
- private int maxConnections = 50;
+ private int maxConnections = DEFAULT_MAX_CONNECTIONS;
/**
* The amount of time to wait (in milliseconds) for data to be transfered
* over an established, open connection before the connection is timed out.
* A value of 0 means infinity, and is not recommended.
*/
- private int socketTimeout = 50 * 1000;
+ private int socketTimeout = DEFAULT_SOCKET_TIMEOUT;
/**
* The amount of time to wait (in milliseconds) when initially establishing
@@ -90,6 +99,27 @@ public class ClientConfiguration {
*/
private int socketReceiveBufferSizeHint = 0;
+
+ public ClientConfiguration() {}
+
+ public ClientConfiguration(ClientConfiguration other) {
+ this.connectionTimeout = other.connectionTimeout;
+ this.maxConnections = other.maxConnections;
+ this.maxErrorRetry = other.maxErrorRetry;
+ this.protocol = other.protocol;
+ this.proxyDomain = other.proxyDomain;
+ this.proxyHost = other.proxyHost;
+ this.proxyPassword = other.proxyPassword;
+ this.proxyPort = other.proxyPort;
+ this.proxyUsername = other.proxyUsername;
+ this.proxyWorkstation = other.proxyWorkstation;
+ this.socketTimeout = other.socketTimeout;
+ this.userAgent = other.userAgent;
+
+ this.socketReceiveBufferSizeHint = other.socketReceiveBufferSizeHint;
+ this.socketSendBufferSizeHint = other.socketSendBufferSizeHint;
+ }
+
/**
* Returns the protocol (i.e. HTTP or HTTPS) to use when connecting to
* Amazon Web Services.
diff --git a/src/com/amazonaws/DefaultRequest.java b/src/com/amazonaws/DefaultRequest.java
index cb77894a..5a471fb5 100644
--- a/src/com/amazonaws/DefaultRequest.java
+++ b/src/com/amazonaws/DefaultRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/HttpMethod.java b/src/com/amazonaws/HttpMethod.java
index 3c8bfe52..75f0c2dc 100644
--- a/src/com/amazonaws/HttpMethod.java
+++ b/src/com/amazonaws/HttpMethod.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/Protocol.java b/src/com/amazonaws/Protocol.java
index 936944ff..e658c2b7 100644
--- a/src/com/amazonaws/Protocol.java
+++ b/src/com/amazonaws/Protocol.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/Request.java b/src/com/amazonaws/Request.java
index c8f49816..7f61fc92 100644
--- a/src/com/amazonaws/Request.java
+++ b/src/com/amazonaws/Request.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/RequestClientOptions.java b/src/com/amazonaws/RequestClientOptions.java
index 711ba17d..b9568ef8 100644
--- a/src/com/amazonaws/RequestClientOptions.java
+++ b/src/com/amazonaws/RequestClientOptions.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon Technologies, Inc.
+ * Copyright 2011-2012 Amazon Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/com/amazonaws/ResponseMetadata.java b/src/com/amazonaws/ResponseMetadata.java
index eb2a54cb..877e0a24 100644
--- a/src/com/amazonaws/ResponseMetadata.java
+++ b/src/com/amazonaws/ResponseMetadata.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/AWS3Signer.java b/src/com/amazonaws/auth/AWS3Signer.java
index 8ae7fad6..381cae83 100644
--- a/src/com/amazonaws/auth/AWS3Signer.java
+++ b/src/com/amazonaws/auth/AWS3Signer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -14,10 +14,8 @@
*/
package com.amazonaws.auth;
-import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
-import java.security.MessageDigest;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -34,7 +32,6 @@
import com.amazonaws.Request;
import com.amazonaws.util.DateUtils;
import com.amazonaws.util.HttpUtils;
-import com.amazonaws.util.StringInputStream;
/**
* Signer implementation that signs requests with the AWS3 signing protocol.
@@ -68,7 +65,7 @@ public void sign(Request request, AWSCredentials credentials) throws AmazonCl
SigningAlgorithm algorithm = SigningAlgorithm.HmacSHA256;
String nonce = UUID.randomUUID().toString();
String date = dateUtils.formatRfc822Date(new Date());
- boolean isHttps = isHttpsRequest(request);
+ boolean isHttps = false;
if (overriddenDate != null) date = overriddenDate;
request.addHeader("Date", date);
@@ -96,16 +93,22 @@ public void sign(Request request, AWSCredentials credentials) throws AmazonCl
throw new AmazonClientException("Unable to serialize string to bytes: " + e.getMessage(), e);
}
} else {
- stringToSign = "POST\n"
- + getCanonicalizedResourcePath(request.getEndpoint()) + "\n"
+ /*
+ * AWS3 requires all query params to be listed on the third line of
+ * the string to sign, even if those query params will be sent in
+ * the request body and not as a query string. POST formatted query
+ * params should *NOT* be included in the request payload.
+ */
+ stringToSign = request.getHttpMethod().toString() + "\n"
+ + getCanonicalizedResourcePath(request.getResourcePath()) + "\n"
+ getCanonicalizedQueryString(request.getParameters()) + "\n"
+ getCanonicalizedHeadersForStringToSign(request) + "\n"
- + getRequestPayload(request);
+ + getRequestPayloadWithoutQueryParams(request);
bytesToSign = hash(stringToSign);
}
log.debug("Calculated StringToSign: " + stringToSign);
- String signature = sign(bytesToSign, sanitizedCredentials.getAWSSecretKey(), algorithm);
+ String signature = signAndBase64Encode(bytesToSign, sanitizedCredentials.getAWSSecretKey(), algorithm);
StringBuilder builder = new StringBuilder();
builder.append(isHttps ? HTTPS_SCHEME : HTTP_SCHEME).append(" ");
@@ -120,32 +123,6 @@ public void sign(Request request, AWSCredentials credentials) throws AmazonCl
request.addHeader(AUTHORIZATION_HEADER, builder.toString());
}
- private String getRequestPayload(Request request) {
- try {
- InputStream content = request.getContent();
-
- if (content instanceof StringInputStream) {
- StringInputStream sis = (StringInputStream)content;
- return sis.getString();
- }
-
- if (!content.markSupported()) {
- throw new AmazonClientException("Unable to read request payload to sign request.");
- }
-
- StringBuilder sb = new StringBuilder();
- content.mark(-1);
- int b;
- while ((b = content.read()) > -1) {
- sb.append((char)b);
- }
- content.reset();
- return sb.toString();
- } catch (Exception e) {
- throw new AmazonClientException("Unable to read request payload to sign request: " + e.getMessage(), e);
- }
- }
-
private String getSignedHeadersComponent(Request request) {
StringBuilder builder = new StringBuilder();
builder.append("SignedHeaders=");
@@ -158,24 +135,13 @@ private String getSignedHeadersComponent(Request request) {
return builder.toString();
}
- private byte[] hash(String text) throws AmazonClientException {
- try {
- MessageDigest md = MessageDigest.getInstance("SHA-256");
- md.update(text.getBytes("UTF-8"));
- return md.digest();
- } catch (Exception e) {
- throw new AmazonClientException("Unable to compute hash while signing request: " + e.getMessage(), e);
- }
- }
-
protected List getHeadersForStringToSign(Request request) {
List headersToSign = new ArrayList();
for (Map.Entry entry : request.getHeaders().entrySet()) {
String key = entry.getKey();
String lowerCaseKey = key.toLowerCase();
if (lowerCaseKey.startsWith("x-amz")
- || lowerCaseKey.equals("content-encoding")
- || lowerCaseKey.equals("host")) {
+ || lowerCaseKey.equals("host")) {
headersToSign.add(key);
}
}
@@ -218,7 +184,7 @@ protected String getCanonicalizedHeadersForStringToSign(Request request) {
return builder.toString();
}
- private boolean isHttpsRequest(Request request) throws AmazonClientException {
+ protected boolean shouldUseHttpsScheme(Request request) throws AmazonClientException {
try {
String protocol = request.getEndpoint().toURL().getProtocol().toLowerCase();
if (protocol.equals("http")) {
@@ -238,5 +204,5 @@ private boolean isHttpsRequest(Request request) throws AmazonClientException
protected void addSessionCredentials(Request request, AWSSessionCredentials credentials) {
request.addHeader("x-amz-security-token", credentials.getSessionToken());
}
-
+
}
diff --git a/src/com/amazonaws/auth/AWS4Signer.java b/src/com/amazonaws/auth/AWS4Signer.java
new file mode 100644
index 00000000..a89a0f93
--- /dev/null
+++ b/src/com/amazonaws/auth/AWS4Signer.java
@@ -0,0 +1,236 @@
+/*
+ * Copyright 2012 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.auth;
+
+import java.net.URI;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.SimpleTimeZone;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import com.amazonaws.AmazonClientException;
+import com.amazonaws.Request;
+import com.amazonaws.util.BinaryUtils;
+
+/**
+ * Signer implementation that signs requests with the AWS4 signing protocol.
+ */
+public class AWS4Signer extends AbstractAWSSigner {
+
+ private static final String ALGORITHM = "AWS4-HMAC-SHA256";
+ private static final String TERMINATOR = "aws4_request";
+
+ /**
+ * Service name override for use when the endpoint can't be used to
+ * determine the service name.
+ */
+ private String serviceName;
+
+ /**
+ * Region name override for use when the endpoint can't be used to
+ * determine the region name.
+ */
+ private String regionName;
+
+ /** Date override for testing only */
+ private Date overriddenDate;
+
+ private static final Log log = LogFactory.getLog(AWS4Signer.class);
+
+
+ /* (non-Javadoc)
+ * @see com.amazonaws.auth.Signer#sign(com.amazonaws.Request, com.amazonaws.auth.AWSCredentials)
+ */
+ public void sign(Request request, AWSCredentials credentials) throws AmazonClientException {
+ AWSCredentials sanitizedCredentials = sanitizeCredentials(credentials);
+ if ( sanitizedCredentials instanceof AWSSessionCredentials ) {
+ addSessionCredentials(request, (AWSSessionCredentials) sanitizedCredentials);
+ }
+
+ SimpleDateFormat dateStampFormat = new SimpleDateFormat("yyyyMMdd");
+ dateStampFormat.setTimeZone(new SimpleTimeZone(0, "UTC"));
+
+ SimpleDateFormat dateTimeFormat = new SimpleDateFormat("yyyyMMdd'T'HHmmss'Z'");
+ dateTimeFormat.setTimeZone(new SimpleTimeZone(0, "UTC"));
+
+ String regionName = extractRegionName(request.getEndpoint());
+ String serviceName = extractServiceName(request.getEndpoint());
+
+ Date date = new Date();
+ if (overriddenDate != null) date = overriddenDate;
+
+ String dateTime = dateTimeFormat.format(date);
+ String dateStamp = dateStampFormat.format(date);
+
+ request.addHeader("X-Amz-Date", dateTime);
+
+ String canonicalRequest =
+ request.getHttpMethod().toString() + "\n" +
+ super.getCanonicalizedResourcePath(request.getResourcePath()) + "\n" +
+ getCanonicalizedQueryString(request) + "\n" +
+ getCanonicalizedHeaderString(request) + "\n" +
+ getSignedHeadersString(request) + "\n" +
+ BinaryUtils.toHex(hash(getRequestPayload(request)));
+
+ log.debug("AWS4 Canonical Request: '\"" + canonicalRequest + "\"");
+
+ String scope = dateStamp + "/" + regionName + "/" + serviceName + "/" + TERMINATOR;
+ String signingCredentials = sanitizedCredentials.getAWSAccessKeyId() + "/" + scope;
+ String stringToSign =
+ ALGORITHM + "\n" +
+ dateTime + "\n" +
+ scope + "\n" +
+ BinaryUtils.toHex(hash(canonicalRequest));
+ log.debug("AWS4 String to Sign: '\"" + stringToSign + "\"");
+
+ // AWS4 uses a series of derived keys, formed by hashing different pieces of data
+ byte[] kSecret = ("AWS4" + sanitizedCredentials.getAWSSecretKey()).getBytes();
+ byte[] kDate = sign(dateStamp, kSecret, SigningAlgorithm.HmacSHA256);
+ byte[] kRegion = sign(regionName, kDate, SigningAlgorithm.HmacSHA256);
+ byte[] kService = sign(serviceName, kRegion, SigningAlgorithm.HmacSHA256);
+ byte[] kSigning = sign(TERMINATOR, kService, SigningAlgorithm.HmacSHA256);
+
+ byte[] signature = sign(stringToSign.getBytes(), kSigning, SigningAlgorithm.HmacSHA256);
+
+ String signatureAlgorithmHeader =
+ "Algorithm=" + ALGORITHM;
+ String credentialsAuthorizationHeader =
+ "Credential=" + signingCredentials;
+ String signedHeadersAuthorizationHeader =
+ "SignedHeaders=" + getSignedHeadersString(request);
+ String signatureAuthorizationHeader =
+ "Signature=" + BinaryUtils.toHex(signature);
+
+ String authorizationHeader = ALGORITHM + " "
+ + credentialsAuthorizationHeader + ", "
+ + signedHeadersAuthorizationHeader + ", "
+ + signatureAuthorizationHeader;
+
+ request.addHeader("Authorization", authorizationHeader);
+ }
+
+ /**
+ * Sets the service name that this signer should use when calculating
+ * request signatures. This can almost always be determined directly from
+ * the request's end point, so you shouldn't need this method, but it's
+ * provided for the edge case where the information is not in the endpoint.
+ *
+ * @param serviceName
+ * The service name to use when calculating signatures in this
+ * signer.
+ */
+ public void setServiceName(String serviceName) {
+ this.serviceName = serviceName;
+ }
+
+ /**
+ * Sets the region name that this signer should use when calculating request
+ * signatures. This can almost always be determined directly from the
+ * request's end point, so you shouldn't need this method, but it's provided
+ * for the edge case where the information is not in the endpoint.
+ *
+ * @param regionName
+ * The region name to use when calculating signatures in this
+ * signer.
+ */
+ public void setRegionName(String regionName) {
+ this.regionName = regionName;
+ }
+
+ @Override
+ protected void addSessionCredentials(Request request, AWSSessionCredentials credentials) {
+ request.addHeader("x-amz-security-token", credentials.getSessionToken());
+ }
+
+ private String extractRegionName(URI endpoint) {
+ if (regionName != null) return regionName;
+
+ String host = endpoint.getHost();
+
+ // If we don't recognize the domain, just return the default
+ if (!host.endsWith(".amazonaws.com")) return "us-east-1";
+
+ String serviceAndRegion = host.substring(0, host.indexOf(".amazonaws.com"));
+
+ char separator = '.';
+ if (serviceAndRegion.startsWith("s3")) separator = '-';
+
+ if (serviceAndRegion.indexOf(separator) == -1) return "us-east-1";
+
+ String region = serviceAndRegion.substring(serviceAndRegion.indexOf(separator) + 1);
+ if ("us-gov".equals(region)) {
+ return "us-gov-west-1";
+ }
+
+ return region;
+ }
+
+ private String extractServiceName(URI endpoint) {
+ if (serviceName != null) return serviceName;
+
+ String host = endpoint.getHost();
+
+ // If we don't recognize the domain, just return the default
+ if (!host.endsWith(".amazonaws.com")) return "us-east-1";
+
+ String serviceAndRegion = host.substring(0, host.indexOf(".amazonaws.com"));
+
+ char separator = '.';
+ if (serviceAndRegion.startsWith("s3")) separator = '-';
+
+ if (serviceAndRegion.indexOf(separator) == -1) return "us-east-1";
+
+ String service = serviceAndRegion.substring(0, serviceAndRegion.indexOf(separator));
+ return service;
+ }
+
+ void overrideDate(Date overriddenDate) {
+ this.overriddenDate = overriddenDate;
+ }
+
+ private String getCanonicalizedHeaderString(Request request) {
+ List sortedHeaders = new ArrayList();
+ sortedHeaders.addAll(request.getHeaders().keySet());
+ Collections.sort(sortedHeaders, String.CASE_INSENSITIVE_ORDER);
+
+ StringBuilder buffer = new StringBuilder();
+ for (String header : sortedHeaders) {
+ buffer.append(header.toLowerCase() + ":" + request.getHeaders().get(header));
+ buffer.append("\n");
+ }
+
+ return buffer.toString();
+ }
+
+ private String getSignedHeadersString(Request request) {
+ List sortedHeaders = new ArrayList();
+ sortedHeaders.addAll(request.getHeaders().keySet());
+ Collections.sort(sortedHeaders, String.CASE_INSENSITIVE_ORDER);
+
+ StringBuilder buffer = new StringBuilder();
+ for (String header : sortedHeaders) {
+ if (buffer.length() > 0) buffer.append(";");
+ buffer.append(header.toLowerCase());
+ }
+
+ return buffer.toString();
+ }
+
+}
diff --git a/src/com/amazonaws/auth/AWSCredentials.java b/src/com/amazonaws/auth/AWSCredentials.java
index e5c287c4..7854e0b6 100644
--- a/src/com/amazonaws/auth/AWSCredentials.java
+++ b/src/com/amazonaws/auth/AWSCredentials.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/AWSCredentialsProvider.java b/src/com/amazonaws/auth/AWSCredentialsProvider.java
index b8a06811..ab163a50 100644
--- a/src/com/amazonaws/auth/AWSCredentialsProvider.java
+++ b/src/com/amazonaws/auth/AWSCredentialsProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2011-2012 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.
@@ -43,4 +43,4 @@ public interface AWSCredentialsProvider {
*/
public void refresh();
-}
\ No newline at end of file
+}
diff --git a/src/com/amazonaws/auth/AWSRefreshableSessionCredentials.java b/src/com/amazonaws/auth/AWSRefreshableSessionCredentials.java
index 28005283..b5f587c0 100644
--- a/src/com/amazonaws/auth/AWSRefreshableSessionCredentials.java
+++ b/src/com/amazonaws/auth/AWSRefreshableSessionCredentials.java
@@ -1,3 +1,17 @@
+/*
+ * Copyright 2011-2012 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.auth;
/**
@@ -10,4 +24,4 @@ public interface AWSRefreshableSessionCredentials extends AWSSessionCredentials
*/
public void refreshCredentials();
-}
\ No newline at end of file
+}
diff --git a/src/com/amazonaws/auth/AWSSessionCredentials.java b/src/com/amazonaws/auth/AWSSessionCredentials.java
index fe625284..d6bae56f 100644
--- a/src/com/amazonaws/auth/AWSSessionCredentials.java
+++ b/src/com/amazonaws/auth/AWSSessionCredentials.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon Technologies, Inc.
+ * Copyright 2011-2012 Amazon Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/com/amazonaws/auth/AbstractAWSSigner.java b/src/com/amazonaws/auth/AbstractAWSSigner.java
index 3652bc88..47c61d95 100644
--- a/src/com/amazonaws/auth/AbstractAWSSigner.java
+++ b/src/com/amazonaws/auth/AbstractAWSSigner.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -14,8 +14,10 @@
*/
package com.amazonaws.auth;
+import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URI;
+import java.security.MessageDigest;
import java.util.Iterator;
import java.util.Map;
import java.util.SortedMap;
@@ -29,6 +31,7 @@
import com.amazonaws.AmazonClientException;
import com.amazonaws.Request;
import com.amazonaws.util.HttpUtils;
+import com.amazonaws.util.StringInputStream;
/**
* Abstract base class for AWS signing protocol implementations. Provides
@@ -43,32 +46,86 @@ public abstract class AbstractAWSSigner implements Signer {
private static final String DEFAULT_ENCODING = "UTF-8";
/**
- * Computes an RFC 2104-compliant HMAC signature.
+ * Computes an RFC 2104-compliant HMAC signature and returns the result as a
+ * Base64 encoded string.
*/
- protected String sign(String data, String key, SigningAlgorithm algorithm)
+ protected String signAndBase64Encode(String data, String key, SigningAlgorithm algorithm)
throws AmazonClientException {
try {
- return sign(data.getBytes(DEFAULT_ENCODING), key, algorithm);
+ return signAndBase64Encode(data.getBytes(DEFAULT_ENCODING), key, algorithm);
} catch (UnsupportedEncodingException e) {
throw new AmazonClientException("Unable to calculate a request signature: " + e.getMessage(), e);
}
}
/**
- * Computes an RFC 2104-compliant HMAC signature for an array of bytes.
+ * Computes an RFC 2104-compliant HMAC signature for an array of bytes and
+ * returns the result as a Base64 encoded string.
*/
- protected String sign(byte[] data, String key, SigningAlgorithm algorithm)
+ protected String signAndBase64Encode(byte[] data, String key, SigningAlgorithm algorithm)
throws AmazonClientException {
try {
- Mac mac = Mac.getInstance(algorithm.toString());
- mac.init(new SecretKeySpec(key.getBytes(), algorithm.toString()));
- byte[] signature = Base64.encodeBase64(mac.doFinal(data));
- return new String(signature);
+ byte[] signature = sign(data, key.getBytes(DEFAULT_ENCODING), algorithm);
+ return new String(Base64.encodeBase64(signature));
} catch (Exception e) {
throw new AmazonClientException("Unable to calculate a request signature: " + e.getMessage(), e);
}
}
+ protected byte[] sign(String stringData, byte[] key, SigningAlgorithm algorithm) throws AmazonClientException {
+ try {
+ byte[] data = stringData.getBytes(DEFAULT_ENCODING);
+ return sign(data, key, algorithm);
+ } catch (Exception e) {
+ throw new AmazonClientException("Unable to calculate a request signature: " + e.getMessage(), e);
+ }
+ }
+
+ protected byte[] sign(byte[] data, byte[] key, SigningAlgorithm algorithm) throws AmazonClientException {
+ try {
+ Mac mac = Mac.getInstance(algorithm.toString());
+ mac.init(new SecretKeySpec(key, algorithm.toString()));
+ return mac.doFinal(data);
+ } catch (Exception e) {
+ throw new AmazonClientException("Unable to calculate a request signature: " + e.getMessage(), e);
+ }
+ }
+
+ /**
+ * Hashes the string contents (assumed to be UTF-8) using the SHA-256
+ * algorithm.
+ *
+ * @param text
+ * The string to hash.
+ *
+ * @return The hashed bytes from the specified string.
+ *
+ * @throws AmazonClientException
+ * If the hash cannot be computed.
+ */
+ protected byte[] hash(String text) throws AmazonClientException {
+ try {
+ MessageDigest md = MessageDigest.getInstance("SHA-256");
+ md.update(text.getBytes(DEFAULT_ENCODING));
+ return md.digest();
+ } catch (Exception e) {
+ throw new AmazonClientException("Unable to compute hash while signing request: " + e.getMessage(), e);
+ }
+ }
+
+ /**
+ * Examines the specified query string parameters and returns a
+ * canonicalized form.
+ *
+ * The canonicalized query string is formed by first sorting all the query
+ * string parameters, then URI encoding both the key and value and then
+ * joining them, in order, separating key value pairs with an '&'.
+ *
+ * @param parameters
+ * The query string parameters to be canonicalized.
+ *
+ * @return A canonicalized form for the specified query string parameters.
+ */
protected String getCanonicalizedQueryString(Map parameters) {
SortedMap sorted = new TreeMap();
sorted.putAll(parameters);
@@ -90,12 +147,57 @@ protected String getCanonicalizedQueryString(Map parameters) {
return builder.toString();
}
- protected String getCanonicalizedResourcePath(URI endpoint) {
- String uri = endpoint.getPath();
- if (uri == null || uri.length() == 0) {
+ protected String getCanonicalizedQueryString(Request request) {
+ /*
+ * If we're using POST and we don't have any request payload content,
+ * then any request query parameters will be sent as the payload, and
+ * not in the actual query string.
+ */
+ if (HttpUtils.usePayloadForQueryParameters(request)) return "";
+ else return this.getCanonicalizedQueryString(request.getParameters());
+ }
+
+ protected String getRequestPayload(Request request) {
+ if (HttpUtils.usePayloadForQueryParameters(request)) {
+ String encodedParameters = HttpUtils.encodeParameters(request);
+ if (encodedParameters == null) return "";
+ return encodedParameters;
+ }
+
+ return getRequestPayloadWithoutQueryParams(request);
+ }
+
+ protected String getRequestPayloadWithoutQueryParams(Request request) {
+ try {
+ InputStream content = request.getContent();
+ if (content == null) return "";
+
+ if (content instanceof StringInputStream) {
+ return ((StringInputStream)content).getString();
+ }
+
+ if (!content.markSupported()) {
+ throw new AmazonClientException("Unable to read request payload to sign request.");
+ }
+
+ StringBuilder sb = new StringBuilder();
+ content.mark(-1);
+ int b;
+ while ((b = content.read()) > -1) {
+ sb.append((char)b);
+ }
+ content.reset();
+ return sb.toString();
+ } catch (Exception e) {
+ throw new AmazonClientException("Unable to read request payload to sign request: " + e.getMessage(), e);
+ }
+ }
+
+ protected String getCanonicalizedResourcePath(String resourcePath) {
+ if (resourcePath == null || resourcePath.length() == 0) {
return "/";
} else {
- return HttpUtils.urlEncode(uri, true);
+ return HttpUtils.urlEncode(resourcePath, true);
}
}
@@ -123,11 +225,11 @@ protected String getCanonicalizedEndpoint(URI endpoint) {
*
* Returns either a {@link BasicSessionCredentials} or a
* {@link BasicAWSCredentials} object, depending on the input type.
- *
+ *
* @param credentials
* @return A new credentials object with the sanitized credentials.
*/
- protected AWSCredentials sanitizeCredentials(AWSCredentials credentials) {
+ protected AWSCredentials sanitizeCredentials(AWSCredentials credentials) {
String accessKeyId = null;
String secretKey = null;
String token = null;
@@ -145,18 +247,18 @@ protected AWSCredentials sanitizeCredentials(AWSCredentials credentials) {
if (credentials instanceof AWSSessionCredentials) {
return new BasicSessionCredentials(accessKeyId, secretKey, token);
}
-
+
return new BasicAWSCredentials(accessKeyId, secretKey);
}
-
+
/**
* Adds session credentials to the request given.
- *
+ *
* @param request
* The request to add session credentials information to
* @param credentials
* The session credentials to add to the request
*/
protected abstract void addSessionCredentials(Request request, AWSSessionCredentials credentials);
-
+
}
diff --git a/src/com/amazonaws/auth/BasicAWSCredentials.java b/src/com/amazonaws/auth/BasicAWSCredentials.java
index 21ec6f79..e62e4599 100644
--- a/src/com/amazonaws/auth/BasicAWSCredentials.java
+++ b/src/com/amazonaws/auth/BasicAWSCredentials.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/BasicSessionCredentials.java b/src/com/amazonaws/auth/BasicSessionCredentials.java
index 6ddde606..dcc46b79 100644
--- a/src/com/amazonaws/auth/BasicSessionCredentials.java
+++ b/src/com/amazonaws/auth/BasicSessionCredentials.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon Technologies, Inc.
+ * Copyright 2011-2012 Amazon Technologies, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
diff --git a/src/com/amazonaws/auth/PropertiesCredentials.java b/src/com/amazonaws/auth/PropertiesCredentials.java
index 54d706ea..2de7e3bb 100644
--- a/src/com/amazonaws/auth/PropertiesCredentials.java
+++ b/src/com/amazonaws/auth/PropertiesCredentials.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/QueryStringSigner.java b/src/com/amazonaws/auth/QueryStringSigner.java
index 218dc058..94f0ef5d 100644
--- a/src/com/amazonaws/auth/QueryStringSigner.java
+++ b/src/com/amazonaws/auth/QueryStringSigner.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -65,7 +65,7 @@ public void sign(Request request, SignatureVersion version, SigningAlgorithm
request.addParameter("AWSAccessKeyId", sanitizedCredentials.getAWSAccessKeyId());
request.addParameter("SignatureVersion", version.toString());
request.addParameter("Timestamp", getFormattedTimestamp());
-
+
if ( sanitizedCredentials instanceof AWSSessionCredentials ) {
addSessionCredentials(request, (AWSSessionCredentials) sanitizedCredentials);
}
@@ -75,12 +75,12 @@ public void sign(Request request, SignatureVersion version, SigningAlgorithm
stringToSign = calculateStringToSignV1(request.getParameters());
} else if ( version.equals( SignatureVersion.V2 ) ) {
request.addParameter("SignatureMethod", algorithm.toString());
- stringToSign = calculateStringToSignV2(request.getEndpoint(), request.getParameters());
+ stringToSign = calculateStringToSignV2(request);
} else {
throw new AmazonClientException("Invalid Signature Version specified");
}
- String signatureValue = sign(stringToSign, sanitizedCredentials.getAWSSecretKey(), algorithm);
+ String signatureValue = signAndBase64Encode(stringToSign, sanitizedCredentials.getAWSSecretKey(), algorithm);
request.addParameter("Signature", signatureValue);
}
@@ -109,23 +109,22 @@ private String calculateStringToSignV1(Map parameters) {
/**
* Calculate string to sign for signature version 2.
*
- * @param parameters
- * request parameters
- *
- * @param serviceUrl
- * service url
+ * @param request
+ * The request being signed.
*
* @return String to sign
*
* @throws AmazonClientException
* If the string to sign cannot be calculated.
*/
- private String calculateStringToSignV2(URI endpoint,
- Map parameters) throws AmazonClientException {
+ private String calculateStringToSignV2(Request request) throws AmazonClientException {
+ URI endpoint = request.getEndpoint();
+ Map parameters = request.getParameters();
+
StringBuilder data = new StringBuilder();
data.append("POST").append("\n");
data.append(getCanonicalizedEndpoint(endpoint)).append("\n");
- data.append(getCanonicalizedResourcePath(endpoint)).append("\n");
+ data.append(getCanonicalizedResourcePath(request.getResourcePath())).append("\n");
data.append(getCanonicalizedQueryString(parameters));
return data.toString();
}
diff --git a/src/com/amazonaws/auth/RenewableAWSSessionCredentials.java b/src/com/amazonaws/auth/RenewableAWSSessionCredentials.java
deleted file mode 100644
index 7ef8c8bb..00000000
--- a/src/com/amazonaws/auth/RenewableAWSSessionCredentials.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright 2011 Amazon Technologies, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at:
- *
- * http://aws.amazon.com/apache2.0
- *
- * 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.auth;
-
-/**
- * AWSSessionCredientials that automatically renew themselves as necessary.
- */
-public interface RenewableAWSSessionCredentials extends AWSSessionCredentials {
-
- /**
- * Atomically returns immutable credentials for this object. This accessor
- * is recommended over {@link AWSCredentials#getAWSAccessKeyId()},
- * {@link AWSCredentials#getAWSSecretKey()},
- * {@link RenewableAWSSessionCredentials#getSessionToken()} for session credentials,
- * since it's possible that credential information could change in between
- * calls to each of these accessors.
- */
- public AWSSessionCredentials getImmutableCredentials();
-}
diff --git a/src/com/amazonaws/auth/SignatureVersion.java b/src/com/amazonaws/auth/SignatureVersion.java
index d7e07dca..d4feb730 100644
--- a/src/com/amazonaws/auth/SignatureVersion.java
+++ b/src/com/amazonaws/auth/SignatureVersion.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/Signer.java b/src/com/amazonaws/auth/Signer.java
index d71e1f5b..dbd6590e 100644
--- a/src/com/amazonaws/auth/Signer.java
+++ b/src/com/amazonaws/auth/Signer.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/SigningAlgorithm.java b/src/com/amazonaws/auth/SigningAlgorithm.java
index 20f08c42..badf4f28 100644
--- a/src/com/amazonaws/auth/SigningAlgorithm.java
+++ b/src/com/amazonaws/auth/SigningAlgorithm.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/Action.java b/src/com/amazonaws/auth/policy/Action.java
index 3b3dee1c..a6b8780a 100644
--- a/src/com/amazonaws/auth/policy/Action.java
+++ b/src/com/amazonaws/auth/policy/Action.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/Condition.java b/src/com/amazonaws/auth/policy/Condition.java
index f98d6a2c..7c9314bb 100644
--- a/src/com/amazonaws/auth/policy/Condition.java
+++ b/src/com/amazonaws/auth/policy/Condition.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/Policy.java b/src/com/amazonaws/auth/policy/Policy.java
index 228d545d..079e24b7 100644
--- a/src/com/amazonaws/auth/policy/Policy.java
+++ b/src/com/amazonaws/auth/policy/Policy.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/Principal.java b/src/com/amazonaws/auth/policy/Principal.java
index 29a13f8e..08a4b27d 100644
--- a/src/com/amazonaws/auth/policy/Principal.java
+++ b/src/com/amazonaws/auth/policy/Principal.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/Resource.java b/src/com/amazonaws/auth/policy/Resource.java
index b3cf68ee..c914dda2 100644
--- a/src/com/amazonaws/auth/policy/Resource.java
+++ b/src/com/amazonaws/auth/policy/Resource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/Statement.java b/src/com/amazonaws/auth/policy/Statement.java
index 2fc11b8a..418f1648 100644
--- a/src/com/amazonaws/auth/policy/Statement.java
+++ b/src/com/amazonaws/auth/policy/Statement.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/actions/S3Actions.java b/src/com/amazonaws/auth/policy/actions/S3Actions.java
index 1ebda273..f31b223d 100644
--- a/src/com/amazonaws/auth/policy/actions/S3Actions.java
+++ b/src/com/amazonaws/auth/policy/actions/S3Actions.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/actions/SNSActions.java b/src/com/amazonaws/auth/policy/actions/SNSActions.java
index 7156b4fc..5155f96e 100644
--- a/src/com/amazonaws/auth/policy/actions/SNSActions.java
+++ b/src/com/amazonaws/auth/policy/actions/SNSActions.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/actions/SQSActions.java b/src/com/amazonaws/auth/policy/actions/SQSActions.java
index 7b2f0d1c..c0a11623 100644
--- a/src/com/amazonaws/auth/policy/actions/SQSActions.java
+++ b/src/com/amazonaws/auth/policy/actions/SQSActions.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -50,6 +50,13 @@ public enum SQSActions implements Action {
*/
CreateQueue("sqs:CreateQueue"),
+ /**
+ * Action for the GetQueueUrl operation on Amazon SQS.
+ *
+ * @see AmazonSQS#getQueueUrl(com.amazonaws.services.sqs.model.GetQueueUrlRequest)
+ */
+ GetQueueUrl("sqs:GetQueueUrl"),
+
/**
* Action for the DeleteMessage operation on Amazon SQS.
*
@@ -104,7 +111,28 @@ public enum SQSActions implements Action {
*
* @see AmazonSQS#setQueueAttributes(com.amazonaws.services.sqs.model.SetQueueAttributesRequest)
*/
- SetQueueAttributes("sqs:SetQueueAttributes");
+ SetQueueAttributes("sqs:SetQueueAttributes"),
+
+ /**
+ * Action for the SendMessageBatch operation on Amazon SQS.
+ *
+ * @see AmazonSQS#sendMessageBatch(com.amazonaws.services.sqs.model.SendMessageBatchRequest)
+ */
+ SendMessageBatch("sqs:SendMessageBatch"),
+
+ /**
+ * Action for the ChangeMessageVisibilityBatch operation on Amazon SQS.
+ *
+ * @see AmazonSQS#changeMessageVisibilityBatch(com.amazonaws.services.sqs.model.ChangeMessageVisibilityBatchRequest)
+ */
+ ChangeMessageVisibilityBatch("sqs:ChangeMessageVisibilityBatch"),
+
+ /**
+ * Action for the DeleteMessageBatch operation on Amazon SQS.
+ *
+ * @see AmazonSQS#deleteMessageBatch(com.amazonaws.services.sqs.model.DeleteMessageBatchRequest)
+ */
+ DeleteMessageBatch("sqs:DeleteMessageBatch");
private final String action;
@@ -116,4 +144,4 @@ public String getActionName() {
return this.action;
}
-}
\ No newline at end of file
+}
diff --git a/src/com/amazonaws/auth/policy/actions/package-info.java b/src/com/amazonaws/auth/policy/actions/package-info.java
index e8cecf30..1ad10a38 100644
--- a/src/com/amazonaws/auth/policy/actions/package-info.java
+++ b/src/com/amazonaws/auth/policy/actions/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/ArnCondition.java b/src/com/amazonaws/auth/policy/conditions/ArnCondition.java
index 875f4afe..99abcad3 100644
--- a/src/com/amazonaws/auth/policy/conditions/ArnCondition.java
+++ b/src/com/amazonaws/auth/policy/conditions/ArnCondition.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/BooleanCondition.java b/src/com/amazonaws/auth/policy/conditions/BooleanCondition.java
index d55bf61d..9ba42dbf 100644
--- a/src/com/amazonaws/auth/policy/conditions/BooleanCondition.java
+++ b/src/com/amazonaws/auth/policy/conditions/BooleanCondition.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/ConditionFactory.java b/src/com/amazonaws/auth/policy/conditions/ConditionFactory.java
index b770c696..02f46c75 100644
--- a/src/com/amazonaws/auth/policy/conditions/ConditionFactory.java
+++ b/src/com/amazonaws/auth/policy/conditions/ConditionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/DateCondition.java b/src/com/amazonaws/auth/policy/conditions/DateCondition.java
index 6da24456..6320e1b3 100644
--- a/src/com/amazonaws/auth/policy/conditions/DateCondition.java
+++ b/src/com/amazonaws/auth/policy/conditions/DateCondition.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/IpAddressCondition.java b/src/com/amazonaws/auth/policy/conditions/IpAddressCondition.java
index 043d3b02..78239ea3 100644
--- a/src/com/amazonaws/auth/policy/conditions/IpAddressCondition.java
+++ b/src/com/amazonaws/auth/policy/conditions/IpAddressCondition.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/NumericCondition.java b/src/com/amazonaws/auth/policy/conditions/NumericCondition.java
index 1ab0a68c..aa5314b0 100644
--- a/src/com/amazonaws/auth/policy/conditions/NumericCondition.java
+++ b/src/com/amazonaws/auth/policy/conditions/NumericCondition.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/S3ConditionFactory.java b/src/com/amazonaws/auth/policy/conditions/S3ConditionFactory.java
index 5bfc043b..08fe99f7 100644
--- a/src/com/amazonaws/auth/policy/conditions/S3ConditionFactory.java
+++ b/src/com/amazonaws/auth/policy/conditions/S3ConditionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/SNSConditionFactory.java b/src/com/amazonaws/auth/policy/conditions/SNSConditionFactory.java
index a17f56c3..956eff09 100644
--- a/src/com/amazonaws/auth/policy/conditions/SNSConditionFactory.java
+++ b/src/com/amazonaws/auth/policy/conditions/SNSConditionFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/StringCondition.java b/src/com/amazonaws/auth/policy/conditions/StringCondition.java
index 1206f60a..ed535e65 100644
--- a/src/com/amazonaws/auth/policy/conditions/StringCondition.java
+++ b/src/com/amazonaws/auth/policy/conditions/StringCondition.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/conditions/package-info.java b/src/com/amazonaws/auth/policy/conditions/package-info.java
index ef4b9ae7..af1254e2 100644
--- a/src/com/amazonaws/auth/policy/conditions/package-info.java
+++ b/src/com/amazonaws/auth/policy/conditions/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/internal/JsonPolicyWriter.java b/src/com/amazonaws/auth/policy/internal/JsonPolicyWriter.java
index cf72983e..b43109e9 100644
--- a/src/com/amazonaws/auth/policy/internal/JsonPolicyWriter.java
+++ b/src/com/amazonaws/auth/policy/internal/JsonPolicyWriter.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/package-info.java b/src/com/amazonaws/auth/policy/package-info.java
index 4d8ed0c5..adf2fb48 100644
--- a/src/com/amazonaws/auth/policy/package-info.java
+++ b/src/com/amazonaws/auth/policy/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/resources/S3BucketResource.java b/src/com/amazonaws/auth/policy/resources/S3BucketResource.java
index 91471579..867a0bef 100644
--- a/src/com/amazonaws/auth/policy/resources/S3BucketResource.java
+++ b/src/com/amazonaws/auth/policy/resources/S3BucketResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/resources/S3ObjectResource.java b/src/com/amazonaws/auth/policy/resources/S3ObjectResource.java
index bfd544ba..e62e6232 100644
--- a/src/com/amazonaws/auth/policy/resources/S3ObjectResource.java
+++ b/src/com/amazonaws/auth/policy/resources/S3ObjectResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/resources/SQSQueueResource.java b/src/com/amazonaws/auth/policy/resources/SQSQueueResource.java
index 33a00bd6..dd93af6a 100644
--- a/src/com/amazonaws/auth/policy/resources/SQSQueueResource.java
+++ b/src/com/amazonaws/auth/policy/resources/SQSQueueResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/auth/policy/resources/package-info.java b/src/com/amazonaws/auth/policy/resources/package-info.java
index a6a9cb0d..b9de9dea 100644
--- a/src/com/amazonaws/auth/policy/resources/package-info.java
+++ b/src/com/amazonaws/auth/policy/resources/package-info.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/handlers/AbstractRequestHandler.java b/src/com/amazonaws/handlers/AbstractRequestHandler.java
index 10922368..f4103cb3 100644
--- a/src/com/amazonaws/handlers/AbstractRequestHandler.java
+++ b/src/com/amazonaws/handlers/AbstractRequestHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -24,4 +24,4 @@ public abstract class AbstractRequestHandler implements RequestHandler {
public void beforeRequest(Request request) {}
public void afterResponse(Request request, Object response, TimingInfo timingInfo) {}
public void afterError(Request request, Exception e) {}
-}
\ No newline at end of file
+}
diff --git a/src/com/amazonaws/handlers/HandlerChainFactory.java b/src/com/amazonaws/handlers/HandlerChainFactory.java
index e1e1adc3..75d7d835 100644
--- a/src/com/amazonaws/handlers/HandlerChainFactory.java
+++ b/src/com/amazonaws/handlers/HandlerChainFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/handlers/RequestHandler.java b/src/com/amazonaws/handlers/RequestHandler.java
index c0fb8ccb..7ab09160 100644
--- a/src/com/amazonaws/handlers/RequestHandler.java
+++ b/src/com/amazonaws/handlers/RequestHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/http/AmazonHttpClient.java b/src/com/amazonaws/http/AmazonHttpClient.java
index 92be182e..173b64c0 100644
--- a/src/com/amazonaws/http/AmazonHttpClient.java
+++ b/src/com/amazonaws/http/AmazonHttpClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -46,6 +46,7 @@
import com.amazonaws.Request;
import com.amazonaws.ResponseMetadata;
import com.amazonaws.handlers.RequestHandler;
+import com.amazonaws.internal.CustomBackoffStrategy;
import com.amazonaws.util.CountingInputStream;
import com.amazonaws.util.ResponseMetadataCache;
import com.amazonaws.util.TimingInfo;
@@ -249,7 +250,7 @@ private T executeHelper(Request request,
org.apache.http.HttpResponse response = null;
try {
if (retryCount > 0) {
- pauseExponentially(retryCount, exception);
+ pauseExponentially(retryCount, exception, executionContext.getCustomBackoffStrategy());
if (entity != null && entity.getContent().markSupported()) {
entity.getContent().reset();
}
@@ -484,6 +485,7 @@ private T handleResponse(Request request,
}
}
+
/**
* Responsible for handling an error response, including unmarshalling the
* error response into the most specific exception type possible, and
@@ -516,12 +518,20 @@ private AmazonServiceException handleErrorResponse(Request request,
exception = errorResponseHandler.handle(response);
requestLog.info("Received error response: " + exception.toString());
} catch (Exception e) {
- // If the errorResponseHandler doesn't work, then check for a
- // VIP spill-over error response before giving up...
- if (status == 503 && "Service Unavailable".equalsIgnoreCase(apacheHttpResponse.getStatusLine().getReasonPhrase())) {
- exception = new AmazonServiceException("Service Unavailable");
+ // If the errorResponseHandler doesn't work, then check for error
+ // responses that don't have any content
+ if (status == 413) {
+ exception = new AmazonServiceException("Request entity too large");
+ exception.setServiceName(request.getServiceName());
+ exception.setStatusCode(413);
+ exception.setErrorType(ErrorType.Client);
+ exception.setErrorCode("Request entity too large");
+ } else if (status == 503 && "Service Unavailable".equalsIgnoreCase(apacheHttpResponse.getStatusLine().getReasonPhrase())) {
+ exception = new AmazonServiceException("Service unavailable");
+ exception.setServiceName(request.getServiceName());
+ exception.setStatusCode(503);
exception.setErrorType(ErrorType.Service);
- exception.setErrorCode("Service Unavailable");
+ exception.setErrorCode("Service unavailable");
} else {
String errorMessage = "Unable to unmarshall error response (" + e.getMessage() + ")";
log.error(errorMessage, e);
@@ -576,12 +586,17 @@ private HttpResponse createResponse(HttpRequestBase method, Request request,
* @param previousException
* Exception information for the previous attempt, if any.
*/
- private void pauseExponentially(int retries, AmazonServiceException previousException) {
- long scaleFactor = 300;
- if ( isThrottlingException(previousException) ) {
- scaleFactor = 500 + random.nextInt(100);
+ private void pauseExponentially(int retries, AmazonServiceException previousException, CustomBackoffStrategy backoffStrategy) {
+ long delay = 0;
+ if (backoffStrategy != null) {
+ delay = backoffStrategy.getBackoffPeriod(retries);
+ } else {
+ long scaleFactor = 300;
+ if ( isThrottlingException(previousException) ) {
+ scaleFactor = 500 + random.nextInt(100);
+ }
+ delay = (long) (Math.pow(2, retries) * scaleFactor);
}
- long delay = (long) (Math.pow(2, retries) * scaleFactor);
delay = Math.min(delay, MAX_BACKOFF_IN_MILLISECONDS);
log.debug("Retriable error detected, will retry in " + delay + "ms, attempt number: " + retries);
@@ -604,7 +619,9 @@ private void pauseExponentially(int retries, AmazonServiceException previousExce
*/
private boolean isThrottlingException(AmazonServiceException ase) {
if (ase == null) return false;
- return "Throttling".equals(ase.getErrorCode());
+ return "Throttling".equals(ase.getErrorCode())
+ || "ThrottlingException".equals(ase.getErrorCode())
+ || "ProvisionedThroughputExceededException".equals(ase.getErrorCode());
}
@Override
diff --git a/src/com/amazonaws/http/ConnectionManagerFactory.java b/src/com/amazonaws/http/ConnectionManagerFactory.java
index 5aed851e..8d9db236 100644
--- a/src/com/amazonaws/http/ConnectionManagerFactory.java
+++ b/src/com/amazonaws/http/ConnectionManagerFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2011-2012 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.
@@ -14,15 +14,6 @@
*/
package com.amazonaws.http;
-import org.apache.http.conn.params.ConnManagerParams;
-import org.apache.http.conn.params.ConnPerRouteBean;
-
-import org.apache.http.conn.scheme.Scheme;
-import org.apache.http.conn.scheme.SchemeRegistry;
-import org.apache.http.conn.scheme.PlainSocketFactory;
-
-import org.apache.http.conn.ssl.SSLSocketFactory;
-
import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager;
import org.apache.http.params.HttpParams;
@@ -32,16 +23,10 @@
class ConnectionManagerFactory {
public static ThreadSafeClientConnManager createThreadSafeClientConnManager( ClientConfiguration config, HttpParams httpClientParams ) {
- ConnManagerParams.setMaxConnectionsPerRoute( httpClientParams, new ConnPerRouteBean( 20 ) );
-
- SSLSocketFactory sslSocketFactory = SSLSocketFactory.getSocketFactory();
- sslSocketFactory.setHostnameVerifier( SSLSocketFactory.STRICT_HOSTNAME_VERIFIER );
-
- SchemeRegistry registry = new SchemeRegistry( );
- registry.register( new Scheme("http", PlainSocketFactory.getSocketFactory(), 80) );
- registry.register( new Scheme("https", sslSocketFactory, 443) );
-
- return new ThreadSafeClientConnManager(httpClientParams,registry);
- }
+ ThreadSafeClientConnManager connectionManager = new ThreadSafeClientConnManager();
+ connectionManager.setDefaultMaxPerRoute(config.getMaxConnections());
+ connectionManager.setMaxTotal(config.getMaxConnections());
+ return connectionManager;
+ }
}
diff --git a/src/com/amazonaws/http/DefaultErrorResponseHandler.java b/src/com/amazonaws/http/DefaultErrorResponseHandler.java
index 23f9a5f5..96a65a8a 100644
--- a/src/com/amazonaws/http/DefaultErrorResponseHandler.java
+++ b/src/com/amazonaws/http/DefaultErrorResponseHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/http/ExecutionContext.java b/src/com/amazonaws/http/ExecutionContext.java
index ec0d1e32..e6de9419 100644
--- a/src/com/amazonaws/http/ExecutionContext.java
+++ b/src/com/amazonaws/http/ExecutionContext.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2011-2012 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.
@@ -19,12 +19,14 @@
import com.amazonaws.auth.AWSCredentials;
import com.amazonaws.auth.Signer;
import com.amazonaws.handlers.RequestHandler;
+import com.amazonaws.internal.CustomBackoffStrategy;
import com.amazonaws.util.TimingInfo;
public class ExecutionContext {
private List requestHandlers;
private String contextUserAgent;
private TimingInfo timingInfo;
+ private CustomBackoffStrategy backoffStrategy;
/** Optional signer to enable the runtime layer to handle signing requests (and resigning on retries). */
private Signer signer;
@@ -108,4 +110,27 @@ public void setCredentials(AWSCredentials credentials) {
this.credentials = credentials;
}
-}
\ No newline at end of file
+ /**
+ * Returns the optional custom backoff strategy for controlling how long
+ * between retries on error responses. If no custom backoff strategy is
+ * specified, a default exponential backoff strategy is used.
+ *
+ * @return the optional custom backoff strategy for the associated request.
+ */
+ public CustomBackoffStrategy getCustomBackoffStrategy() {
+ return backoffStrategy;
+ }
+
+ /**
+ * Sets the optional custom backoff strategy for controlling how long
+ * between retries on error responses. If no custom backoff strategy is
+ * specified, a default exponential backoff strategy is used.
+ *
+ * @param backoffStrategy
+ * The optional custom backoff strategy for the associated
+ * request.
+ */
+ public void setCustomBackoffStrategy(CustomBackoffStrategy backoffStrategy) {
+ this.backoffStrategy = backoffStrategy;
+ }
+}
diff --git a/src/com/amazonaws/http/HttpClientFactory.java b/src/com/amazonaws/http/HttpClientFactory.java
index abfc4df7..8a273362 100644
--- a/src/com/amazonaws/http/HttpClientFactory.java
+++ b/src/com/amazonaws/http/HttpClientFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2011-2012 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.
@@ -88,7 +88,7 @@ public HttpClient createHttpClient(ClientConfiguration config) {
* register a new scheme for HTTPS that won't cause self-signed certs to
* error out.
*/
- if (false) {
+ if (System.getProperty("com.amazonaws.sdk.disableCertChecking") != null) {
Scheme sch = new Scheme("https", 443, new TrustingSocketFactory());
httpClient.getConnectionManager().getSchemeRegistry().register(sch);
}
diff --git a/src/com/amazonaws/http/HttpMethodName.java b/src/com/amazonaws/http/HttpMethodName.java
index dc121752..e9a730b6 100644
--- a/src/com/amazonaws/http/HttpMethodName.java
+++ b/src/com/amazonaws/http/HttpMethodName.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/http/HttpMethodReleaseInputStream.java b/src/com/amazonaws/http/HttpMethodReleaseInputStream.java
index 35533413..e5c09ecb 100644
--- a/src/com/amazonaws/http/HttpMethodReleaseInputStream.java
+++ b/src/com/amazonaws/http/HttpMethodReleaseInputStream.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 Amazon.com, Inc. or its affiliates. All Rights Reserved.
*
* Portions copyright 2006-2009 James Murty. Please see LICENSE.txt
* for applicable license terms and NOTICE.txt for applicable notices.
diff --git a/src/com/amazonaws/http/HttpRequest.java b/src/com/amazonaws/http/HttpRequest.java
index a2a6f0d7..1ac230a6 100644
--- a/src/com/amazonaws/http/HttpRequest.java
+++ b/src/com/amazonaws/http/HttpRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/http/HttpRequestFactory.java b/src/com/amazonaws/http/HttpRequestFactory.java
index 431cbdce..e3538ead 100644
--- a/src/com/amazonaws/http/HttpRequestFactory.java
+++ b/src/com/amazonaws/http/HttpRequestFactory.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2011-2012 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.
@@ -17,22 +17,17 @@
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map.Entry;
import org.apache.http.HttpEntity;
-import org.apache.http.NameValuePair;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpHead;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.client.methods.HttpRequestBase;
-import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.http.entity.BufferedHttpEntity;
import org.apache.http.entity.StringEntity;
-import org.apache.http.message.BasicNameValuePair;
import org.apache.http.params.CoreProtocolPNames;
import com.amazonaws.AmazonClientException;
@@ -42,9 +37,9 @@
/** Responsible for creating Apache HttpClient 4 request objects. */
class HttpRequestFactory {
-
+
private static final String DEFAULT_ENCODING = "UTF-8";
-
+
/**
* Creates an HttpClient method object based on the specified request and
* populates any parameters, headers, etc. from the original request.
@@ -70,7 +65,7 @@ HttpRequestBase createHttpRequest(Request request, ClientConfiguration client
uri += request.getResourcePath();
}
- String encodedParams = encodeParameters(request);
+ String encodedParams = HttpUtils.encodeParameters(request);
/*
* For all non-POST requests, and any POST requests that already have a
@@ -134,10 +129,10 @@ HttpRequestBase createHttpRequest(Request request, ClientConfiguration client
}
configureHeaders(httpRequest, request, context, clientConfiguration);
-
+
return httpRequest;
}
-
+
/** Configures the headers in the specified Apache HTTP request. */
private void configureHeaders(HttpRequestBase httpRequest, Request request, ExecutionContext context, ClientConfiguration clientConfiguration) {
/*
@@ -167,47 +162,20 @@ private void configureHeaders(HttpRequestBase httpRequest, Request request, E
httpRequest.addHeader(entry.getKey(), entry.getValue());
}
-
+
/* Set content type and encoding */
if (httpRequest.getHeaders("Content-Type") == null || httpRequest.getHeaders("Content-Type").length == 0) {
httpRequest.addHeader("Content-Type",
"application/x-www-form-urlencoded; " +
"charset=" + DEFAULT_ENCODING.toLowerCase());
}
-
+
// Override the user agent string specified in the client params if the context requires it
if (context != null && context.getContextUserAgent() != null) {
httpRequest.addHeader("User-Agent", createUserAgentString(clientConfiguration, context.getContextUserAgent()));
}
}
- /**
- * Creates an encoded query string from all the parameters in the specified
- * request.
- *
- * @param request
- * The request containing the parameters to encode.
- *
- * @return Null if no parameters were present, otherwise the encoded query
- * string for the parameters present in the specified request.
- */
- private String encodeParameters(Request request) {
- List nameValuePairs = null;
- if (request.getParameters().size() > 0) {
- nameValuePairs = new ArrayList(request.getParameters().size());
- for (Entry entry : request.getParameters().entrySet()) {
- nameValuePairs.add(new BasicNameValuePair(entry.getKey(), entry.getValue()));
- }
- }
-
- String encodedParams = null;
- if (nameValuePairs != null) {
- encodedParams = URLEncodedUtils.format(nameValuePairs, DEFAULT_ENCODING);
- }
-
- return encodedParams;
- }
-
/** Appends the given user-agent string to the client's existing one and returns it. */
private String createUserAgentString(ClientConfiguration clientConfiguration, String contextUserAgent) {
if (clientConfiguration.getUserAgent().contains(contextUserAgent)) {
@@ -220,10 +188,10 @@ private String createUserAgentString(ClientConfiguration clientConfiguration, St
/**
* Utility function for creating a new StringEntity and wrapping any errors
* as an AmazonClientException.
- *
+ *
* @param s
* The string contents of the returned HTTP entity.
- *
+ *
* @return A new StringEntity with the specified contents.
*/
private HttpEntity newStringEntity(String s) {
@@ -233,14 +201,14 @@ private HttpEntity newStringEntity(String s) {
throw new AmazonClientException("Unable to create HTTP entity: " + e.getMessage(), e);
}
}
-
+
/**
* Utility function for creating a new BufferedEntity and wrapping any errors
* as an AmazonClientException.
- *
+ *
* @param entity
* The HTTP entity to wrap with a buffered HTTP entity.
- *
+ *
* @return A new BufferedHttpEntity wrapping the specified entity.
*/
private HttpEntity newBufferedHttpEntity(HttpEntity entity) {
@@ -250,4 +218,4 @@ private HttpEntity newBufferedHttpEntity(HttpEntity entity) {
throw new AmazonClientException("Unable to create HTTP entity: " + e.getMessage(), e);
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/amazonaws/http/HttpResponse.java b/src/com/amazonaws/http/HttpResponse.java
index fbe58ff8..883fc4e0 100644
--- a/src/com/amazonaws/http/HttpResponse.java
+++ b/src/com/amazonaws/http/HttpResponse.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/http/HttpResponseHandler.java b/src/com/amazonaws/http/HttpResponseHandler.java
index 8b3a1eef..ba44894b 100644
--- a/src/com/amazonaws/http/HttpResponseHandler.java
+++ b/src/com/amazonaws/http/HttpResponseHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/http/JsonErrorResponseHandler.java b/src/com/amazonaws/http/JsonErrorResponseHandler.java
index ccf29ae0..7f930d69 100644
--- a/src/com/amazonaws/http/JsonErrorResponseHandler.java
+++ b/src/com/amazonaws/http/JsonErrorResponseHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2011-2012 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.
@@ -17,55 +17,73 @@
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.List;
import java.util.Map.Entry;
import com.amazonaws.AmazonClientException;
import com.amazonaws.AmazonServiceException;
import com.amazonaws.AmazonServiceException.ErrorType;
-import com.amazonaws.util.json.JSONException;
+import com.amazonaws.transform.Unmarshaller;
import com.amazonaws.util.json.JSONObject;
public class JsonErrorResponseHandler implements HttpResponseHandler {
+ /**
+ * The list of error response unmarshallers to try to apply to error
+ * responses.
+ */
+ private List> unmarshallerList;
+
+ public JsonErrorResponseHandler(List> exceptionUnmarshallers) {
+ this.unmarshallerList = exceptionUnmarshallers;
+ }
+
public AmazonServiceException handle(HttpResponse response) throws Exception {
JSONObject jsonErrorMessage = new JSONObject(readStreamContents(response.getContent()));
- String message = null;
- try {
- message = jsonErrorMessage.getString("message");
- } catch (JSONException jsone) {}
-
- AmazonServiceException exception = new AmazonServiceException(message);
- exception.setServiceName(response.getRequest().getServiceName());
- if (jsonErrorMessage.getString("__type") != null) {
- String type = jsonErrorMessage.getString("__type");
- int separator = type.lastIndexOf("#");
- if (separator > 0) {
- exception.setErrorCode(type.substring(separator + 1));
- }
- }
+ AmazonServiceException ase = runErrorUnmarshallers(response, jsonErrorMessage);
+ if (ase == null) return null;
- exception.setStatusCode(response.getStatusCode());
+ ase.setServiceName(response.getRequest().getServiceName());
+ ase.setStatusCode(response.getStatusCode());
if (response.getStatusCode() < 500) {
- exception.setErrorType(ErrorType.Client);
+ ase.setErrorType(ErrorType.Client);
} else {
- exception.setErrorType(ErrorType.Service);
+ ase.setErrorType(ErrorType.Service);
}
for (Entry headerEntry : response.getHeaders().entrySet()) {
if (headerEntry.getKey().equalsIgnoreCase("X-Amzn-RequestId")) {
- exception.setRequestId(headerEntry.getValue());
+ ase.setRequestId(headerEntry.getValue());
}
}
- return exception;
+ return ase;
+ }
+
+ protected AmazonServiceException runErrorUnmarshallers(HttpResponse errorResponse, JSONObject json) throws Exception {
+ /*
+ * We need to select which exception unmarshaller is the correct one to
+ * use from all the possible exceptions this operation can throw.
+ * Currently we rely on the unmarshallers to return null if they can't
+ * unmarshall the response, but we might need something a little more
+ * sophisticated in the future.
+ */
+ for (Unmarshaller unmarshaller : unmarshallerList) {
+ AmazonServiceException ase = unmarshaller.unmarshall(json);
+ if (ase != null) {
+ ase.setStatusCode(errorResponse.getStatusCode());
+ return ase;
+ }
+ }
+
+ return null;
}
public boolean needsConnectionLeftOpen() {
return false;
}
-
private String readStreamContents(final InputStream stream) {
try {
BufferedReader reader = new BufferedReader(new InputStreamReader(stream));
@@ -83,4 +101,4 @@ private String readStreamContents(final InputStream stream) {
}
}
-}
\ No newline at end of file
+}
diff --git a/src/com/amazonaws/http/JsonResponseHandler.java b/src/com/amazonaws/http/JsonResponseHandler.java
index ad8c15ec..27df5ec3 100644
--- a/src/com/amazonaws/http/JsonResponseHandler.java
+++ b/src/com/amazonaws/http/JsonResponseHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -80,16 +80,13 @@ public AmazonWebServiceResponse handle(HttpResponse response) throws Exceptio
try {
AmazonWebServiceResponse awsResponse = new AmazonWebServiceResponse();
JsonUnmarshallerContext unmarshallerContext = new JsonUnmarshallerContext(jsonParser);
-
- // TODO: Anything else to do for JSON metadata?
- unmarshallerContext.registerMetadataExpression("ResponseMetadata/RequestId", 2, ResponseMetadata.AWS_REQUEST_ID);
- unmarshallerContext.registerMetadataExpression("requestId", 2, ResponseMetadata.AWS_REQUEST_ID);
registerAdditionalMetadataExpressions(unmarshallerContext);
T result = responseUnmarshaller.unmarshall(unmarshallerContext);
awsResponse.setResult(result);
Map metadata = unmarshallerContext.getMetadata();
+ metadata.put(ResponseMetadata.AWS_REQUEST_ID, response.getHeaders().get("x-amzn-RequestId"));
awsResponse.setResponseMetadata(new ResponseMetadata(metadata));
log.trace("Done parsing service response");
diff --git a/src/com/amazonaws/http/RepeatableInputStreamRequestEntity.java b/src/com/amazonaws/http/RepeatableInputStreamRequestEntity.java
index f25051fc..d57e3e52 100644
--- a/src/com/amazonaws/http/RepeatableInputStreamRequestEntity.java
+++ b/src/com/amazonaws/http/RepeatableInputStreamRequestEntity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/http/StaxResponseHandler.java b/src/com/amazonaws/http/StaxResponseHandler.java
index e6bff829..ad204119 100644
--- a/src/com/amazonaws/http/StaxResponseHandler.java
+++ b/src/com/amazonaws/http/StaxResponseHandler.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/internal/CustomBackoffStrategy.java b/src/com/amazonaws/internal/CustomBackoffStrategy.java
new file mode 100644
index 00000000..a2c580f3
--- /dev/null
+++ b/src/com/amazonaws/internal/CustomBackoffStrategy.java
@@ -0,0 +1,19 @@
+/*
+ * Copyright 2012 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.internal;
+
+public abstract class CustomBackoffStrategy {
+ public abstract int getBackoffPeriod(int retryAttempts);
+}
\ No newline at end of file
diff --git a/src/com/amazonaws/internal/DynamoDBBackoffStrategy.java b/src/com/amazonaws/internal/DynamoDBBackoffStrategy.java
new file mode 100644
index 00000000..cdac3071
--- /dev/null
+++ b/src/com/amazonaws/internal/DynamoDBBackoffStrategy.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2012 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.internal;
+
+public class DynamoDBBackoffStrategy extends CustomBackoffStrategy {
+ public int getBackoffPeriod(int retries) {
+ return (retries == 0) ? 0 : 50 * (int)Math.pow(2, retries - 1);
+ }
+
+ public static final CustomBackoffStrategy DEFAULT = new DynamoDBBackoffStrategy();
+}
\ No newline at end of file
diff --git a/src/com/amazonaws/internal/StaticCredentialsProvider.java b/src/com/amazonaws/internal/StaticCredentialsProvider.java
index 6d716afd..b14a6867 100644
--- a/src/com/amazonaws/internal/StaticCredentialsProvider.java
+++ b/src/com/amazonaws/internal/StaticCredentialsProvider.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2011-2012 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.
diff --git a/src/com/amazonaws/sdk/versionInfo.properties b/src/com/amazonaws/sdk/versionInfo.properties
index 2a9b5a7e..003664c8 100644
--- a/src/com/amazonaws/sdk/versionInfo.properties
+++ b/src/com/amazonaws/sdk/versionInfo.properties
@@ -1,2 +1,2 @@
-version = 1.0.4
+version = 1.1.0
platform = android
diff --git a/src/com/amazonaws/services/autoscaling/AmazonAutoScaling.java b/src/com/amazonaws/services/autoscaling/AmazonAutoScaling.java
index 837d8c58..7be0c3c1 100644
--- a/src/com/amazonaws/services/autoscaling/AmazonAutoScaling.java
+++ b/src/com/amazonaws/services/autoscaling/AmazonAutoScaling.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/services/autoscaling/AmazonAutoScalingAsync.java b/src/com/amazonaws/services/autoscaling/AmazonAutoScalingAsync.java
index b1f0d6c4..17054eae 100644
--- a/src/com/amazonaws/services/autoscaling/AmazonAutoScalingAsync.java
+++ b/src/com/amazonaws/services/autoscaling/AmazonAutoScalingAsync.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/services/autoscaling/AmazonAutoScalingAsyncClient.java b/src/com/amazonaws/services/autoscaling/AmazonAutoScalingAsyncClient.java
index 49ae8df4..45b8c7fe 100644
--- a/src/com/amazonaws/services/autoscaling/AmazonAutoScalingAsyncClient.java
+++ b/src/com/amazonaws/services/autoscaling/AmazonAutoScalingAsyncClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/services/autoscaling/AmazonAutoScalingClient.java b/src/com/amazonaws/services/autoscaling/AmazonAutoScalingClient.java
index 67992f55..b8b06914 100644
--- a/src/com/amazonaws/services/autoscaling/AmazonAutoScalingClient.java
+++ b/src/com/amazonaws/services/autoscaling/AmazonAutoScalingClient.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/services/autoscaling/model/Activity.java b/src/com/amazonaws/services/autoscaling/model/Activity.java
index ed35c958..d527abf9 100644
--- a/src/com/amazonaws/services/autoscaling/model/Activity.java
+++ b/src/com/amazonaws/services/autoscaling/model/Activity.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -478,18 +478,64 @@ public Activity withProgress(Integer progress) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("ActivityId: " + activityId + ", ");
- sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
- sb.append("Description: " + description + ", ");
- sb.append("Cause: " + cause + ", ");
- sb.append("StartTime: " + startTime + ", ");
- sb.append("EndTime: " + endTime + ", ");
- sb.append("StatusCode: " + statusCode + ", ");
- sb.append("StatusMessage: " + statusMessage + ", ");
- sb.append("Progress: " + progress + ", ");
+ if (activityId != null) sb.append("ActivityId: " + activityId + ", ");
+ if (autoScalingGroupName != null) sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
+ if (description != null) sb.append("Description: " + description + ", ");
+ if (cause != null) sb.append("Cause: " + cause + ", ");
+ if (startTime != null) sb.append("StartTime: " + startTime + ", ");
+ if (endTime != null) sb.append("EndTime: " + endTime + ", ");
+ if (statusCode != null) sb.append("StatusCode: " + statusCode + ", ");
+ if (statusMessage != null) sb.append("StatusMessage: " + statusMessage + ", ");
+ if (progress != null) sb.append("Progress: " + progress + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getActivityId() == null) ? 0 : getActivityId().hashCode());
+ hashCode = prime * hashCode + ((getAutoScalingGroupName() == null) ? 0 : getAutoScalingGroupName().hashCode());
+ hashCode = prime * hashCode + ((getDescription() == null) ? 0 : getDescription().hashCode());
+ hashCode = prime * hashCode + ((getCause() == null) ? 0 : getCause().hashCode());
+ hashCode = prime * hashCode + ((getStartTime() == null) ? 0 : getStartTime().hashCode());
+ hashCode = prime * hashCode + ((getEndTime() == null) ? 0 : getEndTime().hashCode());
+ hashCode = prime * hashCode + ((getStatusCode() == null) ? 0 : getStatusCode().hashCode());
+ hashCode = prime * hashCode + ((getStatusMessage() == null) ? 0 : getStatusMessage().hashCode());
+ hashCode = prime * hashCode + ((getProgress() == null) ? 0 : getProgress().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof Activity == false) return false;
+ Activity other = (Activity)obj;
+
+ if (other.getActivityId() == null ^ this.getActivityId() == null) return false;
+ if (other.getActivityId() != null && other.getActivityId().equals(this.getActivityId()) == false) return false;
+ if (other.getAutoScalingGroupName() == null ^ this.getAutoScalingGroupName() == null) return false;
+ if (other.getAutoScalingGroupName() != null && other.getAutoScalingGroupName().equals(this.getAutoScalingGroupName()) == false) return false;
+ if (other.getDescription() == null ^ this.getDescription() == null) return false;
+ if (other.getDescription() != null && other.getDescription().equals(this.getDescription()) == false) return false;
+ if (other.getCause() == null ^ this.getCause() == null) return false;
+ if (other.getCause() != null && other.getCause().equals(this.getCause()) == false) return false;
+ if (other.getStartTime() == null ^ this.getStartTime() == null) return false;
+ if (other.getStartTime() != null && other.getStartTime().equals(this.getStartTime()) == false) return false;
+ if (other.getEndTime() == null ^ this.getEndTime() == null) return false;
+ if (other.getEndTime() != null && other.getEndTime().equals(this.getEndTime()) == false) return false;
+ if (other.getStatusCode() == null ^ this.getStatusCode() == null) return false;
+ if (other.getStatusCode() != null && other.getStatusCode().equals(this.getStatusCode()) == false) return false;
+ if (other.getStatusMessage() == null ^ this.getStatusMessage() == null) return false;
+ if (other.getStatusMessage() != null && other.getStatusMessage().equals(this.getStatusMessage()) == false) return false;
+ if (other.getProgress() == null ^ this.getProgress() == null) return false;
+ if (other.getProgress() != null && other.getProgress().equals(this.getProgress()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/AdjustmentType.java b/src/com/amazonaws/services/autoscaling/model/AdjustmentType.java
index 0babd278..2df985da 100644
--- a/src/com/amazonaws/services/autoscaling/model/AdjustmentType.java
+++ b/src/com/amazonaws/services/autoscaling/model/AdjustmentType.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -104,10 +104,32 @@ public AdjustmentType withAdjustmentType(String adjustmentType) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AdjustmentType: " + adjustmentType + ", ");
+ if (adjustmentType != null) sb.append("AdjustmentType: " + adjustmentType + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getAdjustmentType() == null) ? 0 : getAdjustmentType().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof AdjustmentType == false) return false;
+ AdjustmentType other = (AdjustmentType)obj;
+
+ if (other.getAdjustmentType() == null ^ this.getAdjustmentType() == null) return false;
+ if (other.getAdjustmentType() != null && other.getAdjustmentType().equals(this.getAdjustmentType()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/Alarm.java b/src/com/amazonaws/services/autoscaling/model/Alarm.java
index 0876df4c..17d60752 100644
--- a/src/com/amazonaws/services/autoscaling/model/Alarm.java
+++ b/src/com/amazonaws/services/autoscaling/model/Alarm.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -143,11 +143,36 @@ public Alarm withAlarmARN(String alarmARN) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AlarmName: " + alarmName + ", ");
- sb.append("AlarmARN: " + alarmARN + ", ");
+ if (alarmName != null) sb.append("AlarmName: " + alarmName + ", ");
+ if (alarmARN != null) sb.append("AlarmARN: " + alarmARN + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getAlarmName() == null) ? 0 : getAlarmName().hashCode());
+ hashCode = prime * hashCode + ((getAlarmARN() == null) ? 0 : getAlarmARN().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof Alarm == false) return false;
+ Alarm other = (Alarm)obj;
+
+ if (other.getAlarmName() == null ^ this.getAlarmName() == null) return false;
+ if (other.getAlarmName() != null && other.getAlarmName().equals(this.getAlarmName()) == false) return false;
+ if (other.getAlarmARN() == null ^ this.getAlarmARN() == null) return false;
+ if (other.getAlarmARN() != null && other.getAlarmARN().equals(this.getAlarmARN()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/AlreadyExistsException.java b/src/com/amazonaws/services/autoscaling/model/AlreadyExistsException.java
index e80b5f43..4de1a986 100644
--- a/src/com/amazonaws/services/autoscaling/model/AlreadyExistsException.java
+++ b/src/com/amazonaws/services/autoscaling/model/AlreadyExistsException.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
diff --git a/src/com/amazonaws/services/autoscaling/model/AutoScalingGroup.java b/src/com/amazonaws/services/autoscaling/model/AutoScalingGroup.java
index 2559ee4e..72b7b025 100644
--- a/src/com/amazonaws/services/autoscaling/model/AutoScalingGroup.java
+++ b/src/com/amazonaws/services/autoscaling/model/AutoScalingGroup.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -454,10 +454,13 @@ public java.util.List getAvailabilityZones() {
* @param availabilityZones Contains a list of availability zones for the group.
*/
public void setAvailabilityZones(java.util.Collection availabilityZones) {
- java.util.List availabilityZonesCopy = new java.util.ArrayList();
- if (availabilityZones != null) {
- availabilityZonesCopy.addAll(availabilityZones);
+ if (availabilityZones == null) {
+ this.availabilityZones = null;
+ return;
}
+
+ java.util.List availabilityZonesCopy = new java.util.ArrayList(availabilityZones.size());
+ availabilityZonesCopy.addAll(availabilityZones);
this.availabilityZones = availabilityZonesCopy;
}
@@ -475,7 +478,7 @@ public void setAvailabilityZones(java.util.Collection availabilityZones)
* together.
*/
public AutoScalingGroup withAvailabilityZones(String... availabilityZones) {
- if (getAvailabilityZones() == null) setAvailabilityZones(new java.util.ArrayList());
+ if (getAvailabilityZones() == null) setAvailabilityZones(new java.util.ArrayList(availabilityZones.length));
for (String value : availabilityZones) {
getAvailabilityZones().add(value);
}
@@ -496,11 +499,13 @@ public AutoScalingGroup withAvailabilityZones(String... availabilityZones) {
* together.
*/
public AutoScalingGroup withAvailabilityZones(java.util.Collection availabilityZones) {
- java.util.List availabilityZonesCopy = new java.util.ArrayList();
- if (availabilityZones != null) {
+ if (availabilityZones == null) {
+ this.availabilityZones = null;
+ } else {
+ java.util.List availabilityZonesCopy = new java.util.ArrayList(availabilityZones.size());
availabilityZonesCopy.addAll(availabilityZones);
+ this.availabilityZones = availabilityZonesCopy;
}
- this.availabilityZones = availabilityZonesCopy;
return this;
}
@@ -524,10 +529,13 @@ public java.util.List getLoadBalancerNames() {
* @param loadBalancerNames A list of load balancers associated with this Auto Scaling group.
*/
public void setLoadBalancerNames(java.util.Collection loadBalancerNames) {
- java.util.List loadBalancerNamesCopy = new java.util.ArrayList();
- if (loadBalancerNames != null) {
- loadBalancerNamesCopy.addAll(loadBalancerNames);
+ if (loadBalancerNames == null) {
+ this.loadBalancerNames = null;
+ return;
}
+
+ java.util.List loadBalancerNamesCopy = new java.util.ArrayList(loadBalancerNames.size());
+ loadBalancerNamesCopy.addAll(loadBalancerNames);
this.loadBalancerNames = loadBalancerNamesCopy;
}
@@ -542,7 +550,7 @@ public void setLoadBalancerNames(java.util.Collection loadBalancerNames)
* together.
*/
public AutoScalingGroup withLoadBalancerNames(String... loadBalancerNames) {
- if (getLoadBalancerNames() == null) setLoadBalancerNames(new java.util.ArrayList());
+ if (getLoadBalancerNames() == null) setLoadBalancerNames(new java.util.ArrayList(loadBalancerNames.length));
for (String value : loadBalancerNames) {
getLoadBalancerNames().add(value);
}
@@ -560,11 +568,13 @@ public AutoScalingGroup withLoadBalancerNames(String... loadBalancerNames) {
* together.
*/
public AutoScalingGroup withLoadBalancerNames(java.util.Collection loadBalancerNames) {
- java.util.List loadBalancerNamesCopy = new java.util.ArrayList();
- if (loadBalancerNames != null) {
+ if (loadBalancerNames == null) {
+ this.loadBalancerNames = null;
+ } else {
+ java.util.List loadBalancerNamesCopy = new java.util.ArrayList(loadBalancerNames.size());
loadBalancerNamesCopy.addAll(loadBalancerNames);
+ this.loadBalancerNames = loadBalancerNamesCopy;
}
- this.loadBalancerNames = loadBalancerNamesCopy;
return this;
}
@@ -686,10 +696,13 @@ public java.util.List getInstances() {
* @param instances Provides a summary list of EC2 instances.
*/
public void setInstances(java.util.Collection instances) {
- java.util.List instancesCopy = new java.util.ArrayList();
- if (instances != null) {
- instancesCopy.addAll(instances);
+ if (instances == null) {
+ this.instances = null;
+ return;
}
+
+ java.util.List instancesCopy = new java.util.ArrayList(instances.size());
+ instancesCopy.addAll(instances);
this.instances = instancesCopy;
}
@@ -704,7 +717,7 @@ public void setInstances(java.util.Collection instances) {
* together.
*/
public AutoScalingGroup withInstances(Instance... instances) {
- if (getInstances() == null) setInstances(new java.util.ArrayList());
+ if (getInstances() == null) setInstances(new java.util.ArrayList(instances.length));
for (Instance value : instances) {
getInstances().add(value);
}
@@ -722,11 +735,13 @@ public AutoScalingGroup withInstances(Instance... instances) {
* together.
*/
public AutoScalingGroup withInstances(java.util.Collection instances) {
- java.util.List instancesCopy = new java.util.ArrayList();
- if (instances != null) {
+ if (instances == null) {
+ this.instances = null;
+ } else {
+ java.util.List instancesCopy = new java.util.ArrayList(instances.size());
instancesCopy.addAll(instances);
+ this.instances = instancesCopy;
}
- this.instances = instancesCopy;
return this;
}
@@ -784,10 +799,13 @@ public java.util.List getSuspendedProcesses() {
* @param suspendedProcesses Suspended processes associated with this Auto Scaling group.
*/
public void setSuspendedProcesses(java.util.Collection suspendedProcesses) {
- java.util.List suspendedProcessesCopy = new java.util.ArrayList();
- if (suspendedProcesses != null) {
- suspendedProcessesCopy.addAll(suspendedProcesses);
+ if (suspendedProcesses == null) {
+ this.suspendedProcesses = null;
+ return;
}
+
+ java.util.List suspendedProcessesCopy = new java.util.ArrayList(suspendedProcesses.size());
+ suspendedProcessesCopy.addAll(suspendedProcesses);
this.suspendedProcesses = suspendedProcessesCopy;
}
@@ -802,7 +820,7 @@ public void setSuspendedProcesses(java.util.Collection suspend
* together.
*/
public AutoScalingGroup withSuspendedProcesses(SuspendedProcess... suspendedProcesses) {
- if (getSuspendedProcesses() == null) setSuspendedProcesses(new java.util.ArrayList());
+ if (getSuspendedProcesses() == null) setSuspendedProcesses(new java.util.ArrayList(suspendedProcesses.length));
for (SuspendedProcess value : suspendedProcesses) {
getSuspendedProcesses().add(value);
}
@@ -820,11 +838,13 @@ public AutoScalingGroup withSuspendedProcesses(SuspendedProcess... suspendedProc
* together.
*/
public AutoScalingGroup withSuspendedProcesses(java.util.Collection suspendedProcesses) {
- java.util.List suspendedProcessesCopy = new java.util.ArrayList();
- if (suspendedProcesses != null) {
+ if (suspendedProcesses == null) {
+ this.suspendedProcesses = null;
+ } else {
+ java.util.List suspendedProcessesCopy = new java.util.ArrayList(suspendedProcesses.size());
suspendedProcessesCopy.addAll(suspendedProcesses);
+ this.suspendedProcesses = suspendedProcessesCopy;
}
- this.suspendedProcesses = suspendedProcessesCopy;
return this;
}
@@ -958,10 +978,13 @@ public java.util.List getEnabledMetrics() {
* @param enabledMetrics A list of metrics enabled for this Auto Scaling group.
*/
public void setEnabledMetrics(java.util.Collection enabledMetrics) {
- java.util.List enabledMetricsCopy = new java.util.ArrayList();
- if (enabledMetrics != null) {
- enabledMetricsCopy.addAll(enabledMetrics);
+ if (enabledMetrics == null) {
+ this.enabledMetrics = null;
+ return;
}
+
+ java.util.List enabledMetricsCopy = new java.util.ArrayList(enabledMetrics.size());
+ enabledMetricsCopy.addAll(enabledMetrics);
this.enabledMetrics = enabledMetricsCopy;
}
@@ -976,7 +999,7 @@ public void setEnabledMetrics(java.util.Collection enabledMetrics
* together.
*/
public AutoScalingGroup withEnabledMetrics(EnabledMetric... enabledMetrics) {
- if (getEnabledMetrics() == null) setEnabledMetrics(new java.util.ArrayList());
+ if (getEnabledMetrics() == null) setEnabledMetrics(new java.util.ArrayList(enabledMetrics.length));
for (EnabledMetric value : enabledMetrics) {
getEnabledMetrics().add(value);
}
@@ -994,11 +1017,13 @@ public AutoScalingGroup withEnabledMetrics(EnabledMetric... enabledMetrics) {
* together.
*/
public AutoScalingGroup withEnabledMetrics(java.util.Collection enabledMetrics) {
- java.util.List enabledMetricsCopy = new java.util.ArrayList();
- if (enabledMetrics != null) {
+ if (enabledMetrics == null) {
+ this.enabledMetrics = null;
+ } else {
+ java.util.List enabledMetricsCopy = new java.util.ArrayList(enabledMetrics.size());
enabledMetricsCopy.addAll(enabledMetrics);
+ this.enabledMetrics = enabledMetricsCopy;
}
- this.enabledMetrics = enabledMetricsCopy;
return this;
}
@@ -1061,27 +1086,100 @@ public AutoScalingGroup withStatus(String status) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
- sb.append("AutoScalingGroupARN: " + autoScalingGroupARN + ", ");
- sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
- sb.append("MinSize: " + minSize + ", ");
- sb.append("MaxSize: " + maxSize + ", ");
- sb.append("DesiredCapacity: " + desiredCapacity + ", ");
- sb.append("DefaultCooldown: " + defaultCooldown + ", ");
- sb.append("AvailabilityZones: " + availabilityZones + ", ");
- sb.append("LoadBalancerNames: " + loadBalancerNames + ", ");
- sb.append("HealthCheckType: " + healthCheckType + ", ");
- sb.append("HealthCheckGracePeriod: " + healthCheckGracePeriod + ", ");
- sb.append("Instances: " + instances + ", ");
- sb.append("CreatedTime: " + createdTime + ", ");
- sb.append("SuspendedProcesses: " + suspendedProcesses + ", ");
- sb.append("PlacementGroup: " + placementGroup + ", ");
- sb.append("VPCZoneIdentifier: " + vPCZoneIdentifier + ", ");
- sb.append("EnabledMetrics: " + enabledMetrics + ", ");
- sb.append("Status: " + status + ", ");
+ if (autoScalingGroupName != null) sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
+ if (autoScalingGroupARN != null) sb.append("AutoScalingGroupARN: " + autoScalingGroupARN + ", ");
+ if (launchConfigurationName != null) sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
+ if (minSize != null) sb.append("MinSize: " + minSize + ", ");
+ if (maxSize != null) sb.append("MaxSize: " + maxSize + ", ");
+ if (desiredCapacity != null) sb.append("DesiredCapacity: " + desiredCapacity + ", ");
+ if (defaultCooldown != null) sb.append("DefaultCooldown: " + defaultCooldown + ", ");
+ if (availabilityZones != null) sb.append("AvailabilityZones: " + availabilityZones + ", ");
+ if (loadBalancerNames != null) sb.append("LoadBalancerNames: " + loadBalancerNames + ", ");
+ if (healthCheckType != null) sb.append("HealthCheckType: " + healthCheckType + ", ");
+ if (healthCheckGracePeriod != null) sb.append("HealthCheckGracePeriod: " + healthCheckGracePeriod + ", ");
+ if (instances != null) sb.append("Instances: " + instances + ", ");
+ if (createdTime != null) sb.append("CreatedTime: " + createdTime + ", ");
+ if (suspendedProcesses != null) sb.append("SuspendedProcesses: " + suspendedProcesses + ", ");
+ if (placementGroup != null) sb.append("PlacementGroup: " + placementGroup + ", ");
+ if (vPCZoneIdentifier != null) sb.append("VPCZoneIdentifier: " + vPCZoneIdentifier + ", ");
+ if (enabledMetrics != null) sb.append("EnabledMetrics: " + enabledMetrics + ", ");
+ if (status != null) sb.append("Status: " + status + ", ");
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 + ((getAutoScalingGroupARN() == null) ? 0 : getAutoScalingGroupARN().hashCode());
+ hashCode = prime * hashCode + ((getLaunchConfigurationName() == null) ? 0 : getLaunchConfigurationName().hashCode());
+ hashCode = prime * hashCode + ((getMinSize() == null) ? 0 : getMinSize().hashCode());
+ hashCode = prime * hashCode + ((getMaxSize() == null) ? 0 : getMaxSize().hashCode());
+ hashCode = prime * hashCode + ((getDesiredCapacity() == null) ? 0 : getDesiredCapacity().hashCode());
+ hashCode = prime * hashCode + ((getDefaultCooldown() == null) ? 0 : getDefaultCooldown().hashCode());
+ hashCode = prime * hashCode + ((getAvailabilityZones() == null) ? 0 : getAvailabilityZones().hashCode());
+ hashCode = prime * hashCode + ((getLoadBalancerNames() == null) ? 0 : getLoadBalancerNames().hashCode());
+ hashCode = prime * hashCode + ((getHealthCheckType() == null) ? 0 : getHealthCheckType().hashCode());
+ hashCode = prime * hashCode + ((getHealthCheckGracePeriod() == null) ? 0 : getHealthCheckGracePeriod().hashCode());
+ hashCode = prime * hashCode + ((getInstances() == null) ? 0 : getInstances().hashCode());
+ hashCode = prime * hashCode + ((getCreatedTime() == null) ? 0 : getCreatedTime().hashCode());
+ hashCode = prime * hashCode + ((getSuspendedProcesses() == null) ? 0 : getSuspendedProcesses().hashCode());
+ hashCode = prime * hashCode + ((getPlacementGroup() == null) ? 0 : getPlacementGroup().hashCode());
+ hashCode = prime * hashCode + ((getVPCZoneIdentifier() == null) ? 0 : getVPCZoneIdentifier().hashCode());
+ hashCode = prime * hashCode + ((getEnabledMetrics() == null) ? 0 : getEnabledMetrics().hashCode());
+ hashCode = prime * hashCode + ((getStatus() == null) ? 0 : getStatus().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof AutoScalingGroup == false) return false;
+ AutoScalingGroup other = (AutoScalingGroup)obj;
+
+ if (other.getAutoScalingGroupName() == null ^ this.getAutoScalingGroupName() == null) return false;
+ if (other.getAutoScalingGroupName() != null && other.getAutoScalingGroupName().equals(this.getAutoScalingGroupName()) == false) return false;
+ if (other.getAutoScalingGroupARN() == null ^ this.getAutoScalingGroupARN() == null) return false;
+ if (other.getAutoScalingGroupARN() != null && other.getAutoScalingGroupARN().equals(this.getAutoScalingGroupARN()) == false) return false;
+ if (other.getLaunchConfigurationName() == null ^ this.getLaunchConfigurationName() == null) return false;
+ if (other.getLaunchConfigurationName() != null && other.getLaunchConfigurationName().equals(this.getLaunchConfigurationName()) == false) return false;
+ if (other.getMinSize() == null ^ this.getMinSize() == null) return false;
+ if (other.getMinSize() != null && other.getMinSize().equals(this.getMinSize()) == false) return false;
+ if (other.getMaxSize() == null ^ this.getMaxSize() == null) return false;
+ if (other.getMaxSize() != null && other.getMaxSize().equals(this.getMaxSize()) == false) return false;
+ if (other.getDesiredCapacity() == null ^ this.getDesiredCapacity() == null) return false;
+ if (other.getDesiredCapacity() != null && other.getDesiredCapacity().equals(this.getDesiredCapacity()) == false) return false;
+ if (other.getDefaultCooldown() == null ^ this.getDefaultCooldown() == null) return false;
+ if (other.getDefaultCooldown() != null && other.getDefaultCooldown().equals(this.getDefaultCooldown()) == false) return false;
+ if (other.getAvailabilityZones() == null ^ this.getAvailabilityZones() == null) return false;
+ if (other.getAvailabilityZones() != null && other.getAvailabilityZones().equals(this.getAvailabilityZones()) == false) return false;
+ if (other.getLoadBalancerNames() == null ^ this.getLoadBalancerNames() == null) return false;
+ if (other.getLoadBalancerNames() != null && other.getLoadBalancerNames().equals(this.getLoadBalancerNames()) == false) return false;
+ if (other.getHealthCheckType() == null ^ this.getHealthCheckType() == null) return false;
+ if (other.getHealthCheckType() != null && other.getHealthCheckType().equals(this.getHealthCheckType()) == false) return false;
+ if (other.getHealthCheckGracePeriod() == null ^ this.getHealthCheckGracePeriod() == null) return false;
+ if (other.getHealthCheckGracePeriod() != null && other.getHealthCheckGracePeriod().equals(this.getHealthCheckGracePeriod()) == false) return false;
+ if (other.getInstances() == null ^ this.getInstances() == null) return false;
+ if (other.getInstances() != null && other.getInstances().equals(this.getInstances()) == false) return false;
+ if (other.getCreatedTime() == null ^ this.getCreatedTime() == null) return false;
+ if (other.getCreatedTime() != null && other.getCreatedTime().equals(this.getCreatedTime()) == false) return false;
+ if (other.getSuspendedProcesses() == null ^ this.getSuspendedProcesses() == null) return false;
+ if (other.getSuspendedProcesses() != null && other.getSuspendedProcesses().equals(this.getSuspendedProcesses()) == false) return false;
+ if (other.getPlacementGroup() == null ^ this.getPlacementGroup() == null) return false;
+ if (other.getPlacementGroup() != null && other.getPlacementGroup().equals(this.getPlacementGroup()) == false) return false;
+ if (other.getVPCZoneIdentifier() == null ^ this.getVPCZoneIdentifier() == null) return false;
+ if (other.getVPCZoneIdentifier() != null && other.getVPCZoneIdentifier().equals(this.getVPCZoneIdentifier()) == false) return false;
+ if (other.getEnabledMetrics() == null ^ this.getEnabledMetrics() == null) return false;
+ if (other.getEnabledMetrics() != null && other.getEnabledMetrics().equals(this.getEnabledMetrics()) == false) return false;
+ if (other.getStatus() == null ^ this.getStatus() == null) return false;
+ if (other.getStatus() != null && other.getStatus().equals(this.getStatus()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/AutoScalingInstanceDetails.java b/src/com/amazonaws/services/autoscaling/model/AutoScalingInstanceDetails.java
index 9a1d7894..e0222899 100644
--- a/src/com/amazonaws/services/autoscaling/model/AutoScalingInstanceDetails.java
+++ b/src/com/amazonaws/services/autoscaling/model/AutoScalingInstanceDetails.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -377,15 +377,52 @@ public AutoScalingInstanceDetails withLaunchConfigurationName(String launchConfi
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("InstanceId: " + instanceId + ", ");
- sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
- sb.append("AvailabilityZone: " + availabilityZone + ", ");
- sb.append("LifecycleState: " + lifecycleState + ", ");
- sb.append("HealthStatus: " + healthStatus + ", ");
- sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
+ if (instanceId != null) sb.append("InstanceId: " + instanceId + ", ");
+ if (autoScalingGroupName != null) sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
+ if (availabilityZone != null) sb.append("AvailabilityZone: " + availabilityZone + ", ");
+ if (lifecycleState != null) sb.append("LifecycleState: " + lifecycleState + ", ");
+ if (healthStatus != null) sb.append("HealthStatus: " + healthStatus + ", ");
+ if (launchConfigurationName != null) sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getInstanceId() == null) ? 0 : getInstanceId().hashCode());
+ hashCode = prime * hashCode + ((getAutoScalingGroupName() == null) ? 0 : getAutoScalingGroupName().hashCode());
+ hashCode = prime * hashCode + ((getAvailabilityZone() == null) ? 0 : getAvailabilityZone().hashCode());
+ hashCode = prime * hashCode + ((getLifecycleState() == null) ? 0 : getLifecycleState().hashCode());
+ hashCode = prime * hashCode + ((getHealthStatus() == null) ? 0 : getHealthStatus().hashCode());
+ hashCode = prime * hashCode + ((getLaunchConfigurationName() == null) ? 0 : getLaunchConfigurationName().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof AutoScalingInstanceDetails == false) return false;
+ AutoScalingInstanceDetails other = (AutoScalingInstanceDetails)obj;
+
+ if (other.getInstanceId() == null ^ this.getInstanceId() == null) return false;
+ if (other.getInstanceId() != null && other.getInstanceId().equals(this.getInstanceId()) == false) return false;
+ if (other.getAutoScalingGroupName() == null ^ this.getAutoScalingGroupName() == null) return false;
+ if (other.getAutoScalingGroupName() != null && other.getAutoScalingGroupName().equals(this.getAutoScalingGroupName()) == false) return false;
+ if (other.getAvailabilityZone() == null ^ this.getAvailabilityZone() == null) return false;
+ if (other.getAvailabilityZone() != null && other.getAvailabilityZone().equals(this.getAvailabilityZone()) == false) return false;
+ if (other.getLifecycleState() == null ^ this.getLifecycleState() == null) return false;
+ if (other.getLifecycleState() != null && other.getLifecycleState().equals(this.getLifecycleState()) == false) return false;
+ if (other.getHealthStatus() == null ^ this.getHealthStatus() == null) return false;
+ if (other.getHealthStatus() != null && other.getHealthStatus().equals(this.getHealthStatus()) == false) return false;
+ if (other.getLaunchConfigurationName() == null ^ this.getLaunchConfigurationName() == null) return false;
+ if (other.getLaunchConfigurationName() != null && other.getLaunchConfigurationName().equals(this.getLaunchConfigurationName()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/BlockDeviceMapping.java b/src/com/amazonaws/services/autoscaling/model/BlockDeviceMapping.java
index b75dac90..9ff7328e 100644
--- a/src/com/amazonaws/services/autoscaling/model/BlockDeviceMapping.java
+++ b/src/com/amazonaws/services/autoscaling/model/BlockDeviceMapping.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -182,12 +182,40 @@ public BlockDeviceMapping withEbs(Ebs ebs) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("VirtualName: " + virtualName + ", ");
- sb.append("DeviceName: " + deviceName + ", ");
- sb.append("Ebs: " + ebs + ", ");
+ if (virtualName != null) sb.append("VirtualName: " + virtualName + ", ");
+ if (deviceName != null) sb.append("DeviceName: " + deviceName + ", ");
+ if (ebs != null) sb.append("Ebs: " + ebs + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getVirtualName() == null) ? 0 : getVirtualName().hashCode());
+ hashCode = prime * hashCode + ((getDeviceName() == null) ? 0 : getDeviceName().hashCode());
+ hashCode = prime * hashCode + ((getEbs() == null) ? 0 : getEbs().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof BlockDeviceMapping == false) return false;
+ BlockDeviceMapping other = (BlockDeviceMapping)obj;
+
+ if (other.getVirtualName() == null ^ this.getVirtualName() == null) return false;
+ if (other.getVirtualName() != null && other.getVirtualName().equals(this.getVirtualName()) == false) return false;
+ if (other.getDeviceName() == null ^ this.getDeviceName() == null) return false;
+ if (other.getDeviceName() != null && other.getDeviceName().equals(this.getDeviceName()) == false) return false;
+ if (other.getEbs() == null ^ this.getEbs() == null) return false;
+ if (other.getEbs() != null && other.getEbs().equals(this.getEbs()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/CreateAutoScalingGroupRequest.java b/src/com/amazonaws/services/autoscaling/model/CreateAutoScalingGroupRequest.java
index 7e8a4f04..21c82a1b 100644
--- a/src/com/amazonaws/services/autoscaling/model/CreateAutoScalingGroupRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/CreateAutoScalingGroupRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -385,10 +385,13 @@ public java.util.List getAvailabilityZones() {
* @param availabilityZones A list of availability zones for the Auto Scaling group.
*/
public void setAvailabilityZones(java.util.Collection availabilityZones) {
- java.util.List availabilityZonesCopy = new java.util.ArrayList();
- if (availabilityZones != null) {
- availabilityZonesCopy.addAll(availabilityZones);
+ if (availabilityZones == null) {
+ this.availabilityZones = null;
+ return;
}
+
+ java.util.List availabilityZonesCopy = new java.util.ArrayList(availabilityZones.size());
+ availabilityZonesCopy.addAll(availabilityZones);
this.availabilityZones = availabilityZonesCopy;
}
@@ -406,7 +409,7 @@ public void setAvailabilityZones(java.util.Collection availabilityZones)
* together.
*/
public CreateAutoScalingGroupRequest withAvailabilityZones(String... availabilityZones) {
- if (getAvailabilityZones() == null) setAvailabilityZones(new java.util.ArrayList());
+ if (getAvailabilityZones() == null) setAvailabilityZones(new java.util.ArrayList(availabilityZones.length));
for (String value : availabilityZones) {
getAvailabilityZones().add(value);
}
@@ -427,11 +430,13 @@ public CreateAutoScalingGroupRequest withAvailabilityZones(String... availabilit
* together.
*/
public CreateAutoScalingGroupRequest withAvailabilityZones(java.util.Collection availabilityZones) {
- java.util.List availabilityZonesCopy = new java.util.ArrayList();
- if (availabilityZones != null) {
+ if (availabilityZones == null) {
+ this.availabilityZones = null;
+ } else {
+ java.util.List availabilityZonesCopy = new java.util.ArrayList(availabilityZones.size());
availabilityZonesCopy.addAll(availabilityZones);
+ this.availabilityZones = availabilityZonesCopy;
}
- this.availabilityZones = availabilityZonesCopy;
return this;
}
@@ -455,10 +460,13 @@ public java.util.List getLoadBalancerNames() {
* @param loadBalancerNames A list of LoadBalancers to use.
*/
public void setLoadBalancerNames(java.util.Collection loadBalancerNames) {
- java.util.List loadBalancerNamesCopy = new java.util.ArrayList();
- if (loadBalancerNames != null) {
- loadBalancerNamesCopy.addAll(loadBalancerNames);
+ if (loadBalancerNames == null) {
+ this.loadBalancerNames = null;
+ return;
}
+
+ java.util.List loadBalancerNamesCopy = new java.util.ArrayList(loadBalancerNames.size());
+ loadBalancerNamesCopy.addAll(loadBalancerNames);
this.loadBalancerNames = loadBalancerNamesCopy;
}
@@ -473,7 +481,7 @@ public void setLoadBalancerNames(java.util.Collection loadBalancerNames)
* together.
*/
public CreateAutoScalingGroupRequest withLoadBalancerNames(String... loadBalancerNames) {
- if (getLoadBalancerNames() == null) setLoadBalancerNames(new java.util.ArrayList());
+ if (getLoadBalancerNames() == null) setLoadBalancerNames(new java.util.ArrayList(loadBalancerNames.length));
for (String value : loadBalancerNames) {
getLoadBalancerNames().add(value);
}
@@ -491,11 +499,13 @@ public CreateAutoScalingGroupRequest withLoadBalancerNames(String... loadBalance
* together.
*/
public CreateAutoScalingGroupRequest withLoadBalancerNames(java.util.Collection loadBalancerNames) {
- java.util.List loadBalancerNamesCopy = new java.util.ArrayList();
- if (loadBalancerNames != null) {
+ if (loadBalancerNames == null) {
+ this.loadBalancerNames = null;
+ } else {
+ java.util.List loadBalancerNamesCopy = new java.util.ArrayList(loadBalancerNames.size());
loadBalancerNamesCopy.addAll(loadBalancerNames);
+ this.loadBalancerNames = loadBalancerNamesCopy;
}
- this.loadBalancerNames = loadBalancerNamesCopy;
return this;
}
@@ -702,21 +712,76 @@ public CreateAutoScalingGroupRequest withVPCZoneIdentifier(String vPCZoneIdentif
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
- sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
- sb.append("MinSize: " + minSize + ", ");
- sb.append("MaxSize: " + maxSize + ", ");
- sb.append("DesiredCapacity: " + desiredCapacity + ", ");
- sb.append("DefaultCooldown: " + defaultCooldown + ", ");
- sb.append("AvailabilityZones: " + availabilityZones + ", ");
- sb.append("LoadBalancerNames: " + loadBalancerNames + ", ");
- sb.append("HealthCheckType: " + healthCheckType + ", ");
- sb.append("HealthCheckGracePeriod: " + healthCheckGracePeriod + ", ");
- sb.append("PlacementGroup: " + placementGroup + ", ");
- sb.append("VPCZoneIdentifier: " + vPCZoneIdentifier + ", ");
+ if (autoScalingGroupName != null) sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
+ if (launchConfigurationName != null) sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
+ if (minSize != null) sb.append("MinSize: " + minSize + ", ");
+ if (maxSize != null) sb.append("MaxSize: " + maxSize + ", ");
+ if (desiredCapacity != null) sb.append("DesiredCapacity: " + desiredCapacity + ", ");
+ if (defaultCooldown != null) sb.append("DefaultCooldown: " + defaultCooldown + ", ");
+ if (availabilityZones != null) sb.append("AvailabilityZones: " + availabilityZones + ", ");
+ if (loadBalancerNames != null) sb.append("LoadBalancerNames: " + loadBalancerNames + ", ");
+ if (healthCheckType != null) sb.append("HealthCheckType: " + healthCheckType + ", ");
+ if (healthCheckGracePeriod != null) sb.append("HealthCheckGracePeriod: " + healthCheckGracePeriod + ", ");
+ if (placementGroup != null) sb.append("PlacementGroup: " + placementGroup + ", ");
+ if (vPCZoneIdentifier != null) sb.append("VPCZoneIdentifier: " + vPCZoneIdentifier + ", ");
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 + ((getLaunchConfigurationName() == null) ? 0 : getLaunchConfigurationName().hashCode());
+ hashCode = prime * hashCode + ((getMinSize() == null) ? 0 : getMinSize().hashCode());
+ hashCode = prime * hashCode + ((getMaxSize() == null) ? 0 : getMaxSize().hashCode());
+ hashCode = prime * hashCode + ((getDesiredCapacity() == null) ? 0 : getDesiredCapacity().hashCode());
+ hashCode = prime * hashCode + ((getDefaultCooldown() == null) ? 0 : getDefaultCooldown().hashCode());
+ hashCode = prime * hashCode + ((getAvailabilityZones() == null) ? 0 : getAvailabilityZones().hashCode());
+ hashCode = prime * hashCode + ((getLoadBalancerNames() == null) ? 0 : getLoadBalancerNames().hashCode());
+ hashCode = prime * hashCode + ((getHealthCheckType() == null) ? 0 : getHealthCheckType().hashCode());
+ hashCode = prime * hashCode + ((getHealthCheckGracePeriod() == null) ? 0 : getHealthCheckGracePeriod().hashCode());
+ hashCode = prime * hashCode + ((getPlacementGroup() == null) ? 0 : getPlacementGroup().hashCode());
+ hashCode = prime * hashCode + ((getVPCZoneIdentifier() == null) ? 0 : getVPCZoneIdentifier().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof CreateAutoScalingGroupRequest == false) return false;
+ CreateAutoScalingGroupRequest other = (CreateAutoScalingGroupRequest)obj;
+
+ if (other.getAutoScalingGroupName() == null ^ this.getAutoScalingGroupName() == null) return false;
+ if (other.getAutoScalingGroupName() != null && other.getAutoScalingGroupName().equals(this.getAutoScalingGroupName()) == false) return false;
+ if (other.getLaunchConfigurationName() == null ^ this.getLaunchConfigurationName() == null) return false;
+ if (other.getLaunchConfigurationName() != null && other.getLaunchConfigurationName().equals(this.getLaunchConfigurationName()) == false) return false;
+ if (other.getMinSize() == null ^ this.getMinSize() == null) return false;
+ if (other.getMinSize() != null && other.getMinSize().equals(this.getMinSize()) == false) return false;
+ if (other.getMaxSize() == null ^ this.getMaxSize() == null) return false;
+ if (other.getMaxSize() != null && other.getMaxSize().equals(this.getMaxSize()) == false) return false;
+ if (other.getDesiredCapacity() == null ^ this.getDesiredCapacity() == null) return false;
+ if (other.getDesiredCapacity() != null && other.getDesiredCapacity().equals(this.getDesiredCapacity()) == false) return false;
+ if (other.getDefaultCooldown() == null ^ this.getDefaultCooldown() == null) return false;
+ if (other.getDefaultCooldown() != null && other.getDefaultCooldown().equals(this.getDefaultCooldown()) == false) return false;
+ if (other.getAvailabilityZones() == null ^ this.getAvailabilityZones() == null) return false;
+ if (other.getAvailabilityZones() != null && other.getAvailabilityZones().equals(this.getAvailabilityZones()) == false) return false;
+ if (other.getLoadBalancerNames() == null ^ this.getLoadBalancerNames() == null) return false;
+ if (other.getLoadBalancerNames() != null && other.getLoadBalancerNames().equals(this.getLoadBalancerNames()) == false) return false;
+ if (other.getHealthCheckType() == null ^ this.getHealthCheckType() == null) return false;
+ if (other.getHealthCheckType() != null && other.getHealthCheckType().equals(this.getHealthCheckType()) == false) return false;
+ if (other.getHealthCheckGracePeriod() == null ^ this.getHealthCheckGracePeriod() == null) return false;
+ if (other.getHealthCheckGracePeriod() != null && other.getHealthCheckGracePeriod().equals(this.getHealthCheckGracePeriod()) == false) return false;
+ if (other.getPlacementGroup() == null ^ this.getPlacementGroup() == null) return false;
+ if (other.getPlacementGroup() != null && other.getPlacementGroup().equals(this.getPlacementGroup()) == false) return false;
+ if (other.getVPCZoneIdentifier() == null ^ this.getVPCZoneIdentifier() == null) return false;
+ if (other.getVPCZoneIdentifier() != null && other.getVPCZoneIdentifier().equals(this.getVPCZoneIdentifier()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/CreateLaunchConfigurationRequest.java b/src/com/amazonaws/services/autoscaling/model/CreateLaunchConfigurationRequest.java
index 32d43789..391f6f27 100644
--- a/src/com/amazonaws/services/autoscaling/model/CreateLaunchConfigurationRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/CreateLaunchConfigurationRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -361,10 +361,13 @@ public java.util.List getSecurityGroups() {
* Security Groups in the Amazon VPC product documentation.
*/
public void setSecurityGroups(java.util.Collection securityGroups) {
- java.util.List securityGroupsCopy = new java.util.ArrayList();
- if (securityGroups != null) {
- securityGroupsCopy.addAll(securityGroups);
+ if (securityGroups == null) {
+ this.securityGroups = null;
+ return;
}
+
+ java.util.List securityGroupsCopy = new java.util.ArrayList(securityGroups.size());
+ securityGroupsCopy.addAll(securityGroups);
this.securityGroups = securityGroupsCopy;
}
@@ -399,7 +402,7 @@ public void setSecurityGroups(java.util.Collection securityGroups) {
* together.
*/
public CreateLaunchConfigurationRequest withSecurityGroups(String... securityGroups) {
- if (getSecurityGroups() == null) setSecurityGroups(new java.util.ArrayList());
+ if (getSecurityGroups() == null) setSecurityGroups(new java.util.ArrayList(securityGroups.length));
for (String value : securityGroups) {
getSecurityGroups().add(value);
}
@@ -437,11 +440,13 @@ public CreateLaunchConfigurationRequest withSecurityGroups(String... securityGro
* together.
*/
public CreateLaunchConfigurationRequest withSecurityGroups(java.util.Collection securityGroups) {
- java.util.List securityGroupsCopy = new java.util.ArrayList();
- if (securityGroups != null) {
+ if (securityGroups == null) {
+ this.securityGroups = null;
+ } else {
+ java.util.List securityGroupsCopy = new java.util.ArrayList(securityGroups.size());
securityGroupsCopy.addAll(securityGroups);
+ this.securityGroups = securityGroupsCopy;
}
- this.securityGroups = securityGroupsCopy;
return this;
}
@@ -709,10 +714,13 @@ public java.util.List getBlockDeviceMappings() {
* Block Device Mapping in the Amazon EC2 product documentation.
*/
public void setBlockDeviceMappings(java.util.Collection blockDeviceMappings) {
- java.util.List blockDeviceMappingsCopy = new java.util.ArrayList();
- if (blockDeviceMappings != null) {
- blockDeviceMappingsCopy.addAll(blockDeviceMappings);
+ if (blockDeviceMappings == null) {
+ this.blockDeviceMappings = null;
+ return;
}
+
+ java.util.List blockDeviceMappingsCopy = new java.util.ArrayList(blockDeviceMappings.size());
+ blockDeviceMappingsCopy.addAll(blockDeviceMappings);
this.blockDeviceMappings = blockDeviceMappingsCopy;
}
@@ -739,7 +747,7 @@ public void setBlockDeviceMappings(java.util.Collection bloc
* together.
*/
public CreateLaunchConfigurationRequest withBlockDeviceMappings(BlockDeviceMapping... blockDeviceMappings) {
- if (getBlockDeviceMappings() == null) setBlockDeviceMappings(new java.util.ArrayList());
+ if (getBlockDeviceMappings() == null) setBlockDeviceMappings(new java.util.ArrayList(blockDeviceMappings.length));
for (BlockDeviceMapping value : blockDeviceMappings) {
getBlockDeviceMappings().add(value);
}
@@ -769,11 +777,13 @@ public CreateLaunchConfigurationRequest withBlockDeviceMappings(BlockDeviceMappi
* together.
*/
public CreateLaunchConfigurationRequest withBlockDeviceMappings(java.util.Collection blockDeviceMappings) {
- java.util.List blockDeviceMappingsCopy = new java.util.ArrayList();
- if (blockDeviceMappings != null) {
+ if (blockDeviceMappings == null) {
+ this.blockDeviceMappings = null;
+ } else {
+ java.util.List blockDeviceMappingsCopy = new java.util.ArrayList(blockDeviceMappings.size());
blockDeviceMappingsCopy.addAll(blockDeviceMappings);
+ this.blockDeviceMappings = blockDeviceMappingsCopy;
}
- this.blockDeviceMappings = blockDeviceMappingsCopy;
return this;
}
@@ -824,19 +834,68 @@ public CreateLaunchConfigurationRequest withInstanceMonitoring(InstanceMonitorin
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
- sb.append("ImageId: " + imageId + ", ");
- sb.append("KeyName: " + keyName + ", ");
- sb.append("SecurityGroups: " + securityGroups + ", ");
- sb.append("UserData: " + userData + ", ");
- sb.append("InstanceType: " + instanceType + ", ");
- sb.append("KernelId: " + kernelId + ", ");
- sb.append("RamdiskId: " + ramdiskId + ", ");
- sb.append("BlockDeviceMappings: " + blockDeviceMappings + ", ");
- sb.append("InstanceMonitoring: " + instanceMonitoring + ", ");
+ if (launchConfigurationName != null) sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
+ if (imageId != null) sb.append("ImageId: " + imageId + ", ");
+ if (keyName != null) sb.append("KeyName: " + keyName + ", ");
+ if (securityGroups != null) sb.append("SecurityGroups: " + securityGroups + ", ");
+ if (userData != null) sb.append("UserData: " + userData + ", ");
+ if (instanceType != null) sb.append("InstanceType: " + instanceType + ", ");
+ if (kernelId != null) sb.append("KernelId: " + kernelId + ", ");
+ if (ramdiskId != null) sb.append("RamdiskId: " + ramdiskId + ", ");
+ if (blockDeviceMappings != null) sb.append("BlockDeviceMappings: " + blockDeviceMappings + ", ");
+ if (instanceMonitoring != null) sb.append("InstanceMonitoring: " + instanceMonitoring + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getLaunchConfigurationName() == null) ? 0 : getLaunchConfigurationName().hashCode());
+ hashCode = prime * hashCode + ((getImageId() == null) ? 0 : getImageId().hashCode());
+ hashCode = prime * hashCode + ((getKeyName() == null) ? 0 : getKeyName().hashCode());
+ hashCode = prime * hashCode + ((getSecurityGroups() == null) ? 0 : getSecurityGroups().hashCode());
+ hashCode = prime * hashCode + ((getUserData() == null) ? 0 : getUserData().hashCode());
+ hashCode = prime * hashCode + ((getInstanceType() == null) ? 0 : getInstanceType().hashCode());
+ hashCode = prime * hashCode + ((getKernelId() == null) ? 0 : getKernelId().hashCode());
+ hashCode = prime * hashCode + ((getRamdiskId() == null) ? 0 : getRamdiskId().hashCode());
+ hashCode = prime * hashCode + ((getBlockDeviceMappings() == null) ? 0 : getBlockDeviceMappings().hashCode());
+ hashCode = prime * hashCode + ((getInstanceMonitoring() == null) ? 0 : getInstanceMonitoring().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof CreateLaunchConfigurationRequest == false) return false;
+ CreateLaunchConfigurationRequest other = (CreateLaunchConfigurationRequest)obj;
+
+ if (other.getLaunchConfigurationName() == null ^ this.getLaunchConfigurationName() == null) return false;
+ if (other.getLaunchConfigurationName() != null && other.getLaunchConfigurationName().equals(this.getLaunchConfigurationName()) == false) return false;
+ if (other.getImageId() == null ^ this.getImageId() == null) return false;
+ if (other.getImageId() != null && other.getImageId().equals(this.getImageId()) == false) return false;
+ if (other.getKeyName() == null ^ this.getKeyName() == null) return false;
+ if (other.getKeyName() != null && other.getKeyName().equals(this.getKeyName()) == false) return false;
+ if (other.getSecurityGroups() == null ^ this.getSecurityGroups() == null) return false;
+ if (other.getSecurityGroups() != null && other.getSecurityGroups().equals(this.getSecurityGroups()) == false) return false;
+ if (other.getUserData() == null ^ this.getUserData() == null) return false;
+ if (other.getUserData() != null && other.getUserData().equals(this.getUserData()) == false) return false;
+ if (other.getInstanceType() == null ^ this.getInstanceType() == null) return false;
+ if (other.getInstanceType() != null && other.getInstanceType().equals(this.getInstanceType()) == false) return false;
+ if (other.getKernelId() == null ^ this.getKernelId() == null) return false;
+ if (other.getKernelId() != null && other.getKernelId().equals(this.getKernelId()) == false) return false;
+ if (other.getRamdiskId() == null ^ this.getRamdiskId() == null) return false;
+ if (other.getRamdiskId() != null && other.getRamdiskId().equals(this.getRamdiskId()) == false) return false;
+ if (other.getBlockDeviceMappings() == null ^ this.getBlockDeviceMappings() == null) return false;
+ if (other.getBlockDeviceMappings() != null && other.getBlockDeviceMappings().equals(this.getBlockDeviceMappings()) == false) return false;
+ if (other.getInstanceMonitoring() == null ^ this.getInstanceMonitoring() == null) return false;
+ if (other.getInstanceMonitoring() != null && other.getInstanceMonitoring().equals(this.getInstanceMonitoring()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DeleteAutoScalingGroupRequest.java b/src/com/amazonaws/services/autoscaling/model/DeleteAutoScalingGroupRequest.java
index 32ff9761..165198e3 100644
--- a/src/com/amazonaws/services/autoscaling/model/DeleteAutoScalingGroupRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/DeleteAutoScalingGroupRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -164,11 +164,36 @@ public Boolean getForceDelete() {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
- sb.append("ForceDelete: " + forceDelete + ", ");
+ if (autoScalingGroupName != null) sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
+ if (forceDelete != null) sb.append("ForceDelete: " + forceDelete + ", ");
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 + ((isForceDelete() == null) ? 0 : isForceDelete().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DeleteAutoScalingGroupRequest == false) return false;
+ DeleteAutoScalingGroupRequest other = (DeleteAutoScalingGroupRequest)obj;
+
+ if (other.getAutoScalingGroupName() == null ^ this.getAutoScalingGroupName() == null) return false;
+ if (other.getAutoScalingGroupName() != null && other.getAutoScalingGroupName().equals(this.getAutoScalingGroupName()) == false) return false;
+ if (other.isForceDelete() == null ^ this.isForceDelete() == null) return false;
+ if (other.isForceDelete() != null && other.isForceDelete().equals(this.isForceDelete()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DeleteLaunchConfigurationRequest.java b/src/com/amazonaws/services/autoscaling/model/DeleteLaunchConfigurationRequest.java
index 28936913..daf9587a 100644
--- a/src/com/amazonaws/services/autoscaling/model/DeleteLaunchConfigurationRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/DeleteLaunchConfigurationRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -97,10 +97,32 @@ public DeleteLaunchConfigurationRequest withLaunchConfigurationName(String launc
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
+ if (launchConfigurationName != null) sb.append("LaunchConfigurationName: " + launchConfigurationName + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getLaunchConfigurationName() == null) ? 0 : getLaunchConfigurationName().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DeleteLaunchConfigurationRequest == false) return false;
+ DeleteLaunchConfigurationRequest other = (DeleteLaunchConfigurationRequest)obj;
+
+ if (other.getLaunchConfigurationName() == null ^ this.getLaunchConfigurationName() == null) return false;
+ if (other.getLaunchConfigurationName() != null && other.getLaunchConfigurationName().equals(this.getLaunchConfigurationName()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DeleteNotificationConfigurationRequest.java b/src/com/amazonaws/services/autoscaling/model/DeleteNotificationConfigurationRequest.java
index 0942e106..01bcc93e 100644
--- a/src/com/amazonaws/services/autoscaling/model/DeleteNotificationConfigurationRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/DeleteNotificationConfigurationRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -154,11 +154,36 @@ public DeleteNotificationConfigurationRequest withTopicARN(String topicARN) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
- sb.append("TopicARN: " + topicARN + ", ");
+ if (autoScalingGroupName != null) sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
+ if (topicARN != null) sb.append("TopicARN: " + topicARN + ", ");
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 + ((getTopicARN() == null) ? 0 : getTopicARN().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DeleteNotificationConfigurationRequest == false) return false;
+ DeleteNotificationConfigurationRequest other = (DeleteNotificationConfigurationRequest)obj;
+
+ if (other.getAutoScalingGroupName() == null ^ this.getAutoScalingGroupName() == null) return false;
+ if (other.getAutoScalingGroupName() != null && other.getAutoScalingGroupName().equals(this.getAutoScalingGroupName()) == false) return false;
+ if (other.getTopicARN() == null ^ this.getTopicARN() == null) return false;
+ if (other.getTopicARN() != null && other.getTopicARN().equals(this.getTopicARN()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DeletePolicyRequest.java b/src/com/amazonaws/services/autoscaling/model/DeletePolicyRequest.java
index b6901c49..410e07dc 100644
--- a/src/com/amazonaws/services/autoscaling/model/DeletePolicyRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/DeletePolicyRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -147,11 +147,36 @@ public DeletePolicyRequest withPolicyName(String policyName) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
- sb.append("PolicyName: " + policyName + ", ");
+ if (autoScalingGroupName != null) sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
+ if (policyName != null) sb.append("PolicyName: " + policyName + ", ");
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 + ((getPolicyName() == null) ? 0 : getPolicyName().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DeletePolicyRequest == false) return false;
+ DeletePolicyRequest other = (DeletePolicyRequest)obj;
+
+ if (other.getAutoScalingGroupName() == null ^ this.getAutoScalingGroupName() == null) return false;
+ if (other.getAutoScalingGroupName() != null && other.getAutoScalingGroupName().equals(this.getAutoScalingGroupName()) == false) return false;
+ if (other.getPolicyName() == null ^ this.getPolicyName() == null) return false;
+ if (other.getPolicyName() != null && other.getPolicyName().equals(this.getPolicyName()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DeleteScheduledActionRequest.java b/src/com/amazonaws/services/autoscaling/model/DeleteScheduledActionRequest.java
index 23a3e45f..4c6099a8 100644
--- a/src/com/amazonaws/services/autoscaling/model/DeleteScheduledActionRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/DeleteScheduledActionRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -148,11 +148,36 @@ public DeleteScheduledActionRequest withScheduledActionName(String scheduledActi
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
- sb.append("ScheduledActionName: " + scheduledActionName + ", ");
+ if (autoScalingGroupName != null) sb.append("AutoScalingGroupName: " + autoScalingGroupName + ", ");
+ if (scheduledActionName != null) sb.append("ScheduledActionName: " + scheduledActionName + ", ");
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 + ((getScheduledActionName() == null) ? 0 : getScheduledActionName().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DeleteScheduledActionRequest == false) return false;
+ DeleteScheduledActionRequest other = (DeleteScheduledActionRequest)obj;
+
+ if (other.getAutoScalingGroupName() == null ^ this.getAutoScalingGroupName() == null) return false;
+ if (other.getAutoScalingGroupName() != null && other.getAutoScalingGroupName().equals(this.getAutoScalingGroupName()) == false) return false;
+ if (other.getScheduledActionName() == null ^ this.getScheduledActionName() == null) return false;
+ if (other.getScheduledActionName() != null && other.getScheduledActionName().equals(this.getScheduledActionName()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DescribeAdjustmentTypesRequest.java b/src/com/amazonaws/services/autoscaling/model/DescribeAdjustmentTypesRequest.java
index fcec5c7a..a287565a 100644
--- a/src/com/amazonaws/services/autoscaling/model/DescribeAdjustmentTypesRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/DescribeAdjustmentTypesRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -42,5 +42,24 @@ public String toString() {
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DescribeAdjustmentTypesRequest == false) return false;
+ DescribeAdjustmentTypesRequest other = (DescribeAdjustmentTypesRequest)obj;
+
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DescribeAdjustmentTypesResult.java b/src/com/amazonaws/services/autoscaling/model/DescribeAdjustmentTypesResult.java
index 9c4afb4a..a1409c13 100644
--- a/src/com/amazonaws/services/autoscaling/model/DescribeAdjustmentTypesResult.java
+++ b/src/com/amazonaws/services/autoscaling/model/DescribeAdjustmentTypesResult.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -45,10 +45,13 @@ public java.util.List getAdjustmentTypes() {
* @param adjustmentTypes A list of specific policy adjustment types.
*/
public void setAdjustmentTypes(java.util.Collection adjustmentTypes) {
- java.util.List adjustmentTypesCopy = new java.util.ArrayList();
- if (adjustmentTypes != null) {
- adjustmentTypesCopy.addAll(adjustmentTypes);
+ if (adjustmentTypes == null) {
+ this.adjustmentTypes = null;
+ return;
}
+
+ java.util.List adjustmentTypesCopy = new java.util.ArrayList(adjustmentTypes.size());
+ adjustmentTypesCopy.addAll(adjustmentTypes);
this.adjustmentTypes = adjustmentTypesCopy;
}
@@ -63,7 +66,7 @@ public void setAdjustmentTypes(java.util.Collection adjustmentTy
* together.
*/
public DescribeAdjustmentTypesResult withAdjustmentTypes(AdjustmentType... adjustmentTypes) {
- if (getAdjustmentTypes() == null) setAdjustmentTypes(new java.util.ArrayList());
+ if (getAdjustmentTypes() == null) setAdjustmentTypes(new java.util.ArrayList(adjustmentTypes.length));
for (AdjustmentType value : adjustmentTypes) {
getAdjustmentTypes().add(value);
}
@@ -81,11 +84,13 @@ public DescribeAdjustmentTypesResult withAdjustmentTypes(AdjustmentType... adjus
* together.
*/
public DescribeAdjustmentTypesResult withAdjustmentTypes(java.util.Collection adjustmentTypes) {
- java.util.List adjustmentTypesCopy = new java.util.ArrayList();
- if (adjustmentTypes != null) {
+ if (adjustmentTypes == null) {
+ this.adjustmentTypes = null;
+ } else {
+ java.util.List adjustmentTypesCopy = new java.util.ArrayList(adjustmentTypes.size());
adjustmentTypesCopy.addAll(adjustmentTypes);
+ this.adjustmentTypes = adjustmentTypesCopy;
}
- this.adjustmentTypes = adjustmentTypesCopy;
return this;
}
@@ -102,10 +107,32 @@ public DescribeAdjustmentTypesResult withAdjustmentTypes(java.util.Collection getAutoScalingGroupNames() {
* @param autoScalingGroupNames A list of Auto Scaling group names.
*/
public void setAutoScalingGroupNames(java.util.Collection autoScalingGroupNames) {
- java.util.List autoScalingGroupNamesCopy = new java.util.ArrayList();
- if (autoScalingGroupNames != null) {
- autoScalingGroupNamesCopy.addAll(autoScalingGroupNames);
+ if (autoScalingGroupNames == null) {
+ this.autoScalingGroupNames = null;
+ return;
}
+
+ java.util.List autoScalingGroupNamesCopy = new java.util.ArrayList(autoScalingGroupNames.size());
+ autoScalingGroupNamesCopy.addAll(autoScalingGroupNames);
this.autoScalingGroupNames = autoScalingGroupNamesCopy;
}
@@ -91,7 +94,7 @@ public void setAutoScalingGroupNames(java.util.Collection autoScalingGro
* together.
*/
public DescribeAutoScalingGroupsRequest withAutoScalingGroupNames(String... autoScalingGroupNames) {
- if (getAutoScalingGroupNames() == null) setAutoScalingGroupNames(new java.util.ArrayList());
+ if (getAutoScalingGroupNames() == null) setAutoScalingGroupNames(new java.util.ArrayList(autoScalingGroupNames.length));
for (String value : autoScalingGroupNames) {
getAutoScalingGroupNames().add(value);
}
@@ -109,11 +112,13 @@ public DescribeAutoScalingGroupsRequest withAutoScalingGroupNames(String... auto
* together.
*/
public DescribeAutoScalingGroupsRequest withAutoScalingGroupNames(java.util.Collection autoScalingGroupNames) {
- java.util.List autoScalingGroupNamesCopy = new java.util.ArrayList();
- if (autoScalingGroupNames != null) {
+ if (autoScalingGroupNames == null) {
+ this.autoScalingGroupNames = null;
+ } else {
+ java.util.List autoScalingGroupNamesCopy = new java.util.ArrayList(autoScalingGroupNames.size());
autoScalingGroupNamesCopy.addAll(autoScalingGroupNames);
+ this.autoScalingGroupNames = autoScalingGroupNamesCopy;
}
- this.autoScalingGroupNames = autoScalingGroupNamesCopy;
return this;
}
@@ -216,12 +221,40 @@ public DescribeAutoScalingGroupsRequest withMaxRecords(Integer maxRecords) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AutoScalingGroupNames: " + autoScalingGroupNames + ", ");
- sb.append("NextToken: " + nextToken + ", ");
- sb.append("MaxRecords: " + maxRecords + ", ");
+ if (autoScalingGroupNames != null) sb.append("AutoScalingGroupNames: " + autoScalingGroupNames + ", ");
+ if (nextToken != null) sb.append("NextToken: " + nextToken + ", ");
+ if (maxRecords != null) sb.append("MaxRecords: " + maxRecords + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getAutoScalingGroupNames() == null) ? 0 : getAutoScalingGroupNames().hashCode());
+ hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+ hashCode = prime * hashCode + ((getMaxRecords() == null) ? 0 : getMaxRecords().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DescribeAutoScalingGroupsRequest == false) return false;
+ DescribeAutoScalingGroupsRequest other = (DescribeAutoScalingGroupsRequest)obj;
+
+ if (other.getAutoScalingGroupNames() == null ^ this.getAutoScalingGroupNames() == null) return false;
+ if (other.getAutoScalingGroupNames() != null && other.getAutoScalingGroupNames().equals(this.getAutoScalingGroupNames()) == false) return false;
+ if (other.getNextToken() == null ^ this.getNextToken() == null) return false;
+ if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false;
+ if (other.getMaxRecords() == null ^ this.getMaxRecords() == null) return false;
+ if (other.getMaxRecords() != null && other.getMaxRecords().equals(this.getMaxRecords()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingGroupsResult.java b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingGroupsResult.java
index 7506fc69..b97fb22a 100644
--- a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingGroupsResult.java
+++ b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingGroupsResult.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -53,10 +53,13 @@ public java.util.List getAutoScalingGroups() {
* @param autoScalingGroups A list of Auto Scaling groups.
*/
public void setAutoScalingGroups(java.util.Collection autoScalingGroups) {
- java.util.List autoScalingGroupsCopy = new java.util.ArrayList();
- if (autoScalingGroups != null) {
- autoScalingGroupsCopy.addAll(autoScalingGroups);
+ if (autoScalingGroups == null) {
+ this.autoScalingGroups = null;
+ return;
}
+
+ java.util.List autoScalingGroupsCopy = new java.util.ArrayList(autoScalingGroups.size());
+ autoScalingGroupsCopy.addAll(autoScalingGroups);
this.autoScalingGroups = autoScalingGroupsCopy;
}
@@ -71,7 +74,7 @@ public void setAutoScalingGroups(java.util.Collection autoScal
* together.
*/
public DescribeAutoScalingGroupsResult withAutoScalingGroups(AutoScalingGroup... autoScalingGroups) {
- if (getAutoScalingGroups() == null) setAutoScalingGroups(new java.util.ArrayList());
+ if (getAutoScalingGroups() == null) setAutoScalingGroups(new java.util.ArrayList(autoScalingGroups.length));
for (AutoScalingGroup value : autoScalingGroups) {
getAutoScalingGroups().add(value);
}
@@ -89,11 +92,13 @@ public DescribeAutoScalingGroupsResult withAutoScalingGroups(AutoScalingGroup...
* together.
*/
public DescribeAutoScalingGroupsResult withAutoScalingGroups(java.util.Collection autoScalingGroups) {
- java.util.List autoScalingGroupsCopy = new java.util.ArrayList();
- if (autoScalingGroups != null) {
+ if (autoScalingGroups == null) {
+ this.autoScalingGroups = null;
+ } else {
+ java.util.List autoScalingGroupsCopy = new java.util.ArrayList(autoScalingGroups.size());
autoScalingGroupsCopy.addAll(autoScalingGroups);
+ this.autoScalingGroups = autoScalingGroupsCopy;
}
- this.autoScalingGroups = autoScalingGroupsCopy;
return this;
}
@@ -153,11 +158,36 @@ public DescribeAutoScalingGroupsResult withNextToken(String nextToken) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AutoScalingGroups: " + autoScalingGroups + ", ");
- sb.append("NextToken: " + nextToken + ", ");
+ if (autoScalingGroups != null) sb.append("AutoScalingGroups: " + autoScalingGroups + ", ");
+ if (nextToken != null) sb.append("NextToken: " + nextToken + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getAutoScalingGroups() == null) ? 0 : getAutoScalingGroups().hashCode());
+ hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DescribeAutoScalingGroupsResult == false) return false;
+ DescribeAutoScalingGroupsResult other = (DescribeAutoScalingGroupsResult)obj;
+
+ if (other.getAutoScalingGroups() == null ^ this.getAutoScalingGroups() == null) return false;
+ if (other.getAutoScalingGroups() != null && other.getAutoScalingGroups().equals(this.getAutoScalingGroups()) == false) return false;
+ if (other.getNextToken() == null ^ this.getNextToken() == null) return false;
+ if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingInstancesRequest.java b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingInstancesRequest.java
index ec14e772..ba5d80a5 100644
--- a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingInstancesRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingInstancesRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -90,10 +90,13 @@ public java.util.List getInstanceIds() {
* instances are requested, they are ignored with no error.
*/
public void setInstanceIds(java.util.Collection instanceIds) {
- java.util.List instanceIdsCopy = new java.util.ArrayList();
- if (instanceIds != null) {
- instanceIdsCopy.addAll(instanceIds);
+ if (instanceIds == null) {
+ this.instanceIds = null;
+ return;
}
+
+ java.util.List instanceIdsCopy = new java.util.ArrayList(instanceIds.size());
+ instanceIdsCopy.addAll(instanceIds);
this.instanceIds = instanceIdsCopy;
}
@@ -114,7 +117,7 @@ public void setInstanceIds(java.util.Collection instanceIds) {
* together.
*/
public DescribeAutoScalingInstancesRequest withInstanceIds(String... instanceIds) {
- if (getInstanceIds() == null) setInstanceIds(new java.util.ArrayList());
+ if (getInstanceIds() == null) setInstanceIds(new java.util.ArrayList(instanceIds.length));
for (String value : instanceIds) {
getInstanceIds().add(value);
}
@@ -138,11 +141,13 @@ public DescribeAutoScalingInstancesRequest withInstanceIds(String... instanceIds
* together.
*/
public DescribeAutoScalingInstancesRequest withInstanceIds(java.util.Collection instanceIds) {
- java.util.List instanceIdsCopy = new java.util.ArrayList();
- if (instanceIds != null) {
+ if (instanceIds == null) {
+ this.instanceIds = null;
+ } else {
+ java.util.List instanceIdsCopy = new java.util.ArrayList(instanceIds.size());
instanceIdsCopy.addAll(instanceIds);
+ this.instanceIds = instanceIdsCopy;
}
- this.instanceIds = instanceIdsCopy;
return this;
}
@@ -257,12 +262,40 @@ public DescribeAutoScalingInstancesRequest withNextToken(String nextToken) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("InstanceIds: " + instanceIds + ", ");
- sb.append("MaxRecords: " + maxRecords + ", ");
- sb.append("NextToken: " + nextToken + ", ");
+ if (instanceIds != null) sb.append("InstanceIds: " + instanceIds + ", ");
+ if (maxRecords != null) sb.append("MaxRecords: " + maxRecords + ", ");
+ if (nextToken != null) sb.append("NextToken: " + nextToken + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getInstanceIds() == null) ? 0 : getInstanceIds().hashCode());
+ hashCode = prime * hashCode + ((getMaxRecords() == null) ? 0 : getMaxRecords().hashCode());
+ hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DescribeAutoScalingInstancesRequest == false) return false;
+ DescribeAutoScalingInstancesRequest other = (DescribeAutoScalingInstancesRequest)obj;
+
+ if (other.getInstanceIds() == null ^ this.getInstanceIds() == null) return false;
+ if (other.getInstanceIds() != null && other.getInstanceIds().equals(this.getInstanceIds()) == false) return false;
+ if (other.getMaxRecords() == null ^ this.getMaxRecords() == null) return false;
+ if (other.getMaxRecords() != null && other.getMaxRecords().equals(this.getMaxRecords()) == false) return false;
+ if (other.getNextToken() == null ^ this.getNextToken() == null) return false;
+ if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingInstancesResult.java b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingInstancesResult.java
index b004f9ea..a04d87fb 100644
--- a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingInstancesResult.java
+++ b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingInstancesResult.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -53,10 +53,13 @@ public java.util.List getAutoScalingInstances() {
* @param autoScalingInstances A list of Auto Scaling instances.
*/
public void setAutoScalingInstances(java.util.Collection autoScalingInstances) {
- java.util.List autoScalingInstancesCopy = new java.util.ArrayList();
- if (autoScalingInstances != null) {
- autoScalingInstancesCopy.addAll(autoScalingInstances);
+ if (autoScalingInstances == null) {
+ this.autoScalingInstances = null;
+ return;
}
+
+ java.util.List autoScalingInstancesCopy = new java.util.ArrayList(autoScalingInstances.size());
+ autoScalingInstancesCopy.addAll(autoScalingInstances);
this.autoScalingInstances = autoScalingInstancesCopy;
}
@@ -71,7 +74,7 @@ public void setAutoScalingInstances(java.util.Collection());
+ if (getAutoScalingInstances() == null) setAutoScalingInstances(new java.util.ArrayList(autoScalingInstances.length));
for (AutoScalingInstanceDetails value : autoScalingInstances) {
getAutoScalingInstances().add(value);
}
@@ -89,11 +92,13 @@ public DescribeAutoScalingInstancesResult withAutoScalingInstances(AutoScalingIn
* together.
*/
public DescribeAutoScalingInstancesResult withAutoScalingInstances(java.util.Collection autoScalingInstances) {
- java.util.List autoScalingInstancesCopy = new java.util.ArrayList();
- if (autoScalingInstances != null) {
+ if (autoScalingInstances == null) {
+ this.autoScalingInstances = null;
+ } else {
+ java.util.List autoScalingInstancesCopy = new java.util.ArrayList(autoScalingInstances.size());
autoScalingInstancesCopy.addAll(autoScalingInstances);
+ this.autoScalingInstances = autoScalingInstancesCopy;
}
- this.autoScalingInstances = autoScalingInstancesCopy;
return this;
}
@@ -153,11 +158,36 @@ public DescribeAutoScalingInstancesResult withNextToken(String nextToken) {
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
- sb.append("AutoScalingInstances: " + autoScalingInstances + ", ");
- sb.append("NextToken: " + nextToken + ", ");
+ if (autoScalingInstances != null) sb.append("AutoScalingInstances: " + autoScalingInstances + ", ");
+ if (nextToken != null) sb.append("NextToken: " + nextToken + ", ");
sb.append("}");
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ hashCode = prime * hashCode + ((getAutoScalingInstances() == null) ? 0 : getAutoScalingInstances().hashCode());
+ hashCode = prime * hashCode + ((getNextToken() == null) ? 0 : getNextToken().hashCode());
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DescribeAutoScalingInstancesResult == false) return false;
+ DescribeAutoScalingInstancesResult other = (DescribeAutoScalingInstancesResult)obj;
+
+ if (other.getAutoScalingInstances() == null ^ this.getAutoScalingInstances() == null) return false;
+ if (other.getAutoScalingInstances() != null && other.getAutoScalingInstances().equals(this.getAutoScalingInstances()) == false) return false;
+ if (other.getNextToken() == null ^ this.getNextToken() == null) return false;
+ if (other.getNextToken() != null && other.getNextToken().equals(this.getNextToken()) == false) return false;
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingNotificationTypesRequest.java b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingNotificationTypesRequest.java
index 56fcddc5..e9c9aa3d 100644
--- a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingNotificationTypesRequest.java
+++ b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingNotificationTypesRequest.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -42,5 +42,24 @@ public String toString() {
return sb.toString();
}
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int hashCode = 1;
+
+ return hashCode;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (obj == null) return false;
+
+ if (obj instanceof DescribeAutoScalingNotificationTypesRequest == false) return false;
+ DescribeAutoScalingNotificationTypesRequest other = (DescribeAutoScalingNotificationTypesRequest)obj;
+
+ return true;
+ }
+
}
\ No newline at end of file
diff --git a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingNotificationTypesResult.java b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingNotificationTypesResult.java
index 45306219..4b240a8c 100644
--- a/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingNotificationTypesResult.java
+++ b/src/com/amazonaws/services/autoscaling/model/DescribeAutoScalingNotificationTypesResult.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2010-2011 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+ * Copyright 2010-2012 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.
@@ -68,10 +68,13 @@ public java.util.List getAutoScalingNotificationTypes() {
* autoscaling:TEST_NOTIFICATION
*/
public void setAutoScalingNotificationTypes(java.util.Collection autoScalingNotificationTypes) {
- java.util.List autoScalingNotificationTypesCopy = new java.util.ArrayList();
- if (autoScalingNotificationTypes != null) {
- autoScalingNotificationTypesCopy.addAll(autoScalingNotificationTypes);
+ if (autoScalingNotificationTypes == null) {
+ this.autoScalingNotificationTypes = null;
+ return;
}
+
+ java.util.List autoScalingNotificationTypesCopy = new java.util.ArrayList