Deprecate old port/secure builder for combo method

Author: mbax

src/main/java/org/kitteh/irc/client/library/Client.java

@@ -138,6 +138,20 @@ interface Bind {
          * Server builder methods.
          */
         interface Server {
+            /**
+             * The security type, TLS or no.
+             */
+            enum SecurityType {
+                /**
+                 * TLS enabled.
+                 */
+                SECURE,
+                /**
+                 * TLS disabled.
+                 */
+                INSECURE;
+            }
+
             /**
              * Sets the server host and port to which the client will connect.
              * <p>
@@ -167,9 +181,22 @@ interface Server {
              *
              * @param port IRC server port
              * @return this builder
+             * @deprecated use {@link #port(int, SecurityType)} instead
              */
+            @Deprecated
             @NonNull Server port(int port);
 
+            /**
+             * Sets the server port to which the client will connect and
+             * determines TLS setting. By default, the port is 6697 and the
+             * TLS setting is {@link SecurityType#SECURE}.
+             *
+             * @param port IRC server port
+             * @param security TLS security setting
+             * @return this builder
+             */
+            @NonNull Server port(int port, @NonNull SecurityType security);
+
             /**
              * Sets the server password.
              * <p>
@@ -190,7 +217,9 @@ interface Server {
              *
              * @param secure true for TLS
              * @return this builder
+             * @deprecated use {@link #port(int, SecurityType)} instead
              */
+            @Deprecated
             @NonNull Server secure(boolean secure);
 
             /**

src/main/java/org/kitteh/irc/client/library/defaults/DefaultBuilder.java

@@ -100,18 +100,27 @@ private class ServerImpl implements Server {
             return this;
         }
 
+        @Deprecated
         @Override
         public @NonNull Server port(int port) {
             DefaultBuilder.this.serverHostWithPort = DefaultBuilder.this.serverHostWithPort.withPort(DefaultBuilder.this.isValidPort(port));
             return this;
         }
 
+        @Override
+        public @NonNull Server port(int port, @NonNull SecurityType security) {
+            DefaultBuilder.this.serverHostWithPort = DefaultBuilder.this.serverHostWithPort.withPort(DefaultBuilder.this.isValidPort(port));
+            DefaultBuilder.this.secure = security != SecurityType.INSECURE; // Default to secure on null
+            return this;
+        }
+
         @Override
         public @NonNull Server password(@Nullable String password) {
             DefaultBuilder.this.serverPassword = password;
             return this;
         }
 
+        @Deprecated
         @Override
         public @NonNull Server secure(boolean secure) {
             DefaultBuilder.this.secure = secure;