(shardingsphere) branch master updated: Refactor StandardPipelineDataSourceConfiguration (#32474)

[sunnianjun]

This is an automated email from the ASF dual-hosted git repository.

sunnianjun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git


The following commit(s) were added to refs/heads/master by this push:
     new 4044e1a39cd Refactor StandardPipelineDataSourceConfiguration (#32474)
4044e1a39cd is described below

commit 4044e1a39cd8729b28aedf1a4d23428527e0b0a2
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Aug 12 21:04:03 2024 +0800

    Refactor StandardPipelineDataSourceConfiguration (#32474)
---
 .../StandardPipelineDataSourceConfiguration.java   | 35 ++++++++++------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git 
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/StandardPipelineDataSourceConfiguration.java
 
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/StandardPipelineDataSourceConfiguration.java
index 22b83faddb8..6e8be819d8d 100644
--- 
a/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/StandardPipelineDataSourceConfiguration.java
+++ 
b/kernel/data-pipeline/api/src/main/java/org/apache/shardingsphere/data/pipeline/api/type/StandardPipelineDataSourceConfiguration.java
@@ -64,31 +64,28 @@ public final class StandardPipelineDataSourceConfiguration 
implements PipelineDa
     private final DataSourcePoolProperties dataSourcePoolProps;
     
     @SuppressWarnings("unchecked")
-    public StandardPipelineDataSourceConfiguration(final String param) {
-        this(param, YamlEngine.unmarshal(param, Map.class));
+    public StandardPipelineDataSourceConfiguration(final String 
poolYamlContent) {
+        this(YamlEngine.unmarshal(poolYamlContent, Map.class));
     }
     
     public StandardPipelineDataSourceConfiguration(final Map<String, Object> 
poolProps) {
-        this(YamlEngine.marshal(poolProps), new HashMap<>(poolProps));
-    }
-    
-    private StandardPipelineDataSourceConfiguration(final String param, final 
Map<String, Object> poolProps) {
-        parameter = param;
+        parameter = YamlEngine.marshal(poolProps);
+        Map<String, Object> newPoolProps = new HashMap<>(poolProps);
         for (String each : Arrays.asList("minPoolSize", "minimumIdle")) {
-            poolProps.put(each, "1");
+            newPoolProps.put(each, "1");
         }
-        if (poolProps.containsKey("jdbcUrl")) {
-            poolProps.put("url", poolProps.get("jdbcUrl"));
-            poolProps.remove("jdbcUrl");
+        if (newPoolProps.containsKey("jdbcUrl")) {
+            newPoolProps.put("url", newPoolProps.get("jdbcUrl"));
+            newPoolProps.remove("jdbcUrl");
         }
-        databaseType = 
DatabaseTypeFactory.get(String.valueOf(poolProps.get("url")));
-        poolProps.remove(DATA_SOURCE_CLASS_NAME);
-        poolProps.put(DATA_SOURCE_CLASS_NAME, 
"com.zaxxer.hikari.HikariDataSource");
-        appendJdbcQueryProperties(poolProps);
-        url = String.valueOf(poolProps.get("url"));
-        username = String.valueOf(poolProps.get("username"));
-        password = String.valueOf(poolProps.get("password"));
-        dataSourcePoolProps = new 
YamlDataSourceConfigurationSwapper().swapToDataSourcePoolProperties(poolProps);
+        databaseType = 
DatabaseTypeFactory.get(String.valueOf(newPoolProps.get("url")));
+        newPoolProps.remove(DATA_SOURCE_CLASS_NAME);
+        newPoolProps.put(DATA_SOURCE_CLASS_NAME, 
"com.zaxxer.hikari.HikariDataSource");
+        appendJdbcQueryProperties(newPoolProps);
+        url = String.valueOf(newPoolProps.get("url"));
+        username = String.valueOf(newPoolProps.get("username"));
+        password = String.valueOf(newPoolProps.get("password"));
+        dataSourcePoolProps = new 
YamlDataSourceConfigurationSwapper().swapToDataSourcePoolProperties(newPoolProps);
     }
     
     private void appendJdbcQueryProperties(final Map<String, Object> 
poolProps) {