Fix forceTLS to useTLS in PusherOptions

Author: daniellevass

src/main/java/com/pusher/client/PusherOptions.java

@@ -34,7 +34,7 @@ public class PusherOptions {
     private String host = "ws.pusherapp.com";
     private int wsPort = WS_PORT;
     private int wssPort = WSS_PORT;
-    private boolean forceTLS = true;
+    private boolean useTLS = true;
     private long activityTimeout = DEFAULT_ACTIVITY_TIMEOUT;
     private long pongTimeout = DEFAULT_PONG_TIMEOUT;
     private Authorizer authorizer;
@@ -44,38 +44,38 @@ public class PusherOptions {
 
     /**
      * @deprecated
-     * Please use isForceTLS
+     * Please use isUseTLS
      */
     @Deprecated
     public boolean isEncrypted() {
-        return forceTLS;
+        return useTLS;
     }
 
     /**
      * @deprecated
-     * Please use setForceTLS
+     * Please use setUseTLS
      */
     @Deprecated
     public PusherOptions setEncrypted(final boolean encrypted) {
-        this.forceTLS = encrypted;
+        this.useTLS = encrypted;
         return this;
     }
 
     /**
      *
      * @return whether the connection to Pusher should use TLS
      */
-    public boolean isForceTLS() {
-        return forceTLS;
+    public boolean isUseTLS() {
+        return useTLS;
     }
 
     /**
      * Sets whether the connection to Pusher should be use TLS.
-     * @param forceTLS whether the connection should use TLS, by default this is true
+     * @param useTLS whether the connection should use TLS, by default this is true
      * @return this, for chaining
      */
-    public PusherOptions setForceTLS(final boolean forceTLS) {
-        this.forceTLS = forceTLS;
+    public PusherOptions setUseTLS(final boolean useTLS) {
+        this.useTLS = useTLS;
         return this;
     }
 
@@ -237,7 +237,7 @@ public long getPongTimeout() {
      * @return the WebSocket URL
      */
     public String buildUrl(final String apiKey) {
-        return String.format("%s://%s:%s/app/%s%s", forceTLS ? WSS_SCHEME : WS_SCHEME, host, forceTLS ? wssPort
+        return String.format("%s://%s:%s/app/%s%s", useTLS ? WSS_SCHEME : WS_SCHEME, host, useTLS ? wssPort
                 : wsPort, apiKey, URI_SUFFIX);
     }
 

src/test/java/com/pusher/client/PusherOptionsTest.java

@@ -32,8 +32,8 @@ public void testEncryptedInitializedAsTrue() {
     }
 
     @Test
-    public void testForceTLSInitializedAsTrue() {
-        assert pusherOptions.isForceTLS();
+    public void testUseTLSInitializedAsTrue() {
+        assert pusherOptions.isUseTLS();
     }
 
     @Test
@@ -54,9 +54,9 @@ public void testEncryptedCanBeSetToTrue() {
     }
 
     @Test
-    public void testForceTLSCanBeSetToTrue() {
-        pusherOptions.setForceTLS(true);
-        assertSame(true, pusherOptions.isForceTLS());
+    public void testUseTLSCanBeSetToTrue() {
+        pusherOptions.setUseTLS(true);
+        assertSame(true, pusherOptions.isUseTLS());
     }
 
     @Test
@@ -70,8 +70,8 @@ public void testSetEncryptedReturnsSelf() {
     }
 
     @Test
-    public void testSetForceTLSReturnsSelf() {
-        assertSame(pusherOptions, pusherOptions.setForceTLS(true));
+    public void testSetUseTLSReturnsSelf() {
+        assertSame(pusherOptions, pusherOptions.setUseTLS(true));
     }
 
     @Test
@@ -82,7 +82,7 @@ public void testDefaultURL() {
 
     @Test
     public void testNonSSLURLIsCorrect() {
-        pusherOptions.setForceTLS(false);
+        pusherOptions.setUseTLS(false);
         assertEquals(pusherOptions.buildUrl(API_KEY), "ws://ws.pusherapp.com:80/app/" + API_KEY
                 + "?client=java-client&protocol=5&version=" + PusherOptions.LIB_VERSION);
     }
@@ -96,7 +96,7 @@ public void testClusterSetURLIsCorrect() {
 
     @Test
     public void testClusterSetNonSSLURLIsCorrect() {
-        pusherOptions.setCluster("eu").setForceTLS(false);
+        pusherOptions.setCluster("eu").setUseTLS(false);
         assertEquals(pusherOptions.buildUrl(API_KEY), "ws://ws-eu.pusher.com:80/app/" + API_KEY
                 + "?client=java-client&protocol=5&version=" + PusherOptions.LIB_VERSION);
     }
@@ -110,7 +110,7 @@ public void testCustomHostAndPortURLIsCorrect() {
 
     @Test
     public void testCustomHostAndPortNonSSLURLIsCorrect() {
-        pusherOptions.setHost("subdomain.example.com").setWsPort(8080).setWssPort(8181).setForceTLS(false);
+        pusherOptions.setHost("subdomain.example.com").setWsPort(8080).setWssPort(8181).setUseTLS(false);
         assertEquals(pusherOptions.buildUrl(API_KEY), "ws://subdomain.example.com:8080/app/" + API_KEY
                 + "?client=java-client&protocol=5&version=" + PusherOptions.LIB_VERSION);
     }