refactor: move datasourceConfig.getExtParams() handling logic to SqlBasedConnector

chengluo · chengluo · commit a32bc463918c · 2023-03-20T16:06:40.000+08:00
diff --git a/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeConnector.java b/server/api-service/openblocks-plugins/snowflakePlugin/src/main/java/com/openblocks/plugin/snowflake/SnowflakeConnector.java
@@ -1,6 +1,5 @@
 package com.openblocks.plugin.snowflake;
 
-import org.apache.commons.lang3.StringUtils;
 import org.pf4j.Extension;
 
 import com.openblocks.plugin.sql.SqlBasedConnector;
@@ -30,13 +29,5 @@ protected void setUpConfigs(SnowflakeDatasourceConfig datasourceConfig, HikariCo
         config.addDataSourceProperty("db", database);
         config.addDataSourceProperty("user", datasourceConfig.getUsername());
         config.addDataSourceProperty("password", datasourceConfig.getPassword());
-
-        datasourceConfig.getExtParams()
-                .forEach((key, value) -> {
-                    if (StringUtils.isBlank(key) || value == null || StringUtils.isBlank(String.valueOf(value))) {
-                        return;
-                    }
-                    config.addDataSourceProperty(key, value);
-                });
     }
 }
diff --git a/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlBasedConnector.java b/server/api-service/openblocks-plugins/sqlBasedPlugin/src/main/java/com/openblocks/plugin/sql/SqlBasedConnector.java
@@ -56,6 +56,14 @@ protected final HikariPerfWrapper blockingCreateConnection(T connectionConfig) {
 
         setUpConfigs(connectionConfig, config);
 
+        connectionConfig.getExtParams()
+                .forEach((key, value) -> {
+                    if (StringUtils.isBlank(key) || value == null || StringUtils.isBlank(String.valueOf(value))) {
+                        return;
+                    }
+                    config.addDataSourceProperty(key, value);
+                });
+
         HikariDataSource hikariDataSource = new HikariDataSource(config);
         return HikariPerfWrapper.wrap(hikariDataSource,
                 () -> hikariDataSource.getHikariPoolMXBean().getTotalConnections(),
