fix ssl for URL defined endpoints

Author: chernser

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

@@ -43,6 +43,7 @@
 import java.io.InputStream;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.URISyntaxException;
 import java.net.URL;
 import java.time.Duration;
 import java.time.temporal.ChronoUnit;
@@ -174,7 +175,10 @@ public Builder addEndpoint(String endpoint) {
                         endpointURL.getProtocol().equalsIgnoreCase("http"))) {
                     throw new IllegalArgumentException("Only HTTP and HTTPS protocols are supported");
                 }
-            } catch (java.net.MalformedURLException e) {
+                if (endpointURL.toURI().getScheme().equalsIgnoreCase("https")) {
+                    this.configuration.put(ClickHouseClientOption.SSL.getKey(), "true");
+                }
+            } catch (java.net.MalformedURLException | URISyntaxException e) {
                 throw new IllegalArgumentException("Endpoint should be a valid URL string", e);
             }
             this.endpoints.add(endpoint);
@@ -640,7 +644,9 @@ public CompletableFuture<InsertResponse> insert(String tableName,
                 try {
                     InsertResponse response = new InsertResponse(client, future.get(), clientStats);
                     responseFuture.complete(response);
-                } catch (InterruptedException | ExecutionException e) {
+                } catch (ExecutionException e) {
+                    responseFuture.completeExceptionally(new ClientException("Failed to get insert response", e.getCause()));
+                } catch (InterruptedException e) {
                     responseFuture.completeExceptionally(new ClientException("Operation has likely timed out.", e));
                 }
             }
@@ -807,6 +813,8 @@ public List<GenericRecord> queryAll(String sqlQuery) {
                 }
                 return records;
             }
+        } catch (ExecutionException e) {
+            throw new ClientException("Failed to get query response", e.getCause());
         } catch (Exception e) {
             throw new ClientException("Failed to get query response", e);
         }

client-v2/src/main/java/com/clickhouse/client/api/enums/Protocol.java

@@ -1,7 +1,5 @@
 package com.clickhouse.client.api.enums;
 
 public enum Protocol {
-    HTTP,
-    //HTTPS,
-    //TCP,
+    HTTP
 }

client-v2/src/main/java/com/clickhouse/client/api/query/QueryResponse.java

@@ -68,7 +68,9 @@ private void makeComplete() {
             ClickHouseResponse response = responseRef.get(completeTimeout, TimeUnit.MILLISECONDS);
             completed = true;
             operationMetrics.operationComplete(response.getSummary());
-        } catch (TimeoutException | InterruptedException | ExecutionException e) {
+        } catch (ExecutionException e) {
+            throw new ClientException("Failed to get command response", e.getCause());
+        } catch (TimeoutException | InterruptedException e) {
             throw new ClientException("Query request failed", e);
         }
     }

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

@@ -1,31 +1,58 @@
 package com.clickhouse.client;
 
 import com.clickhouse.client.api.Client;
+import com.clickhouse.client.api.ClientException;
 import com.clickhouse.client.api.enums.Protocol;
 import com.clickhouse.client.api.query.GenericRecord;
+import com.clickhouse.client.config.ClickHouseClientOption;
 import org.junit.Assert;
+import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
+import java.net.ConnectException;
+import java.sql.Connection;
 import java.util.Optional;
 
 public class ClientTests extends BaseIntegrationTest {
 
 
-    @Test(enabled = false)
-    public void testWithSSL() {
-
-        ClickHouseNode secureNode = getSecureServer(ClickHouseProtocol.HTTP);
-        Client client = new Client.Builder()
-                .addEndpoint(Protocol.HTTP, "localhost", secureNode.getPort(), true)
-                .setUsername("default")
-                .setPassword("")
-                .build();
-
-
-        Optional<GenericRecord> genericRecord = client
-                .queryAll("SELECT hostname()").stream().findFirst();
-        Assert.assertTrue(genericRecord.isPresent());
+    @Test(dataProvider = "clientProvider")
+    public void testAddSecureEndpoint(Client client) {
+        try {
+            Optional<GenericRecord> genericRecord = client
+                    .queryAll("SELECT hostname()").stream().findFirst();
+            Assert.assertTrue(genericRecord.isPresent());
+        } catch (ClientException e) {
+            e.printStackTrace();
+            if (e.getCause().getCause() instanceof ClickHouseException) {
+                Exception cause = (Exception) e.getCause().getCause().getCause();
+                Assert.assertTrue(cause instanceof ConnectException);
+                // TODO: correct when SSL support is fully implemented.
+                Assert.assertTrue(cause.getMessage()
+                        .startsWith("HTTP request failed: PKIX path building failed"));
+                return;
+            }
+            Assert.fail(e.getMessage());
+        }
+    }
 
-        System.out.println(genericRecord.get().getString(1));
+    @DataProvider(name = "clientProvider")
+    private static Client[] secureClientProvider() throws Exception {
+        ClickHouseNode node = ClickHouseServerForTest.getClickHouseNode(ClickHouseProtocol.HTTP,
+                true, ClickHouseNode.builder()
+                                .addOption(ClickHouseClientOption.SSL_MODE.getKey(), "none")
+                        .addOption(ClickHouseClientOption.SSL.getKey(), "true").build());
+        return new Client[]{
+                new Client.Builder()
+                        .addEndpoint("https://" + node.getHost() + ":" + node.getPort())
+                        .setUsername("default")
+                        .setPassword("")
+                        .build(),
+                new Client.Builder()
+                        .addEndpoint(Protocol.HTTP, node.getHost(), node.getPort(), true)
+                        .setUsername("default")
+                        .setPassword("")
+                        .build()
+        };
     }
 }