From 13cc84eb8a75c8b2e99faa2c60a4f44e4df6360c Mon Sep 17 00:00:00 2001
From: worry <7039986@qq.com>
Date: Mon, 28 Mar 2022 12:32:49 +0800
Subject: [PATCH] [Fix-8281][DataSource]Mysql jdbc connect failed. (#9199)

* [Fix-8281][DataSource]Mysql jdbc connect failed.This bug occurs when MySQL has no password.

* [Fix-8281][DataSource]Mysql jdbc connect failed.This bug occurs when MySQL has no password.
---
 .../datasource/api/client/CommonDataSourceClient.java     | 8 --------
 .../datasource/api/client/CommonDataSourceClientTest.java | 5 -----
 2 files changed, 13 deletions(-)

diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClient.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClient.java
index fedfc3fc2..37af39775 100644
--- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClient.java
+++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClient.java
@@ -40,7 +40,6 @@ public class CommonDataSourceClient implements DataSourceClient {
     private static final Logger logger = LoggerFactory.getLogger(CommonDataSourceClient.class);
 
     public static final String COMMON_USER = "root";
-    public static final String COMMON_PASSWORD = "123456";
     public static final String COMMON_VALIDATION_QUERY = "select 1";
 
     protected final BaseConnectionParam baseConnectionParam;
@@ -73,19 +72,12 @@ public class CommonDataSourceClient implements DataSourceClient {
         if (StringUtils.isBlank(baseConnectionParam.getUser())) {
             setDefaultUsername(baseConnectionParam);
         }
-        if (StringUtils.isBlank(baseConnectionParam.getPassword())) {
-            setDefaultPassword(baseConnectionParam);
-        }
     }
 
     protected void setDefaultUsername(BaseConnectionParam baseConnectionParam) {
         baseConnectionParam.setUser(COMMON_USER);
     }
 
-    protected void setDefaultPassword(BaseConnectionParam baseConnectionParam) {
-        baseConnectionParam.setPassword(COMMON_PASSWORD);
-    }
-
     protected void checkValidationQuery(BaseConnectionParam baseConnectionParam) {
         if (StringUtils.isBlank(baseConnectionParam.getValidationQuery())) {
             setDefaultValidationQuery(baseConnectionParam);
diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClientTest.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClientTest.java
index 5f8eeee62..f29c07516 100644
--- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClientTest.java
+++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/test/java/org/apache/dolphinscheduler/plugin/datasource/api/client/CommonDataSourceClientTest.java
@@ -70,11 +70,6 @@ public class CommonDataSourceClientTest {
         PowerMockito.doNothing().when(commonDataSourceClient).setDefaultUsername(Mockito.any(BaseConnectionParam.class));
         commonDataSourceClient.setDefaultUsername(baseConnectionParam);
         Mockito.verify(commonDataSourceClient).setDefaultUsername(Mockito.any(BaseConnectionParam.class));
-
-        PowerMockito.doNothing().when(commonDataSourceClient).setDefaultPassword(Mockito.any(BaseConnectionParam.class));
-        commonDataSourceClient.setDefaultPassword(baseConnectionParam);
-        Mockito.verify(commonDataSourceClient).setDefaultPassword(Mockito.any(BaseConnectionParam.class));
-
     }
 
     @Test