Merge branch 'main' into 06/22/26/extract_request_logic

Author: chernser

clickhouse-data/src/main/java/com/clickhouse/data/ClickHouseDataType.java

@@ -177,7 +177,7 @@ public static Map<Class<?>, Integer> buildVariantMapping(List<ClickHouseDataType
         return variantMapping;
     }
 
-    static final Map<ClickHouseDataType, Set<Class<?>>> DATA_TYPE_TO_CLASS = dataTypeClassMap();
+    public static final Map<ClickHouseDataType, Set<Class<?>>> DATA_TYPE_TO_CLASS = Collections.unmodifiableMap(dataTypeClassMap());
     static Map<ClickHouseDataType, Set<Class<?>>> dataTypeClassMap() {
         Map<ClickHouseDataType, Set<Class<?>>> map = new HashMap<>();
 

client-v2/pom.xml

@@ -88,8 +88,26 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <scope>test</scope>
             <version>${jackson.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson.version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson.version}</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>${project.parent.groupId}</groupId>

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

@@ -12,6 +12,7 @@
 import com.clickhouse.client.api.data_formats.internal.ProcessParser;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.enums.ProxyType;
+import com.clickhouse.client.api.enums.SSLMode;
 import com.clickhouse.client.api.http.ClickHouseHttpProto;
 import com.clickhouse.client.api.insert.InsertResponse;
 import com.clickhouse.client.api.insert.InsertSettings;
@@ -756,6 +757,34 @@ public Builder setClientKey(String path) {
             return this;
         }
 
+        /**
+         * Defines how strictly the client verifies a server identity on secure connections.
+         *
+         * <p>Supported modes:</p>
+         * <ul>
+         *     <li>{@link SSLMode#DISABLED} - SSL is not used; only meaningful with plain protocols</li>
+         *     <li>{@link SSLMode#TRUST} - encrypt, but accept any server certificate and skip
+         *     hostname verification; a configured trust store or CA certificate is ignored (a warning
+         *     is logged), while a client certificate/key is still applied for mTLS</li>
+         *     <li>{@link SSLMode#VERIFY_CA} - validate the server certificate chain, but skip
+         *     hostname verification</li>
+         *     <li>{@link SSLMode#STRICT} - full verification of the certificate chain and the
+         *     hostname (default)</li>
+         * </ul>
+         *
+         * <p>The mode applies only when a secure protocol is in use - for the HTTP transport that
+         * means an {@code https://} endpoint. Setting any mode does <b>not</b> make the client use
+         * encryption on a plain HTTP endpoint: the endpoint scheme always decides whether the
+         * connection is encrypted.</p>
+         *
+         * @param sslMode ssl mode
+         * @return same instance of the builder
+         */
+        public Builder setSSLMode(SSLMode sslMode) {
+            this.configuration.put(ClientConfigProperties.SSL_MODE.getKey(), sslMode.name());
+            return this;
+        }
+
         /**
          * Configure client to use server timezone for date/datetime columns. Default is true.
          * If this options is selected then server timezone should be set as well.
@@ -1141,6 +1170,36 @@ public Client build() {
                 throw new ClientMisconfigurationException("Trust store and certificates cannot be used together");
             }
 
+            // A trust store and a CA certificate are not rejected here: for VERIFY_CA/STRICT the trust
+            // store takes precedence and the CA certificate is ignored with a warning (see createSSLContext).
+
+            // Resolve ssl_mode case-insensitively and normalize it to the canonical enum name so that
+            // downstream parsing is consistent and an unknown value is reported as a misconfiguration
+            // here instead of failing later with a generic enum-parsing error.
+            String sslModeValue = configuration.get(ClientConfigProperties.SSL_MODE.getKey());
+            if (sslModeValue != null) {
+                SSLMode sslMode;
+                try {
+                    sslMode = SSLMode.fromValue(sslModeValue);
+                } catch (IllegalArgumentException e) {
+                    throw new ClientMisconfigurationException("Invalid value '" + sslModeValue + "' for '"
+                            + ClientConfigProperties.SSL_MODE.getKey() + "'", e);
+                }
+                configuration.put(ClientConfigProperties.SSL_MODE.getKey(), sslMode.name());
+
+                // SSLMode.DISABLED does not turn encryption off - the endpoint scheme decides that. So it
+                // contradicts a secure (https) endpoint and must be rejected here, before the client is created.
+                if (sslMode == SSLMode.DISABLED) {
+                    for (Endpoint endpoint : this.endpoints) {
+                        if ("https".equalsIgnoreCase(endpoint.getURI().getScheme())) {
+                            throw new ClientMisconfigurationException("SSL mode '" + SSLMode.DISABLED
+                                    + "' cannot be used with a secure (https) endpoint. Use '" + SSLMode.TRUST
+                                    + "' to trust all certificates or use plain HTTP.");
+                        }
+                    }
+                }
+            }
+
             // Check timezone settings
             String useTimeZoneValue = this.configuration.get(ClientConfigProperties.USE_TIMEZONE.getKey());
             String serverTimeZoneValue = this.configuration.get(ClientConfigProperties.SERVER_TIMEZONE.getKey());
@@ -1641,6 +1700,7 @@ public CompletableFuture<QueryResponse> query(String sqlQuery, Map<String, Objec
         if (requestSettings.getFormat() == null) {
             requestSettings.setFormat(ClickHouseFormat.RowBinaryWithNamesAndTypes);
         }
+        applyFormatSpecificSettings(requestSettings);
         ClientStatisticsHolder clientStats = new ClientStatisticsHolder();
         clientStats.start(ClientMetrics.OP_DURATION);
 
@@ -2226,6 +2286,30 @@ private Map<String, Object> buildRequestSettings(Map<String, Object> opSettings)
         return requestSettings;
     }
 
+    /**
+     * Applies format-specific server-side settings to the already merged request settings.
+     * Must be called after {@link #buildRequestSettings(Map)} and after the request format has been resolved
+     * (either provided by the caller or defaulted), so that the inspected format reflects the final value.
+     *
+     * <p>For {@link ClickHouseFormat#JSONEachRow}, callers may opt in to plain JSON numbers by setting
+     * {@link ClientConfigProperties#JSON_DISABLE_NUMBER_QUOTING}. Explicit server settings are otherwise
+     * left untouched.</p>
+     * <ul>
+     *     <li>{@code output_format_json_quote_64bit_integers}</li>
+     *     <li>{@code output_format_json_quote_64bit_floats}</li>
+     *     <li>{@code output_format_json_quote_decimals}</li>
+     * </ul>
+     */
+    private static void applyFormatSpecificSettings(QuerySettings requestSettings) {
+        boolean disableNumberQuoting = ClientConfigProperties.JSON_DISABLE_NUMBER_QUOTING
+                .getOrDefault(requestSettings.getAllSettings());
+        if (requestSettings.getFormat() == ClickHouseFormat.JSONEachRow && disableNumberQuoting) {
+            requestSettings.serverSetting("output_format_json_quote_64bit_integers", "0");
+            requestSettings.serverSetting("output_format_json_quote_64bit_floats", "0");
+            requestSettings.serverSetting("output_format_json_quote_decimals", "0");
+        }
+    }
+
     private Duration durationSince(long sinceNanos) {
         return Duration.ofNanos(System.nanoTime() - sinceNanos);
     }

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

@@ -1,6 +1,7 @@
 package com.clickhouse.client.api;
 
 import com.clickhouse.client.api.data_formats.internal.AbstractBinaryFormatReader;
+import com.clickhouse.client.api.enums.SSLMode;
 import com.clickhouse.client.api.internal.ClickHouseLZ4OutputStream;
 import com.clickhouse.data.ClickHouseDataType;
 import com.clickhouse.data.ClickHouseFormat;
@@ -115,6 +116,8 @@ public enum ClientConfigProperties {
 
     SSL_CERTIFICATE("sslcert", String.class),
 
+    SSL_MODE("ssl_mode", SSLMode.class, SSLMode.STRICT.name()),
+
     RETRY_ON_FAILURE("retry", Integer.class, "3"),
 
     INPUT_OUTPUT_FORMAT("format", ClickHouseFormat.class),
@@ -190,6 +193,11 @@ public Object parseValue(String value) {
      */
     HTTP_SEND_PARAMS_IN_BODY("client.http.use_form_request_for_query", Boolean.class, "false"),
 
+    /**
+     * When enabled for JSONEachRow queries, asks ClickHouse to emit large integer,
+     * floating-point, and decimal values as JSON numbers instead of quoted strings.
+     */
+    JSON_DISABLE_NUMBER_QUOTING("json_disable_number_quoting", Boolean.class, "false"),
 
     /**
      *  Prefix for custom settings. Should be aligned with server configuration.