Adjusting port handling

Author: Paultagoras

client-v2/src/main/java/com/clickhouse/client/api/Client.java

@@ -236,13 +236,21 @@ public Builder() {
         /**
          * Builds a client object with the provided configuration through URL parameters.
          *
-         * @param url - URL formatted string with protocol, host, port, and client configuration settings.
+         * @param urlString - URL formatted string with protocol, host, port, and client configuration settings.
          * @return Client - a client object
          */
-        public Builder fromUrl(String url) {
+        public Builder fromUrl(String urlString) {
             try {
-                Map<String, String> urlProperties = HttpAPIClientHelper.parseUrlParameters(new java.net.URL(url));
-                this.addEndpoint(url);
+                URL url = new URL(urlString);
+                Map<String, String> urlProperties = HttpAPIClientHelper.parseUrlParameters(url);
+
+                // Add the endpoint
+                boolean secure = url.getProtocol().equalsIgnoreCase("https");
+                int port = url.getPort();
+                if (port == -1) {
+                    port = secure ? ClickHouseHttpProto.DEFAULT_HTTPS_PORT : ClickHouseHttpProto.DEFAULT_HTTP_PORT;
+                }
+                this.addEndpoint(Protocol.HTTP, url.getHost(), port, secure);
 
                 for (ClientConfigProperties properties: ClientConfigProperties.values()) {
                     String key = properties.getKey().replace(ClientConfigProperties.SERVER_SETTING_PREFIX, "");//People wouldn't pass with prefix

client-v2/src/main/java/com/clickhouse/client/api/http/ClickHouseHttpProto.java

@@ -58,4 +58,8 @@ public class ClickHouseHttpProto {
     public static final String QPARAM_QUERY_ID = "query_id";
 
     public static final String QPARAM_ROLE = "role";
+
+    public static final int DEFAULT_HTTP_PORT = 8123;
+
+    public static final int DEFAULT_HTTPS_PORT = 8443;
 }

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/JdbcConfiguration.java

@@ -44,8 +44,8 @@ public boolean isDisableFrameworkDetection() {
     }
 
     public JdbcConfiguration(String url, Properties info) {
-        this.jdbcUrl = url;
-        this.url = stripUrlPrefix(url);
+        this.jdbcUrl = url;//Raw URL
+        this.url = cleanUrl(url);
         this.user = info.getProperty("user", "default");
         this.password = info.getProperty("password", "");
         this.disableFrameworkDetection = Boolean.parseBoolean(info.getProperty("disable_frameworks_detection", "false"));
@@ -55,6 +55,14 @@ public static boolean acceptsURL(String url) {
         return url.startsWith(PREFIX_CLICKHOUSE) || url.startsWith(PREFIX_CLICKHOUSE_SHORT);
     }
 
+    private String cleanUrl(String url) {
+        url = stripUrlPrefix(url);
+        if (url.startsWith("//")) {
+            url = "http:" + url;
+        }
+
+        return url;
+    }
     private String stripUrlPrefix(String url) {
         if (url.startsWith(PREFIX_CLICKHOUSE)) {
             return url.substring(PREFIX_CLICKHOUSE.length());