Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
善良的小乔
DolphinScheduler
提交
528f45ac
DolphinScheduler
项目概览
善良的小乔
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
DolphinScheduler
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
528f45ac
编写于
11月 17, 2022
作者:
I
insist777
提交者:
GitHub
11月 17, 2022
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[improve]Source skip check (#12900)
* Source skip check
上级
d02991a2
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
0 addition
and
24 deletion
+0
-24
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
...phinscheduler/api/service/impl/DataSourceServiceImpl.java
+0
-11
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
...e/dolphinscheduler/api/service/DataSourceServiceTest.java
+0
-13
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
浏览文件 @
528f45ac
...
@@ -119,13 +119,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
...
@@ -119,13 +119,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
putMsg
(
result
,
Status
.
DESCRIPTION_TOO_LONG_ERROR
);
putMsg
(
result
,
Status
.
DESCRIPTION_TOO_LONG_ERROR
);
return
result
;
return
result
;
}
}
// check connect
ConnectionParam
connectionParam
=
DataSourceUtils
.
buildConnectionParams
(
datasourceParam
);
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
// build datasource
DataSource
dataSource
=
new
DataSource
();
DataSource
dataSource
=
new
DataSource
();
...
@@ -202,11 +196,6 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
...
@@ -202,11 +196,6 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
connectionParam
.
setPassword
(
oldParams
.
path
(
Constants
.
PASSWORD
).
asText
());
connectionParam
.
setPassword
(
oldParams
.
path
(
Constants
.
PASSWORD
).
asText
());
}
}
Result
<
Object
>
isConnection
=
checkConnection
(
dataSource
.
getType
(),
connectionParam
);
if
(
isConnection
.
isFailed
())
{
return
isConnection
;
}
Date
now
=
new
Date
();
Date
now
=
new
Date
();
dataSource
.
setName
(
dataSourceParam
.
getName
().
trim
());
dataSource
.
setName
(
dataSourceParam
.
getName
().
trim
());
...
...
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataSourceServiceTest.java
浏览文件 @
528f45ac
...
@@ -128,19 +128,12 @@ public class DataSourceServiceTest {
...
@@ -128,19 +128,12 @@ public class DataSourceServiceTest {
try
(
try
(
MockedStatic
<
DataSourceClientProvider
>
mockedStaticDataSourceClientProvider
=
MockedStatic
<
DataSourceClientProvider
>
mockedStaticDataSourceClientProvider
=
Mockito
.
mockStatic
(
DataSourceClientProvider
.
class
))
{
Mockito
.
mockStatic
(
DataSourceClientProvider
.
class
))
{
// DATASOURCE_CONNECT_FAILED
DataSourceClientProvider
clientProvider
=
Mockito
.
mock
(
DataSourceClientProvider
.
class
);
DataSourceClientProvider
clientProvider
=
Mockito
.
mock
(
DataSourceClientProvider
.
class
);
mockedStaticDataSourceClientProvider
.
when
(
DataSourceClientProvider:
:
getInstance
).
thenReturn
(
clientProvider
);
mockedStaticDataSourceClientProvider
.
when
(
DataSourceClientProvider:
:
getInstance
).
thenReturn
(
clientProvider
);
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
dataSourceName
.
trim
())).
thenReturn
(
null
);
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
// SUCCESS
Connection
connection
=
Mockito
.
mock
(
Connection
.
class
);
Mockito
.
when
(
clientProvider
.
getConnection
(
Mockito
.
any
(),
Mockito
.
any
())).
thenReturn
(
connection
);
Result
success
=
dataSourceService
.
createDataSource
(
loginUser
,
postgreSqlDatasourceParam
);
Result
success
=
dataSourceService
.
createDataSource
(
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
success
.
getCode
().
intValue
());
Assertions
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
success
.
getCode
().
intValue
());
}
}
...
@@ -204,15 +197,9 @@ public class DataSourceServiceTest {
...
@@ -204,15 +197,9 @@ public class DataSourceServiceTest {
DataSourceClientProvider
clientProvider
=
Mockito
.
mock
(
DataSourceClientProvider
.
class
);
DataSourceClientProvider
clientProvider
=
Mockito
.
mock
(
DataSourceClientProvider
.
class
);
mockedStaticDataSourceClientProvider
.
when
(
DataSourceClientProvider:
:
getInstance
).
thenReturn
(
clientProvider
);
mockedStaticDataSourceClientProvider
.
when
(
DataSourceClientProvider:
:
getInstance
).
thenReturn
(
clientProvider
);
Mockito
.
when
(
clientProvider
.
getConnection
(
Mockito
.
any
(),
Mockito
.
any
())).
thenReturn
(
null
);
Mockito
.
when
(
dataSourceMapper
.
queryDataSourceByName
(
postgreSqlDatasourceParam
.
getName
())).
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
// SUCCESS
Connection
connection
=
Mockito
.
mock
(
Connection
.
class
);
Mockito
.
when
(
clientProvider
.
getConnection
(
Mockito
.
any
(),
Mockito
.
any
())).
thenReturn
(
connection
);
Result
success
=
dataSourceService
.
updateDataSource
(
dataSourceId
,
loginUser
,
postgreSqlDatasourceParam
);
Result
success
=
dataSourceService
.
updateDataSource
(
dataSourceId
,
loginUser
,
postgreSqlDatasourceParam
);
Assertions
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
success
.
getCode
().
intValue
());
Assertions
.
assertEquals
(
Status
.
SUCCESS
.
getCode
(),
success
.
getCode
().
intValue
());
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录