This is an automated email from the ASF dual-hosted git repository.
lidongdai 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 ca66cfe solve code spell problem (#2419)
ca66cfe is described below
commit ca66cfec171be8cd7a7359e47350580943222c42
Author: zixi0825 <[email protected]>
AuthorDate: Sat Apr 18 11:28:08 2020 +0800
solve code spell problem (#2419)
* solve code spell problem
* remove controller test
* add controller test
* sovle spell problem and sovle conflict
* sovle spell problem and sovle conflict
* sovle spell problem and add test
Co-authored-by: sunchaohe <[email protected]>
---
.../controller/ProcessDefinitionController.java | 66 ++-
.../api/controller/ProjectController.java | 3 +-
.../apache/dolphinscheduler/api/enums/Status.java | 4 +-
.../api/service/ProcessDefinitionService.java | 14 +-
.../src/main/resources/i18n/messages.properties | 14 +-
.../main/resources/i18n/messages_en_US.properties | 14 +-
.../main/resources/i18n/messages_zh_CN.properties | 14 +-
.../ProcessDefinitionControllerTest.java | 451 +++++++++------------
.../api/service/ProcessDefinitionServiceTest.java | 22 +-
.../src/js/conf/home/store/dag/actions.js | 4 +-
pom.xml | 1 +
11 files changed, 276 insertions(+), 331 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
index b043da2..b3fe1a9 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
@@ -102,19 +102,19 @@ public class ProcessDefinitionController extends
BaseController {
* @param name name
* @return true if process definition name not exists, otherwise false
*/
- @ApiOperation(value = "verify-name", notes =
"VERIFY_PROCCESS_DEFINITION_NAME_NOTES")
+ @ApiOperation(value = "verify-name", notes =
"VERIFY_PROCESS_DEFINITION_NAME_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value =
"PROCESS_DEFINITION_NAME", required = true, type = "String")
})
@GetMapping(value = "/verify-name")
@ResponseStatus(HttpStatus.OK)
@ApiException(VERIFY_PROCESS_DEFINITION_NAME_UNIQUE_ERROR)
- public Result verifyProccessDefinitionName(@ApiIgnore
@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+ public Result verifyProcessDefinitionName(@ApiIgnore
@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@ApiParam(name = "projectName",
value = "PROJECT_NAME", required = true) @PathVariable String projectName,
@RequestParam(value = "name",
required = true) String name) {
logger.info("verify process definition name unique, user:{}, project
name:{}, process definition name:{}",
loginUser.getUserName(), projectName, name);
- Map<String, Object> result =
processDefinitionService.verifyProccessDefinitionName(loginUser, projectName,
name);
+ Map<String, Object> result =
processDefinitionService.verifyProcessDefinitionName(loginUser, projectName,
name);
return returnDataList(result);
}
@@ -131,7 +131,8 @@ public class ProcessDefinitionController extends
BaseController {
* @param connects connects for nodes
* @return update result code
*/
- @ApiOperation(value = "updateProccessDefinition", notes =
"UPDATE_PROCCESS_DEFINITION_NOTES")
+
+ @ApiOperation(value = "updateProcessDefinition", notes=
"UPDATE_PROCESS_DEFINITION_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value =
"PROCESS_DEFINITION_NAME", required = true, type = "String"),
@ApiImplicitParam(name = "id", value = "PROCESS_DEFINITION_ID",
required = true, dataType = "Int", example = "100"),
@@ -143,7 +144,7 @@ public class ProcessDefinitionController extends
BaseController {
@PostMapping(value = "/update")
@ResponseStatus(HttpStatus.OK)
@ApiException(UPDATE_PROCESS_DEFINITION_ERROR)
- public Result updateProccessDefinition(@ApiIgnore @RequestAttribute(value
= Constants.SESSION_USER) User loginUser,
+ public Result updateProcessDefinition(@ApiIgnore @RequestAttribute(value =
Constants.SESSION_USER) User loginUser,
@ApiParam(name = "projectName",
value = "PROJECT_NAME", required = true) @PathVariable String projectName,
@RequestParam(value = "name",
required = true) String name,
@RequestParam(value = "id",
required = true) int id,
@@ -169,7 +170,8 @@ public class ProcessDefinitionController extends
BaseController {
* @param releaseState release state
* @return release result code
*/
- @ApiOperation(value = "releaseProccessDefinition", notes =
"RELEASE_PROCCESS_DEFINITION_NOTES")
+
+ @ApiOperation(value = "releaseProcessDefinition", notes=
"RELEASE_PROCESS_DEFINITION_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "name", value =
"PROCESS_DEFINITION_NAME", required = true, type = "String"),
@ApiImplicitParam(name = "processId", value =
"PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100"),
@@ -178,7 +180,7 @@ public class ProcessDefinitionController extends
BaseController {
@PostMapping(value = "/release")
@ResponseStatus(HttpStatus.OK)
@ApiException(RELEASE_PROCESS_DEFINITION_ERROR)
- public Result releaseProccessDefinition(@ApiIgnore @RequestAttribute(value
= Constants.SESSION_USER) User loginUser,
+ public Result releaseProcessDefinition(@ApiIgnore @RequestAttribute(value
= Constants.SESSION_USER) User loginUser,
@ApiParam(name = "projectName",
value = "PROJECT_NAME", required = true) @PathVariable String projectName,
@RequestParam(value = "processId",
required = true) int processId,
@RequestParam(value =
"releaseState", required = true) int releaseState) {
@@ -189,7 +191,6 @@ public class ProcessDefinitionController extends
BaseController {
return returnDataList(result);
}
-
/**
* query datail of process definition
*
@@ -198,46 +199,45 @@ public class ProcessDefinitionController extends
BaseController {
* @param processId process definition id
* @return process definition detail
*/
- @ApiOperation(value = "queryProccessDefinitionById", notes =
"QUERY_PROCCESS_DEFINITION_BY_ID_NOTES")
+ @ApiOperation(value = "queryProcessDefinitionById", notes=
"QUERY_PROCESS_DEFINITION_BY_ID_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "processId", value =
"PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100")
})
@GetMapping(value = "/select-by-id")
@ResponseStatus(HttpStatus.OK)
@ApiException(QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR)
- public Result queryProccessDefinitionById(@ApiIgnore
@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+ public Result queryProcessDefinitionById(@ApiIgnore
@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@ApiParam(name = "projectName",
value = "PROJECT_NAME", required = true) @PathVariable String projectName,
@RequestParam("processId")
Integer processId
) {
- logger.info("query datail of process definition, login user:{},
project name:{}, process definition id:{}",
+ logger.info("query detail of process definition, login user:{},
project name:{}, process definition id:{}",
loginUser.getUserName(), projectName, processId);
- Map<String, Object> result =
processDefinitionService.queryProccessDefinitionById(loginUser, projectName,
processId);
+ Map<String, Object> result =
processDefinitionService.queryProcessDefinitionById(loginUser, projectName,
processId);
return returnDataList(result);
}
-
/**
- * query proccess definition list
+ * query Process definition list
*
* @param loginUser login user
* @param projectName project name
* @return process definition list
*/
- @ApiOperation(value = "queryProccessDefinitionList", notes =
"QUERY_PROCCESS_DEFINITION_LIST_NOTES")
+ @ApiOperation(value = "queryProcessDefinitionList", notes =
"QUERY_PROCESS_DEFINITION_LIST_NOTES")
@GetMapping(value = "/list")
@ResponseStatus(HttpStatus.OK)
- @ApiException(QUERY_PROCCESS_DEFINITION_LIST)
- public Result queryProccessDefinitionList(@ApiIgnore
@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+ @ApiException(QUERY_PROCESS_DEFINITION_LIST)
+ public Result queryProcessDefinitionList(@ApiIgnore
@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@ApiParam(name = "projectName",
value = "PROJECT_NAME", required = true) @PathVariable String projectName
) {
- logger.info("query proccess definition list, login user:{}, project
name:{}",
+ logger.info("query process definition list, login user:{}, project
name:{}",
loginUser.getUserName(), projectName);
- Map<String, Object> result =
processDefinitionService.queryProccessDefinitionList(loginUser, projectName);
+ Map<String, Object> result =
processDefinitionService.queryProcessDefinitionList(loginUser, projectName);
return returnDataList(result);
}
/**
- * query proccess definition list paging
+ * query process definition list paging
*
* @param loginUser login user
* @param projectName project name
@@ -247,7 +247,7 @@ public class ProcessDefinitionController extends
BaseController {
* @param userId user id
* @return process definition page
*/
- @ApiOperation(value = "queryProcessDefinitionListPaging", notes =
"QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES")
+ @ApiOperation(value = "queryProcessDefinitionListPaging", notes=
"QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required =
true, dataType = "Int", example = "100"),
@ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL",
required = false, type = "String"),
@@ -256,14 +256,14 @@ public class ProcessDefinitionController extends
BaseController {
})
@GetMapping(value = "/list-paging")
@ResponseStatus(HttpStatus.OK)
- @ApiException(QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR)
+ @ApiException(QUERY_PROCESS_DEFINITION_LIST_PAGING_ERROR)
public Result queryProcessDefinitionListPaging(@ApiIgnore
@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@ApiParam(name =
"projectName", value = "PROJECT_NAME", required = true) @PathVariable String
projectName,
@RequestParam("pageNo")
Integer pageNo,
@RequestParam(value =
"searchVal", required = false) String searchVal,
@RequestParam(value =
"userId", required = false, defaultValue = "0") Integer userId,
@RequestParam("pageSize")
Integer pageSize) {
- logger.info("query proccess definition list paging, login user:{},
project name:{}", loginUser.getUserName(), projectName);
+ logger.info("query process definition list paging, login user:{},
project name:{}", loginUser.getUserName(), projectName);
Map<String, Object> result = checkPageParams(pageNo, pageSize);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return returnDataListPaging(result);
@@ -273,7 +273,6 @@ public class ProcessDefinitionController extends
BaseController {
return returnDataListPaging(result);
}
-
/**
* encapsulation treeview structure
*
@@ -299,7 +298,6 @@ public class ProcessDefinitionController extends
BaseController {
return returnDataList(result);
}
-
/**
* get tasks list by process definition id
*
@@ -434,7 +432,8 @@ public class ProcessDefinitionController extends
BaseController {
* @param processDefinitionId process definition id
* @param response response
*/
- @ApiOperation(value = "exportProcessDefinitionById", notes =
"EXPORT_PROCCESS_DEFINITION_BY_ID_NOTES")
+
+ @ApiOperation(value = "exportProcessDefinitionById", notes=
"EXPORT_PROCESS_DEFINITION_BY_ID_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "processDefinitionId", value =
"PROCESS_DEFINITION_ID", required = true, dataType = "Int", example = "100")
})
@@ -453,23 +452,22 @@ public class ProcessDefinitionController extends
BaseController {
}
}
-
/**
- * query proccess definition all by project id
+ * query process definition all by project id
*
* @param loginUser login user
* @param projectId project id
* @return process definition list
*/
- @ApiOperation(value = "queryProccessDefinitionAllByProjectId", notes =
"QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES")
- @GetMapping(value = "/queryProccessDefinitionAllByProjectId")
+ @ApiOperation(value = "queryProcessDefinitionAllByProjectId", notes =
"QUERY_PROCESS_DEFINITION_All_BY_PROJECT_ID_NOTES")
+ @GetMapping(value = "/queryProcessDefinitionAllByProjectId")
@ResponseStatus(HttpStatus.OK)
- @ApiException(QUERY_PROCCESS_DEFINITION_LIST)
- public Result queryProccessDefinitionAllByProjectId(@ApiIgnore
@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
+ @ApiException(QUERY_PROCESS_DEFINITION_LIST)
+ public Result queryProcessDefinitionAllByProjectId(@ApiIgnore
@RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestParam("projectId") Integer projectId) {
- logger.info("query proccess definition list, login user:{}, project
id:{}",
+ logger.info("query process definition list, login user:{}, project
id:{}",
loginUser.getUserName(), projectId);
- Map<String, Object> result =
processDefinitionService.queryProccessDefinitionAllByProjectId(projectId);
+ Map<String, Object> result =
processDefinitionService.queryProcessDefinitionAllByProjectId(projectId);
return returnDataList(result);
}
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java
index 90364f0..cc9e0f6 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java
@@ -234,7 +234,8 @@ public class ProjectController extends BaseController {
* @param projectName project name
* @return import result code
*/
- @ApiOperation(value = "importProcessDefinition", notes =
"EXPORT_PROCCESS_DEFINITION_NOTES")
+
+ @ApiOperation(value = "importProcessDefinition", notes=
"EXPORT_PROCESS_DEFINITION_NOTES")
@ApiImplicitParams({
@ApiImplicitParam(name = "file", value = "RESOURCE_FILE", required
= true, dataType = "MultipartFile")
})
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
index 3e5147b..00665aa 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
@@ -136,7 +136,7 @@ public enum Status {
UPDATE_PROCESS_DEFINITION_ERROR(10107,"update process definition error",
"更新工作流定义错误"),
RELEASE_PROCESS_DEFINITION_ERROR(10108,"release process definition error",
"上线工作流错误"),
QUERY_DATAIL_OF_PROCESS_DEFINITION_ERROR(10109,"query datail of process
definition error", "查询工作流详细信息错误"),
- QUERY_PROCCESS_DEFINITION_LIST(10110,"query proccess definition list",
"查询工作流列表错误"),
+ QUERY_PROCESS_DEFINITION_LIST(10110,"query process definition list",
"查询工作流列表错误"),
ENCAPSULATION_TREEVIEW_STRUCTURE_ERROR(10111,"encapsulation treeview
structure error", "查询工作流树形图数据错误"),
GET_TASKS_LIST_BY_PROCESS_DEFINITION_ID_ERROR(10112,"get tasks list by
process definition id error", "查询工作流定义节点信息错误"),
QUERY_PROCESS_INSTANCE_LIST_PAGING_ERROR(10113,"query process instance
list paging error", "分页查询工作流实例列表错误"),
@@ -148,7 +148,7 @@ public enum Status {
QUERY_PARENT_PROCESS_INSTANCE_DETAIL_INFO_BY_SUB_PROCESS_INSTANCE_ID_ERROR(10119,"query
parent process instance detail info by sub process instance id error",
"查询子流程该工作流实例错误"),
QUERY_PROCESS_INSTANCE_ALL_VARIABLES_ERROR(10120,"query process instance
all variables error", "查询工作流自定义变量信息错误"),
ENCAPSULATION_PROCESS_INSTANCE_GANTT_STRUCTURE_ERROR(10121,"encapsulation
process instance gantt structure error", "查询工作流实例甘特图数据错误"),
- QUERY_PROCCESS_DEFINITION_LIST_PAGING_ERROR(10122,"query proccess
definition list paging error", "分页查询工作流定义列表错误"),
+ QUERY_PROCESS_DEFINITION_LIST_PAGING_ERROR(10122,"query process definition
list paging error", "分页查询工作流定义列表错误"),
SIGN_OUT_ERROR(10123,"sign out error", "退出错误"),
TENANT_CODE_HAS_ALREADY_EXISTS(10124,"tenant code has already exists",
"租户编码已存在"),
IP_IS_EMPTY(10125,"ip is empty", "IP地址不能为空"),
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
index 3684923..4081cab 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
@@ -191,13 +191,13 @@ public class ProcessDefinitionService extends
BaseDAGService {
/**
- * query proccess definition list
+ * query process definition list
*
* @param loginUser login user
* @param projectName project name
* @return definition list
*/
- public Map<String, Object> queryProccessDefinitionList(User loginUser,
String projectName) {
+ public Map<String, Object> queryProcessDefinitionList(User loginUser,
String projectName) {
HashMap<String, Object> result = new HashMap<>(5);
Project project = projectMapper.queryByName(projectName);
@@ -217,7 +217,7 @@ public class ProcessDefinitionService extends
BaseDAGService {
/**
- * query proccess definition list paging
+ * query process definition list paging
*
* @param loginUser login user
* @param projectName project name
@@ -259,7 +259,7 @@ public class ProcessDefinitionService extends
BaseDAGService {
* @param processId process definition id
* @return process definition detail
*/
- public Map<String, Object> queryProccessDefinitionById(User loginUser,
String projectName, Integer processId) {
+ public Map<String, Object> queryProcessDefinitionById(User loginUser,
String projectName, Integer processId) {
Map<String, Object> result = new HashMap<>(5);
@@ -365,7 +365,7 @@ public class ProcessDefinitionService extends
BaseDAGService {
* @param name name
* @return true if process definition name not exists, otherwise false
*/
- public Map<String, Object> verifyProccessDefinitionName(User loginUser,
String projectName, String name) {
+ public Map<String, Object> verifyProcessDefinitionName(User loginUser,
String projectName, String name) {
Map<String, Object> result = new HashMap<>();
Project project = projectMapper.queryByName(projectName);
@@ -1038,12 +1038,12 @@ public class ProcessDefinitionService extends
BaseDAGService {
/**
- * query proccess definition all by project id
+ * query process definition all by project id
*
* @param projectId project id
* @return process definitions in the project
*/
- public Map<String, Object> queryProccessDefinitionAllByProjectId(Integer
projectId) {
+ public Map<String, Object> queryProcessDefinitionAllByProjectId(Integer
projectId) {
HashMap<String, Object> result = new HashMap<>(5);
diff --git a/dolphinscheduler-api/src/main/resources/i18n/messages.properties
b/dolphinscheduler-api/src/main/resources/i18n/messages.properties
index a9b7c84..c4ca131 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages.properties
@@ -166,15 +166,15 @@ SIGNOUT_NOTES=logout
USER_PASSWORD=user password
UPDATE_PROCESS_INSTANCE_NOTES=update process instance
QUERY_PROCESS_INSTANCE_LIST_NOTES=query process instance list
-VERIFY_PROCCESS_DEFINITION_NAME_NOTES=verify proccess definition name
+VERIFY_PROCESS_DEFINITION_NAME_NOTES=verify process definition name
LOGIN_NOTES=user login
-UPDATE_PROCCESS_DEFINITION_NOTES=update proccess definition
+UPDATE_PROCESS_DEFINITION_NOTES=update process definition
PROCESS_DEFINITION_ID=process definition id
PROCESS_DEFINITION_IDS=process definition ids
-RELEASE_PROCCESS_DEFINITION_NOTES=release proccess definition
-QUERY_PROCCESS_DEFINITION_BY_ID_NOTES=query proccess definition by id
-QUERY_PROCCESS_DEFINITION_LIST_NOTES=query proccess definition list
-QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=query proccess definition list
paging
+RELEASE_PROCESS_DEFINITION_NOTES=release process definition
+QUERY_PROCESS_DEFINITION_BY_ID_NOTES=query process definition by id
+QUERY_PROCESS_DEFINITION_LIST_NOTES=query process definition list
+QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES=query process definition list paging
QUERY_ALL_DEFINITION_LIST_NOTES=query all definition list
PAGE_NO=page no
PROCESS_INSTANCE_ID=process instance id
@@ -190,7 +190,7 @@ LIMIT=limit
VIEW_TREE_NOTES=view tree
GET_NODE_LIST_BY_DEFINITION_ID_NOTES=get task node list by process definition
id
PROCESS_DEFINITION_ID_LIST=process definition id list
-QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query proccess definition
all by project id
+QUERY_PROCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query process definition all
by project id
DELETE_PROCESS_DEFINITION_BY_ID_NOTES=delete process definition by process
definition id
BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=batch delete process definition
by process definition ids
QUERY_PROCESS_INSTANCE_BY_ID_NOTES=query process instance by process instance
id
diff --git
a/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
b/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
index 6035bb6..e0c1c28 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages_en_US.properties
@@ -166,15 +166,15 @@ SIGNOUT_NOTES=logout
USER_PASSWORD=user password
UPDATE_PROCESS_INSTANCE_NOTES=update process instance
QUERY_PROCESS_INSTANCE_LIST_NOTES=query process instance list
-VERIFY_PROCCESS_DEFINITION_NAME_NOTES=verify proccess definition name
+VERIFY_PROCESS_DEFINITION_NAME_NOTES=verify process definition name
LOGIN_NOTES=user login
-UPDATE_PROCCESS_DEFINITION_NOTES=update proccess definition
+UPDATE_PROCESS_DEFINITION_NOTES=update process definition
PROCESS_DEFINITION_ID=process definition id
PROCESS_DEFINITION_IDS=process definition ids
-RELEASE_PROCCESS_DEFINITION_NOTES=release proccess definition
-QUERY_PROCCESS_DEFINITION_BY_ID_NOTES=query proccess definition by id
-QUERY_PROCCESS_DEFINITION_LIST_NOTES=query proccess definition list
-QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=query proccess definition list
paging
+RELEASE_PROCESS_DEFINITION_NOTES=release process definition
+QUERY_PROCESS_DEFINITION_BY_ID_NOTES=query process definition by id
+QUERY_PROCESS_DEFINITION_LIST_NOTES=query process definition list
+QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES=query process definition list paging
QUERY_ALL_DEFINITION_LIST_NOTES=query all definition list
PAGE_NO=page no
PROCESS_INSTANCE_ID=process instance id
@@ -190,7 +190,7 @@ LIMIT=limit
VIEW_TREE_NOTES=view tree
GET_NODE_LIST_BY_DEFINITION_ID_NOTES=get task node list by process definition
id
PROCESS_DEFINITION_ID_LIST=process definition id list
-QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query proccess definition
all by project id
+QUERY_PROCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=query process definition all
by project id
DELETE_PROCESS_DEFINITION_BY_ID_NOTES=delete process definition by process
definition id
BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=batch delete process definition
by process definition ids
QUERY_PROCESS_INSTANCE_BY_ID_NOTES=query process instance by process instance
id
diff --git
a/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
index 597d1a8..af7fde5 100644
--- a/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
+++ b/dolphinscheduler-api/src/main/resources/i18n/messages_zh_CN.properties
@@ -165,14 +165,14 @@ SIGNOUT_NOTES=退出登录
USER_PASSWORD=用户密码
UPDATE_PROCESS_INSTANCE_NOTES=更新流程实例
QUERY_PROCESS_INSTANCE_LIST_NOTES=查询流程实例列表
-VERIFY_PROCCESS_DEFINITION_NAME_NOTES=验证流程定义名字
+VERIFY_PROCESS_DEFINITION_NAME_NOTES=验证流程定义名字
LOGIN_NOTES=用户登录
-UPDATE_PROCCESS_DEFINITION_NOTES=更新流程定义
+UPDATE_PROCESS_DEFINITION_NOTES=更新流程定义
PROCESS_DEFINITION_ID=流程定义ID
-RELEASE_PROCCESS_DEFINITION_NOTES=发布流程定义
-QUERY_PROCCESS_DEFINITION_BY_ID_NOTES=查询流程定义通过流程定义ID
-QUERY_PROCCESS_DEFINITION_LIST_NOTES=查询流程定义列表
-QUERY_PROCCESS_DEFINITION_LIST_PAGING_NOTES=分页查询流程定义列表
+RELEASE_PROCESS_DEFINITION_NOTES=发布流程定义
+QUERY_PROCESS_DEFINITION_BY_ID_NOTES=查询流程定义通过流程定义ID
+QUERY_PROCESS_DEFINITION_LIST_NOTES=查询流程定义列表
+QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES=分页查询流程定义列表
QUERY_ALL_DEFINITION_LIST_NOTES=查询所有流程定义
PAGE_NO=页码号
PROCESS_INSTANCE_ID=流程实例ID
@@ -188,7 +188,7 @@ LIMIT=显示多少条
VIEW_TREE_NOTES=树状图
GET_NODE_LIST_BY_DEFINITION_ID_NOTES=获得任务节点列表通过流程定义ID
PROCESS_DEFINITION_ID_LIST=流程定义id列表
-QUERY_PROCCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=查询流程定义通过项目ID
+QUERY_PROCESS_DEFINITION_All_BY_PROJECT_ID_NOTES=查询流程定义通过项目ID
BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES=批量删除流程定义通过流程定义ID集合
DELETE_PROCESS_DEFINITION_BY_ID_NOTES=删除流程定义通过流程定义ID
QUERY_PROCESS_INSTANCE_BY_ID_NOTES=查询流程实例通过流程实例ID
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 7b4e259..c028dd4 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
@@ -17,314 +17,259 @@
package org.apache.dolphinscheduler.api.controller;
import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
import org.apache.dolphinscheduler.api.utils.Result;
+import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
-import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.junit.Assert;
-import org.junit.Ignore;
-import org.junit.Test;
+import org.apache.dolphinscheduler.common.enums.UserType;
+import org.apache.dolphinscheduler.common.model.TaskNode;
+import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.junit.*;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.MockitoJUnitRunner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.http.MediaType;
-import org.springframework.test.web.servlet.MvcResult;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-
-import static
org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static
org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
-import static
org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static
org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import java.text.MessageFormat;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* process definition controller test
*/
-public class ProcessDefinitionControllerTest extends AbstractControllerTest{
+@RunWith(MockitoJUnitRunner.Silent.class)
+public class ProcessDefinitionControllerTest{
private static Logger logger =
LoggerFactory.getLogger(ProcessDefinitionControllerTest.class);
+ @InjectMocks
+ private ProcessDefinitionController processDefinitionController;
+
+ @Mock
+ private ProcessDefinitionService processDefinitionService;
+
+ protected User user;
+
+ @Before
+ public void before(){
+ User loginUser = new User();
+ loginUser.setId(1);
+ loginUser.setUserType(UserType.GENERAL_USER);
+ loginUser.setUserName("admin");
+
+ user = loginUser;
+ }
+
@Test
public void testCreateProcessDefinition() throws Exception {
String json =
"{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-36196\",\"name\":\"ssh_test1\",\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"aa=\\\"1234\\\"\\necho
${aa}\"},\"desc\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\",\"timeout\":{\"strategy\":\"\",\"interval\":null,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\",\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":-1,\"timeout\":0}";
String locations =
"{\"tasks-36196\":{\"name\":\"ssh_test1\",\"targetarr\":\"\",\"x\":141,\"y\":70}}";
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("name","dag_test");
- paramsMap.add("processDefinitionJson",json);
- paramsMap.add("locations", locations);
- paramsMap.add("connects", "[]");
- paramsMap.add("description", "desc test");
-
- MvcResult mvcResult =
mockMvc.perform(post("/projects/{projectName}/process/save","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isCreated())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
- }
+ String projectName = "test";
+ String name = "dag_test";
+ String description = "desc test";
+ String connects = "[]";
+ Map<String, Object> result = new HashMap<>(5);
+ putMsg(result, Status.SUCCESS);
+ result.put("processDefinitionId",1);
+ Mockito.when(processDefinitionService.createProcessDefinition(user,
projectName, name, json,
+ description, locations, connects)).thenReturn(result);
- @Test
- public void testVerifyProccessDefinitionName() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("name","dag_test");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/verify-name","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.PROCESS_INSTANCE_EXIST.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
+ Result response =
processDefinitionController.createProcessDefinition(user, projectName, name,
json,
+ locations, connects, description);
+
Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
}
- @Test
- public void testVerifyProccessDefinitionNameNotExit() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("name","dag_test_1");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/verify-name","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
+ private void putMsg(Map<String, Object> result, Status status, Object...
statusParams) {
+ result.put(Constants.STATUS, status);
+ if (statusParams != null && statusParams.length > 0) {
+ result.put(Constants.MSG, MessageFormat.format(status.getMsg(),
statusParams));
+ } else {
+ result.put(Constants.MSG, status.getMsg());
+ }
}
+ @Test
+ public void testVerifyProcessDefinitionName() throws Exception {
+
+ Map<String, Object> result = new HashMap<>(5);
+ putMsg(result, Status.PROCESS_INSTANCE_EXIST);
+ String projectName = "test";
+ String name = "dag_test";
+
Mockito.when(processDefinitionService.verifyProcessDefinitionName(user,projectName,name)).thenReturn(result);
+
+ Result response =
processDefinitionController.verifyProcessDefinitionName(user,projectName,name);
+
Assert.assertEquals(Status.PROCESS_INSTANCE_EXIST.getCode(),response.getCode().intValue());
+
+ }
@Test
- public void UpdateProccessDefinition() throws Exception {
+ public void UpdateProcessDefinition() throws Exception {
+
String json =
"{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-36196\",\"name\":\"ssh_test1\",\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"aa=\\\"1234\\\"\\necho
${aa}\"},\"desc\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\",\"timeout\":{\"strategy\":\"\",\"interval\":null,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\",\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":-1,\"timeout\":0}";
String locations =
"{\"tasks-36196\":{\"name\":\"ssh_test1\",\"targetarr\":\"\",\"x\":141,\"y\":70}}";
-
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("name","dag_test_update");
- paramsMap.add("id","91");
- paramsMap.add("processDefinitionJson",json);
- paramsMap.add("locations", locations);
- paramsMap.add("connects", "[]");
- paramsMap.add("description", "desc test update");
-
- MvcResult mvcResult =
mockMvc.perform(post("/projects/{projectName}/process/update","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
+ String projectName = "test";
+ String name = "dag_test";
+ String description = "desc test";
+ String connects = "[]";
+ int id = 1;
+ Map<String, Object> result = new HashMap<>(5);
+ putMsg(result, Status.SUCCESS);
+ result.put("processDefinitionId",1);
+
+ Mockito.when(processDefinitionService.updateProcessDefinition(user,
projectName, id,name, json,
+ description, locations, connects)).thenReturn(result);
+
+ Result response =
processDefinitionController.updateProcessDefinition(user, projectName, name,id,
json,
+ locations, connects, description);
+
Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
}
-
@Test
- public void testReleaseProccessDefinition() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("processId","91");
- paramsMap.add("releaseState",String.valueOf(ReleaseState.OFFLINE));
-
- MvcResult mvcResult =
mockMvc.perform(post("/projects/{projectName}/process/release","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
+ public void testReleaseProcessDefinition() throws Exception {
+ String projectName = "test";
+ int id = 1;
+ Map<String, Object> result = new HashMap<>(5);
+ putMsg(result, Status.SUCCESS);
+
+ Mockito.when(processDefinitionService.releaseProcessDefinition(user,
projectName,id,ReleaseState.OFFLINE.ordinal())).thenReturn(result);
+ Result response =
processDefinitionController.releaseProcessDefinition(user,
projectName,id,ReleaseState.OFFLINE.ordinal());
+
Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
}
-
@Test
- public void testQueryProccessDefinitionById() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("processId","91");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/select-by-id","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
+ public void testQueryProcessDefinitionById() throws Exception {
+
+ String json =
"{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-36196\",\"name\":\"ssh_test1\",\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"aa=\\\"1234\\\"\\necho
${aa}\"},\"desc\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\",\"timeout\":{\"strategy\":\"\",\"interval\":null,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\",\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":-1,\"timeout\":0}";
+ String locations =
"{\"tasks-36196\":{\"name\":\"ssh_test1\",\"targetarr\":\"\",\"x\":141,\"y\":70}}";
+ String projectName = "test";
+ String name = "dag_test";
+ String description = "desc test";
+ String connects = "[]";
+ int id = 1;
+
+ ProcessDefinition processDefinition = new ProcessDefinition();
+ processDefinition.setProjectName(projectName);
+ processDefinition.setConnects(connects);
+ processDefinition.setDescription(description);
+ processDefinition.setId(id);
+ processDefinition.setLocations(locations);
+ processDefinition.setName(name);
+ processDefinition.setProcessDefinitionJson(json);
+
+ Map<String, Object> result = new HashMap<>(5);
+ putMsg(result, Status.SUCCESS);
+ result.put(Constants.DATA_LIST, processDefinition);
+
+ Mockito.when(processDefinitionService.queryProcessDefinitionById(user,
projectName,id)).thenReturn(result);
+ Result response =
processDefinitionController.queryProcessDefinitionById(user, projectName,id);
+
+
Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
}
+
@Test
- public void testQueryProccessDefinitionList() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/list","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
- }
+ public void testQueryProcessDefinitionList() throws Exception {
+ String projectName = "test";
+ List<ProcessDefinition> resourceList = getDefinitionList();
+ Map<String, Object> result = new HashMap<>(5);
+ putMsg(result, Status.SUCCESS);
+ result.put(Constants.DATA_LIST, resourceList);
- @Test
- public void testQueryProcessDefinitionListPaging() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("pageNo","1");
- paramsMap.add("searchVal","test");
- paramsMap.add("userId","");
- paramsMap.add("pageSize", "1");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/list-paging","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
- }
- @Test
- public void testViewTree() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("processId","91");
- paramsMap.add("limit","30");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/view-tree","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
- }
+ Mockito.when(processDefinitionService.queryProcessDefinitionList(user,
projectName)).thenReturn(result);
+ Result response =
processDefinitionController.queryProcessDefinitionList(user, projectName);
- @Test
- public void testGetNodeListByDefinitionId() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("processDefinitionId","40");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/gen-task-list","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
+
Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
}
- @Test
- public void testGetNodeListByDefinitionIdList() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("processDefinitionIdList","40,90,91");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/get-task-list","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
- }
+ public List<ProcessDefinition> getDefinitionList(){
+ List<ProcessDefinition> resourceList = new ArrayList<>();
+ String json =
"{\"globalParams\":[],\"tasks\":[{\"type\":\"SHELL\",\"id\":\"tasks-36196\",\"name\":\"ssh_test1\",\"params\":{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"aa=\\\"1234\\\"\\necho
${aa}\"},\"desc\":\"\",\"runFlag\":\"NORMAL\",\"dependence\":{},\"maxRetryTimes\":\"0\",\"retryInterval\":\"1\",\"timeout\":{\"strategy\":\"\",\"interval\":null,\"enable\":false},\"taskInstancePriority\":\"MEDIUM\",\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":-1,\"timeout\":0}";
+ String locations =
"{\"tasks-36196\":{\"name\":\"ssh_test1\",\"targetarr\":\"\",\"x\":141,\"y\":70}}";
+ String projectName = "test";
+ String name = "dag_test";
+ String description = "desc test";
+ String connects = "[]";
+ int id = 1;
+
+ ProcessDefinition processDefinition = new ProcessDefinition();
+ processDefinition.setProjectName(projectName);
+ processDefinition.setConnects(connects);
+ processDefinition.setDescription(description);
+ processDefinition.setId(id);
+ processDefinition.setLocations(locations);
+ processDefinition.setName(name);
+ processDefinition.setProcessDefinitionJson(json);
+
+ String name2 = "dag_test";
+ int id2 = 2;
+
+ ProcessDefinition processDefinition2 = new ProcessDefinition();
+ processDefinition2.setProjectName(projectName);
+ processDefinition2.setConnects(connects);
+ processDefinition2.setDescription(description);
+ processDefinition2.setId(id2);
+ processDefinition2.setLocations(locations);
+ processDefinition2.setName(name2);
+ processDefinition2.setProcessDefinitionJson(json);
+
+ resourceList.add(processDefinition);
+ resourceList.add(processDefinition2);
+
+ return resourceList;
+ }
- @Ignore
@Test
- public void testExportProcessDefinitionById() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("processDefinitionId","91");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/export","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
-// .andExpect(status().isOk())
-//
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
- }
+ public void testDeleteProcessDefinitionById() throws Exception {
+ String projectName = "test";
+ int id = 1;
+ Map<String, Object> result = new HashMap<>(5);
+ putMsg(result, Status.SUCCESS);
- @Test
- public void testQueryProccessDefinitionAllByProjectId() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("projectId","9");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/queryProccessDefinitionAllByProjectId","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
+
Mockito.when(processDefinitionService.deleteProcessDefinitionById(user,
projectName,id)).thenReturn(result);
+ Result response =
processDefinitionController.deleteProcessDefinitionById(user, projectName,id);
+
+
Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
}
+ @Test
+ public void testGetNodeListByDefinitionId() throws Exception {
+ String projectName = "test";
+ int id = 1;
+ Map<String, Object> result = new HashMap<>(5);
+ putMsg(result, Status.SUCCESS);
- @Test
- public void testDeleteProcessDefinitionById() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("processDefinitionId","73");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/delete","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
+
Mockito.when(processDefinitionService.getTaskNodeListByDefinitionId(id)).thenReturn(result);
+ Result response =
processDefinitionController.getNodeListByDefinitionId(user,projectName,id);
+
+
Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
}
@Test
- public void testBatchDeleteProcessDefinitionByIds() throws Exception {
- MultiValueMap<String, String> paramsMap = new LinkedMultiValueMap<>();
- paramsMap.add("processDefinitionIds","54,62");
-
- MvcResult mvcResult =
mockMvc.perform(get("/projects/{projectName}/process/batch-delete","cxc_1113")
- .header(SESSION_ID, sessionId)
- .params(paramsMap))
- .andExpect(status().isOk())
-
.andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
- .andReturn();
-
- Result result =
JSONUtils.parseObject(mvcResult.getResponse().getContentAsString(),
Result.class);
-
Assert.assertEquals(Status.SUCCESS.getCode(),result.getCode().intValue());
- logger.info(mvcResult.getResponse().getContentAsString());
+ public void testGetNodeListByDefinitionIdList() throws Exception {
+ String projectName = "test";
+ String idList = "1,2,3";
+
+ Map<String, Object> result = new HashMap<>(5);
+ putMsg(result, Status.SUCCESS);
+
+
Mockito.when(processDefinitionService.getTaskNodeListByDefinitionIdList(idList)).thenReturn(result);
+ Result response =
processDefinitionController.getNodeListByDefinitionIdList(user,projectName,idList);
+
+
Assert.assertEquals(Status.SUCCESS.getCode(),response.getCode().intValue());
}
}
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
index 9b25653..a0da228 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
@@ -115,7 +115,7 @@ public class ProcessDefinitionServiceTest {
"\"workerGroupId\":-1,\"preTasks\":[]}],\"tenantId\":1,\"timeout\":0}";
@Test
- public void testQueryProccessDefinitionList() {
+ public void testQueryProcessDefinitionList() {
String projectName = "project_test1";
Mockito.when(projectMapper.queryByName(projectName)).thenReturn(getProject(projectName));
@@ -129,7 +129,7 @@ public class ProcessDefinitionServiceTest {
//project not found
Mockito.when(projectService.checkProjectAndAuth(loginUser,project,projectName)).thenReturn(result);
- Map<String, Object> map =
processDefinitionService.queryProccessDefinitionList(loginUser,"project_test1");
+ Map<String, Object> map =
processDefinitionService.queryProcessDefinitionList(loginUser,"project_test1");
Assert.assertEquals(Status.PROJECT_NOT_FOUNT,
map.get(Constants.STATUS));
//project check auth success
@@ -138,7 +138,7 @@ public class ProcessDefinitionServiceTest {
List<ProcessDefinition> resourceList = new ArrayList<>();
resourceList.add(getProcessDefinition());
Mockito.when(processDefineMapper.queryAllDefinitionList(project.getId())).thenReturn(resourceList);
- Map<String, Object> checkSuccessRes =
processDefinitionService.queryProccessDefinitionList(loginUser,"project_test1");
+ Map<String, Object> checkSuccessRes =
processDefinitionService.queryProcessDefinitionList(loginUser,"project_test1");
Assert.assertEquals(Status.SUCCESS,
checkSuccessRes.get(Constants.STATUS));
}
@@ -179,7 +179,7 @@ public class ProcessDefinitionServiceTest {
//project check auth fail
Mockito.when(projectService.checkProjectAndAuth(loginUser,project,projectName)).thenReturn(result);
- Map<String, Object> map =
processDefinitionService.queryProccessDefinitionById(loginUser,
+ Map<String, Object> map =
processDefinitionService.queryProcessDefinitionById(loginUser,
"project_test1", 1);
Assert.assertEquals(Status.PROJECT_NOT_FOUNT,
map.get(Constants.STATUS));
@@ -187,13 +187,13 @@ public class ProcessDefinitionServiceTest {
putMsg(result, Status.SUCCESS, projectName);
Mockito.when(projectService.checkProjectAndAuth(loginUser,project,projectName)).thenReturn(result);
Mockito.when(processDefineMapper.selectById(1)).thenReturn(null);
- Map<String, Object> instanceNotexitRes =
processDefinitionService.queryProccessDefinitionById(loginUser,
+ Map<String, Object> instanceNotexitRes =
processDefinitionService.queryProcessDefinitionById(loginUser,
"project_test1", 1);
Assert.assertEquals(Status.PROCESS_INSTANCE_NOT_EXIST,
instanceNotexitRes.get(Constants.STATUS));
//instance exit
Mockito.when(processDefineMapper.selectById(46)).thenReturn(getProcessDefinition());
- Map<String, Object> successRes =
processDefinitionService.queryProccessDefinitionById(loginUser,
+ Map<String, Object> successRes =
processDefinitionService.queryProcessDefinitionById(loginUser,
"project_test1", 46);
Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS));
}
@@ -335,20 +335,20 @@ public class ProcessDefinitionServiceTest {
Map<String, Object> result = new HashMap<>(5);
putMsg(result, Status.PROJECT_NOT_FOUNT, projectName);
Mockito.when(projectService.checkProjectAndAuth(loginUser,project,projectName)).thenReturn(result);
- Map<String, Object> map =
processDefinitionService.verifyProccessDefinitionName(loginUser,
+ Map<String, Object> map =
processDefinitionService.verifyProcessDefinitionName(loginUser,
"project_test1", "test_pdf");
Assert.assertEquals(Status.PROJECT_NOT_FOUNT,
map.get(Constants.STATUS));
//project check auth success, process not exist
putMsg(result, Status.SUCCESS, projectName);
Mockito.when(processDefineMapper.queryByDefineName(project.getId(),"test_pdf")).thenReturn(null);
- Map<String, Object> processNotExistRes =
processDefinitionService.verifyProccessDefinitionName(loginUser,
+ Map<String, Object> processNotExistRes =
processDefinitionService.verifyProcessDefinitionName(loginUser,
"project_test1", "test_pdf");
Assert.assertEquals(Status.SUCCESS,
processNotExistRes.get(Constants.STATUS));
//process exist
Mockito.when(processDefineMapper.queryByDefineName(project.getId(),"test_pdf")).thenReturn(getProcessDefinition());
- Map<String, Object> processExistRes =
processDefinitionService.verifyProccessDefinitionName(loginUser,
+ Map<String, Object> processExistRes =
processDefinitionService.verifyProcessDefinitionName(loginUser,
"project_test1", "test_pdf");
Assert.assertEquals(Status.PROCESS_INSTANCE_EXIST,
processExistRes.get(Constants.STATUS));
}
@@ -418,14 +418,14 @@ public class ProcessDefinitionServiceTest {
}
@Test
- public void testQueryProccessDefinitionAllByProjectId() {
+ public void testQueryProcessDefinitionAllByProjectId() {
int projectId = 1;
ProcessDefinition processDefinition = getProcessDefinition();
processDefinition.setProcessDefinitionJson(shellJson);
List<ProcessDefinition> processDefinitionList = new ArrayList<>();
processDefinitionList.add(processDefinition);
Mockito.when(processDefineMapper.queryAllDefinitionList(projectId)).thenReturn(processDefinitionList);
- Map<String, Object> successRes =
processDefinitionService.queryProccessDefinitionAllByProjectId(projectId);
+ Map<String, Object> successRes =
processDefinitionService.queryProcessDefinitionAllByProjectId(projectId);
Assert.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS));
}
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
index fd1b200..a63c9ed 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@@ -293,7 +293,7 @@ export default {
*/
getProcessByProjectId ({ state }, payload) {
return new Promise((resolve, reject) => {
-
io.get(`projects/${state.projectName}/process/queryProccessDefinitionAllByProjectId`,
payload, res => {
+
io.get(`projects/${state.projectName}/process/queryProcessDefinitionAllByProjectId`,
payload, res => {
resolve(res.data)
}).catch(res => {
reject(res)
@@ -725,4 +725,4 @@ export default {
})
})
},
-}
\ No newline at end of file
+}
diff --git a/pom.xml b/pom.xml
index c3e0da5..f90700e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -721,6 +721,7 @@
<include>**/api/service/UserAlertGroupServiceTest.java</include>
<include>**/api/service/UsersServiceTest.java</include>
<include>**/api/service/WorkerGroupServiceTest.java</include>
+
<include>**/api/controller/ProcessDefinitionControllerTest.java</include>
<include>**/api/utils/exportprocess/DataSourceParamTest.java</include>
<include>**/api/utils/exportprocess/DependentParamTest.java</include>
<include>**/api/utils/CheckUtilsTest.java</include>
