Refactoring API Call and error Handling

Author: shuron

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

@@ -10,15 +10,16 @@
 import java.util.Map;
 
 import org.apache.http.Header;
+import org.apache.http.StatusLine;
 import org.apache.http.annotation.NotThreadSafe;
-import org.apache.http.client.ClientProtocolException;
 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;
 import org.apache.http.client.methods.HttpPatch;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.client.methods.HttpPut;
+import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.client.utils.URIBuilder;
 import org.apache.http.entity.StringEntity;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -143,8 +144,6 @@ public Response getResponse(CloseableHttpResponse response) throws IOException {
 	 * response headers.
 	 */
 	public Response get(Request request) throws URISyntaxException, IOException {
-		CloseableHttpResponse serverResponse = null;
-		Response response = new Response();
 		URI uri = null;
 		HttpGet httpGet = null;
 
@@ -160,28 +159,14 @@ public Response get(Request request) throws URISyntaxException, IOException {
 				httpGet.setHeader(entry.getKey(), entry.getValue());
 			}
 		}
-
-		try {
-			serverResponse = httpClient.execute(httpGet);
-			response = getResponse(serverResponse);
-		} catch (IOException ex) {
-			throw ex;
-		} finally {
-			if (serverResponse != null) {
-				serverResponse.close();
-			}
-		}
-
-		return response;
+		return executeApiCall(httpGet);
 	}
 
 	/**
 	 * Make a POST request and provide the status code, response body and
 	 * response headers.
 	 */
 	public Response post(Request request) throws URISyntaxException, IOException {
-		CloseableHttpResponse serverResponse = null;
-		Response response = new Response();
 		URI uri = null;
 		HttpPost httpPost = null;
 
@@ -203,28 +188,14 @@ public Response post(Request request) throws URISyntaxException, IOException {
 			httpPost.setHeader("Content-Type", "application/json");
 		}
 
-		try {
-			serverResponse = httpClient.execute(httpPost);
-			response = getResponse(serverResponse);
-			serverResponse.close();
-		} catch (IOException ex) {
-			throw ex;
-		} finally {
-			if (serverResponse != null) {
-				serverResponse.close();
-			}
-		}
-
-		return response;
+		return executeApiCall(httpPost);
 	}
 
 	/**
 	 * Make a PATCH request and provide the status code, response body and
 	 * response headers.
 	 */
 	public Response patch(Request request) throws URISyntaxException, IOException {
-		CloseableHttpResponse serverResponse = null;
-		Response response = new Response();
 		URI uri = null;
 		HttpPatch httpPatch = null;
 
@@ -245,29 +216,14 @@ public Response patch(Request request) throws URISyntaxException, IOException {
 		if (request.body != "") {
 			httpPatch.setHeader("Content-Type", "application/json");
 		}
-
-		try {
-			serverResponse = httpClient.execute(httpPatch);
-			response = getResponse(serverResponse);
-			serverResponse.close();
-		} catch (IOException ex) {
-			throw ex;
-		} finally {
-			if (serverResponse != null) {
-				serverResponse.close();
-			}
-		}
-
-		return response;
+		return executeApiCall(httpPatch);
 	}
 
 	/**
 	 * Make a PUT request and provide the status code, response body and
 	 * response headers.
 	 */
 	public Response put(Request request) throws URISyntaxException, IOException {
-		CloseableHttpResponse serverResponse = null;
-		Response response = new Response();
 		URI uri = null;
 		HttpPut httpPut = null;
 
@@ -289,27 +245,13 @@ public Response put(Request request) throws URISyntaxException, IOException {
 			httpPut.setHeader("Content-Type", "application/json");
 		}
 
-		try {
-			serverResponse = httpClient.execute(httpPut);
-			response = getResponse(serverResponse);
-			serverResponse.close();
-		} catch (IOException ex) {
-			throw ex;
-		} finally {
-			if (serverResponse != null) {
-				serverResponse.close();
-			}
-		}
-
-		return response;
+		return executeApiCall(httpPut);
 	}
 
 	/**
 	 * Make a DELETE request and provide the status code and response headers.
 	 */
 	public Response delete(Request request) throws URISyntaxException, IOException {
-		CloseableHttpResponse serverResponse = null;
-		Response response = new Response();
 		URI uri = null;
 		HttpDeleteWithBody httpDelete = null;
 
@@ -331,18 +273,26 @@ public Response delete(Request request) throws URISyntaxException, IOException {
 			httpDelete.setHeader("Content-Type", "application/json");
 		}
 
+		return executeApiCall(httpDelete);
+	}
+
+	private Response executeApiCall(HttpRequestBase httpPost) throws IOException {
+		CloseableHttpResponse serverResponse = null;
+		Response response = new Response();
 		try {
-			serverResponse = httpClient.execute(httpDelete);
+			serverResponse = httpClient.execute(httpPost);
 			response = getResponse(serverResponse);
-			serverResponse.close();
-		} catch (IOException ex) {
-			throw ex;
+			final StatusLine statusLine = serverResponse.getStatusLine();
+			if(statusLine.getStatusCode()>=300){
+				//throwing IOException here to not break API behavior.
+				throw new IOException("Request returned status Code "+statusLine.getStatusCode()+"Body:"+(response!=null?response.body:null));
+			}
+	
 		} finally {
 			if (serverResponse != null) {
 				serverResponse.close();
 			}
 		}
-
 		return response;
 	}
 

src/main/java/com/sendgrid/Response.java

@@ -1,6 +1,5 @@
 package com.sendgrid;
 
-import java.util.List;
 import java.util.Map;
 
 /**