Skip to content

Commit

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

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/amazonaws/auth/AwsChunkedEncodingInputStream.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public boolean markSupported() {
* The readlimit parameter is ignored.
*/
@Override
public synchronized void mark(int readlimit) {
public void mark(int readlimit) {
abortIfNeeded();
if ( !isAtStart )
throw new UnsupportedOperationException("Chunk-encoded stream only supports mark() at the start of the stream.");
Expand All @@ -220,7 +220,7 @@ public synchronized void mark(int readlimit) {
* buffer created by this class.
*/
@Override
public synchronized void reset() throws IOException {
public void reset() throws IOException {
abortIfNeeded();
// Clear up any encoded data
currentChunkIterator = null;
Expand Down
8 changes: 7 additions & 1 deletion src/main/java/com/amazonaws/services/dynamodbv2/datamodeling/DynamoDBMapperConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,14 @@ public DynamoDBMapperConfig(PaginationLoadingStrategy paginationLoadingStrategy)
* <p>
* Used internally to merge the {@link DynamoDBMapperConfig} provided at
* construction with an overriding object for a particular operation.
*
* @param defaults
* The default mapper configuration values.
* @param overrides
* The overridden mapper configuration values. Any non-null
* config settings will be applied to the returned object.
*/
DynamoDBMapperConfig(DynamoDBMapperConfig defaults, DynamoDBMapperConfig overrides) {
public DynamoDBMapperConfig(DynamoDBMapperConfig defaults, DynamoDBMapperConfig overrides) {
if ( overrides == null ) {
this.saveBehavior = defaults.getSaveBehavior();
this.consistentReads = defaults.getConsistentReads();
Expand Down
257 changes: 0 additions & 257 deletions src/main/java/com/amazonaws/services/ec2/AmazonEC2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5121,29 +5121,6 @@ public void createVpnConnectionRoute(CreateVpnConnectionRouteRequest createVpnCo
*/
public DescribeAvailabilityZonesResult describeAvailabilityZones() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Deletes a security group.
* </p>
* <p>
* If you attempt to delete a security group that is associated with an
* instance, or is referenced by another security group, the operation
* fails with <code>InvalidGroup.InUse</code> in EC2-Classic or
* <code>DependencyViolation</code> in EC2-VPC.
* </p>
*
*
*
* @throws AmazonClientException
* If any internal errors are encountered inside the client while
* attempting to make the request or handle the response. For example
* if a network connection is not available.
* @throws AmazonServiceException
* If an error response is returned by AmazonEC2 indicating
* either a problem with the data in the request, or a server side issue.
*/
public void deleteSecurityGroup() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Describes the Spot Price history. Spot Instances are instances that
Expand Down Expand Up @@ -5241,30 +5218,6 @@ public void createVpnConnectionRoute(CreateVpnConnectionRouteRequest createVpnCo
*/
public DescribeInternetGatewaysResult describeInternetGateways() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Creates an import volume task using metadata from the specified disk
* image. After importing the image, you then upload it using the
* ec2-import-volume command in the Amazon EC2 command-line interface
* (CLI) tools. For more information, see
* <a href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/UploadingYourInstancesandVolumes.html"> Using the Command Line Tools to Import Your Virtual Machine to Amazon EC2 </a>
* in the <i>Amazon Elastic Compute Cloud User Guide</i> .
* </p>
*
* @return The response from the ImportVolume service method, as returned
* by AmazonEC2.
*
*
* @throws AmazonClientException
* If any internal errors are encountered inside the client while
* attempting to make the request or handle the response. For example
* if a network connection is not available.
* @throws AmazonServiceException
* If an error response is returned by AmazonEC2 indicating
* either a problem with the data in the request, or a server side issue.
*/
public ImportVolumeResult importVolume() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Describes one or more of your security groups.
Expand All @@ -5290,28 +5243,6 @@ public void createVpnConnectionRoute(CreateVpnConnectionRouteRequest createVpnCo
*/
public DescribeSecurityGroupsResult describeSecurityGroups() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Rejects a VPC peering connection request. The VPC peering connection
* must be in the <code>pending-acceptance</code> state. Use the
* <code>DescribeVpcPeeringConnections</code> request to view your
* outstanding VPC peering connection requests.
* </p>
*
* @return The response from the RejectVpcPeeringConnection service
* method, as returned by AmazonEC2.
*
*
* @throws AmazonClientException
* If any internal errors are encountered inside the client while
* attempting to make the request or handle the response. For example
* if a network connection is not available.
* @throws AmazonServiceException
* If an error response is returned by AmazonEC2 indicating
* either a problem with the data in the request, or a server side issue.
*/
public RejectVpcPeeringConnectionResult rejectVpcPeeringConnection() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Describes the datafeed for Spot Instances. For more information, see
Expand Down Expand Up @@ -5584,28 +5515,6 @@ public void createVpnConnectionRoute(CreateVpnConnectionRouteRequest createVpnCo
*/
public DescribeReservedInstancesListingsResult describeReservedInstancesListings() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Submits feedback about the status of an instance. The instance must
* be in the <code>running</code> state. If your experience with the
* instance differs from the instance status returned by
* DescribeInstanceStatus, use ReportInstanceStatus to report your
* experience with the instance. Amazon EC2 collects this information to
* improve the accuracy of status checks.
* </p>
*
*
*
* @throws AmazonClientException
* If any internal errors are encountered inside the client while
* attempting to make the request or handle the response. For example
* if a network connection is not available.
* @throws AmazonServiceException
* If an error response is returned by AmazonEC2 indicating
* either a problem with the data in the request, or a server side issue.
*/
public void reportInstanceStatus() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Describes one or more of your route tables.
Expand Down Expand Up @@ -5732,29 +5641,6 @@ public void createVpnConnectionRoute(CreateVpnConnectionRouteRequest createVpnCo
*/
public void revokeSecurityGroupIngress() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Deletes a VPC peering connection. Either the owner of the requester
* VPC or the owner of the peer VPC can delete the VPC peering connection
* if it's in the <code>active</code> state. The owner of the requester
* VPC can delete a VPC peering connection in the
* <code>pending-acceptance</code> state.
* </p>
*
* @return The response from the DeleteVpcPeeringConnection service
* method, as returned by AmazonEC2.
*
*
* @throws AmazonClientException
* If any internal errors are encountered inside the client while
* attempting to make the request or handle the response. For example
* if a network connection is not available.
* @throws AmazonServiceException
* If an error response is returned by AmazonEC2 indicating
* either a problem with the data in the request, or a server side issue.
*/
public DeleteVpcPeeringConnectionResult deleteVpcPeeringConnection() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Creates an Internet gateway for use with a VPC. After creating the
Expand Down Expand Up @@ -5924,46 +5810,6 @@ public void createVpnConnectionRoute(CreateVpnConnectionRouteRequest createVpnCo
*/
public DescribeImagesResult describeImages() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Adds one or more ingress rules to a security group.
* </p>
* <p>
* <b>IMPORTANT:</b> EC2-Classic: You can have up to 100 rules per
* group. EC2-VPC: You can have up to 50 rules per group (covering both
* ingress and egress rules).
* </p>
* <p>
* Rule changes are propagated to instances within the security group as
* quickly as possible. However, a small delay might occur.
* </p>
* <p>
* [EC2-Classic] This action gives one or more CIDR IP address ranges
* permission to access a security group in your account, or gives one or
* more security groups (called the <i>source groups</i> ) permission to
* access a security group for your account. A source group can be for
* your own AWS account, or another.
* </p>
* <p>
* [EC2-VPC] This action gives one or more CIDR IP address ranges
* permission to access a security group in your VPC, or gives one or
* more other security groups (called the <i>source groups</i> )
* permission to access a security group for your VPC. The security
* groups must all be for the same VPC.
* </p>
*
*
*
* @throws AmazonClientException
* If any internal errors are encountered inside the client while
* attempting to make the request or handle the response. For example
* if a network connection is not available.
* @throws AmazonServiceException
* If an error response is returned by AmazonEC2 indicating
* either a problem with the data in the request, or a server side issue.
*/
public void authorizeSecurityGroupIngress() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Describes the Spot Instance requests that belong to your account.
Expand Down Expand Up @@ -6296,28 +6142,6 @@ public void createVpnConnectionRoute(CreateVpnConnectionRouteRequest createVpnCo
*/
public DescribeReservedInstancesOfferingsResult describeReservedInstancesOfferings() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Disassociates an Elastic IP address from the instance or network
* interface it's associated with.
* </p>
* <p>
* This is an idempotent operation. If you perform the operation more
* than once, Amazon EC2 doesn't return an error.
* </p>
*
*
*
* @throws AmazonClientException
* If any internal errors are encountered inside the client while
* attempting to make the request or handle the response. For example
* if a network connection is not available.
* @throws AmazonServiceException
* If an error response is returned by AmazonEC2 indicating
* either a problem with the data in the request, or a server side issue.
*/
public void disassociateAddress() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Acquires an Elastic IP address.
Expand All @@ -6343,42 +6167,6 @@ public void createVpnConnectionRoute(CreateVpnConnectionRouteRequest createVpnCo
*/
public AllocateAddressResult allocateAddress() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Releases the specified Elastic IP address.
* </p>
* <p>
* After releasing an Elastic IP address, it is released to the IP
* address pool and might be unavailable to you. Be sure to update your
* DNS records and any servers or devices that communicate with the
* address. If you attempt to release an Elastic IP address that you
* already released, you'll get an <code>AuthFailure</code> error if the
* address is already allocated to another AWS account.
* </p>
* <p>
* [EC2-Classic, default VPC] Releasing an Elastic IP address
* automatically disassociates it from any instance that it's associated
* with. To disassociate an Elastic IP address without releasing it, use
* DisassociateAddress.
* </p>
* <p>
* [Nondefault VPC] You must use the DisassociateAddress to disassociate
* the Elastic IP address before you try to release it. Otherwise, Amazon
* EC2 returns an error ( <code>InvalidIPAddress.InUse</code> ).
* </p>
*
*
*
* @throws AmazonClientException
* If any internal errors are encountered inside the client while
* attempting to make the request or handle the response. For example
* if a network connection is not available.
* @throws AmazonServiceException
* If an error response is returned by AmazonEC2 indicating
* either a problem with the data in the request, or a server side issue.
*/
public void releaseAddress() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Describes one or more of the Amazon EBS snapshots available to you.
Expand Down Expand Up @@ -6447,51 +6235,6 @@ public void createVpnConnectionRoute(CreateVpnConnectionRouteRequest createVpnCo
*/
public DescribeSnapshotsResult describeSnapshots() throws AmazonServiceException, AmazonClientException;

/**
* <p>
* Registers an AMI. When you're creating an AMI, this is the final step
* you must complete before you can launch an instance from the AMI. For
* more information about creating AMIs, see
* <a href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/creating-an-ami.html"> Creating Your Own AMIs </a>
* in the <i>Amazon Elastic Compute Cloud User Guide</i> .
* </p>
* <p>
* <b>NOTE:</b> For Amazon EBS-backed instances, CreateImage creates and
* registers the AMI in a single request, so you don't have to register
* the AMI yourself.
* </p>
* <p>
* You can also use <code>RegisterImage</code> to create an Amazon
* EBS-backed AMI from a snapshot of a root device volume. For more
* information, see
* <a href="http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_LaunchingInstanceFromSnapshot.html"> Launching an Instance from a Snapshot </a>
* in the <i>Amazon Elastic Compute Cloud User Guide</i> .
* </p>
* <p>
* If needed, you can deregister an AMI at any time. Any modifications
* you make to an AMI backed by an instance store volume invalidates its
* registration. If you make changes to an image, deregister the previous
* image and register the new image.
* </p>
* <p>
* <b>NOTE:</b> You can't register an image where a secondary (non-root)
* snapshot has AWS Marketplace product codes.
* </p>
*
* @return The response from the RegisterImage service method, as
* returned by AmazonEC2.
*
*
* @throws AmazonClientException
* If any internal errors are encountered inside the client while
* attempting to make the request or handle the response. For example
* if a network connection is not available.
* @throws AmazonServiceException
* If an error response is returned by AmazonEC2 indicating
* either a problem with the data in the request, or a server side issue.
*/
public RegisterImageResult registerImage() throws AmazonServiceException, AmazonClientException;

/**
* Checks whether you have the required permissions for the provided
* AmazonEC2 operation, without actually running it. The returned
Expand Down
Loading

0 comments on commit af24ee2

Please sign in to comment.