Default API Url updated in HttpClient builder

Author: mukesh-kum

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

@@ -71,10 +71,7 @@ public OpenTok(int apiKey, String apiSecret) {
 
 		this.apiKey = apiKey;
 		this.apiSecret = apiSecret;
-
-		HttpClient.Builder clientBuilder = new HttpClient.Builder(apiKey, apiSecret).apiUrl(DefaultApiUrl.DEFAULT_API_URI);
-
-		this.client = clientBuilder.build();
+		this.client = new HttpClient.Builder(apiKey, apiSecret).build();
 	}
 
 	private OpenTok(int apiKey, String apiSecret, HttpClient httpClient) {
@@ -525,8 +522,7 @@ public OpenTok build() {
 			if (this.apiUrl != null) {
 				clientBuilder.apiUrl(this.apiUrl);
 			}
-			if(this.proxy!=null)
-			{
+			if (this.proxy!=null) {
 				clientBuilder.proxy(this.proxy);
 			}
 

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

@@ -1,3 +1,10 @@
+/**
+ * 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 

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,15 @@ 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);