implemented passing properties

Author: chernser

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

@@ -940,6 +940,16 @@ public Builder setClientName(String clientName) {
             return this;
         }
 
+        /**
+         * Sets client options from provided map. Values are copied as is
+         * @param options - map of client options
+         * @return same instance of the builder
+         */
+        public Builder setOptions(Map<String, String> options) {
+            this.configuration.putAll(options);
+            return this;
+        }
+
         public Client build() {
             setDefaults();
 
@@ -950,7 +960,7 @@ public Client build() {
             // check if username and password are empty. so can not initiate client?
             if (!this.configuration.containsKey("access_token") &&
                 (!this.configuration.containsKey("user") || !this.configuration.containsKey("password")) &&
-                !MapUtils.getFlag(this.configuration, "ssl_authentication")) {
+                !MapUtils.getFlag(this.configuration, "ssl_authentication", false)) {
                 throw new IllegalArgumentException("Username and password (or access token, or SSL authentication) are required");
             }
 
@@ -2105,6 +2115,10 @@ public Set<String> getEndpoints() {
         return Collections.unmodifiableSet(endpoints);
     }
 
+    public String getUser() {
+        return this.configuration.get(ClientConfigProperties.USER.getKey());
+    }
+
     /**
      * Sets list of DB roles that should be applied to each query.
      *

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

@@ -17,14 +17,14 @@ public enum ClientConfigProperties {
 
     HTTP_USE_BASIC_AUTH("http_use_basic_auth"),
 
-    USER("user"),
+    USER("user", "default"),
 
-    PASSWORD("password"),
+    PASSWORD("password", ""),
 
     /**
      * Maximum number of active connection in internal connection pool.
      */
-    HTTP_MAX_OPEN_CONNECTIONS("max_open_connections"),
+    HTTP_MAX_OPEN_CONNECTIONS("max_open_connections", "10"),
 
     /**
      * HTTP keep-alive timeout override.
@@ -59,7 +59,7 @@ public enum ClientConfigProperties {
 
     SOCKET_LINGER_OPT("socket_linger"),
 
-    DATABASE("database"),
+    DATABASE("database", "default"),
 
     COMPRESS_SERVER_RESPONSE("compress"), // actually a server setting, but has client effect too
 
@@ -118,14 +118,37 @@ public enum ClientConfigProperties {
 
     private String key;
 
+    private String defaultValue;
+
+    private List<String> choices;
+
+
     ClientConfigProperties(String key) {
+        this(key, null, Collections.emptyList());
+    }
+
+    ClientConfigProperties(String key, String defaultValue) {
+        this(key, defaultValue, Collections.emptyList());
+    }
+
+    ClientConfigProperties(String key, String defaultValue, List<String> choices) {
         this.key = key;
+        this.defaultValue = defaultValue;
+        this.choices = Collections.unmodifiableList(choices);
     }
 
     public String getKey() {
         return key;
     }
 
+    public List<String> getChoices() {
+        return choices;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
     public static final String HTTP_HEADER_PREFIX = "http_header_";
 
     public static final String SERVER_SETTING_PREFIX = "clickhouse_setting_";

jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java

@@ -5,8 +5,8 @@
 import com.clickhouse.client.api.query.GenericRecord;
 import com.clickhouse.client.api.query.QuerySettings;
 import com.clickhouse.jdbc.internal.ClientInfoProperties;
-import com.clickhouse.jdbc.internal.JdbcConfiguration;
 import com.clickhouse.jdbc.internal.ExceptionUtils;
+import com.clickhouse.jdbc.internal.JdbcConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -67,24 +67,13 @@ public ConnectionImpl(String url, Properties info) throws SQLException {
             clientName += " (" + detectedFrameworks + ")";
         }
 
-        this.client =  new Client.Builder()
-                .fromUrl(this.config.getUrl())//URL without prefix
-                .setUsername(config.getUser())
-                .setPassword(config.getPassword())
+        this.client =  this.config.applyClientProperties(new Client.Builder())
                 .setClientName(clientName)
                 .build();
-        this.schema = client.getDefaultDatabase(); // TODO: fix in properties handling?
+        this.schema = client.getDefaultDatabase();
         this.defaultQuerySettings = new QuerySettings();
 
-        this.metadata = new com.clickhouse.jdbc.metadata.DatabaseMetaData(this, false);
-    }
-
-    public String getUser() {
-        return config.getUser();
-    }
-
-    public String getURL() {
-        return url;
+        this.metadata = new com.clickhouse.jdbc.metadata.DatabaseMetaData(this, false, url);
     }
 
     public QuerySettings getDefaultQuerySettings() {
@@ -489,6 +478,14 @@ public void setShardingKey(ShardingKey shardingKey) throws SQLException {
         Connection.super.setShardingKey(shardingKey);
     }
 
+    /**
+     * Returns instance of the client used to execute queries by this connection.
+     * @return - client instance
+     */
+    public Client getClient() {
+        return client;
+    }
+
     private void checkOpen() throws SQLException {
         if (isClosed()) {
             throw new SQLException("Connection is closed", ExceptionUtils.SQL_STATE_CONNECTION_EXCEPTION);

jdbc-v2/src/main/java/com/clickhouse/jdbc/Driver.java

@@ -130,7 +130,7 @@ public boolean acceptsURL(String url) throws SQLException {
 
     @Override
     public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
-        return JdbcConfiguration.getDriverPropertyInfo(info).toArray(new DriverPropertyInfo[0]);
+        return new JdbcConfiguration(url, info).getDriverPropertyInfo().toArray(new DriverPropertyInfo[0]);
     }
 
     public static int getDriverMajorVersion() {

jdbc-v2/src/main/java/com/clickhouse/jdbc/internal/DriverProperties.java

@@ -1,19 +1,45 @@
 package com.clickhouse.jdbc.internal;
 
+import java.util.Collections;
+import java.util.List;
+
 /**
- * JDBC driver specific properties. Do not include any ClickHouse client properties here.
+ * JDBC driver specific properties. Should not include any of ClientConfigProperties.
+ * All driver specific properties must have {@code "driver."} prefix to isolate them from everything else
  */
 public enum DriverProperties {
 
-    PLACEHOLDER("placeholder", "Placeholder for unknown properties");
+    /**
+     * query settings to be passed along with query operation.
+     * {@see com.clickhouse.client.api.query.QuerySettings}
+     */
+    DEFAULT_QUERY_SETTINGS("driver.query_settings", null);
 
     private final String key;
 
-    private final String description;
+    private final String defaultValue;
+
+    private final List<String> choices;
 
-    DriverProperties(String key, String description) {
+    DriverProperties(String key, String defaultValue) {
+        this(key, defaultValue, Collections.emptyList());
+    }
+
+    DriverProperties(String key, String defaultValue, List<String> choices) {
         this.key = key;
-        this.description = description;
+        this.defaultValue = defaultValue;
+        this.choices = choices;
     }
 
+    public String getKey() {
+        return key;
+    }
+
+    public String getDefaultValue() {
+        return defaultValue;
+    }
+
+    public List<String> getChoices() {
+        return choices;
+    }
 }