diff --git a/src/main/java/com/sendgrid/helpers/mail/objects/Personalization.java b/src/main/java/com/sendgrid/helpers/mail/objects/Personalization.java index 50dcafc5..734dc9c0 100644 --- a/src/main/java/com/sendgrid/helpers/mail/objects/Personalization.java +++ b/src/main/java/com/sendgrid/helpers/mail/objects/Personalization.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Collections; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -19,9 +20,11 @@ public class Personalization { @JsonProperty("substitutions") private Map substitutions; @JsonProperty("custom_args") private Map customArgs; @JsonProperty("send_at") private long sendAt; - + @JsonProperty("to") public List getTos() { + if(tos == null) + return Collections.emptyList(); return tos; } @@ -39,6 +42,8 @@ public void addTo(Email email) { @JsonProperty("cc") public List getCcs() { + if(ccs == null) + return Collections.emptyList(); return ccs; } @@ -56,6 +61,8 @@ public void addCc(Email email) { @JsonProperty("bcc") public List getBccs() { + if(bccs == null) + return Collections.emptyList(); return bccs; } @@ -82,6 +89,8 @@ public void setSubject(String subject) { @JsonProperty("headers") public Map getHeaders() { + if(headers == null) + return Collections.emptyMap(); return headers; } @@ -96,6 +105,8 @@ public void addHeader(String key, String value) { @JsonProperty("substitutions") public Map getSubstitutions() { + if(substitutions == null) + return Collections.emptyMap(); return substitutions; } @@ -110,6 +121,8 @@ public void addSubstitution(String key, String value) { @JsonProperty("custom_args") public Map getCustomArgs() { + if(customArgs == null) + return Collections.emptyMap(); return customArgs; } @@ -130,4 +143,5 @@ public long sendAt() { public void setSendAt(long sendAt) { this.sendAt = sendAt; } -} \ No newline at end of file + +}