Merged commit for Upgrade issue6 branch against the latest version 2.…

…3.3.

src/main/java/com/sendgrid/Client.java

@@ -12,6 +12,7 @@
 import org.apache.http.Header;
 import org.apache.http.StatusLine;
 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.HttpGet;
@@ -24,27 +25,6 @@
 import org.apache.http.impl.client.CloseableHttpClient;
 import org.apache.http.impl.client.HttpClients;
 
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-
-import java.net.HttpURLConnection;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URISyntaxException;
-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
 class HttpDeleteWithBody extends HttpEntityEnclosingRequestBase {
@@ -136,23 +116,19 @@ public URI buildUri(String baseUri, String endpoint, Map<String, String> queryPa
 		return uri;
 	}
 
-  /**
-    * Prepare a Response object from an API call via Apache's HTTP client.
-    *
-    * @param response from a call to a CloseableHttpClient
-    */
-  public Response getResponse(CloseableHttpResponse response) throws IOException {
-    String responseBody = "";
+	/**
+	 * Prepare a Response object from an API call via Apache's HTTP client.
+	 *
+	 * @param response
+	 *            from a call to a CloseableHttpClient
+	 */
+	public Response getResponse(CloseableHttpResponse response) throws IOException {
+		ResponseHandler<String> handler = new SendGridResponseHandler();
+		String responseBody = "";
 
 		int statusCode = response.getStatusLine().getStatusCode();
 
-    try {
-        if(response.getEntity() != null) {
-          responseBody = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
-        }
-    } catch (IOException ex) {
-      throw ex;
-    }
+		responseBody = handler.handleResponse(response);
 
 		Header[] headers = response.getAllHeaders();
 		Map<String, String> responseHeaders = new HashMap<String, String>();
@@ -350,4 +326,4 @@ public Response api(Request request) throws IOException {
 			throw new IOException(errors.toString());
 		}
 	}
-}
+}

src/main/java/com/sendgrid/SendGridResponseHandler.java

@@ -7,6 +7,7 @@
 import org.apache.http.client.HttpResponseException;
 import org.apache.http.impl.client.AbstractResponseHandler;
 import org.apache.http.util.EntityUtils;
+import java.nio.charset.StandardCharsets;
 
 /**
  * A {@link org.apache.http.client.ResponseHandler} that returns the response body as a String
@@ -34,9 +35,9 @@ public String handleResponse(final HttpResponse response)
         return entity == null ? null : handleEntity(entity);
     }
 
-	@Override
-	public String handleEntity(HttpEntity entity) throws IOException {
-		 return EntityUtils.toString(entity);
-	}
+    @Override
+    public String handleEntity(HttpEntity entity) throws IOException {
+        return EntityUtils.toString(entity, StandardCharsets.UTF_8);
+    }
 
 }