Merge pull request cloudbees-oss#41 from johnou/http_client_upgrade

Allow users to specify async-http-client version (1.9.3 compatible).

Author: stephenc

pom.xml

@@ -27,6 +27,10 @@
   <artifactId>zendesk-java-client</artifactId>
   <version>0.2.5-SNAPSHOT</version>
 
+  <properties>
+    <async-http-client.version>1.7.12</async-http-client.version>
+  </properties>
+
   <name>zendesk-java-client</name>
   <description>Java client for the Zendesk API</description>
   <url>https://github.com/cloudbees/zendesk-java-client</url>
@@ -71,7 +75,7 @@
     <dependency>
       <groupId>com.ning</groupId>
       <artifactId>async-http-client</artifactId>
-      <version>1.7.12</version>
+      <version>${async-http-client.version}</version>
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>

src/main/java/org/zendesk/client/v2/Zendesk.java

@@ -1102,7 +1102,7 @@ private byte[] json(Object object) {
         }
     }
 
-    private <T> ListenableFuture<T> submit(Request request, AsyncCompletionHandler<T> handler) {
+    private <T> ListenableFuture<T> submit(Request request, ZendeskAsyncCompletionHandler<T> handler) {
         try {
             if (request.getStringData() != null) {
                 logger.debug("Request {} {}\n{}", request.getMethod(), request.getUrl(), request.getStringData());
@@ -1113,8 +1113,19 @@ private <T> ListenableFuture<T> submit(Request request, AsyncCompletionHandler<T
                 logger.debug("Request {} {}", request.getMethod(), request.getUrl());
             }
             return client.executeRequest(request, handler);
-        } catch (IOException e) {
-            throw new ZendeskException(e.getMessage(), e);
+        } catch (Throwable t) {
+            throw new ZendeskException(t);
+        }
+    }
+
+    private static abstract class ZendeskAsyncCompletionHandler<T> extends AsyncCompletionHandler<T> {
+        @Override
+        public void onThrowable(Throwable t) {
+            if (t instanceof IOException) {
+                throw new ZendeskException(t);
+            } else {
+                super.onThrowable(t);
+            }
         }
     }
 
@@ -1148,8 +1159,8 @@ private Request req(String method, Uri template, String contentType, byte[] body
         return builder.build();
     }
 
-    protected AsyncCompletionHandler<Void> handleStatus() {
-        return new AsyncCompletionHandler<Void>() {
+    protected ZendeskAsyncCompletionHandler<Void> handleStatus() {
+        return new ZendeskAsyncCompletionHandler<Void>() {
             @Override
             public Void onCompleted(Response response) throws Exception {
                 logResponse(response);
@@ -1162,8 +1173,8 @@ public Void onCompleted(Response response) throws Exception {
     }
 
     @SuppressWarnings("unchecked")
-    protected <T> AsyncCompletionHandler<T> handle(final Class<T> clazz) {
-        return new AsyncCompletionHandler<T>() {
+    protected <T> ZendeskAsyncCompletionHandler<T> handle(final Class<T> clazz) {
+        return new ZendeskAsyncCompletionHandler<T>() {
             @Override
             public T onCompleted(Response response) throws Exception {
                 logResponse(response);
@@ -1178,8 +1189,8 @@ public T onCompleted(Response response) throws Exception {
         };
     }
 
-    protected <T> AsyncCompletionHandler<T> handle(final Class<T> clazz, final String name) {
-        return new AsyncCompletionHandler<T>() {
+    protected <T> ZendeskAsyncCompletionHandler<T> handle(final Class<T> clazz, final String name) {
+        return new ZendeskAsyncCompletionHandler<T>() {
             @Override
             public T onCompleted(Response response) throws Exception {
                 logResponse(response);
@@ -1196,7 +1207,7 @@ public T onCompleted(Response response) throws Exception {
 
     private static final String NEXT_PAGE = "next_page";
 
-    private abstract class PagedAsyncCompletionHandler<T> extends AsyncCompletionHandler<T> {
+    private abstract class PagedAsyncCompletionHandler<T> extends ZendeskAsyncCompletionHandler<T> {
         private String nextPage;
 
         public void setPagedProperties(JsonNode responseNode, Class<?> clazz) {
@@ -1215,7 +1226,6 @@ public String getNextPage() {
 
     protected <T> PagedAsyncCompletionHandler<List<T>> handleList(final Class<T> clazz, final String name) {
         return new PagedAsyncCompletionHandler<List<T>>() {
-
             @Override
             public List<T> onCompleted(Response response) throws Exception {
                 logResponse(response);
@@ -1235,7 +1245,6 @@ public List<T> onCompleted(Response response) throws Exception {
 
     protected PagedAsyncCompletionHandler<List<SearchResultEntity>> handleSearchList(final String name) {
         return new PagedAsyncCompletionHandler<List<SearchResultEntity>>() {
-
             @Override
             public List<SearchResultEntity> onCompleted(Response response) throws Exception {
                 logResponse(response);
@@ -1258,7 +1267,6 @@ public List<SearchResultEntity> onCompleted(Response response) throws Exception
 
     protected PagedAsyncCompletionHandler<List<Target>> handleTargetList(final String name) {
         return new PagedAsyncCompletionHandler<List<Target>>() {
-
             @Override
             public List<Target> onCompleted(Response response) throws Exception {
                 logResponse(response);