Merge pull request #17 from bluestealth/master

Assign server response outside try block

Author: thinkingserious

build.gradle

@@ -12,9 +12,9 @@
  */
 
 apply plugin: 'java'
-apply plugin: 'fatjar'
 apply plugin: 'maven'
 apply plugin: 'signing'
+apply plugin: 'com.github.johnrengelman.shadow'
 
 group         = 'com.sendgrid'
 version       = '4.0.0'
@@ -37,10 +37,10 @@ task wrapper(type: Wrapper) {
 
 buildscript {
   dependencies {
-    classpath 'eu.appsatori:gradle-fatjar-plugin:0.1.2' // adds fatJar task
+    classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'
   }
   repositories {
-    mavenCentral()
+    jcenter()
   }
 }
 
@@ -64,33 +64,36 @@ allprojects {
   }
 }
 
-// adds 'with-dependencies' to the fatJar name
-fatJar {
+// adds 'with-dependencies' to the shadowJar name
+shadowJar {
   classifier 'jar'
   baseName "sendgrid-java-http-client"
+  version version
+}
+jar {
   manifest {
     attributes("Implementation-Title": "http", "Implementation-Version": version)
   }
 }
 
-// copy fatJar to base project directory so they will be in git (and on github for download)
+// copy shadowJar to base project directory so they will be in git (and on github for download)
 build << {
   copy {
-    println "Copying ${fatJar.archiveName} to $projectDir/repo/com/sendgrid/$version"
-    from("$buildDir/libs/${fatJar.archiveName}")
+    println "Copying ${shadowJar.archiveName} to $projectDir/repo/com/sendgrid/$version"
+    from("$buildDir/libs/${shadowJar.archiveName}")
     into("$projectDir/repo/com/sendgrid/$version")
   }
   copy {
-    println "Copying ${fatJar.archiveName} to $projectDir/repo/com/sendgrid"
-    from("$buildDir/libs/${fatJar.archiveName}")
+    println "Copying ${shadowJar.archiveName} to $projectDir/repo/com/sendgrid"
+    from("$buildDir/libs/${shadowJar.archiveName}")
     into("$projectDir/repo/com/sendgrid")
   }
   tasks.renameSendGridVersionJarToSendGridJar.execute()
 }
 
 task renameSendGridVersionJarToSendGridJar {
   doLast {
-    file("$projectDir/repo/com/sendgrid/${fatJar.archiveName}").renameTo(file("$projectDir/repo/com/sendgrid/http-jar.jar"))
+    file("$projectDir/repo/com/sendgrid/${shadowJar.archiveName}").renameTo(file("$projectDir/repo/com/sendgrid/http-jar.jar"))
   }
 }
 
@@ -149,8 +152,8 @@ uploadArchives {
 }
 
 artifacts {
-  archives fatJar
+  archives shadowJar
   archives jar
   archives javadocJar
   archives sourcesJar
-}
+}

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.ClientProtocolException;
 import org.apache.http.client.ResponseHandler;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpEntityEnclosingRequestBase;
@@ -277,23 +278,21 @@ public Response delete(Request request) throws URISyntaxException, IOException {
 	}
 
 	private Response executeApiCall(HttpRequestBase httpPost) throws IOException {
-		CloseableHttpResponse serverResponse = null;
-		Response response = new Response();
 		try {
-			serverResponse = httpClient.execute(httpPost);
-			response = getResponse(serverResponse);
-			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.getBody():null));
-			}
-
-		} finally {
-			if (serverResponse != null) {
+			CloseableHttpResponse serverResponse = httpClient.execute(httpPost);
+			try {
+				Response response = getResponse(serverResponse);
+				if(response.getStatusCode() >= 300) {
+					//throwing IOException here to not break API behavior.
+					throw new IOException("Request returned status Code "+response.getStatusCode()+"Body:"+response.getBody());
+				}
+				return response;
+			} finally {
 				serverResponse.close();
 			}
+		} catch(ClientProtocolException e) {
+			throw new IOException(e.getMessage());
 		}
-		return response;
 	}
 
 	/**
@@ -326,4 +325,15 @@ public Response api(Request request) throws IOException {
 			throw new IOException(errors.toString());
 		}
 	}
-}
+
+	@Override
+	public void finalize() throws Throwable {
+		try {
+			this.httpClient.close();
+		} catch(IOException e) {
+			throw new Throwable(e.getMessage());
+		} finally {
+			super.finalize();
+		}
+	}
+}