Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
e053858e
DolphinScheduler
项目概览
pentaLiker
/
DolphinScheduler
与 Fork 源项目一致
Fork自
apache / DolphinScheduler
通知
1
Star
1
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,发现更多精彩内容 >>
提交
e053858e
编写于
11月 09, 2020
作者:
B
baoliang
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
merge from 1.3.3-release
上级
67baba27
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
8 addition
and
5 deletion
+8
-5
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
...eduler/api/service/impl/ProcessDefinitionServiceImpl.java
+3
-0
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
...inscheduler/api/service/ProcessDefinitionServiceTest.java
+5
-5
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
浏览文件 @
e053858e
...
...
@@ -243,6 +243,9 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
for
(
TaskNode
taskNode
:
tasks
)
{
String
taskParameter
=
taskNode
.
getParams
();
AbstractParameters
params
=
TaskParametersUtils
.
getParameters
(
taskNode
.
getType
(),
taskParameter
);
if
(
params
==
null
)
{
continue
;
}
if
(
CollectionUtils
.
isNotEmpty
(
params
.
getResourceFilesList
()))
{
Set
<
Integer
>
tempSet
=
params
.
getResourceFilesList
().
stream
()
...
...
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
浏览文件 @
e053858e
...
...
@@ -1035,15 +1035,15 @@ public class ProcessDefinitionServiceTest {
taskNode5
.
setType
(
"SHELL"
);
ShellParameters
shellParameters5
=
new
ShellParameters
();
ResourceInfo
resourceInfo5A
=
new
ResourceInfo
();
resourceInfo5A
.
setId
(
0
);
resourceInfo5A
.
setId
(
1
);
ResourceInfo
resourceInfo5B
=
new
ResourceInfo
();
resourceInfo5B
.
setId
(
1
);
resourceInfo5B
.
setId
(
2
);
shellParameters5
.
setResourceList
(
Arrays
.
asList
(
resourceInfo5A
,
resourceInfo5B
));
taskNode5
.
setParams
(
JSONUtils
.
toJsonString
(
shellParameters5
));
input5
.
setTasks
(
Collections
.
singletonList
(
taskNode5
));
String
output5
=
(
String
)
testMethod
.
invoke
(
processDefinitionService
,
input5
);
assertThat
(
output5
.
split
(
","
)).
hasSize
(
2
)
.
containsExactlyInAnyOrder
(
"
0"
,
"1
"
);
.
containsExactlyInAnyOrder
(
"
1"
,
"2
"
);
// when resource id list is 0 1 1 2, then return 0,1,2
ProcessData
input6
=
new
ProcessData
();
...
...
@@ -1051,7 +1051,7 @@ public class ProcessDefinitionServiceTest {
taskNode6
.
setType
(
"SHELL"
);
ShellParameters
shellParameters6
=
new
ShellParameters
();
ResourceInfo
resourceInfo6A
=
new
ResourceInfo
();
resourceInfo6A
.
setId
(
0
);
resourceInfo6A
.
setId
(
3
);
ResourceInfo
resourceInfo6B
=
new
ResourceInfo
();
resourceInfo6B
.
setId
(
1
);
ResourceInfo
resourceInfo6C
=
new
ResourceInfo
();
...
...
@@ -1065,7 +1065,7 @@ public class ProcessDefinitionServiceTest {
String
output6
=
(
String
)
testMethod
.
invoke
(
processDefinitionService
,
input6
);
assertThat
(
output6
.
split
(
","
)).
hasSize
(
3
)
.
containsExactlyInAnyOrder
(
"
0
"
,
"1"
,
"2"
);
.
containsExactlyInAnyOrder
(
"
3
"
,
"1"
,
"2"
);
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录