move OpenTokHttpClient to util.HttpClient. fixes #21

Author: aoberoi

src/main/java/com/opentok/api/Archive.java

@@ -179,7 +179,7 @@ public void setUrl(String url) {
 //    public Archive stop() throws OpenTokException {
 //        HashMap<String, String> headers = new HashMap<String, String>();
 //        headers.put("content-type", "application/json");
-//        String archive = OpenTokHttpClient.makePostRequest("/v2/partner/" + this.partnerId + "/archive/" + id, headers, null,
+//        String archive = HttpClient.makePostRequest("/v2/partner/" + this.partnerId + "/archive/" + id, headers, null,
 //                "{ \"action\" : \"stop\"  }");
 //        ObjectMapper mapper = new ObjectMapper();
 //        try {
@@ -192,7 +192,7 @@ public void setUrl(String url) {
 //    }
 
 //    public void delete() throws OpenTokException {
-//        OpenTokHttpClient.makeDeleteRequest("/v2/partner/" + partnerId + "/archive/" + id);
+//        HttpClient.makeDeleteRequest("/v2/partner/" + partnerId + "/archive/" + id);
 //    }
 
     @Override

src/main/java/com/opentok/api/OpenTok.java

@@ -23,6 +23,7 @@
 import com.opentok.api.constants.SessionProperties;
 import com.opentok.exception.OpenTokException;
 import com.opentok.exception.OpenTokInvalidArgumentException;
+import com.opentok.util.HttpClient;
 import org.xml.sax.InputSource;
 
 /**
@@ -39,7 +40,7 @@ public class OpenTok {
 
     private int apiKey;
     private String apiSecret;
-    protected OpenTokHttpClient client;
+    protected HttpClient client;
 
     /**
      * Creates an OpenTokSDK object.
@@ -56,7 +57,7 @@ public OpenTok(int apiKey, String apiSecret) {
     public OpenTok(int apiKey, String apiSecret, String apiUrl) {
         this.apiKey = apiKey;
         this.apiSecret = apiSecret.trim();
-        this.client = new OpenTokHttpClient.Builder(apiKey, apiSecret)
+        this.client = new HttpClient.Builder(apiKey, apiSecret)
                 .apiUrl(apiUrl)
                 .build();
     }
@@ -320,7 +321,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
      */
 //    public Archive getArchive(String archiveId) throws OpenTokException {
 //        ObjectMapper mapper = new ObjectMapper();
-//        String archive = OpenTokHttpClient.makeGetRequest("/v2/partner/" + this.apiKey + "/archive/" + archiveId);
+//        String archive = HttpClient.makeGetRequest("/v2/partner/" + this.apiKey + "/archive/" + archiveId);
 //        try {
 //            return mapper.readValue(archive, Archive.class);
 //        } catch (Exception e) {
@@ -352,7 +353,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
      */
 //    public List<Archive> listArchives(int offset, int count) throws OpenTokException {
 //        ObjectMapper mapper = new ObjectMapper();
-//        String archive = OpenTokHttpClient.makeGetRequest("/v2/partner/" + this.apiKey + "/archive?offset=" + offset + "&count="
+//        String archive = HttpClient.makeGetRequest("/v2/partner/" + this.apiKey + "/archive?offset=" + offset + "&count="
 //                + count);
 //        try {
 //            JsonNode node = mapper.readTree(archive);
@@ -384,7 +385,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
 //        }
 //        HashMap<String, String> headers = new HashMap<String, String>();
 //        headers.put("content-type", "application/json");
-//        String archive = OpenTokHttpClient.makePostRequest("/v2/partner/" + this.apiKey + "/archive", headers, null,
+//        String archive = HttpClient.makePostRequest("/v2/partner/" + this.apiKey + "/archive", headers, null,
 //                "{ \"sessionId\" : \"" + sessionId + "\", \"name\": \"" + name + "\" }");
 //        ObjectMapper mapper = new ObjectMapper();
 //        try {
@@ -406,7 +407,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
 //    public Archive stopArchive(String archiveId) throws OpenTokException {
 //        HashMap<String, String> headers = new HashMap<String, String>();
 //        headers.put("content-type", "application/json");
-//        String archive = OpenTokHttpClient.makePostRequest("/v2/partner/" + this.apiKey + "/archive/" + archiveId + "/stop", headers, null,
+//        String archive = HttpClient.makePostRequest("/v2/partner/" + this.apiKey + "/archive/" + archiveId + "/stop", headers, null,
 //                "");
 //        ObjectMapper mapper = new ObjectMapper();
 //        try {
@@ -426,6 +427,6 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
      * @param archiveId The archive ID of the archive you want to delete.
      */
 //    public void deleteArchive(String archiveId) throws OpenTokException {
-//        OpenTokHttpClient.makeDeleteRequest("/v2/partner/" + this.apiKey + "/archive/" + archiveId);
+//        HttpClient.makeDeleteRequest("/v2/partner/" + this.apiKey + "/archive/" + archiveId);
 //    }
 }

src/main/java/com/opentok/api/OpenTokHttpClient.java renamed to src/main/java/com/opentok/util/HttpClient.java

@@ -1,4 +1,4 @@
-package com.opentok.api;
+package com.opentok.util;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -13,14 +13,14 @@
 
 import com.opentok.api.constants.Version;
 
-public class OpenTokHttpClient extends AsyncHttpClient {
+public class HttpClient extends AsyncHttpClient {
 
     private final String apiUrl;
     // NOTE: do we even need these since we now have the PartnerAuthRequestFilter?
     private final int apiKey;
     private final String apiSecret;
 
-    private OpenTokHttpClient(Builder builder) {
+    private HttpClient(Builder builder) {
         super(builder.config);
         this.apiKey = builder.apiKey;
         this.apiSecret = builder.apiSecret;
@@ -145,13 +145,13 @@ public Builder apiUrl(String apiUrl) {
             return this;
         }
 
-        public OpenTokHttpClient build() {
+        public HttpClient build() {
             this.config = new AsyncHttpClientConfig.Builder()
                     .setUserAgent("Opentok-Java-SDK/"+Version.VERSION)
                     .addRequestFilter(new PartnerAuthRequestFilter(this.apiKey, this.apiSecret))
                     .build();
             // NOTE: not thread-safe, config could be modified by another thread here?
-            OpenTokHttpClient client = new OpenTokHttpClient(this);
+            HttpClient client = new HttpClient(this);
             return client;
         }
     }