added version check to the test. fixed NPE getting operation timeout setting

Author: chernser

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

@@ -1980,7 +1980,7 @@ public Map<String, String> getConfiguration() {
 
     /** Returns operation timeout in seconds */
     protected int getOperationTimeout() {
-        return (int) configuration.get(ClientConfigProperties.MAX_EXECUTION_TIME.getKey());
+        return ClientConfigProperties.MAX_EXECUTION_TIME.getOrDefault(configuration);
     }
 
     /**

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

@@ -280,7 +280,8 @@ public CloseableHttpClient createHttpClient(boolean initSslContext, Map<String,
             soCfgBuilder.setSocksProxyAddress(new InetSocketAddress(proxyHost, proxyPort));
         }
 
-        if (ClientConfigProperties.HTTP_SAVE_COOKIES.getOrDefault(configuration)) {
+        boolean disableCookies = !((Boolean)ClientConfigProperties.HTTP_SAVE_COOKIES.getOrDefault(configuration));
+        if (disableCookies) {
             clientBuilder.disableCookieManagement();
         }
         SocketConfig socketConfig = soCfgBuilder.build();

jdbc-v2/src/test/java/com/clickhouse/jdbc/DataTypeTests.java

@@ -2,6 +2,7 @@
 
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.internal.ServerSettings;
+import com.clickhouse.data.ClickHouseVersion;
 import com.clickhouse.data.Tuple;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -1064,8 +1065,12 @@ public void testTupleTypeSimpleStatement() throws SQLException {
 
 
 
-    @Test
-    public void testJSONTypeSimpleStatement() throws SQLException {
+    @Test(groups = { "integration" })
+    public void testJSONWritingAsString() throws SQLException {
+        if (ClickHouseVersion.of(getServerVersion()).check("(,24.8]")) {
+            return; // JSON was introduced in 24.10
+        }
+
         runQuery("CREATE TABLE test_json (order Int8, "
                 + "json JSON"
                 + ") ENGINE = MergeTree ORDER BY ()");