Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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<MergeVar> global_merge_vars;

List<MessageMergeVars> merge_vars;

private Map<String, String> headers;

public String getSubject() {
Expand Down Expand Up @@ -133,4 +134,12 @@ public List<MergeVar> getGlobal_merge_vars() {
public void setGlobal_merge_vars(List<MergeVar> global_merge_vars) {
this.global_merge_vars = global_merge_vars;
}

public List<MessageMergeVars> getMerge_vars() {
return merge_vars;
}

public void setMerge_vars(List<MessageMergeVars> merge_vars) {
this.merge_vars = merge_vars;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package com.cribbstechnologies.clients.mandrill.model;

import java.util.List;

public class MessageMergeVars {
private String rcpt;
private List<MergeVar> vars;

public String getRcpt() {
return rcpt;
}

public void setRcpt(String rcpt) {
this.rcpt = rcpt;
}

public List<MergeVar> getVars() {
return vars;
}

public void setVars(List<MergeVar> vars) {
this.vars = vars;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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("}}");
Expand Down