From aa9d12c0ce845ba4ae2754c8adf2440be5a17c11 Mon Sep 17 00:00:00 2001
From: "awwa500@gmail.com" <awwa500@gmail.com>
Date: Fri, 15 May 2015 11:47:47 +0900
Subject: [PATCH] Add rawJsonString()

---
 README.md                                           | 5 +++++
 src/main/java/com/sendgrid/smtpapi/SMTPAPI.java     | 4 ++++
 src/test/java/com/sendgrid/smtpapi/SMTPAPITest.java | 8 ++++++++
 3 files changed, 17 insertions(+)

diff --git a/README.md b/README.md
index 08cf7b9..1406dbe 100644
--- a/README.md
+++ b/README.md
@@ -137,6 +137,11 @@ int sendAt = header.getSendAt();
 String headers = header.jsonString();
 ```
 
+If you need the unescaped JSON string.
+```java
+String rawJson = header.rawJsonString();
+```
+
 ## Running Tests
 
 ```
diff --git a/src/main/java/com/sendgrid/smtpapi/SMTPAPI.java b/src/main/java/com/sendgrid/smtpapi/SMTPAPI.java
index f7715a7..f3e7c0a 100644
--- a/src/main/java/com/sendgrid/smtpapi/SMTPAPI.java
+++ b/src/main/java/com/sendgrid/smtpapi/SMTPAPI.java
@@ -231,4 +231,8 @@ private String escapeUnicode(String input) {
   public String jsonString() {
     return escapeUnicode(this.header.toString());
   }
+
+  public String rawJsonString() {
+    return this.header.toString();
+  }
 }
diff --git a/src/test/java/com/sendgrid/smtpapi/SMTPAPITest.java b/src/test/java/com/sendgrid/smtpapi/SMTPAPITest.java
index eb5ac29..ad9af8f 100644
--- a/src/test/java/com/sendgrid/smtpapi/SMTPAPITest.java
+++ b/src/test/java/com/sendgrid/smtpapi/SMTPAPITest.java
@@ -76,6 +76,14 @@ public class SMTPAPITest {
     Assert.assertEquals(expected, test.jsonString());
   }
 
+  @Test public void testRawJsonString() {
+    test.addCategory("カテゴリUñicode");
+    test.addCategory("カテゴリ2Unicode");
+    test.addCategory("鼖");
+    String expected = "{\"category\":[\"カテゴリUñicode\",\"カテゴリ2Unicode\",\"鼖\"]}";
+    Assert.assertEquals(expected, test.rawJsonString());
+  }
+
   @Test public void testAddCategories() throws JSONException {
     String[] expected = new String[]{"test", "test2"};
     test.addCategories(expected);