removed dependency on clickhouse-http-client

Author: chernser

client-v2/pom.xml

@@ -26,11 +26,7 @@
             <artifactId>clickhouse-client</artifactId>
             <version>${revision}</version>
         </dependency>
-        <dependency>
-            <groupId>${project.parent.groupId}</groupId>
-            <artifactId>clickhouse-http-client</artifactId>
-            <version>${revision}</version>
-        </dependency>
+
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -68,6 +64,12 @@
         </dependency>
 
         <!-- Test Dependencies -->
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>clickhouse-http-client</artifactId>
+            <version>${revision}</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

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

@@ -18,6 +18,7 @@
 import com.clickhouse.client.api.data_formats.internal.SerializerUtils;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.enums.ProxyType;
+import com.clickhouse.client.api.http.ClickHouseHttpProto;
 import com.clickhouse.client.api.insert.DataSerializationException;
 import com.clickhouse.client.api.insert.InsertResponse;
 import com.clickhouse.client.api.insert.InsertSettings;
@@ -42,8 +43,6 @@
 import com.clickhouse.client.api.query.Records;
 import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.client.config.ClickHouseDefaults;
-import com.clickhouse.client.http.ClickHouseHttpProto;
-import com.clickhouse.client.http.config.ClickHouseHttpOption;
 import com.clickhouse.data.ClickHouseColumn;
 import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.data.ClickHouseFormat;
@@ -389,7 +388,7 @@ public Builder setConnectionRequestTimeout(long timeout, ChronoUnit unit) {
          * @param maxConnections - maximum number of connections
          */
         public Builder setMaxConnections(int maxConnections) {
-            this.configuration.put(ClickHouseHttpOption.MAX_OPEN_CONNECTIONS.getKey(), String.valueOf(maxConnections));
+            this.configuration.put(ClientSettings.HTTP_MAX_OPEN_CONNECTIONS, String.valueOf(maxConnections));
             return this;
         }
 
@@ -416,7 +415,7 @@ public Builder setConnectionTTL(long timeout, ChronoUnit unit) {
          * @return
          */
         public Builder setKeepAliveTimeout(long timeout, ChronoUnit unit) {
-            this.configuration.put(ClickHouseHttpOption.KEEP_ALIVE_TIMEOUT.getKey(), String.valueOf(Duration.of(timeout, unit).toMillis()));
+            this.configuration.put(ClientSettings.HTTP_KEEP_ALIVE_TIMEOUT, String.valueOf(Duration.of(timeout, unit).toMillis()));
             return this;
         }
 
@@ -980,7 +979,7 @@ private void setDefaults() {
                 useAsyncRequests(false);
             }
 
-            if (!configuration.containsKey(ClickHouseHttpOption.MAX_OPEN_CONNECTIONS.getKey())) {
+            if (!configuration.containsKey(ClientSettings.HTTP_MAX_OPEN_CONNECTIONS)) {
                 setMaxConnections(10);
             }
 

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

@@ -51,4 +51,14 @@ public static List<String> valuesFromCommaSeparated(String value) {
      * Server will return a JSON object as a string.
      */
     public static final String OUTPUT_FORMAT_BINARY_WRITE_JSON_AS_STRING = "output_format_binary_write_json_as_string";
+
+    /**
+     * Maximum number of active connection in internal connection pool.
+     */
+    public static final String HTTP_MAX_OPEN_CONNECTIONS = "max_open_connections";
+
+    /**
+     * HTTP keep-alive timeout override.
+     */
+    public static final String HTTP_KEEP_ALIVE_TIMEOUT = "http_keep_alive_timeout";
 }

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

@@ -0,0 +1,61 @@
+package com.clickhouse.client.api.http;
+
+public class ClickHouseHttpProto {
+
+
+    public static final String HEADER_SRV_DISPLAY_NAME = "X-ClickHouse-Server-Display-Name";
+
+    /**
+     * Response only header to indicate a query id
+     * Cannot be used in request.
+     */
+    public static final String HEADER_QUERY_ID = "X-ClickHouse-Query-Id";
+
+    public static final String HEADER_SRV_SUMMARY = "X-ClickHouse-Summary";
+
+    /**
+     * Response only header to indicate the format of the data.
+     * Cannot be used in request.
+     */
+    public static final String HEADER_FORMAT = "X-ClickHouse-Format";
+
+    public static final String HEADER_TIMEZONE = "X-ClickHouse-Timezone";
+
+    /**
+     * Response only header to indicate the error code.
+     * Cannot be used in request.
+     */
+    public static final String HEADER_EXCEPTION_CODE = "X-ClickHouse-Exception-Code";
+
+    /**
+     * Response only header to indicate a query progress.
+     * Cannot be used in request.
+     */
+    public static final String HEADER_PROGRESS = "X-ClickHouse-Progress";
+
+
+    /**
+     * Name of default database to be used if not specified in a table name.
+     */
+    public static final String HEADER_DATABASE = "X-ClickHouse-Database";
+
+    /**
+     * Name of user to be used to authenticate
+     */
+    public static final String HEADER_DB_USER = "X-ClickHouse-User";
+
+    /**
+     * Password of user to be used to authenticate. Note: header value should be unencoded, so using
+     * special characters might cause issues. It is recommended to use the Basic Authentication instead.
+     */
+    public static final String HEADER_DB_PASSWORD = "X-ClickHouse-Key";
+
+    public static final String HEADER_SSL_CERT_AUTH = "x-clickhouse-ssl-certificate-auth";
+
+    /**
+     * Query parameter to specify the query ID.
+     */
+    public static final String QPARAM_QUERY_ID = "query_id";
+
+    public static final String QPARAM_ROLE = "role";
+}

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -12,10 +12,9 @@
 import com.clickhouse.client.api.ServerException;
 import com.clickhouse.client.api.data_formats.internal.SerializerUtils;
 import com.clickhouse.client.api.enums.ProxyType;
+import com.clickhouse.client.api.http.ClickHouseHttpProto;
 import com.clickhouse.client.config.ClickHouseClientOption;
 import com.clickhouse.client.config.ClickHouseDefaults;
-import com.clickhouse.client.http.ClickHouseHttpProto;
-import com.clickhouse.client.http.config.ClickHouseHttpOption;
 import org.apache.hc.client5.http.ConnectTimeoutException;
 import org.apache.hc.client5.http.classic.methods.HttpPost;
 import org.apache.hc.client5.http.config.ConnectionConfig;
@@ -198,7 +197,7 @@ private HttpClientConnectionManager poolConnectionManager(SSLContext sslContext,
 
         connMgrBuilder.setDefaultConnectionConfig(createConnectionConfig());
         connMgrBuilder.setMaxConnTotal(Integer.MAX_VALUE); // as we do not know how many routes we will have
-        MapUtils.applyInt(chConfiguration, ClickHouseHttpOption.MAX_OPEN_CONNECTIONS.getKey(),
+        MapUtils.applyInt(chConfiguration, ClientSettings.HTTP_MAX_OPEN_CONNECTIONS,
                 connMgrBuilder::setMaxConnPerRoute);
 
 
@@ -266,7 +265,7 @@ public CloseableHttpClient createHttpClient() {
         } else {
             clientBuilder.setConnectionManager(basicConnectionManager(sslContext, socketConfig));
         }
-        long keepAliveTimeout = MapUtils.getLong(chConfiguration, ClickHouseHttpOption.KEEP_ALIVE_TIMEOUT.getKey());
+        long keepAliveTimeout = MapUtils.getLong(chConfiguration, ClientSettings.HTTP_KEEP_ALIVE_TIMEOUT);
         if (keepAliveTimeout > 0) {
             clientBuilder.setKeepAliveStrategy((response, context) -> TimeValue.ofMilliseconds(keepAliveTimeout));
         }
@@ -468,10 +467,6 @@ private void addQueryParams(URIBuilder req, Map<String, String> chConfig, Map<St
             }
         }
 
-        if (requestConfig.containsKey(ClickHouseHttpOption.WAIT_END_OF_QUERY.getKey())) {
-            req.addParameter(ClickHouseHttpOption.WAIT_END_OF_QUERY.getKey(),
-                    requestConfig.get(ClickHouseHttpOption.WAIT_END_OF_QUERY.getKey()).toString());
-        }
         if (requestConfig.containsKey(ClickHouseClientOption.QUERY_ID.getKey())) {
             req.addParameter(ClickHouseHttpProto.QPARAM_QUERY_ID, requestConfig.get(ClickHouseClientOption.QUERY_ID.getKey()).toString());
         }

client-v2/src/main/java/com/clickhouse/client/api/internal/ServerSettings.java

@@ -0,0 +1,12 @@
+package com.clickhouse.client.api.internal;
+
+
+/**
+ * Incomplete list of server side settings.
+ * This class is not intended to list all possible settings, but only those that are commonly used.
+ *
+ */
+public final class ServerSettings {
+
+    public static final String WAIT_END_OF_QUERY = "wait_end_of_query";
+}