Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
pentaLiker
DolphinScheduler
提交
99ac7398
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,发现更多精彩内容 >>
未验证
提交
99ac7398
编写于
2月 15, 2020
作者:
G
gabry.wu
提交者:
GitHub
2月 15, 2020
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename vaild to valid (#1961)
上级
90df1484
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
9 addition
and
9 deletion
+9
-9
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
.../apache/dolphinscheduler/api/service/ExecutorService.java
+3
-3
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
...ava/org/apache/dolphinscheduler/api/utils/CheckUtils.java
+1
-1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
...a/org/apache/dolphinscheduler/common/utils/JSONUtils.java
+1
-1
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
...g/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
+3
-3
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
...e/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
+1
-1
未找到文件。
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
浏览文件 @
99ac7398
...
...
@@ -117,7 +117,7 @@ public class ExecutorService extends BaseService{
}
if
(!
checkTenantSuitable
(
processDefinition
)){
logger
.
error
(
"there is not any va
il
d tenant for the process definition: id:{},name:{}, "
,
logger
.
error
(
"there is not any va
li
d tenant for the process definition: id:{},name:{}, "
,
processDefinition
.
getId
(),
processDefinition
.
getName
());
putMsg
(
result
,
Status
.
TENANT_NOT_SUITABLE
);
return
result
;
...
...
@@ -206,7 +206,7 @@ public class ExecutorService extends BaseService{
return
checkResult
;
}
if
(!
checkTenantSuitable
(
processDefinition
)){
logger
.
error
(
"there is not any va
il
d tenant for the process definition: id:{},name:{}, "
,
logger
.
error
(
"there is not any va
li
d tenant for the process definition: id:{},name:{}, "
,
processDefinition
.
getId
(),
processDefinition
.
getName
());
putMsg
(
result
,
Status
.
TENANT_NOT_SUITABLE
);
}
...
...
@@ -539,7 +539,7 @@ public class ExecutorService extends BaseService{
}
}
}
else
{
logger
.
error
(
"there is not va
il
d schedule date for the process definition: id:{},date:{}"
,
logger
.
error
(
"there is not va
li
d schedule date for the process definition: id:{},date:{}"
,
processDefineId
,
schedule
);
}
}
else
{
...
...
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
浏览文件 @
99ac7398
...
...
@@ -86,7 +86,7 @@ public class CheckUtils {
* @return true if other parameters are valid, otherwise return false
*/
public
static
boolean
checkOtherParams
(
String
otherParams
)
{
return
StringUtils
.
isNotEmpty
(
otherParams
)
&&
!
JSONUtils
.
checkJsonVa
il
d
(
otherParams
);
return
StringUtils
.
isNotEmpty
(
otherParams
)
&&
!
JSONUtils
.
checkJsonVa
li
d
(
otherParams
);
}
/**
...
...
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
浏览文件 @
99ac7398
...
...
@@ -126,7 +126,7 @@ public class JSONUtils {
* @param json json
* @return true if valid
*/
public
static
boolean
checkJsonVa
il
d
(
String
json
)
{
public
static
boolean
checkJsonVa
li
d
(
String
json
)
{
if
(
StringUtils
.
isEmpty
(
json
))
{
return
false
;
...
...
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
浏览文件 @
99ac7398
...
...
@@ -117,9 +117,9 @@ public class JSONUtilsTest {
}
@Test
public
void
testCheckJsonVa
il
d
()
{
Assert
.
assertTrue
(
JSONUtils
.
checkJsonVa
il
d
(
"3"
));
Assert
.
assertFalse
(
JSONUtils
.
checkJsonVa
il
d
(
""
));
public
void
testCheckJsonVa
li
d
()
{
Assert
.
assertTrue
(
JSONUtils
.
checkJsonVa
li
d
(
"3"
));
Assert
.
assertFalse
(
JSONUtils
.
checkJsonVa
li
d
(
""
));
}
@Test
...
...
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
浏览文件 @
99ac7398
...
...
@@ -121,7 +121,7 @@ public class TaskInstanceMapperTest {
}
/**
* test find va
il
d task list by process instance id
* test find va
li
d task list by process instance id
*/
@Test
public
void
testFindValidTaskListByProcessId
()
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录