fixed

Author: chernser

CHANGELOG.md

@@ -29,7 +29,7 @@
 
 ### New Features
 
-- **[client-v2]** Added `Session` API to encapsulate and manage ClickHouse session settings (`session_id`, `session_check`, `session_timeout`, `session_timezone`) as a reusable object. The `Session` instance can be applied to any request settings using `applyTo()`, and session state can be cleared via `clearSession()`. Additionally, added `resetOption(String)` and `suppressOption(String)` to `InsertSettings`, `QuerySettings`, and `CommonSettings` to allow removing or suppressing specific settings. Suppressed settings (set to `null`) will not be sent to the server, which is useful for overriding global settings.
+- **[client-v2]** Added `Session` API to encapsulate and manage ClickHouse session settings (`session_id`, `session_check`, `session_timeout`, `session_timezone`) as a reusable object. The `Session` instance can be applied to any request settings using `applyTo()`, and session state can be cleared via `clearSession()`. Additionally, added `resetOption(String)` to `InsertSettings`, `QuerySettings`, and `CommonSettings` to allow removing specific settings. Settings explicitly set to `null` will not be sent to the server, which is useful for overriding global settings.
 
 - **[client-v2]** Added runtime credential update APIs on `Client`: `updateUserAndPassword(String, String)`, `updateAccessToken(String)`, and `updateBearerToken(String)`. Subsequent requests on the same `Client` instance use the new credentials without rebuilding the client. The authentication method is fixed at construction time; calling a runtime updater that does not match the configured method throws `ClientMisconfigurationException`. See `docs/authentication.md` for details and migration guidance.
 

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

@@ -3,7 +3,6 @@
 import com.clickhouse.client.api.http.ClickHouseHttpProto;
 import com.clickhouse.client.api.internal.ValidationUtils;
 
-import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -93,7 +92,7 @@ public synchronized void applyTo(Map<? super String, Object> requestSettings) {
         putIfSet(requestSettings, ClickHouseHttpProto.QPARAM_SESSION_TIMEZONE, sessionTimezone);
     }
 
-    public static void clearSession(HashMap<String, Object> settings) {
+    public static void clearSession(Map<String, Object> settings) {
         settings.put(ClientConfigProperties.serverSetting(ClickHouseHttpProto.QPARAM_SESSION_ID), null);
         settings.put(ClientConfigProperties.serverSetting(ClickHouseHttpProto.QPARAM_SESSION_TIMEOUT), null);
         settings.put(ClientConfigProperties.serverSetting(ClickHouseHttpProto.QPARAM_SESSION_CHECK), null);

client-v2/src/main/java/com/clickhouse/client/api/insert/InsertSettings.java

@@ -69,17 +69,6 @@ public InsertSettings resetOption(String option) {
         return this;
     }
 
-    /**
-     * Makes option value to null that makes agent to remove it from final collection.
-     * This is useful to override even global settings when they need to be removed.
-     * @param option - option key
-     * @return current settings instance
-     */
-    public InsertSettings suppressOption(String option) {
-        settings.suppressOption(option);
-        return this;
-    }
-
     /**
      * Get all settings as an unmodifiable map.
      *

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

@@ -20,7 +20,7 @@ public class CommonSettings {
 
     private String operationId;
     private String logComment;
-    protected HashMap<String, Object> settings; // using hashmap to store null values
+    protected Map<String, Object> settings;
 
     public CommonSettings() {
         settings = new HashMap<>();
@@ -66,27 +66,11 @@ public CommonSettings setOption(String option, Object value) {
         return this;
     }
 
-    /**
-     * Removes option from the setting
-     * @param option - option key
-     * @return current settings instance
-     */
     public CommonSettings resetOption(String option) {
         settings.remove(option);
         return this;
     }
 
-    /**
-     * Makes option value to null that makes agent to remove it from final collection.
-     * This is useful to override even global settings when they need to be removed.
-     * @param option - option key
-     * @return current settings instance
-     */
-    public CommonSettings suppressOption(String option) {
-        settings.put(option, null);
-        return this;
-    }
-
     /**
      * Get all settings as an unmodifiable map.
      *

client-v2/src/main/java/com/clickhouse/client/api/query/QuerySettings.java

@@ -50,26 +50,11 @@ public QuerySettings setOption(String option, Object value) {
         return this;
     }
 
-    /**
-     * Removes options from the settings.
-     * @param option - configuration option name
-     */
     public QuerySettings resetOption(String option) {
         settings.resetOption(option);
         return this;
     }
 
-    /**
-     * Makes option value to null that makes agent to remove it from final collection.
-     * This is useful to override even global settings when they need to be removed.
-     * @param option - option key
-     * @return current settings instance
-     */
-    public QuerySettings suppressOption(String option) {
-        settings.suppressOption(option);
-        return this;
-    }
-
     /**
      * Gets a configuration option.
      *

docs/features.md

@@ -11,7 +11,7 @@ This document lists stable, user-visible behavior in `client-v2` and `jdbc-v2` t
 - Proxy support: Can send requests through configured HTTP proxies, including proxy credentials.
 - Connection and socket tuning: Exposes pool sizing, keep-alive, reuse strategy, connect/request/socket timeouts, and low-level socket options.
 - Query execution: Executes SQL asynchronously and returns streaming query responses with response metadata and metrics.
-- Query settings: Supports per-query database selection, output format, execution limits, roles, log comments, headers, reusable `Session` objects, session settings, server settings, and network timeout overrides. Settings explicitly set to `null` are suppressed and will not be sent to the server.
+- Query settings: Supports per-query database selection, output format, execution limits, roles, log comments, headers, reusable `Session` objects, session settings, server settings, and network timeout overrides. Settings explicitly set to `null` will not be sent to the server.
 - Parameterized SQL: Accepts named query parameters and can send them through supported HTTP request encodings.
 - Result materialization helpers: Provides streaming `Records`, generic row access, and convenience APIs that materialize all rows into generic records or typed POJOs.
 - Binary format readers: Reads ClickHouse binary result formats including `Native`, `RowBinary`, `RowBinaryWithNames`, and `RowBinaryWithNamesAndTypes`.