Small refactor for bearer token

Author: mzitnik

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

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

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

@@ -123,7 +123,7 @@ public enum ClientConfigProperties {
     @Deprecated
     PRODUCT_NAME("product_name"),
 
-
+    BEARERTOKEN_AUTH ("bearer_token")
     ;
 
     private String key;

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

@@ -22,8 +22,8 @@ public enum DriverProperties {
      * query settings to be passed along with query operation.
      * {@see com.clickhouse.client.api.query.QuerySettings}
      */
-    DEFAULT_QUERY_SETTINGS("default_query_settings", null);
-
+    DEFAULT_QUERY_SETTINGS("default_query_settings", null),
+    BEARER_TOKEN("jdbc_bearer_token", null);
     private final String key;
 
     private final String defaultValue;

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

@@ -57,7 +57,11 @@ public JdbcConfiguration(String url, Properties info) throws SQLException {
         initProperties(urlProperties, info);
 
         // after initializing all properties - set final connection URL
-        boolean useSSL = Boolean.parseBoolean(info.getProperty("ssl", "false"));
+        boolean useSSL = Boolean.parseBoolean(info.getProperty(DriverProperties.SECURE_CONNECTION.getKey(), "false"));
+        String bearerToken = info.getProperty(DriverProperties.BEARER_TOKEN.getKey(), null);
+        if (bearerToken != null) {
+            clientProperties.put(ClientConfigProperties.BEARERTOKEN_AUTH.getKey(), bearerToken);
+        }
         this.connectionUrl = createConnectionURL(tmpConnectionUrl, useSSL);
         this.isIgnoreUnsupportedRequests= Boolean.parseBoolean(getDriverProperty(DriverProperties.IGNORE_UNSUPPORTED_VALUES.getKey(), "false"));
     }
@@ -240,9 +244,6 @@ public String getDriverProperty(String key, String defaultValue) {
     public Client.Builder applyClientProperties(Client.Builder builder) {
         builder.addEndpoint(connectionUrl)
                 .setOptions(clientProperties);
-        if (clientProperties.containsKey("access_token")) {
-            builder.useBearerTokenAuth(clientProperties.get("access_token"));
-        }
         return builder;
     }
 

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

@@ -504,7 +504,7 @@ public void testBearerTokenAuth() throws Exception {
                                             "{ \"read_bytes\": \"10\", \"read_rows\": \"1\"}")).build());
 
             Properties properties = new Properties();
-            properties.put("access_token", jwtToken1);
+            properties.put(DriverProperties.BEARER_TOKEN.getKey(), jwtToken1);
             properties.put("compress", "false");
             String jdbcUrl = "jdbc:clickhouse://" + "localhost" + ":" + mockServer.port();
             try (Connection conn = new ConnectionImpl(jdbcUrl, properties);