Merge pull request #104 from mukesh-kum/issue-94

Apply builder patter for construction of OpenTok object. fixes #94

Author: aoberoi

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

@@ -62,25 +62,15 @@ public class OpenTok {
      * page.)
      */
     public OpenTok(int apiKey, String apiSecret) {
-        this(apiKey, apiSecret, defaultApiUrl);
-    }
-
-    public OpenTok(int apiKey, String apiSecret, String apiUrl) {
-        this(apiKey, apiSecret, apiUrl, null);
+        this.apiKey = apiKey;
+        this.apiSecret = apiSecret.trim();
+        this.client = new HttpClient.Builder(apiKey, apiSecret).build();
     }
-
-    public OpenTok(int apiKey, String apiSecret, String apiUrl, Proxy proxy) {
+    
+    private OpenTok(int apiKey, String apiSecret, HttpClient httpClient) {
         this.apiKey = apiKey;
         this.apiSecret = apiSecret.trim();
-        if (apiUrl == null) {
-            apiUrl = defaultApiUrl;
-        }
-        HttpClient.Builder clientBuilder = new HttpClient.Builder(apiKey, apiSecret)
-                .apiUrl(apiUrl);
-        if (proxy != null) {
-            clientBuilder.proxy(proxy);
-        }
-        this.client = clientBuilder.build();
+        this.client = httpClient;
     }
 
     /**
@@ -135,7 +125,7 @@ public OpenTok(int apiKey, String apiSecret, String apiUrl, Proxy proxy) {
      */
     public String generateToken(String sessionId, TokenOptions tokenOptions) throws OpenTokException {
         List<String> sessionIdParts = null;
-        if(sessionId == null || sessionId == "") {
+        if (sessionId == null || sessionId == "") {
             throw new InvalidArgumentException("Session not valid");
         }
 
@@ -255,7 +245,7 @@ public Session createSession(SessionProperties properties) throws OpenTokExcepti
         String xpathQuery = "/sessions/Session/session_id";
 
         // NOTE: doing this null check twice is kind of ugly
-        if(properties != null) {
+        if (properties != null) {
             params = properties.toMap();
         } else {
             params = new SessionProperties.Builder().build().toMap();
@@ -324,7 +314,7 @@ private static String readXml(String xpathQuery, String xml) throws XPathExpress
         InputSource source = new InputSource(new StringReader(xml));
         return xpath.evaluate(xpathQuery, source);
     }
-    
+
     /**
      * Gets an {@link Archive} object for the given archive ID.
      *
@@ -456,4 +446,39 @@ public Archive stopArchive(String archiveId) throws OpenTokException {
     public void deleteArchive(String archiveId) throws OpenTokException {
         this.client.deleteArchive(archiveId);
     }
+    
+    public static class Builder {
+        private int apiKey;
+        private String apiSecret;
+        private String apiUrl;
+        private Proxy proxy;
+        
+        public Builder(int apiKey, String apiSecret) {
+            this.apiKey = apiKey;
+            this.apiSecret = apiSecret;
+        }
+        
+        public Builder apiUrl(String apiUrl) {
+            this.apiUrl = apiUrl;
+            return this;
+        }
+        
+        public Builder proxy(Proxy proxy) {
+            this.proxy = proxy;
+            return this;
+        }
+        
+        public OpenTok build() {
+            HttpClient.Builder clientBuilder = new HttpClient.Builder(apiKey, apiSecret);
+            
+            if (this.apiUrl != null) {
+                clientBuilder.apiUrl(this.apiUrl);
+            }
+            if (this.proxy != null) {
+                clientBuilder.proxy(this.proxy);
+            }
+            
+            return new OpenTok(this.apiKey, this.apiSecret, clientBuilder.build());
+        }
+  }
 }

src/main/java/com/opentok/constants/DefaultApiUrl.java

@@ -0,0 +1,13 @@
+/**
+ * OpenTok Java SDK
+ * Copyright (C) 2016 TokBox, Inc.
+ * http://www.tokbox.com
+ *
+ * Licensed under The MIT License (MIT). See LICENSE file for more information.
+ */
+package com.opentok.constants;
+
+public class DefaultApiUrl {
+    public static final String DEFAULT_API_URI = "https://api.opentok.com";
+    
+}

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

@@ -25,6 +25,7 @@
 import com.ning.http.client.filter.FilterException;
 import com.ning.http.client.filter.RequestFilter;
 import com.opentok.ArchiveProperties;
+import com.opentok.constants.DefaultApiUrl;
 import com.opentok.constants.Version;
 import com.opentok.exception.OpenTokException;
 import com.opentok.exception.RequestException;
@@ -311,9 +312,14 @@ public HttpClient build() {
             AsyncHttpClientConfig.Builder configBuilder = new AsyncHttpClientConfig.Builder()
                     .setUserAgent("Opentok-Java-SDK/" + Version.VERSION + " JRE/" + System.getProperty("java.version"))
                     .addRequestFilter(new PartnerAuthRequestFilter(this.apiKey, this.apiSecret));
+            if (this.apiUrl == null) {
+                this.apiUrl=DefaultApiUrl.DEFAULT_API_URI;
+            }
+            
             if (this.proxy != null) {
                 configBuilder.setProxyServer(createProxyServer(this.proxy));
             }
+            
             this.config = configBuilder.build();
             // NOTE: not thread-safe, config could be modified by another thread here?
             HttpClient client = new HttpClient(this);

src/test/java/com/opentok/test/OpenTokTest.java

@@ -93,7 +93,7 @@ public void setUp() {
             apiKey = anApiKey;
             apiSecret = anApiSecret;
         }
-        sdk = new OpenTok(apiKey, apiSecret, apiUrl);
+        sdk = new OpenTok.Builder(apiKey, apiSecret).apiUrl(apiUrl).build();
     }
 
     @Test
@@ -868,7 +868,9 @@ public void testCreateSessionWithProxy() throws OpenTokException, UnknownHostExc
         String sessionId = "SESSIONID";
         Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(InetAddress.getLocalHost(), proxyingService.port()));
 
-        sdk = new OpenTok(apiKey, apiSecret, apiUrl, proxy);
+    
+        sdk = new OpenTok.Builder(apiKey, apiSecret).apiUrl(targetServiceBaseUrl).proxy(proxy).build();
+        
         stubFor(post(urlEqualTo("/session/create"))
                 .willReturn(aResponse()
                         .withStatus(200)