From 582981238303f3e3b30f09aea8d952b43c0afebf Mon Sep 17 00:00:00 2001
From: aluedeke <aluedeke@testobject.com>
Date: Wed, 15 May 2013 07:52:01 +0200
Subject: [PATCH 1/2] fix request entity encoding to support german umlauts

---
 .gitignore                                                    | 4 ++++
 pom.xml                                                       | 2 +-
 .../clients/mandrill/request/MandrillRESTRequest.java         | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c708c36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+/target
+/.settings
+/.classpath
+/.project
diff --git a/pom.xml b/pom.xml
index 8bf23b5..1872d35 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   <groupId>com.cribbstechnologies.clients</groupId>
   <artifactId>mandrillClient</artifactId>
-  <version>0.0.1-SNAPSHOT</version>
+  <version>0.0.1-1</version>
   <packaging>jar</packaging>
   <name>Java Mandrill Wrapper</name>
   <description>A Java wrapper for Mandrill</description>
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 5ff8f36..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);
+			StringEntity input = new StringEntity(postData, "UTF-8");
 			input.setContentType("application/json");
 			postRequest.setEntity(input);
 			

From 9574649dc9afde05a8bd066a2b81d11ac27e0067 Mon Sep 17 00:00:00 2001
From: Tal Kirshboim <tkirshboim@testobject.com>
Date: Thu, 16 May 2013 14:32:26 +0200
Subject: [PATCH 2/2] bugfix - missing field added (madrill api has changed?)

---
 pom.xml                                       |  2 +-
 .../response/message/MessageResponse.java     | 25 +++++++++++++------
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1872d35..335fb3f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
   </parent>
   <groupId>com.cribbstechnologies.clients</groupId>
   <artifactId>mandrillClient</artifactId>
-  <version>0.0.1-1</version>
+  <version>0.0.1-2</version>
   <packaging>jar</packaging>
   <name>Java Mandrill Wrapper</name>
   <description>A Java wrapper for Mandrill</description>
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..281e3f6 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
@@ -4,9 +4,10 @@
 
 public class MessageResponse extends BaseMandrillResponse {
 
-	String email; 
+	String email;
 	String status;
-    String _id;
+	String _id;
+	String reject_reason;
 
 	public String getEmail() {
 		return email;
@@ -24,11 +25,19 @@ public void setStatus(String status) {
 		this.status = status;
 	}
 
-    public String get_id() {
-        return _id;
-    }
+	public String get_id() {
+		return _id;
+	}
+
+	public void set_id(String _id) {
+		this._id = _id;
+	}
 
-    public void set_id(String _id) {
-        this._id = _id;
-    }
+	public void setReject_reason(String reject_reason) {
+		this.reject_reason = reject_reason;
+	}
+
+	public String getReject_reason() {
+		return reject_reason;
+	}
 }