Removing trailing slash in web_context option

Author: radmirnovii

clickhouse-http-client/src/main/java/com/clickhouse/client/http/ClickHouseHttpConnection.java

@@ -150,14 +150,6 @@ private static String buildUrlPath(ClickHouseConfig config) {
                 prev = ch;
             }
 
-            if (prev != '/') {
-                contextBuilder.append('/');
-            }
-        }
-
-        String customPath = (String) config.getOption(ClickHouseHttpOption.CUSTOM_URL_PATH);
-        if (customPath != null && !customPath.isEmpty()) {
-            contextBuilder.append(customPath);
         }
 
         return contextBuilder.toString();

clickhouse-http-client/src/main/java/com/clickhouse/client/http/HttpUrlConnectionImpl.java

@@ -258,7 +258,8 @@ public boolean ping(int timeout) {
         String response = (String) config.getOption(ClickHouseHttpOption.DEFAULT_RESPONSE);
         HttpURLConnection c = null;
         try {
-            c = newConnection(getBaseUrl() + "ping", false);
+            String pingUrl = getPingUrl();
+            c = newConnection(pingUrl, false);
             c.setConnectTimeout(timeout);
             c.setReadTimeout(timeout);
 
@@ -283,6 +284,16 @@ public boolean ping(int timeout) {
         return false;
     }
 
+    private String getPingUrl() {
+        StringBuilder pingUrlBuilder = new StringBuilder();
+        String baseUrl = getBaseUrl();
+        if (!baseUrl.endsWith("/")) {
+            pingUrlBuilder.append("/");
+        }
+        pingUrlBuilder.append("ping");
+        return pingUrlBuilder.toString();
+    }
+
     @Override
     public void close() {
         conn.disconnect();

clickhouse-http-client/src/main/java/com/clickhouse/client/http/config/ClickHouseHttpOption.java

@@ -22,10 +22,6 @@ public enum ClickHouseHttpOption implements ClickHouseOption {
      * Custom HTTP query parameters.
      */
     CUSTOM_PARAMS("custom_http_params", "", "Custom HTTP query parameters."),
-    /**
-     * Custom additional URL path.
-     */
-    CUSTOM_URL_PATH("custom_url_path", "", "Custom additional URL path."),
     /**
      * Default server response.
      */

clickhouse-http-client/src/main/java11/com/clickhouse/client/http/HttpClientConnectionImpl.java

@@ -14,7 +14,6 @@
 import com.clickhouse.client.logging.Logger;
 import com.clickhouse.client.logging.LoggerFactory;
 
-import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.io.InputStream;
@@ -119,7 +118,18 @@ protected HttpClientConnectionImpl(ClickHouseNode server, ClickHouseRequest<?> r
         }
 
         httpClient = builder.build();
-        pingRequest = newRequest(getBaseUrl() + "ping");
+        pingRequest = newRequest(getPingUrl());
+    }
+
+    private String getPingUrl() {
+        String baseUrl = getBaseUrl();
+        StringBuilder pingUrlBuilder = new StringBuilder();
+        if (!baseUrl.endsWith("/")) {
+            pingUrlBuilder.append("/");
+        }
+        pingUrlBuilder.append("ping");
+
+        return pingUrlBuilder.toString();
     }
 
     @Override

clickhouse-http-client/src/test/java/com/clickhouse/client/http/ClickHouseHttpConnectionTest.java

@@ -65,7 +65,7 @@ public void testBuildUrl() throws Exception {
                 "http://localhost:8123/?compress=1&extremes=0");
         Assert.assertEquals(
                 ClickHouseHttpConnection.buildUrl(server, request.option(ClickHouseHttpOption.WEB_CONTEXT, ".")),
-                "http://localhost:8123/./?compress=1&extremes=0");
+                "http://localhost:8123/.?compress=1&extremes=0");
         Assert.assertEquals(
                 ClickHouseHttpConnection.buildUrl(server, request.option(ClickHouseHttpOption.WEB_CONTEXT, "./")),
                 "http://localhost:8123/./?compress=1&extremes=0");