This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new a51b710b1c fix alert msg and change primitive to String to avoid wrong
format (#9689)
a51b710b1c is described below
commit a51b710b1c8ae43d9e9bcbc386af4d81fb7e6b65
Author: Tq <[email protected]>
AuthorDate: Sun Apr 24 13:29:27 2022 +0800
fix alert msg and change primitive to String to avoid wrong format (#9689)
---
.../api/service/impl/ExecutorServiceImpl.java | 6 +++---
.../service/impl/ProcessDefinitionServiceImpl.java | 20 ++++++++++----------
.../service/impl/ProcessTaskRelationServiceImpl.java | 14 +++++++-------
.../api/service/impl/SchedulerServiceImpl.java | 10 +++++-----
.../api/service/impl/TaskDefinitionServiceImpl.java | 18 +++++++++---------
5 files changed, 34 insertions(+), 34 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
index 8fd4ce47d6..783940d343 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
@@ -215,10 +215,10 @@ public class ExecutorServiceImpl extends BaseServiceImpl
implements ExecutorServ
Map<String, Object> result = new HashMap<>();
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
// check process definition exists
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processDefineCode);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(processDefineCode));
} else if (processDefinition.getReleaseState() != ReleaseState.ONLINE)
{
// check process definition online
- putMsg(result, Status.PROCESS_DEFINE_NOT_RELEASE,
processDefineCode);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_RELEASE,
String.valueOf(processDefineCode));
} else if (!checkSubProcessDefinitionValid(processDefinition)){
// check sub process definition online
putMsg(result, Status.SUB_PROCESS_DEFINE_NOT_RELEASE);
@@ -488,7 +488,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl
implements ExecutorServ
command.setProcessInstanceId(instanceId);
if (!processService.verifyIsNeedCreateCommand(command)) {
- putMsg(result, Status.PROCESS_INSTANCE_EXECUTING_COMMAND,
processDefinitionCode);
+ putMsg(result, Status.PROCESS_INSTANCE_EXECUTING_COMMAND,
String.valueOf(processDefinitionCode));
return result;
}
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 30b6307f85..1127d63d8a 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -482,7 +482,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(code);
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(code));
} else {
Tenant tenant =
tenantMapper.queryById(processDefinition.getTenantId());
if (tenant != null) {
@@ -576,7 +576,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(code);
// check process definition exists
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(code));
return result;
}
if (processDefinition.getReleaseState() == ReleaseState.ONLINE) {
@@ -699,7 +699,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
}
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(code);
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(code));
return result;
}
@@ -711,7 +711,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
// check process definition is already online
if (processDefinition.getReleaseState() == ReleaseState.ONLINE) {
- putMsg(result, Status.PROCESS_DEFINE_STATE_ONLINE, code);
+ putMsg(result, Status.PROCESS_DEFINE_STATE_ONLINE,
String.valueOf(code));
return result;
}
// check process instances is already running
@@ -777,7 +777,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(code);
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(code));
return result;
}
switch (releaseState) {
@@ -1341,7 +1341,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(code);
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
logger.info("process define not exists");
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(code));
return result;
}
DagData dagData = processService.genDagData(processDefinition);
@@ -1487,7 +1487,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(code);
if (null == processDefinition || projectCode !=
processDefinition.getProjectCode()) {
logger.info("process define not exists");
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(code));
return result;
}
DAG<String, TaskNode, TaskNodeRelation> dag =
processService.genDagGraph(processDefinition);
@@ -1897,7 +1897,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(code);
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(code));
} else {
if (processDefinition.getVersion() == version) {
putMsg(result, Status.MAIN_TABLE_USING_VERSION);
@@ -2085,7 +2085,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(code);
// check process definition exists
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(code));
return result;
}
if (processDefinition.getReleaseState() == ReleaseState.ONLINE) {
@@ -2186,7 +2186,7 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(code);
if (processDefinition == null) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(code));
return result;
}
Schedule scheduleObj =
scheduleMapper.queryByProcessDefinitionCode(code);
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessTaskRelationServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessTaskRelationServiceImpl.java
index 88254d19fe..26a1e88a05 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessTaskRelationServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessTaskRelationServiceImpl.java
@@ -107,7 +107,7 @@ public class ProcessTaskRelationServiceImpl extends
BaseServiceImpl implements P
}
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(processDefinitionCode);
if (processDefinition == null) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
processDefinitionCode);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(processDefinitionCode));
return result;
}
if (processDefinition.getProjectCode() != projectCode) {
@@ -122,7 +122,7 @@ public class ProcessTaskRelationServiceImpl extends
BaseServiceImpl implements P
.collect(Collectors.toMap(ProcessTaskRelation::getPreTaskCode,
processTaskRelation -> processTaskRelation));
if (!preTaskCodeMap.isEmpty()) {
if (preTaskCodeMap.containsKey(preTaskCode) ||
(!preTaskCodeMap.containsKey(0L) && preTaskCode == 0L)) {
- putMsg(result, Status.PROCESS_TASK_RELATION_EXIST,
processDefinitionCode);
+ putMsg(result, Status.PROCESS_TASK_RELATION_EXIST,
String.valueOf(processDefinitionCode));
return result;
}
if (preTaskCodeMap.containsKey(0L) && preTaskCode != 0L) {
@@ -202,12 +202,12 @@ public class ProcessTaskRelationServiceImpl extends
BaseServiceImpl implements P
}
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(processDefinitionCode);
if (processDefinition == null) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
processDefinitionCode);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(processDefinitionCode));
return result;
}
TaskDefinition taskDefinition =
taskDefinitionMapper.queryByCode(taskCode);
if (null == taskDefinition) {
- putMsg(result, Status.TASK_DEFINE_NOT_EXIST, taskCode);
+ putMsg(result, Status.TASK_DEFINE_NOT_EXIST,
String.valueOf(taskCode));
return result;
}
List<ProcessTaskRelation> processTaskRelations =
processTaskRelationMapper.queryByProcessCode(projectCode,
processDefinitionCode);
@@ -305,7 +305,7 @@ public class ProcessTaskRelationServiceImpl extends
BaseServiceImpl implements P
}
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(upstreamList.get(0).getProcessDefinitionCode());
if (processDefinition == null) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
upstreamList.get(0).getProcessDefinitionCode());
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(upstreamList.get(0).getProcessDefinitionCode()));
return result;
}
List<ProcessTaskRelation> processTaskRelations =
processTaskRelationMapper.queryByProcessCode(projectCode,
processDefinition.getCode());
@@ -364,7 +364,7 @@ public class ProcessTaskRelationServiceImpl extends
BaseServiceImpl implements P
}
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(downstreamList.get(0).getProcessDefinitionCode());
if (processDefinition == null) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
downstreamList.get(0).getProcessDefinitionCode());
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(downstreamList.get(0).getProcessDefinitionCode()));
return result;
}
List<ProcessTaskRelation> processTaskRelations =
processTaskRelationMapper.queryByProcessCode(projectCode,
processDefinition.getCode());
@@ -468,7 +468,7 @@ public class ProcessTaskRelationServiceImpl extends
BaseServiceImpl implements P
}
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(processDefinitionCode);
if (processDefinition == null) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
processDefinitionCode);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(processDefinitionCode));
return result;
}
List<ProcessTaskRelation> processTaskRelations =
processTaskRelationMapper.queryByProcessCode(projectCode,
processDefinitionCode);
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java
index 49b3f1fe3f..d2ff0bd4e6 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java
@@ -257,7 +257,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl
implements SchedulerSe
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(schedule.getProcessDefinitionCode());
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
schedule.getProcessDefinitionCode());
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(schedule.getProcessDefinitionCode()));
return result;
}
@@ -306,7 +306,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl
implements SchedulerSe
}
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(scheduleObj.getProcessDefinitionCode());
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
scheduleObj.getProcessDefinitionCode());
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(scheduleObj.getProcessDefinitionCode()));
return result;
}
List<ProcessTaskRelation> processTaskRelations =
processTaskRelationMapper.queryByProcessCode(projectCode,
scheduleObj.getProcessDefinitionCode());
@@ -336,7 +336,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl
implements SchedulerSe
if (subProcessDefinition.getReleaseState() !=
ReleaseState.ONLINE) {
logger.info("not release process definition id: {}
, name : {}",
subProcessDefinition.getId(),
subProcessDefinition.getName());
- putMsg(result, Status.PROCESS_DEFINE_NOT_RELEASE,
subProcessDefinition.getId());
+ putMsg(result, Status.PROCESS_DEFINE_NOT_RELEASE,
String.valueOf(subProcessDefinition.getId()));
return result;
}
}
@@ -406,7 +406,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl
implements SchedulerSe
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(processDefineCode);
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processDefineCode);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(processDefineCode));
return result;
}
@@ -618,7 +618,7 @@ public class SchedulerServiceImpl extends BaseServiceImpl
implements SchedulerSe
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(processDefinitionCode);
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
processDefinitionCode);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(processDefinitionCode));
return result;
}
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
index 48f86f9e8b..cd617958e0 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
@@ -180,11 +180,11 @@ public class TaskDefinitionServiceImpl extends
BaseServiceImpl implements TaskDe
}
ProcessDefinition processDefinition =
processDefinitionMapper.queryByCode(processDefinitionCode);
if (processDefinition == null || projectCode !=
processDefinition.getProjectCode()) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
processDefinitionCode);
+ putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST,
String.valueOf(processDefinitionCode));
return result;
}
if (processDefinition.getReleaseState() == ReleaseState.ONLINE) {
- putMsg(result, Status.PROCESS_DEFINE_STATE_ONLINE,
processDefinitionCode);
+ putMsg(result, Status.PROCESS_DEFINE_STATE_ONLINE,
String.valueOf(processDefinitionCode));
return result;
}
TaskDefinitionLog taskDefinition =
JSONUtils.parseObject(taskDefinitionJsonObj, TaskDefinitionLog.class);
@@ -314,7 +314,7 @@ public class TaskDefinitionServiceImpl extends
BaseServiceImpl implements TaskDe
}
TaskDefinition taskDefinition =
taskDefinitionMapper.queryByCode(taskCode);
if (taskDefinition == null || projectCode !=
taskDefinition.getProjectCode()) {
- putMsg(result, Status.TASK_DEFINE_NOT_EXIST, taskCode);
+ putMsg(result, Status.TASK_DEFINE_NOT_EXIST,
String.valueOf(taskCode));
return result;
}
if (processService.isTaskOnline(taskCode) && taskDefinition.getFlag()
== Flag.YES) {
@@ -406,7 +406,7 @@ public class TaskDefinitionServiceImpl extends
BaseServiceImpl implements TaskDe
}
TaskDefinition taskDefinition =
taskDefinitionMapper.queryByCode(taskCode);
if (taskDefinition == null) {
- putMsg(result, Status.TASK_DEFINE_NOT_EXIST, taskCode);
+ putMsg(result, Status.TASK_DEFINE_NOT_EXIST,
String.valueOf(taskCode));
return null;
}
if (processService.isTaskOnline(taskCode) && taskDefinition.getFlag()
== Flag.YES) {
@@ -557,7 +557,7 @@ public class TaskDefinitionServiceImpl extends
BaseServiceImpl implements TaskDe
}
TaskDefinition taskDefinition =
taskDefinitionMapper.queryByCode(taskCode);
if (taskDefinition == null || projectCode !=
taskDefinition.getProjectCode()) {
- putMsg(result, Status.TASK_DEFINE_NOT_EXIST, taskCode);
+ putMsg(result, Status.TASK_DEFINE_NOT_EXIST,
String.valueOf(taskCode));
return result;
}
TaskDefinitionLog taskDefinitionUpdate =
taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, version);
@@ -618,7 +618,7 @@ public class TaskDefinitionServiceImpl extends
BaseServiceImpl implements TaskDe
TaskDefinition taskDefinition =
taskDefinitionMapper.queryByCode(taskCode);
if (taskDefinition == null) {
- putMsg(result, Status.TASK_DEFINE_NOT_EXIST, taskCode);
+ putMsg(result, Status.TASK_DEFINE_NOT_EXIST,
String.valueOf(taskCode));
} else {
if (taskDefinition.getVersion() == version) {
putMsg(result, Status.MAIN_TABLE_USING_VERSION);
@@ -645,7 +645,7 @@ public class TaskDefinitionServiceImpl extends
BaseServiceImpl implements TaskDe
TaskDefinition taskDefinition =
taskDefinitionMapper.queryByCode(taskCode);
if (taskDefinition == null || projectCode !=
taskDefinition.getProjectCode()) {
- putMsg(result, Status.TASK_DEFINE_NOT_EXIST, taskCode);
+ putMsg(result, Status.TASK_DEFINE_NOT_EXIST,
String.valueOf(taskCode));
} else {
result.put(Constants.DATA_LIST, taskDefinition);
putMsg(result, Status.SUCCESS);
@@ -752,12 +752,12 @@ public class TaskDefinitionServiceImpl extends
BaseServiceImpl implements TaskDe
}
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(code);
if (taskDefinition == null || projectCode !=
taskDefinition.getProjectCode()) {
- putMsg(result, Status.TASK_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.TASK_DEFINE_NOT_EXIST, String.valueOf(code));
return result;
}
TaskDefinitionLog taskDefinitionLog =
taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(code,
taskDefinition.getVersion());
if (taskDefinitionLog == null) {
- putMsg(result, Status.TASK_DEFINE_NOT_EXIST, code);
+ putMsg(result, Status.TASK_DEFINE_NOT_EXIST, String.valueOf(code));
return result;
}
switch (releaseState) {
