diff --git a/src/main/java/com/cribbstechnologies/clients/mandrill/model/MandrillMessage.java b/src/main/java/com/cribbstechnologies/clients/mandrill/model/MandrillMessage.java index bde1dd9..a843770 100644 --- a/src/main/java/com/cribbstechnologies/clients/mandrill/model/MandrillMessage.java +++ b/src/main/java/com/cribbstechnologies/clients/mandrill/model/MandrillMessage.java @@ -18,7 +18,8 @@ public class MandrillMessage { private String[] google_analytics_domains = new String[0]; private String[] google_analytics_campaign = new String[0]; private List global_merge_vars; - + List merge_vars; + private Map headers; public String getSubject() { @@ -133,4 +134,12 @@ public List getGlobal_merge_vars() { public void setGlobal_merge_vars(List global_merge_vars) { this.global_merge_vars = global_merge_vars; } + + public List getMerge_vars() { + return merge_vars; + } + + public void setMerge_vars(List merge_vars) { + this.merge_vars = merge_vars; + } } diff --git a/src/main/java/com/cribbstechnologies/clients/mandrill/model/MessageMergeVars.java b/src/main/java/com/cribbstechnologies/clients/mandrill/model/MessageMergeVars.java new file mode 100644 index 0000000..365d87a --- /dev/null +++ b/src/main/java/com/cribbstechnologies/clients/mandrill/model/MessageMergeVars.java @@ -0,0 +1,24 @@ +package com.cribbstechnologies.clients.mandrill.model; + +import java.util.List; + +public class MessageMergeVars { + private String rcpt; + private List vars; + + public String getRcpt() { + return rcpt; + } + + public void setRcpt(String rcpt) { + this.rcpt = rcpt; + } + + public List getVars() { + return vars; + } + + public void setVars(List vars) { + this.vars = vars; + } +} diff --git a/src/test/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequestTest.java b/src/test/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequestTest.java index 44c1ae9..368668b 100644 --- a/src/test/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequestTest.java +++ b/src/test/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequestTest.java @@ -262,6 +262,7 @@ public void testGetPostDataMandrillMessageRequest() throws Exception { sb.append(",\"google_analytics_domains\":[]"); sb.append(",\"google_analytics_campaign\":[]"); sb.append(",\"global_merge_vars\":null"); + sb.append(",\"merge_vars\":null"); sb.append(",\"headers\":{\"headerName\":\"headerValue\"},"); sb.append("\"html\":\"Test html\""); sb.append("}}");