You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/01/19 15:03:24 UTC
[incubator-dolphinscheduler] branch dev updated:
[Improvement-#4481][API] ProcessDefinitionController save API optimization
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 0963640 [Improvement-#4481][API] ProcessDefinitionController save API optimization
0963640 is described below
commit 0963640ea7a96b3fb4274ad702332fe50f1b3a06
Author: 青年 <10...@qq.com>
AuthorDate: Tue Jan 19 23:03:13 2021 +0800
[Improvement-#4481][API] ProcessDefinitionController save API optimization
Co-authored-by: lei.zou <le...@rootcloud.com>
---
.../service/impl/ProcessDefinitionServiceImpl.java | 42 ++--------------------
.../ProcessDefinitionControllerTest.java | 2 +-
2 files changed, 4 insertions(+), 40 deletions(-)
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 245d33b..52385dd 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
@@ -221,9 +221,8 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
processDefineMapper.updateVersionByProcessDefinitionId(processDefine.getId(), version);
// return processDefinition object with ID
- result.put(Constants.DATA_LIST, processDefineMapper.selectById(processDefine.getId()));
+ result.put(Constants.DATA_LIST, processDefine.getId());
putMsg(result, Status.SUCCESS);
- result.put(PROCESSDEFINITIONID, processDefine.getId());
return result;
}
@@ -888,8 +887,8 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
//create process definition
Integer processDefinitionId =
- Objects.isNull(createProcessResult.get(PROCESSDEFINITIONID))
- ? null : Integer.parseInt(createProcessResult.get(PROCESSDEFINITIONID).toString());
+ Objects.isNull(createProcessResult.get(Constants.DATA_LIST))
+ ? null : Integer.parseInt(createProcessResult.get(Constants.DATA_LIST).toString());
//scheduler param
return getImportProcessScheduleResult(loginUser,
@@ -1517,41 +1516,6 @@ public class ProcessDefinitionServiceImpl extends BaseService implements
}
/**
- * copy process definition
- *
- * @param loginUser login user
- * @param projectName project name
- * @param processId process definition id
- * @return copy result code
- */
- public Map<String, Object> copyProcessDefinition(User loginUser, String projectName, Integer processId) {
-
- Map<String, Object> result = new HashMap<>(5);
- Project project = projectMapper.queryByName(projectName);
-
- Map<String, Object> checkResult = projectService.checkProjectAndAuth(loginUser, project, projectName);
- Status resultStatus = (Status) checkResult.get(Constants.STATUS);
- if (resultStatus != Status.SUCCESS) {
- return checkResult;
- }
-
- ProcessDefinition processDefinition = processDefineMapper.selectById(processId);
- if (processDefinition == null) {
- putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processId);
- return result;
- } else {
- return createProcessDefinition(
- loginUser,
- projectName,
- processDefinition.getName() + "_copy_" + System.currentTimeMillis(),
- processDefinition.getProcessDefinitionJson(),
- processDefinition.getDescription(),
- processDefinition.getLocations(),
- processDefinition.getConnects());
- }
- }
-
- /**
* batch copy process definition
*
* @param loginUser loginUser
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
index a13afec..662c45d 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
@@ -94,7 +94,7 @@ public class ProcessDefinitionControllerTest {
String connects = "[]";
Map<String, Object> result = new HashMap<>();
putMsg(result, Status.SUCCESS);
- result.put("processDefinitionId", 1);
+ result.put(Constants.DATA_LIST, 1);
Mockito.when(processDefinitionService.createProcessDefinition(user, projectName, name, json,
description, locations, connects)).thenReturn(result);