Merge branch 'upgrade_asynchttpclient' of https://github.com/dkharrat/Opentok-Java-SDK into dkharrat-upgrade_asynchttpclient

Author: aoberoi

build.gradle

@@ -42,7 +42,7 @@ dependencies {
     testCompile group: 'junit', name: 'junit', version: '[4.3,5.0['
     testCompile group: 'com.github.tomakehurst', name: 'wiremock', version: '[1.45,1.99999)'
     testCompile group: 'commons-lang', name: 'commons-lang', version: '[2.6,2.99999)'
-    compile group: 'com.ning', name: 'async-http-client', version: '[1.6.1,1.9['
+    compile group: 'com.ning', name: 'async-http-client', version: '[1.9,2.0['
     compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '[2.3.1,2.99999)'
     compile group: 'commons-validator', name: 'commons-validator', version: '[1.4.0,1.99999)'
     compile group: 'commons-codec', name: 'commons-codec', version: '[1.9,1.99999]'

src/main/java/com/opentok/util/HttpClient.java

@@ -38,18 +38,13 @@ private HttpClient(Builder builder) {
     }
 
     public String createSession(Map<String, Collection<String>> params) throws RequestException {
-        Future<Response> request = null;
         String responseString = null;
         Response response = null;
         FluentStringsMap paramsString = new FluentStringsMap().addAll(params);
 
-        try {
-            request = this.preparePost(this.apiUrl + "/session/create")
-                    .setParameters(paramsString)
-                    .execute();
-        } catch (IOException e) {
-            throw new RequestException("Could not create an OpenTok Session", e);
-        }
+        Future<Response> request = this.preparePost(this.apiUrl + "/session/create")
+                .setFormParams(paramsString)
+                .execute();
 
         try {
             response = request.get();
@@ -75,14 +70,8 @@ public String createSession(Map<String, Collection<String>> params) throws Reque
 
     public String getArchive(String archiveId) throws RequestException {
         String responseString = null;
-        Future<Response> request = null;
         String url = this.apiUrl + "/v2/partner/" + this.apiKey + "/archive/" + archiveId;
-
-        try {
-            request = this.prepareGet(url).execute();
-        } catch (IOException e) {
-            throw new RequestException("Could not get an OpenTok Archive", e);
-        }
+        Future<Response> request = this.prepareGet(url).execute();
 
         try {
             Response response = request.get();
@@ -116,7 +105,6 @@ public String getArchive(String archiveId) throws RequestException {
 
     public String getArchives(int offset, int count) throws RequestException {
         String responseString = null;
-        Future<Response> request = null;
         // TODO: maybe use a StringBuilder?
         String url = this.apiUrl + "/v2/partner/" + this.apiKey + "/archive";
         if (offset != 0 || count != 1000) {
@@ -129,11 +117,7 @@ public String getArchives(int offset, int count) throws RequestException {
             }
         }
 
-        try {
-            request = this.prepareGet(url).execute();
-        } catch (IOException e) {
-            throw new RequestException("Could not get OpenTok Archives", e);
-        }
+        Future<Response> request = this.prepareGet(url).execute();
 
         try {
             Response response = request.get();
@@ -165,7 +149,6 @@ public String getArchives(int offset, int count) throws RequestException {
     public String startArchive(String sessionId, ArchiveProperties properties)
             throws OpenTokException {
         String responseString = null;
-        Future<Response> request = null;
         String requestBody = null;
         // TODO: maybe use a StringBuilder?
         String url = this.apiUrl + "/v2/partner/" + this.apiKey + "/archive";
@@ -185,14 +168,10 @@ public String startArchive(String sessionId, ArchiveProperties properties)
         } catch (JsonProcessingException e) {
             throw new OpenTokException("Could not start an OpenTok Archive. The JSON body encoding failed.", e);
         }
-        try {
-            request = this.preparePost(url)
-                    .setBody(requestBody)
-                    .setHeader("Content-Type", "application/json")
-                    .execute();
-        } catch (IOException e) {
-            throw new RequestException("Could not start an OpenTok Archive.", e);
-        }
+        Future<Response> request = this.preparePost(url)
+                .setBody(requestBody)
+                .setHeader("Content-Type", "application/json")
+                .execute();
 
         try {
             Response response = request.get();
@@ -228,15 +207,9 @@ public String startArchive(String sessionId, ArchiveProperties properties)
 
     public String stopArchive(String archiveId) throws RequestException {
         String responseString = null;
-        Future<Response> request = null;
         // TODO: maybe use a StringBuilder?
         String url = this.apiUrl + "/v2/partner/" + this.apiKey + "/archive/" + archiveId + "/stop";
-
-        try {
-            request = this.preparePost(url).execute();
-        } catch (IOException e) {
-            throw new RequestException("Could not stop an OpenTok Archive. archiveId = " + archiveId, e);
-        }
+        Future<Response> request = this.preparePost(url).execute();
 
         try {
             Response response = request.get();
@@ -276,14 +249,8 @@ public String stopArchive(String archiveId) throws RequestException {
 
     public String deleteArchive(String archiveId) throws RequestException {
         String responseString = null;
-        Future<Response> request = null;
         String url = this.apiUrl + "/v2/partner/" + this.apiKey + "/archive/" + archiveId;
-
-        try {
-            request = this.prepareDelete(url).execute();
-        } catch (IOException e) {
-            throw new RequestException("Could not delete an OpenTok Archive. archiveId = " + archiveId, e);
-        }
+        Future<Response> request = this.prepareDelete(url).execute();
 
         try {
             Response response = request.get();