added test for secure connection

Author: chernser

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

@@ -11,6 +11,11 @@
  */
 public enum DriverProperties {
 
+    /**
+     * Indicates if driver should create a secure connection over SSL/TLS
+     */
+    SECURE_CONNECTION("ssl", "false"),
+
     /**
      * query settings to be passed along with query operation.
      * {@see com.clickhouse.client.api.query.QuerySettings}

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

@@ -80,9 +80,7 @@ static String createConnectionURL(String url, boolean ssl) throws SQLException {
         }
 
         try {
-            System.out.println(url);
             URI tmp = URI.create(url);
-            System.out.println(tmp);
             return tmp.getScheme() + "://" + tmp.getAuthority() + tmp.getPath();
         } catch (Exception e) {
             throw new SQLException("Failed to parse url", e);
@@ -95,7 +93,7 @@ private static String stripUrlPrefix(String url) {
         } else if (url.startsWith(PREFIX_CLICKHOUSE_SHORT)) {
             return url.substring(PREFIX_CLICKHOUSE_SHORT.length());
         } else {
-            throw new IllegalArgumentException("URL is not supported.");
+            throw new IllegalArgumentException("Specified URL doesn't have jdbc any of prefixes: [ " + PREFIX_CLICKHOUSE + ", " + PREFIX_CLICKHOUSE_SHORT + " ]");
         }
     }
 
@@ -107,7 +105,7 @@ private void initProperties(String url, Properties providedProperties) {
             if (entry.getKey() instanceof String && entry.getValue() instanceof String) {
                 props.put((String) entry.getKey(), (String) entry.getValue());
             } else {
-                throw new RuntimeException("Cannot apply non-String properties");
+                throw new IllegalArgumentException("Property key and value should be a string");
             }
         }
 

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

@@ -3,10 +3,13 @@
 import java.sql.*;
 import java.util.Properties;
 
+import com.clickhouse.client.ClickHouseNode;
+import com.clickhouse.client.ClickHouseProtocol;
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.api.ServerException;
 import com.clickhouse.client.api.internal.ServerSettings;
 import com.clickhouse.jdbc.internal.ClientInfoProperties;
+import com.clickhouse.jdbc.internal.DriverProperties;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -306,4 +309,38 @@ public void testMaxResultRowsProperty() throws Exception {
             }
         }
     }
+
+    @Test
+    public void testSecureConnection() throws Exception {
+        if (isCloud()) {
+            return; // this test uses self-signed cert
+        }
+        ClickHouseNode secureServer = getSecureServer(ClickHouseProtocol.HTTP);
+
+        Properties properties = new Properties();
+        properties.put(ClientConfigProperties.USER.getKey(), "default");
+        properties.put(ClientConfigProperties.PASSWORD.getKey(), "");
+        properties.put(ClientConfigProperties.CA_CERTIFICATE.getKey(), "containers/clickhouse-server/certs/localhost.crt");
+
+        try (Connection conn = new ConnectionImpl("jdbc:clickhouse:" + secureServer.getBaseUri(), properties);
+             Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery("SELECT number FROM system.numbers LIMIT 10")) {
+
+            int count = 0;
+            while (rs.next()) { count ++ ; }
+            Assert.assertEquals(count, 10);
+        }
+
+        properties.put(DriverProperties.SECURE_CONNECTION.getKey(), "true");
+        String jdbcUrl = "jdbc:clickhouse://"+secureServer.getHost() + ":" + secureServer.getPort() + "/";
+
+        try (Connection conn = new ConnectionImpl(jdbcUrl, properties);
+             Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery("SELECT number FROM system.numbers LIMIT 10")) {
+
+            int count = 0;
+            while (rs.next()) { count ++ ; }
+            Assert.assertEquals(count, 10);
+        }
+    }
 }

jdbc-v2/src/test/java/com/clickhouse/jdbc/internal/JdbcConfigurationTest.java

@@ -14,7 +14,7 @@
 import static org.testng.Assert.assertEquals;
 
 public class JdbcConfigurationTest {
-    
+
     @Test(dataProvider = "testConnectionUrlDataProvider")
     public void testConnectionUrl(String jdbcUrl, String connectionUrl, Properties properties) throws Exception {
         JdbcConfiguration configuration = new JdbcConfiguration(jdbcUrl, properties);