manual changes completed in styling

Author: mukesh-kum

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

@@ -61,18 +61,17 @@ public class OpenTok {
      * @param apiSecret Your OpenTok API secret. (See the <a href="https://dashboard.tokbox.com">OpenTok dashboard</a>
      * page.)
      */
-	public OpenTok(int apiKey, String apiSecret) {
-		this.apiKey = apiKey;
-		this.apiSecret = apiSecret;
-		this.client = new HttpClient.Builder(apiKey, apiSecret).build();
-	}
-
-	private OpenTok(int apiKey, String apiSecret, HttpClient httpClient) {
-		this.apiKey = apiKey;
-		this.apiSecret = apiSecret;
-		this.client = httpClient;
-
-	}
+    public OpenTok(int apiKey, String apiSecret) {
+        this.apiKey = apiKey;
+        this.apiSecret = apiSecret.trim();
+        this.client = new HttpClient.Builder(apiKey, apiSecret).build();
+    }
+    
+    private OpenTok(int apiKey, String apiSecret, HttpClient httpClient) {
+        this.apiKey = apiKey;
+        this.apiSecret = apiSecret.trim();
+        this.client = httpClient;
+    }
 
     /**
      * Creates a token for connecting to an OpenTok session. In order to authenticate a user
@@ -124,10 +123,9 @@ private OpenTok(int apiKey, String apiSecret, HttpClient httpClient) {
      *
      * @return The token string.
      */
-    public String generateToken(String sessionId, TokenOptions tokenOptions)
-        throws OpenTokException {
+    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");
         }
 
@@ -252,9 +250,10 @@ public Session createSession(SessionProperties properties) throws OpenTokExcepti
         } else {
             params = new SessionProperties.Builder().build().toMap();
         }
-
+        
         String xmlResponse = this.client.createSession(params);
 
+
         // NOTE: doing this null check twice is kind of ugly
         try {
             if (properties != null) {
@@ -263,8 +262,7 @@ public Session createSession(SessionProperties properties) throws OpenTokExcepti
                 return new Session(readXml(xpathQuery, xmlResponse), apiKey, apiSecret);
             }
         } catch (XPathExpressionException e) {
-            throw new OpenTokException(
-                "Cannot create session. Could not read the response: " + xmlResponse);
+            throw new OpenTokException("Cannot create session. Could not read the response: " + xmlResponse);
         }
     }
 
@@ -435,7 +433,7 @@ public Archive stopArchive(String archiveId) throws OpenTokException {
             throw new RequestException("Exception mapping json: " + e.getMessage());
         }
     }
-
+    
     /**
      * Deletes an OpenTok archive.
      * <p>
@@ -450,39 +448,37 @@ public void deleteArchive(String archiveId) throws OpenTokException {
     }
 
     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());
-
-		}
-
-	}
+        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

@@ -8,6 +8,6 @@
 package com.opentok.constants;
 
 public class DefaultApiUrl {
-	public static final String DEFAULT_API_URI = "https://api.opentok.com";
-
+    public static final String DEFAULT_API_URI = "https://api.opentok.com";
+    
 }

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

@@ -313,11 +313,13 @@ public HttpClient build() {
                     .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;
+                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);