Skip to content

Commit

Permalink
'Version 1.4.7 of the AWS Java SDK'
Browse files Browse the repository at this point in the history 
This release adds support for large payloads in Amazon Simple Notification Service and resolves a few issues.
  • Loading branch information
Yifei Sun committed Jun 18, 2013
1 parent 003e91a commit e2883be
Show file tree
Hide file tree
Showing 70 changed files with 912 additions and 718 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.4.6
Bundle-Version: 1.4.7
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.4.6</version>
<version>1.4.7</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
1 change: 1 addition & 0 deletions src/main/java/com/amazonaws/services/s3/internal/ServiceUtils.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ public static String urlEncode(String s) {
// Change all "%2F" back to "/", so that when users download a file in a virtual folder by the presigned URL,
// the web browsers won't mess up the filename. (e.g. 'folder1_folder2_filename' instead of 'filename')
encodedString = encodedString.replace("%2F", "/");
encodedString = encodedString.replace("%7E", "~");
return encodedString;
} catch (UnsupportedEncodingException e) {
throw new AmazonClientException("Unable to encode path: " + s, e);
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/com/amazonaws/services/simpleemail/model/Body.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ public class Body implements Serializable {
*/
public Body() {}



/**
* Constructs a new Body object.
* Callers should use the setter or fluent setter (with...) methods to
Expand All @@ -53,7 +55,7 @@ public Body() {}
* mobile devices).
*/
public Body(Content text) {
this.text = text;
setText(text);
}


Expand Down Expand Up @@ -161,8 +163,8 @@ public Body withHtml(Content html) {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
if (getText() != null) sb.append("Text: " + getText() + ",");
sb.append("{");
if (getText() != null) sb.append("Text: " + getText() + ",");
if (getHtml() != null) sb.append("Html: " + getHtml() );
sb.append("}");
return sb.toString();
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/com/amazonaws/services/simpleemail/model/Content.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@ public class Content implements Serializable {
*/
public Content() {}



/**
* Constructs a new Content object.
* Callers should use the setter or fluent setter (with...) methods to
Expand All @@ -50,7 +52,7 @@ public Content() {}
* @param data The textual data of the content.
*/
public Content(String data) {
this.data = data;
setData(data);
}


Expand Down Expand Up @@ -134,8 +136,8 @@ public Content withCharset(String charset) {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
if (getData() != null) sb.append("Data: " + getData() + ",");
sb.append("{");
if (getData() != null) sb.append("Data: " + getData() + ",");
if (getCharset() != null) sb.append("Charset: " + getCharset() );
sb.append("}");
return sb.toString();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/amazonaws/services/simpleemail/model/DeleteIdentityRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public DeleteIdentityRequest withIdentity(String identity) {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append("{");
if (getIdentity() != null) sb.append("Identity: " + getIdentity() );
sb.append("}");
return sb.toString();
Expand Down
2 changes: 1 addition & 1 deletion ...main/java/com/amazonaws/services/simpleemail/model/DeleteVerifiedEmailAddressRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public DeleteVerifiedEmailAddressRequest withEmailAddress(String emailAddress) {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append("{");
if (getEmailAddress() != null) sb.append("EmailAddress: " + getEmailAddress() );
sb.append("}");
return sb.toString();
Expand Down
40 changes: 21 additions & 19 deletions src/main/java/com/amazonaws/services/simpleemail/model/Destination.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,26 @@ public class Destination implements Serializable {
/**
* The To: field(s) of the message.
*/
private java.util.List<String> toAddresses;
private com.amazonaws.internal.ListWithAutoConstructFlag<String> toAddresses;

/**
* The CC: field(s) of the message.
*/
private java.util.List<String> ccAddresses;
private com.amazonaws.internal.ListWithAutoConstructFlag<String> ccAddresses;

/**
* The BCC: field(s) of the message.
*/
private java.util.List<String> bccAddresses;
private com.amazonaws.internal.ListWithAutoConstructFlag<String> bccAddresses;

/**
* Default constructor for a new Destination object. Callers should use the
* setter or fluent setter (with...) methods to initialize this object after creating it.
*/
public Destination() {}



/**
* Constructs a new Destination object.
* Callers should use the setter or fluent setter (with...) methods to
Expand All @@ -51,7 +53,7 @@ public Destination() {}
* @param toAddresses The To: field(s) of the message.
*/
public Destination(java.util.List<String> toAddresses) {
this.toAddresses = toAddresses;
setToAddresses(toAddresses);
}


Expand All @@ -64,7 +66,8 @@ public Destination(java.util.List<String> toAddresses) {
public java.util.List<String> getToAddresses() {

if (toAddresses == null) {
toAddresses = new java.util.ArrayList<String>();
toAddresses = new com.amazonaws.internal.ListWithAutoConstructFlag<String>();
toAddresses.setAutoConstruct(true);
}
return toAddresses;
}
Expand All @@ -79,8 +82,7 @@ public void setToAddresses(java.util.Collection<String> toAddresses) {
this.toAddresses = null;
return;
}

java.util.List<String> toAddressesCopy = new java.util.ArrayList<String>(toAddresses.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> toAddressesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(toAddresses.size());
toAddressesCopy.addAll(toAddresses);
this.toAddresses = toAddressesCopy;
}
Expand Down Expand Up @@ -117,7 +119,7 @@ public Destination withToAddresses(java.util.Collection<String> toAddresses) {
if (toAddresses == null) {
this.toAddresses = null;
} else {
java.util.List<String> toAddressesCopy = new java.util.ArrayList<String>(toAddresses.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> toAddressesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(toAddresses.size());
toAddressesCopy.addAll(toAddresses);
this.toAddresses = toAddressesCopy;
}
Expand All @@ -133,7 +135,8 @@ public Destination withToAddresses(java.util.Collection<String> toAddresses) {
public java.util.List<String> getCcAddresses() {

if (ccAddresses == null) {
ccAddresses = new java.util.ArrayList<String>();
ccAddresses = new com.amazonaws.internal.ListWithAutoConstructFlag<String>();
ccAddresses.setAutoConstruct(true);
}
return ccAddresses;
}
Expand All @@ -148,8 +151,7 @@ public void setCcAddresses(java.util.Collection<String> ccAddresses) {
this.ccAddresses = null;
return;
}

java.util.List<String> ccAddressesCopy = new java.util.ArrayList<String>(ccAddresses.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> ccAddressesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(ccAddresses.size());
ccAddressesCopy.addAll(ccAddresses);
this.ccAddresses = ccAddressesCopy;
}
Expand Down Expand Up @@ -186,7 +188,7 @@ public Destination withCcAddresses(java.util.Collection<String> ccAddresses) {
if (ccAddresses == null) {
this.ccAddresses = null;
} else {
java.util.List<String> ccAddressesCopy = new java.util.ArrayList<String>(ccAddresses.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> ccAddressesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(ccAddresses.size());
ccAddressesCopy.addAll(ccAddresses);
this.ccAddresses = ccAddressesCopy;
}
Expand All @@ -202,7 +204,8 @@ public Destination withCcAddresses(java.util.Collection<String> ccAddresses) {
public java.util.List<String> getBccAddresses() {

if (bccAddresses == null) {
bccAddresses = new java.util.ArrayList<String>();
bccAddresses = new com.amazonaws.internal.ListWithAutoConstructFlag<String>();
bccAddresses.setAutoConstruct(true);
}
return bccAddresses;
}
Expand All @@ -217,8 +220,7 @@ public void setBccAddresses(java.util.Collection<String> bccAddresses) {
this.bccAddresses = null;
return;
}

java.util.List<String> bccAddressesCopy = new java.util.ArrayList<String>(bccAddresses.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> bccAddressesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(bccAddresses.size());
bccAddressesCopy.addAll(bccAddresses);
this.bccAddresses = bccAddressesCopy;
}
Expand Down Expand Up @@ -255,7 +257,7 @@ public Destination withBccAddresses(java.util.Collection<String> bccAddresses) {
if (bccAddresses == null) {
this.bccAddresses = null;
} else {
java.util.List<String> bccAddressesCopy = new java.util.ArrayList<String>(bccAddresses.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> bccAddressesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(bccAddresses.size());
bccAddressesCopy.addAll(bccAddresses);
this.bccAddresses = bccAddressesCopy;
}
Expand All @@ -274,9 +276,9 @@ public Destination withBccAddresses(java.util.Collection<String> bccAddresses) {
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
if (getToAddresses() != null) sb.append("ToAddresses: " + getToAddresses() + ",");
if (getCcAddresses() != null) sb.append("CcAddresses: " + getCcAddresses() + ",");
sb.append("{");
if (getToAddresses() != null) sb.append("ToAddresses: " + getToAddresses() + ",");
if (getCcAddresses() != null) sb.append("CcAddresses: " + getCcAddresses() + ",");
if (getBccAddresses() != null) sb.append("BccAddresses: " + getBccAddresses() );
sb.append("}");
return sb.toString();
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/com/amazonaws/services/simpleemail/model/GetIdentityDkimAttributesRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public class GetIdentityDkimAttributesRequest extends AmazonWebServiceRequest i
* A list of one or more verified identities - email addresses, domains,
* or both.
*/
private java.util.List<String> identities;
private com.amazonaws.internal.ListWithAutoConstructFlag<String> identities;

/**
* A list of one or more verified identities - email addresses, domains,
Expand All @@ -59,7 +59,8 @@ public class GetIdentityDkimAttributesRequest extends AmazonWebServiceRequest i
public java.util.List<String> getIdentities() {

if (identities == null) {
identities = new java.util.ArrayList<String>();
identities = new com.amazonaws.internal.ListWithAutoConstructFlag<String>();
identities.setAutoConstruct(true);
}
return identities;
}
Expand All @@ -76,8 +77,7 @@ public void setIdentities(java.util.Collection<String> identities) {
this.identities = null;
return;
}

java.util.List<String> identitiesCopy = new java.util.ArrayList<String>(identities.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> identitiesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(identities.size());
identitiesCopy.addAll(identities);
this.identities = identitiesCopy;
}
Expand Down Expand Up @@ -118,7 +118,7 @@ public GetIdentityDkimAttributesRequest withIdentities(java.util.Collection<Stri
if (identities == null) {
this.identities = null;
} else {
java.util.List<String> identitiesCopy = new java.util.ArrayList<String>(identities.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> identitiesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(identities.size());
identitiesCopy.addAll(identities);
this.identities = identitiesCopy;
}
Expand All @@ -137,7 +137,7 @@ public GetIdentityDkimAttributesRequest withIdentities(java.util.Collection<Stri
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append("{");
if (getIdentities() != null) sb.append("Identities: " + getIdentities() );
sb.append("}");
return sb.toString();
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/amazonaws/services/simpleemail/model/GetIdentityDkimAttributesResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public GetIdentityDkimAttributesResult withDkimAttributes(java.util.Map<String,I
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append("{");
if (getDkimAttributes() != null) sb.append("DkimAttributes: " + getDkimAttributes() );
sb.append("}");
return sb.toString();
Expand Down
12 changes: 6 additions & 6 deletions ...va/com/amazonaws/services/simpleemail/model/GetIdentityNotificationAttributesRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public class GetIdentityNotificationAttributesRequest extends AmazonWebServiceRe
/**
* A list of one or more identities.
*/
private java.util.List<String> identities;
private com.amazonaws.internal.ListWithAutoConstructFlag<String> identities;

/**
* A list of one or more identities.
Expand All @@ -41,7 +41,8 @@ public class GetIdentityNotificationAttributesRequest extends AmazonWebServiceRe
public java.util.List<String> getIdentities() {

if (identities == null) {
identities = new java.util.ArrayList<String>();
identities = new com.amazonaws.internal.ListWithAutoConstructFlag<String>();
identities.setAutoConstruct(true);
}
return identities;
}
Expand All @@ -56,8 +57,7 @@ public void setIdentities(java.util.Collection<String> identities) {
this.identities = null;
return;
}

java.util.List<String> identitiesCopy = new java.util.ArrayList<String>(identities.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> identitiesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(identities.size());
identitiesCopy.addAll(identities);
this.identities = identitiesCopy;
}
Expand Down Expand Up @@ -94,7 +94,7 @@ public GetIdentityNotificationAttributesRequest withIdentities(java.util.Collect
if (identities == null) {
this.identities = null;
} else {
java.util.List<String> identitiesCopy = new java.util.ArrayList<String>(identities.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> identitiesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(identities.size());
identitiesCopy.addAll(identities);
this.identities = identitiesCopy;
}
Expand All @@ -113,7 +113,7 @@ public GetIdentityNotificationAttributesRequest withIdentities(java.util.Collect
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append("{");
if (getIdentities() != null) sb.append("Identities: " + getIdentities() );
sb.append("}");
return sb.toString();
Expand Down
2 changes: 1 addition & 1 deletion ...ava/com/amazonaws/services/simpleemail/model/GetIdentityNotificationAttributesResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public GetIdentityNotificationAttributesResult withNotificationAttributes(java.u
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append("{");
if (getNotificationAttributes() != null) sb.append("NotificationAttributes: " + getNotificationAttributes() );
sb.append("}");
return sb.toString();
Expand Down
12 changes: 6 additions & 6 deletions ...va/com/amazonaws/services/simpleemail/model/GetIdentityVerificationAttributesRequest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public class GetIdentityVerificationAttributesRequest extends AmazonWebServiceRe
/**
* A list of identities.
*/
private java.util.List<String> identities;
private com.amazonaws.internal.ListWithAutoConstructFlag<String> identities;

/**
* A list of identities.
Expand All @@ -40,7 +40,8 @@ public class GetIdentityVerificationAttributesRequest extends AmazonWebServiceRe
public java.util.List<String> getIdentities() {

if (identities == null) {
identities = new java.util.ArrayList<String>();
identities = new com.amazonaws.internal.ListWithAutoConstructFlag<String>();
identities.setAutoConstruct(true);
}
return identities;
}
Expand All @@ -55,8 +56,7 @@ public void setIdentities(java.util.Collection<String> identities) {
this.identities = null;
return;
}

java.util.List<String> identitiesCopy = new java.util.ArrayList<String>(identities.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> identitiesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(identities.size());
identitiesCopy.addAll(identities);
this.identities = identitiesCopy;
}
Expand Down Expand Up @@ -93,7 +93,7 @@ public GetIdentityVerificationAttributesRequest withIdentities(java.util.Collect
if (identities == null) {
this.identities = null;
} else {
java.util.List<String> identitiesCopy = new java.util.ArrayList<String>(identities.size());
com.amazonaws.internal.ListWithAutoConstructFlag<String> identitiesCopy = new com.amazonaws.internal.ListWithAutoConstructFlag<String>(identities.size());
identitiesCopy.addAll(identities);
this.identities = identitiesCopy;
}
Expand All @@ -112,7 +112,7 @@ public GetIdentityVerificationAttributesRequest withIdentities(java.util.Collect
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("{");
sb.append("{");
if (getIdentities() != null) sb.append("Identities: " + getIdentities() );
sb.append("}");
return sb.toString();
Expand Down
Loading

0 comments on commit e2883be

Please sign in to comment.