Added handling unknown configuration parameters in client

Author: chernser

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

@@ -345,6 +345,7 @@ public Builder setOption(String key, String value) {
             if (key.equals(ClientConfigProperties.BEARERTOKEN_AUTH.getKey())) {
                 useBearerTokenAuth(value);
             }
+
             return this;
         }
 

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

@@ -184,6 +184,8 @@ public Object parseValue(String value) {
     SSL_SOCKET_SNI("ssl_socket_sni", String.class,""),
     ;
 
+    public static final String NO_THROW_ON_UNKNOWN_CONFIG = "no_throw_on_unknown_config";
+
     private static final Logger LOG = LoggerFactory.getLogger(ClientConfigProperties.class);
 
     private final String key;
@@ -341,7 +343,12 @@ public static Map<String, Object> parseConfigMap(Map<String, String> configMap)
         }
 
         if (!tmpMap.isEmpty()) {
-            LOG.warn("Unknown and unmapped config properties: {}", tmpMap);
+            String msg = "Unknown and unmapped config properties: " + tmpMap.keySet();
+            if (configMap.containsKey(NO_THROW_ON_UNKNOWN_CONFIG)) {
+                LOG.warn(msg);
+            } else {
+                throw new ClientMisconfigurationException(msg);
+            }
         }
 
         return parsedConfig;
@@ -401,8 +408,6 @@ public static Map<String, String> toKeyValuePairs(String str) {
         return Collections.unmodifiableMap(map);
     }
 
-
-
     public static String mapToString(Map<?,?> map, Function<Object, String> valueConverter) {
         StringBuilder sb = new StringBuilder();
         for (Map.Entry<?, ?> entry : map.entrySet()) {

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

@@ -6,6 +6,8 @@ public class ServerException extends ClickHouseException {
 
     public static final int TABLE_NOT_FOUND = 60;
 
+    public static final int UNKNOWN_SETTING = 115;
+
     private final int code;
 
     private final int transportProtocolCode;

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

@@ -4,7 +4,9 @@
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.ClientFaultCause;
+import com.clickhouse.client.api.ClientMisconfigurationException;
 import com.clickhouse.client.api.ConnectionReuseStrategy;
+import com.clickhouse.client.api.ServerException;
 import com.clickhouse.client.api.command.CommandResponse;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.insert.InsertSettings;
@@ -27,6 +29,7 @@
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 import org.testng.util.Strings;
+import wiremock.org.eclipse.jetty.server.Server;
 
 import java.io.ByteArrayInputStream;
 import java.net.ConnectException;
@@ -443,6 +446,33 @@ public void testServerSettings() throws Exception {
         }
     }
 
+    @Test(groups = {"integration"})
+    public void testUnknownClientSettings() throws Exception {
+        try (Client client = newClient().setOption("unknown_setting", "value").build()) {
+            Assert.fail("Exception expected");
+        } catch (Exception ex) {
+            Assert.assertTrue(ex instanceof ClientMisconfigurationException);
+            Assert.assertTrue(ex.getMessage().contains("unknown_setting"));
+        }
+
+        try (Client client = newClient().setOption(ClientConfigProperties.NO_THROW_ON_UNKNOWN_CONFIG, "what ever").setOption("unknown_setting", "value").build()) {
+            Assert.assertTrue(client.ping());
+        }
+
+        try (Client client = newClient().setOption(ClientConfigProperties.SERVER_SETTING_PREFIX + "unknown_setting", "value").build()) {
+            try {
+                client.execute("SELECT 1");
+                Assert.fail("Exception expected");
+            } catch (ServerException e) {
+                Assert.assertEquals(e.getCode(), ServerException.UNKNOWN_SETTING);
+            }
+        }
+
+        try (Client client = newClient().setOption(ClientConfigProperties.HTTP_HEADER_PREFIX + "unknown_setting", "value").build()) {
+            Assert.assertTrue(client.ping());
+        }
+    }
+
     public boolean isVersionMatch(String versionExpression, Client client) {
         List<GenericRecord> serverVersion = client.queryAll("SELECT version()");
         return ClickHouseVersion.of(serverVersion.get(0).getString(1)).check(versionExpression);