From b968a8328c32529fcd2335a57c7828e607fd9871 Mon Sep 17 00:00:00 2001 From: Martin Zapata Date: Wed, 22 May 2013 10:19:07 +1000 Subject: [PATCH 1/3] .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f0e4507 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +.classpath +.project +.settings +/target From c3878656a7c3384964698c076ce9ce68070a95c1 Mon Sep 17 00:00:00 2001 From: Martin Zapata Date: Wed, 22 May 2013 18:08:46 +1000 Subject: [PATCH 2/3] Added new Mandrill response reject_reason --- .../model/response/message/MessageResponse.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/main/java/com/cribbstechnologies/clients/mandrill/model/response/message/MessageResponse.java b/src/main/java/com/cribbstechnologies/clients/mandrill/model/response/message/MessageResponse.java index 0d237e4..91645ff 100644 --- a/src/main/java/com/cribbstechnologies/clients/mandrill/model/response/message/MessageResponse.java +++ b/src/main/java/com/cribbstechnologies/clients/mandrill/model/response/message/MessageResponse.java @@ -1,5 +1,7 @@ package com.cribbstechnologies.clients.mandrill.model.response.message; +import org.codehaus.jackson.annotate.JsonProperty; + import com.cribbstechnologies.clients.mandrill.model.response.BaseMandrillResponse; public class MessageResponse extends BaseMandrillResponse { @@ -7,6 +9,7 @@ public class MessageResponse extends BaseMandrillResponse { String email; String status; String _id; + String rejectReason; public String getEmail() { return email; @@ -31,4 +34,13 @@ public String get_id() { public void set_id(String _id) { this._id = _id; } + + public String getRejectReason() { + return this.rejectReason; + } + + @JsonProperty("reject_reason") + public void setRejectReason(String rejectReason) { + this.rejectReason = rejectReason; + } } From 49a3a83ee137b52e371eb293b36e9e2b5f944cd8 Mon Sep 17 00:00:00 2001 From: Martin Zapata Date: Wed, 22 May 2013 18:09:04 +1000 Subject: [PATCH 3/3] Fixed "UTF-8" mispelling --- .../clients/mandrill/request/MandrillRESTRequest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequest.java b/src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequest.java index 4a5d164..2cf41a3 100644 --- a/src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequest.java +++ b/src/main/java/com/cribbstechnologies/clients/mandrill/request/MandrillRESTRequest.java @@ -42,7 +42,7 @@ private BaseMandrillResponse performPostRequest(BaseMandrillRequest request, Str request.setKey(config.getApiKey()); HttpPost postRequest = new HttpPost(config.getServiceUrl() + serviceMethod); String postData = getPostData(request); - StringEntity input = new StringEntity(postData, "UFT-8"); + StringEntity input = new StringEntity(postData, "UTF-8"); input.setContentType("application/json"); postRequest.setEntity(input);