Merge branch 'master' of https://github.com/opentok/Opentok-Java-SDK into feature/jwt-authentication

* 'master' of https://github.com/opentok/Opentok-Java-SDK:
  OpenTokTest.java updated
  manual changes completed in styling
  File replaced with default formatting and required changes
  replace original files with required changes without extra formating
  test white space
  Pointing badge to master instead of latest commit
  styling changes applied
  styling and formating changes applied
  Default API Url updated in HttpClient builder
  issue -94 builder pattern updated
  updated TokBox constructor as per comment
  issue-94

# Conflicts:
#	src/main/java/com/opentok/OpenTok.java
#	src/main/java/com/opentok/util/HttpClient.java
#	src/test/java/com/opentok/test/OpenTokTest.java

Author: Madhav Chhura

README.md

@@ -1,6 +1,6 @@
 # OpenTok Java SDK
 
-[![Build Status](https://travis-ci.org/opentok/Opentok-Java-SDK.svg)](https://travis-ci.org/opentok/Opentok-Java-SDK)
+[![Build Status](https://travis-ci.org/opentok/Opentok-Java-SDK.svg?branch=master)](https://travis-ci.org/opentok/Opentok-Java-SDK)
 
 The OpenTok Java SDK lets you generate
 [sessions](http://tokbox.com/opentok/tutorials/create-session/) and

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

@@ -56,25 +56,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;
     }
 
     /**
@@ -300,7 +290,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.
      *
@@ -426,4 +416,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;
@@ -275,9 +276,14 @@ public HttpClient build() {
             AsyncHttpClientConfig.Builder configBuilder = new AsyncHttpClientConfig.Builder()
                     .setUserAgent("Opentok-Java-SDK/" + Version.VERSION + " JRE/" + System.getProperty("java.version"))
                     .addRequestFilter(new TokenAuthRequestFilter(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/main/java/com/opentok/util/TokenGenerator.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.util;
 
 import com.opentok.TokenOptions;

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

@@ -98,7 +98,7 @@ public void setUp() throws OpenTokException {
             apiKey = anApiKey;
             apiSecret = anApiSecret;
         }
-        sdk = new OpenTok(apiKey, apiSecret, apiUrl);
+        sdk = new OpenTok.Builder(apiKey, apiSecret).apiUrl(apiUrl).build();
         token = sdk.generateToken(sessionId);
     }
 
@@ -862,8 +862,10 @@ 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);
-        stubFor(post(urlEqualTo(SESSION_CREATE))
+    
+        sdk = new OpenTok.Builder(apiKey, apiSecret).apiUrl(targetServiceBaseUrl).proxy(proxy).build();
+        
+        stubFor(post(urlEqualTo("/session/create"))
                 .willReturn(aResponse()
                         .withStatus(200)
                         .withHeader("Content-Type", "text/xml")