removed:

- PreparedStatementImpl:getMetadata
- sslmode

Author: oleg-zinovev

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

@@ -92,8 +92,6 @@ public enum ClientConfigProperties {
 
     SSL_KEY_STORE_PASSWORD("key_store_password"),
 
-    SSL_MODE("sslmode", "strict", Arrays.asList("strict", "none")),
-
     SSL_KEY("ssl_key"),
 
     CA_CERTIFICATE("sslrootcert"),

client-v2/src/main/java/com/clickhouse/client/api/internal/HttpAPIClientHelper.java

@@ -175,13 +175,6 @@ public SSLContext createSSLContext() {
             } catch (SSLException e) {
                 throw new ClientMisconfigurationException("Failed to create SSL context from certificates", e);
             }
-        } else if ("none".equals(chConfiguration.get(ClientConfigProperties.SSL_MODE.getKey()))) {
-            try {
-                sslContext = SSLContext.getInstance("TLS");
-                sslContext.init(new KeyManager[0], new TrustManager[]{new TrustAllManager()}, new SecureRandom());
-            } catch (NoSuchAlgorithmException | KeyManagementException e) {
-                throw new ClientException("Failed to create none validating SSL context", e);
-            }
         }
         return sslContext;
     }

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

@@ -65,12 +65,6 @@ private static Client[] secureClientProvider() throws Exception {
                         .setPassword("")
                         .setRootCertificate("containers/clickhouse-server/certs/localhost.crt")
                         .build(),
-                new Client.Builder()
-                        .addEndpoint("https://" + node.getHost() + ":" + node.getPort())
-                        .setUsername("default")
-                        .setPassword("")
-                        .setOption(ClientConfigProperties.SSL_MODE.getKey(), "none")
-                        .build(),
                 new Client.Builder()
                         .addEndpoint(Protocol.HTTP, node.getHost(), node.getPort(), true)
                         .setUsername("default")

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

@@ -3,12 +3,11 @@
 
 import com.clickhouse.client.api.ClientConfigProperties;
 import com.clickhouse.client.config.ClickHouseClientOption;
-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;
 
-import java.io.InputStream;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.DriverPropertyInfo;
@@ -33,11 +32,14 @@ public class Driver implements java.sql.Driver {
     private final DataSourceImpl dataSource;
 
     public static String frameworksDetected = null;
+
     public static class FrameworksDetection {
         private static final List<String> FRAMEWORKS_TO_DETECT = Arrays.asList("apache.spark");
         static volatile String frameworksDetected = null;
 
-        private FrameworksDetection() {}
+        private FrameworksDetection() {
+        }
+
         public static String getFrameworksDetected() {
             if (frameworksDetected == null) {//Only detect frameworks once
                 Set<String> inferredFrameworks = new LinkedHashSet<>();
@@ -98,22 +100,21 @@ public Driver(DataSourceImpl dataSourceImpl) {
 
     public static void load() {
         try {
-            DriverManager.registerDriver(DriverHolder.INSTANCE);
+            DriverManager.registerDriver(INSTANCE);
         } catch (SQLException e) {
             log.error("Failed to register ClickHouse JDBC driver", e);
         }
     }
 
     public static void unload() {
         try {
-            DriverManager.deregisterDriver(DriverHolder.INSTANCE);
+            DriverManager.deregisterDriver(INSTANCE);
         } catch (SQLException e) {
             log.error("Failed to deregister ClickHouse JDBC driver", e);
         }
     }
 
 
-
     @Override
     public Connection connect(String url, Properties info) throws SQLException {
         if (!acceptsURL(url)) {
@@ -164,7 +165,5 @@ public java.util.logging.Logger getParentLogger() throws SQLFeatureNotSupportedE
         throw new SQLFeatureNotSupportedException("Method not supported", ExceptionUtils.SQL_STATE_FEATURE_NOT_SUPPORTED);
     }
 
-    private static final class DriverHolder {
-        private static final Driver INSTANCE = new Driver();
-    }
+    private static final Driver INSTANCE = new Driver();
 }

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

@@ -303,26 +303,7 @@ public void setArray(int parameterIndex, Array x) throws SQLException {
     @Override
     public ResultSetMetaData getMetaData() throws SQLException {
         checkClosed();
-        if (this.currentResultSet != null) {
-            return currentResultSet.getMetaData();
-        } else if (statementType != StatementType.SELECT) {
-            return null;
-        }
-
-        String sql = compileSql(sqlSegments);
-        String describe = String.format("describe (\n%s\n)", sql);
-
-        List<ClickHouseColumn> columns = new ArrayList<>();
-        try (Statement stmt = connection.createStatement()) {
-            try (ResultSet rs = stmt.executeQuery(describe)) {
-                while (rs.next()) {
-                    ClickHouseColumn column = ClickHouseColumn.of(rs.getString(1), rs.getString(2));
-                    columns.add(column);
-                }
-            }
-        }
-        TableSchema schema = new TableSchema(columns);
-        return new com.clickhouse.jdbc.metadata.ResultSetMetaData(schema);
+        return null;
     }
 
     @Override

jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/ResultSetMetaData.java

@@ -1,7 +1,6 @@
 package com.clickhouse.jdbc.metadata;
 
 import java.sql.SQLException;
-import java.util.Objects;
 
 import com.clickhouse.client.api.metadata.TableSchema;
 import com.clickhouse.data.ClickHouseColumn;
@@ -12,32 +11,21 @@
 
 public class ResultSetMetaData implements java.sql.ResultSetMetaData, JdbcV2Wrapper {
     private final ResultSetImpl resultSet;
-    private final TableSchema schema;
-
     public ResultSetMetaData(ResultSetImpl resultSet) {
         this.resultSet = resultSet;
-        this.schema = null; // result set schema is lazy
-    }
-
-    public ResultSetMetaData(TableSchema schema) {
-        this.resultSet = null;
-        this.schema = schema;
     }
 
     private ClickHouseColumn getColumn(int column) throws SQLException {
         if (column < 1 || column > getColumnCount()) {
             throw new SQLException("Column index out of range: " + column, ExceptionUtils.SQL_STATE_CLIENT_ERROR);
         }
-        TableSchema schema = resultSet != null ? resultSet.getSchema() : this.schema;
-        assert schema != null : "Schema is null";
-        return schema.getColumns().get(column - 1);
+        return resultSet.getSchema().getColumns().get(column - 1);
     }
 
     @Override
     public int getColumnCount() throws SQLException {
         try {
-            TableSchema schema = resultSet != null ? resultSet.getSchema() : this.schema;
-            assert schema != null : "Schema is null";
+            TableSchema schema = resultSet.getSchema();
             return schema.getColumns().size();
         } catch (Exception e) {
             throw ExceptionUtils.toSqlState(e);

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

@@ -491,17 +491,4 @@ void testStatementSplit() throws Exception {
             }
         }
     }
-
-    @Test(groups = { "integration" })
-    void testPreparedStatementMd() throws Exception {
-        try (Connection conn = getJdbcConnection()) {
-            try (PreparedStatement stmt = conn.prepareStatement("select 1::Int32 as value")) {
-                ResultSetMetaData md = stmt.getMetaData();
-                assertNotNull(md);
-                assertEquals(md.getColumnCount(), 1);
-                assertEquals(md.getColumnName(1), "value");
-                assertEquals(md.getColumnType(1), Types.INTEGER);
-            }
-        }
-    }
 }