From 528f45acc5a899d96dbe7caca1a05f8174648e2f Mon Sep 17 00:00:00 2001
From: insist777 <84278047+insist777@users.noreply.github.com>
Date: Thu, 17 Nov 2022 14:23:12 +0800
Subject: [PATCH] [improve]Source skip check (#12900)

* Source skip check
---
 .../api/service/impl/DataSourceServiceImpl.java     | 11 -----------
 .../api/service/DataSourceServiceTest.java          | 13 -------------
 2 files changed, 24 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
index 6b1214dac..b7cd6f151 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
@@ -119,13 +119,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
             putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
             return result;
         }
-        // check connect
         ConnectionParam connectionParam = DataSourceUtils.buildConnectionParams(datasourceParam);
-        Result<Object> isConnection = checkConnection(datasourceParam.getType(), connectionParam);
-        if (Status.SUCCESS.getCode() != isConnection.getCode()) {
-            putMsg(result, Status.DATASOURCE_CONNECT_FAILED);
-            return result;
-        }
 
         // build datasource
         DataSource dataSource = new DataSource();
@@ -202,11 +196,6 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
             connectionParam.setPassword(oldParams.path(Constants.PASSWORD).asText());
         }
 
-        Result<Object> isConnection = checkConnection(dataSource.getType(), connectionParam);
-        if (isConnection.isFailed()) {
-            return isConnection;
-        }
-
         Date now = new Date();
 
         dataSource.setName(dataSourceParam.getName().trim());
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
index c5ba3c9fd..1a608df58 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
@@ -128,19 +128,12 @@ public class DataSourceServiceTest {
         try (
                 MockedStatic<DataSourceClientProvider> mockedStaticDataSourceClientProvider =
                         Mockito.mockStatic(DataSourceClientProvider.class)) {
-            // DATASOURCE_CONNECT_FAILED
             DataSourceClientProvider clientProvider = Mockito.mock(DataSourceClientProvider.class);
             mockedStaticDataSourceClientProvider.when(DataSourceClientProvider::getInstance).thenReturn(clientProvider);
 
             Mockito.when(dataSourceMapper.queryDataSourceByName(dataSourceName.trim())).thenReturn(null);
-            Mockito.when(clientProvider.getConnection(Mockito.any(), Mockito.any())).thenReturn(null);
-            Result connectFailedResult = dataSourceService.createDataSource(loginUser, postgreSqlDatasourceParam);
-            Assertions.assertEquals(Status.DATASOURCE_CONNECT_FAILED.getCode(),
-                    connectFailedResult.getCode().intValue());
 
             // SUCCESS
-            Connection connection = Mockito.mock(Connection.class);
-            Mockito.when(clientProvider.getConnection(Mockito.any(), Mockito.any())).thenReturn(connection);
             Result success = dataSourceService.createDataSource(loginUser, postgreSqlDatasourceParam);
             Assertions.assertEquals(Status.SUCCESS.getCode(), success.getCode().intValue());
         }
@@ -204,15 +197,9 @@ public class DataSourceServiceTest {
             DataSourceClientProvider clientProvider = Mockito.mock(DataSourceClientProvider.class);
             mockedStaticDataSourceClientProvider.when(DataSourceClientProvider::getInstance).thenReturn(clientProvider);
 
-            Mockito.when(clientProvider.getConnection(Mockito.any(), Mockito.any())).thenReturn(null);
             Mockito.when(dataSourceMapper.queryDataSourceByName(postgreSqlDatasourceParam.getName())).thenReturn(null);
-            Result connectFailed =
-                    dataSourceService.updateDataSource(dataSourceId, loginUser, postgreSqlDatasourceParam);
-            Assertions.assertEquals(Status.CONNECTION_TEST_FAILURE.getCode(), connectFailed.getCode().intValue());
 
             // SUCCESS
-            Connection connection = Mockito.mock(Connection.class);
-            Mockito.when(clientProvider.getConnection(Mockito.any(), Mockito.any())).thenReturn(connection);
             Result success = dataSourceService.updateDataSource(dataSourceId, loginUser, postgreSqlDatasourceParam);
             Assertions.assertEquals(Status.SUCCESS.getCode(), success.getCode().intValue());
         }
-- 
GitLab