updated with classic client options to keep backward compatibility

Author: chernser

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

@@ -367,7 +367,7 @@ public Builder setMaxConnections(int maxConnections) {
          * @return
          */
         public Builder setConnectionTTL(long timeout, ChronoUnit unit) {
-            this.configuration.put("connection_ttl", String.valueOf(Duration.of(timeout, unit).toMillis()));
+            this.configuration.put(ClickHouseClientOption.CONNECTION_TTL.getKey(), String.valueOf(Duration.of(timeout, unit).toMillis()));
             return this;
         }
 
@@ -381,7 +381,7 @@ public Builder setConnectionTTL(long timeout, ChronoUnit unit) {
          * @return
          */
         public Builder setKeepAliveTimeout(long timeout, ChronoUnit unit) {
-            this.configuration.put("connection_keep_alive_timeout", String.valueOf(Duration.of(timeout, unit).toMillis()));
+            this.configuration.put(ClickHouseHttpOption.KEEP_ALIVE_TIMEOUT.getKey(), String.valueOf(Duration.of(timeout, unit).toMillis()));
             return this;
         }
 

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

@@ -134,7 +134,8 @@ public SSLContext createSSLContext() {
 
     private ConnectionConfig createConnectionConfig() {
         ConnectionConfig.Builder connConfig = ConnectionConfig.custom();
-        connConfig.setTimeToLive(MapUtils.getLong(chConfiguration, "connection_ttl"), TimeUnit.MILLISECONDS);
+        connConfig.setTimeToLive(MapUtils.getLong(chConfiguration, ClickHouseClientOption.CONNECTION_TTL.getKey()),
+                TimeUnit.MILLISECONDS);
         connConfig.setConnectTimeout(MapUtils.getLong(chConfiguration, ClickHouseClientOption.CONNECTION_TIMEOUT.getKey()),
                 TimeUnit.MILLISECONDS);
         connConfig.setValidateAfterInactivity(CONNECTION_INACTIVITY_CHECK, TimeUnit.MILLISECONDS); // non-configurable for now
@@ -221,7 +222,7 @@ public CloseableHttpClient createHttpClient() {
         } else {
             clientBuilder.setConnectionManager(basicConnectionManager(sslContext, socketConfig));
         }
-        long keepAliveTimeout = MapUtils.getLong(chConfiguration, "connection_keep_alive_timeout");
+        long keepAliveTimeout = MapUtils.getLong(chConfiguration, ClickHouseHttpOption.KEEP_ALIVE_TIMEOUT.getKey());
         if (keepAliveTimeout > 0) {
             clientBuilder.setKeepAliveStrategy((response, context) -> TimeValue.ofMilliseconds(keepAliveTimeout));
         }

client-v2/src/test/java/com/clickhouse/client/ConnectionManagementTests.java

@@ -26,6 +26,9 @@ public class ConnectionManagementTests extends BaseIntegrationTest{
     @Test(groups = {"integration"},dataProvider = "testConnectionTTLProvider")
     @SuppressWarnings("java:S2925")
     public void testConnectionTTL(Long connectionTtl, Long keepAlive, int openSockets) throws Exception {
+        if (isCloud()) {
+            return; // skip cloud tests because of wiremock proxy. TODO: fix it
+        }
         ClickHouseNode server = getServer(ClickHouseProtocol.HTTP);
 
         int proxyPort = new Random().nextInt(1000) + 10000;
@@ -46,7 +49,6 @@ public void testConnectionTTL(Long connectionTtl, Long keepAlive, int openSocket
                 .setUsername("default")
                 .setPassword(getPassword())
                 .useNewImplementation(true)
-//                .useNewImplementation(System.getProperty("client.tests.useNewImplementation", "false").equals("true"))
                 .addProxy(ProxyType.HTTP, "localhost", proxyPort);
         if (connectionTtl != null) {
             clientBuilder.setConnectionTTL(connectionTtl, ChronoUnit.MILLIS);
@@ -96,23 +98,21 @@ private static class ConnectionCounterListener implements WiremockNetworkTraffic
         @Override
         public void opened(Socket socket) {
             opened.incrementAndGet();
-            System.out.println("Opened: " + socket);
         }
 
         @Override
         public void incoming(Socket socket, ByteBuffer bytes) {
-
+            // ignore
         }
 
         @Override
         public void outgoing(Socket socket, ByteBuffer bytes) {
-
+            // ignore
         }
 
         @Override
         public void closed(Socket socket) {
             closed.incrementAndGet();
-            System.out.println("Closed: " + socket);
         }
     }