Merge pull request #135 from /issues/134

[Bug]: not set Clickhouse userName and password have npe #134
itinycheng · Jun 14, 2024 · 7346c14 · 7346c14
2 parents 1a1b2a7 + 9bc4e3e
commit 7346c14
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/...g/apache/flink/connector/clickhouse/internal/connection/ClickHouseConnectionProvider.java b/...g/apache/flink/connector/clickhouse/internal/connection/ClickHouseConnectionProvider.java
@@ -128,10 +128,14 @@ private ClickHouseConnection createConnection(String url, String database) throw
         LOG.info("connecting to {}, database {}", url, database);
         Properties configuration = new Properties();
         configuration.putAll(connectionProperties);
-        configuration.setProperty(
-                ClickHouseDefaults.USER.getKey(), options.getUsername().orElse(null));
-        configuration.setProperty(
-                ClickHouseDefaults.PASSWORD.getKey(), options.getPassword().orElse(null));
+        if (options.getUsername().isPresent()) {
+            configuration.setProperty(
+                    ClickHouseDefaults.USER.getKey(), options.getUsername().get());
+        }
+        if (options.getPassword().isPresent()) {
+            configuration.setProperty(
+                    ClickHouseDefaults.PASSWORD.getKey(), options.getPassword().get());
+        }
         ClickHouseDriver driver = new ClickHouseDriver();
         return driver.connect(url, configuration);
     }

diff --git a/pom.xml b/pom.xml
@@ -58,10 +58,10 @@ limitations under the License.
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<maven.compiler.source>11</maven.compiler.source>
-		<maven.compiler.target>11</maven.compiler.target>
+		<maven.compiler.source>8</maven.compiler.source>
+		<maven.compiler.target>8</maven.compiler.target>
 		<junit.version>4.13.2</junit.version>
-		<clickhouse-jdbc.version>0.6.0-patch3</clickhouse-jdbc.version>
+		<clickhouse-jdbc.version>0.6.1</clickhouse-jdbc.version>
 		<scala.binary.version>2.12</scala.binary.version>
 		<flink.version>1.19.0</flink.version>
 		<flink.scope>provided</flink.scope>