Version 1.3.15 of the AWS Java SDK

This release adds support for Amazon EC2 High I/O instances and Amazon EBS Provisioned IOPS.

For more information, see the full release notes:
http://aws.amazon.com/releasenotes/0699205190876897

META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: AWS SDK for Java
 Bundle-SymbolicName: com.amazonaws.sdk;singleton:=true
-Bundle-Version: 1.3.14
+Bundle-Version: 1.3.15
 Bundle-Vendor: Amazon Technologies, Inc
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.apache.commons.codec;bundle-version="1.3.0",

pom.xml

@@ -6,7 +6,7 @@
     <artifactId>aws-java-sdk</artifactId>
     <packaging>jar</packaging>
     <name>AWS SDK for Java</name>
-    <version>1.3.14</version>
+    <version>1.3.15</version>
     <description>The Amazon Web Services SDK for Java provides Java APIs for building software on AWS’ cost-effective, scalable, and reliable infrastructure products. The AWS Java SDK allows developers to code against APIs for all of Amazon's infrastructure web services (Amazon S3, Amazon EC2, Amazon SQS, Amazon Relational Database Service, Amazon AutoScaling, etc).</description>
     <url>http://aws.amazon.com/sdkforjava</url>
 

src/main/java/com/amazonaws/services/ec2/model/CreateImageRequest.java

@@ -51,6 +51,8 @@ public class CreateImageRequest extends AmazonWebServiceRequest {
      */
     private Boolean noReboot;
 
+    private java.util.List<BlockDeviceMapping> blockDeviceMappings;
+
     /**
      * Default constructor for a new CreateImageRequest object.  Callers should use the
      * setter or fluent setter (with...) methods to initialize this object after creating it.
@@ -258,6 +260,75 @@ public Boolean getNoReboot() {
         return noReboot;
     }
 
+    /**
+     * Returns the value of the BlockDeviceMappings property for this object.
+     *
+     * @return The value of the BlockDeviceMappings property for this object.
+     */
+    public java.util.List<BlockDeviceMapping> getBlockDeviceMappings() {
+
+        if (blockDeviceMappings == null) {
+            blockDeviceMappings = new java.util.ArrayList<BlockDeviceMapping>();
+        }
+        return blockDeviceMappings;
+    }
+
+    /**
+     * Sets the value of the BlockDeviceMappings property for this object.
+     *
+     * @param blockDeviceMappings The new value for the BlockDeviceMappings property for this object.
+     */
+    public void setBlockDeviceMappings(java.util.Collection<BlockDeviceMapping> blockDeviceMappings) {
+        if (blockDeviceMappings == null) {
+            this.blockDeviceMappings = null;
+            return;
+        }
+
+        java.util.List<BlockDeviceMapping> blockDeviceMappingsCopy = new java.util.ArrayList<BlockDeviceMapping>(blockDeviceMappings.size());
+        blockDeviceMappingsCopy.addAll(blockDeviceMappings);
+        this.blockDeviceMappings = blockDeviceMappingsCopy;
+    }
+
+    /**
+     * Sets the value of the BlockDeviceMappings property for this object.
+     * <p>
+     * Returns a reference to this object so that method calls can be chained together.
+     *
+     * @param blockDeviceMappings The new value for the BlockDeviceMappings property for this object.
+     *
+     * @return A reference to this updated object so that method calls can be chained 
+     *         together. 
+     */
+    public CreateImageRequest withBlockDeviceMappings(BlockDeviceMapping... blockDeviceMappings) {
+        if (getBlockDeviceMappings() == null) setBlockDeviceMappings(new java.util.ArrayList<BlockDeviceMapping>(blockDeviceMappings.length));
+        for (BlockDeviceMapping value : blockDeviceMappings) {
+            getBlockDeviceMappings().add(value);
+        }
+        return this;
+    }
+
+    /**
+     * Sets the value of the BlockDeviceMappings property for this object.
+     * <p>
+     * Returns a reference to this object so that method calls can be chained together.
+     *
+     * @param blockDeviceMappings The new value for the BlockDeviceMappings property for this object.
+     *
+     * @return A reference to this updated object so that method calls can be chained 
+     *         together. 
+     */
+    public CreateImageRequest withBlockDeviceMappings(java.util.Collection<BlockDeviceMapping> blockDeviceMappings) {
+        if (blockDeviceMappings == null) {
+            this.blockDeviceMappings = null;
+        } else {
+            java.util.List<BlockDeviceMapping> blockDeviceMappingsCopy = new java.util.ArrayList<BlockDeviceMapping>(blockDeviceMappings.size());
+            blockDeviceMappingsCopy.addAll(blockDeviceMappings);
+            this.blockDeviceMappings = blockDeviceMappingsCopy;
+        }
+
+        return this;
+    }
+
     /**
      * Returns a string representation of this object; useful for testing and
      * debugging.
@@ -274,6 +345,7 @@ public String toString() {
         if (name != null) sb.append("Name: " + name + ", ");
         if (description != null) sb.append("Description: " + description + ", ");
         if (noReboot != null) sb.append("NoReboot: " + noReboot + ", ");
+        if (blockDeviceMappings != null) sb.append("BlockDeviceMappings: " + blockDeviceMappings + ", ");
         sb.append("}");
         return sb.toString();
     }
@@ -287,6 +359,7 @@ public int hashCode() {
         hashCode = prime * hashCode + ((getName() == null) ? 0 : getName().hashCode()); 
         hashCode = prime * hashCode + ((getDescription() == null) ? 0 : getDescription().hashCode()); 
         hashCode = prime * hashCode + ((isNoReboot() == null) ? 0 : isNoReboot().hashCode()); 
+        hashCode = prime * hashCode + ((getBlockDeviceMappings() == null) ? 0 : getBlockDeviceMappings().hashCode()); 
         return hashCode;
     }
 
@@ -306,6 +379,8 @@ public boolean equals(Object obj) {
         if (other.getDescription() != null && other.getDescription().equals(this.getDescription()) == false) return false; 
         if (other.isNoReboot() == null ^ this.isNoReboot() == null) return false;
         if (other.isNoReboot() != null && other.isNoReboot().equals(this.isNoReboot()) == false) return false; 
+        if (other.getBlockDeviceMappings() == null ^ this.getBlockDeviceMappings() == null) return false;
+        if (other.getBlockDeviceMappings() != null && other.getBlockDeviceMappings().equals(this.getBlockDeviceMappings()) == false) return false; 
         return true;
     }
 

src/main/java/com/amazonaws/services/ec2/model/CreateVolumeRequest.java

@@ -41,6 +41,10 @@ public class CreateVolumeRequest extends AmazonWebServiceRequest {
      */
     private String availabilityZone;
 
+    private String volumeType;
+
+    private Integer iops;
+
     /**
      * Default constructor for a new CreateVolumeRequest object.  Callers should use the
      * setter or fluent setter (with...) methods to initialize this object after creating it.
@@ -189,6 +193,123 @@ public CreateVolumeRequest withAvailabilityZone(String availabilityZone) {
     }
 
 
+    /**
+     * Returns the value of the VolumeType property for this object.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, io1
+     *
+     * @return The value of the VolumeType property for this object.
+     *
+     * @see VolumeType
+     */
+    public String getVolumeType() {
+        return volumeType;
+    }
+
+    /**
+     * Sets the value of the VolumeType property for this object.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, io1
+     *
+     * @param volumeType The new value for the VolumeType property for this object.
+     *
+     * @see VolumeType
+     */
+    public void setVolumeType(String volumeType) {
+        this.volumeType = volumeType;
+    }
+
+    /**
+     * Sets the value of the VolumeType property for this object.
+     * <p>
+     * Returns a reference to this object so that method calls can be chained together.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, io1
+     *
+     * @param volumeType The new value for the VolumeType property for this object.
+     *
+     * @return A reference to this updated object so that method calls can be chained 
+     *         together. 
+     *
+     * @see VolumeType
+     */
+    public CreateVolumeRequest withVolumeType(String volumeType) {
+        this.volumeType = volumeType;
+        return this;
+    }
+
+
+    /**
+     * Sets the value of the VolumeType property for this object.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, io1
+     *
+     * @param volumeType The new value for the VolumeType property for this object.
+     *
+     * @see VolumeType
+     */
+    public void setVolumeType(VolumeType volumeType) {
+        this.volumeType = volumeType.toString();
+    }
+
+    /**
+     * Sets the value of the VolumeType property for this object.
+     * <p>
+     * Returns a reference to this object so that method calls can be chained together.
+     * <p>
+     * <b>Constraints:</b><br/>
+     * <b>Allowed Values: </b>standard, io1
+     *
+     * @param volumeType The new value for the VolumeType property for this object.
+     *
+     * @return A reference to this updated object so that method calls can be chained 
+     *         together. 
+     *
+     * @see VolumeType
+     */
+    public CreateVolumeRequest withVolumeType(VolumeType volumeType) {
+        this.volumeType = volumeType.toString();
+        return this;
+    }
+
+    /**
+     * Returns the value of the Iops property for this object.
+     *
+     * @return The value of the Iops property for this object.
+     */
+    public Integer getIops() {
+        return iops;
+    }
+
+    /**
+     * Sets the value of the Iops property for this object.
+     *
+     * @param iops The new value for the Iops property for this object.
+     */
+    public void setIops(Integer iops) {
+        this.iops = iops;
+    }
+
+    /**
+     * Sets the value of the Iops property for this object.
+     * <p>
+     * Returns a reference to this object so that method calls can be chained together.
+     *
+     * @param iops The new value for the Iops property for this object.
+     *
+     * @return A reference to this updated object so that method calls can be chained 
+     *         together. 
+     */
+    public CreateVolumeRequest withIops(Integer iops) {
+        this.iops = iops;
+        return this;
+    }
+
+
     /**
      * Returns a string representation of this object; useful for testing and
      * debugging.
@@ -204,6 +325,8 @@ public String toString() {
         if (size != null) sb.append("Size: " + size + ", ");
         if (snapshotId != null) sb.append("SnapshotId: " + snapshotId + ", ");
         if (availabilityZone != null) sb.append("AvailabilityZone: " + availabilityZone + ", ");
+        if (volumeType != null) sb.append("VolumeType: " + volumeType + ", ");
+        if (iops != null) sb.append("Iops: " + iops + ", ");
         sb.append("}");
         return sb.toString();
     }
@@ -216,6 +339,8 @@ public int hashCode() {
         hashCode = prime * hashCode + ((getSize() == null) ? 0 : getSize().hashCode()); 
         hashCode = prime * hashCode + ((getSnapshotId() == null) ? 0 : getSnapshotId().hashCode()); 
         hashCode = prime * hashCode + ((getAvailabilityZone() == null) ? 0 : getAvailabilityZone().hashCode()); 
+        hashCode = prime * hashCode + ((getVolumeType() == null) ? 0 : getVolumeType().hashCode()); 
+        hashCode = prime * hashCode + ((getIops() == null) ? 0 : getIops().hashCode()); 
         return hashCode;
     }
 
@@ -233,6 +358,10 @@ public boolean equals(Object obj) {
         if (other.getSnapshotId() != null && other.getSnapshotId().equals(this.getSnapshotId()) == 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.getVolumeType() == null ^ this.getVolumeType() == null) return false;
+        if (other.getVolumeType() != null && other.getVolumeType().equals(this.getVolumeType()) == false) return false; 
+        if (other.getIops() == null ^ this.getIops() == null) return false;
+        if (other.getIops() != null && other.getIops().equals(this.getIops()) == false) return false; 
         return true;
     }
 

src/main/java/com/amazonaws/services/ec2/model/DescribeInstanceAttributeRequest.java

@@ -38,7 +38,7 @@ public class DescribeInstanceAttributeRequest extends AmazonWebServiceRequest {
      * <code>rootDeviceName</code>, <code>blockDeviceMapping</code>
      * <p>
      * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet
+     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized
      */
     private String attribute;
 
@@ -130,7 +130,7 @@ public DescribeInstanceAttributeRequest withInstanceId(String instanceId) {
      * <code>rootDeviceName</code>, <code>blockDeviceMapping</code>
      * <p>
      * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet
+     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized
      *
      * @return The name of the attribute to describe. <p> Available attribute names:
      *         <code>instanceType</code>, <code>kernel</code>, <code>ramdisk</code>,
@@ -152,7 +152,7 @@ public String getAttribute() {
      * <code>rootDeviceName</code>, <code>blockDeviceMapping</code>
      * <p>
      * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet
+     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized
      *
      * @param attribute The name of the attribute to describe. <p> Available attribute names:
      *         <code>instanceType</code>, <code>kernel</code>, <code>ramdisk</code>,
@@ -176,7 +176,7 @@ public void setAttribute(String attribute) {
      * Returns a reference to this object so that method calls can be chained together.
      * <p>
      * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet
+     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized
      *
      * @param attribute The name of the attribute to describe. <p> Available attribute names:
      *         <code>instanceType</code>, <code>kernel</code>, <code>ramdisk</code>,
@@ -203,7 +203,7 @@ public DescribeInstanceAttributeRequest withAttribute(String attribute) {
      * <code>rootDeviceName</code>, <code>blockDeviceMapping</code>
      * <p>
      * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet
+     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized
      *
      * @param attribute The name of the attribute to describe. <p> Available attribute names:
      *         <code>instanceType</code>, <code>kernel</code>, <code>ramdisk</code>,
@@ -227,7 +227,7 @@ public void setAttribute(InstanceAttributeName attribute) {
      * Returns a reference to this object so that method calls can be chained together.
      * <p>
      * <b>Constraints:</b><br/>
-     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet
+     * <b>Allowed Values: </b>instanceType, kernel, ramdisk, userData, disableApiTermination, instanceInitiatedShutdownBehavior, rootDeviceName, blockDeviceMapping, productCodes, sourceDestCheck, groupSet, ebsOptimized
      *
      * @param attribute The name of the attribute to describe. <p> Available attribute names:
      *         <code>instanceType</code>, <code>kernel</code>, <code>ramdisk</code>,