From 4f273e9889edc06af135a699d04d92ed7624c443 Mon Sep 17 00:00:00 2001 From: Yoichi Kikuta Date: Mon, 11 Jul 2016 20:02:47 +0900 Subject: [PATCH 1/2] Fix Response Charset to UTF-8. patch for issue #6 --- src/main/java/com/sendgrid/Client.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/sendgrid/Client.java b/src/main/java/com/sendgrid/Client.java index 6179d7f..a070c33 100644 --- a/src/main/java/com/sendgrid/Client.java +++ b/src/main/java/com/sendgrid/Client.java @@ -2,7 +2,6 @@ import org.apache.http.Header; import org.apache.http.annotation.NotThreadSafe; -import org.apache.http.client.ResponseHandler; import org.apache.http.client.methods.CloseableHttpResponse; import org.apache.http.client.methods.HttpEntityEnclosingRequestBase; import org.apache.http.client.methods.HttpDelete; @@ -31,10 +30,12 @@ import java.net.URLEncoder; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Scanner; +import org.apache.http.util.EntityUtils; // Hack to get DELETE to accept a request body @NotThreadSafe @@ -129,13 +130,12 @@ public URI buildUri(String baseUri, String endpoint, Map queryPar * @param response from a call to a CloseableHttpClient */ public Response getResponse(CloseableHttpResponse response) throws IOException { - ResponseHandler handler = new BasicResponseHandler(); String responseBody = ""; int statusCode = response.getStatusLine().getStatusCode(); try { - responseBody = handler.handleResponse(response); + responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8); } catch (IOException ex) { throw ex; } From ff5bb26ee09edf63fecba17fbf0be3fd1c06dd7b Mon Sep 17 00:00:00 2001 From: Yoichi Kikuta Date: Thu, 4 Aug 2016 19:26:04 +0900 Subject: [PATCH 2/2] Add null check in case of response.getEntity() is null. --- src/main/java/com/sendgrid/Client.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sendgrid/Client.java b/src/main/java/com/sendgrid/Client.java index a070c33..1835654 100644 --- a/src/main/java/com/sendgrid/Client.java +++ b/src/main/java/com/sendgrid/Client.java @@ -135,7 +135,9 @@ public Response getResponse(CloseableHttpResponse response) throws IOException { int statusCode = response.getStatusLine().getStatusCode(); try { - responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8); + if(response.getEntity() != null) { + responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8); + } } catch (IOException ex) { throw ex; }