github
/
DolphinScheduler
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Using Jackson instead of Fastjson (#2850) 

* Using Jackson instead of Fastjson

* Fix some json bugs

Co-authored-by: dailidong <dailidong66@gmail.com>
pull/2/head
Han Gao 5 years ago committed by GitHub
parent
c8ab27acb0
commit
8f8ddae030
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 589 additions and 460 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/JSONUtilsTest.java
  2. 405
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
  3. 5
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
  4. 21
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/exportprocess/DataSourceParam.java
  5. 40
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/exportprocess/DependentParam.java
  6. 6
      dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/exportprocess/ProcessAddTaskParam.java
  7. 8
      dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
  8. 19
      dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/exportprocess/DataSourceParamTest.java
  9. 34
      dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/exportprocess/DependentParamTest.java
  10. 388
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
  11. 2
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
  12. 36
      dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StreamUtils.java
  13. 36
      dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
  14. 8
      dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ParameterUtilsTest.java
  15. 39
      dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StreamUtilsTest.java

2
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/JSONUtilsTest.java
Unescape View File

@ -17,6 +17,7 @@
package org.apache.dolphinscheduler.alert.utils; package org.apache.dolphinscheduler.alert.utils;
import com.fasterxml.jackson.databind.JsonNode;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.slf4j.Logger; import org.slf4j.Logger;
@ -109,4 +110,5 @@ public class JSONUtilsTest {
} }
} }

405
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
Unescape View File

@ -17,11 +17,12 @@
package org.apache.dolphinscheduler.api.service; package org.apache.dolphinscheduler.api.service;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.dolphinscheduler.api.dto.ProcessMeta; import org.apache.dolphinscheduler.api.dto.ProcessMeta;
import org.apache.dolphinscheduler.api.dto.treeview.Instance; import org.apache.dolphinscheduler.api.dto.treeview.Instance;
import org.apache.dolphinscheduler.api.dto.treeview.TreeViewDto; import org.apache.dolphinscheduler.api.dto.treeview.TreeViewDto;
@ -73,6 +74,11 @@ public class ProcessDefinitionService extends BaseDAGService {
private static final Logger logger = LoggerFactory.getLogger(ProcessDefinitionService.class); private static final Logger logger = LoggerFactory.getLogger(ProcessDefinitionService.class);
private static final String PROCESSDEFINITIONID = "processDefinitionId";
private static final String RELEASESTATE = "releaseState";
private static final String TASKS = "tasks";
@Autowired @Autowired
private ProjectMapper projectMapper; private ProjectMapper projectMapper;
@ -99,13 +105,13 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* create process definition * create process definition
* *
* @param loginUser login user * @param loginUser login user
* @param projectName project name * @param projectName project name
* @param name process definition name * @param name process definition name
* @param processDefinitionJson process definition json * @param processDefinitionJson process definition json
* @param desc description * @param desc description
* @param locations locations for nodes * @param locations locations for nodes
* @param connects connects for nodes * @param connects connects for nodes
* @return create result code * @return create result code
* @throws JsonProcessingException JsonProcessingException * @throws JsonProcessingException JsonProcessingException
*/ */
@ -163,29 +169,30 @@ public class ProcessDefinitionService extends BaseDAGService {
// return processDefinition object with ID // return processDefinition object with ID
result.put(Constants.DATA_LIST, processDefineMapper.selectById(processDefine.getId())); result.put(Constants.DATA_LIST, processDefineMapper.selectById(processDefine.getId()));
putMsg(result, Status.SUCCESS); putMsg(result, Status.SUCCESS);
result.put("processDefinitionId",processDefine.getId()); result.put("processDefinitionId", processDefine.getId());
return result; return result;
} }
/** /**
* get resource ids * get resource ids
*
* @param processData process data * @param processData process data
* @return resource ids * @return resource ids
*/ */
private String getResourceIds(ProcessData processData) { private String getResourceIds(ProcessData processData) {
List<TaskNode> tasks = processData.getTasks(); List<TaskNode> tasks = processData.getTasks();
Set<Integer> resourceIds = new HashSet<>(); Set<Integer> resourceIds = new HashSet<>();
for(TaskNode taskNode : tasks){ for (TaskNode taskNode : tasks) {
String taskParameter = taskNode.getParams(); String taskParameter = taskNode.getParams();
AbstractParameters params = TaskParametersUtils.getParameters(taskNode.getType(),taskParameter); AbstractParameters params = TaskParametersUtils.getParameters(taskNode.getType(), taskParameter);
if (CollectionUtils.isNotEmpty(params.getResourceFilesList())) { if (CollectionUtils.isNotEmpty(params.getResourceFilesList())) {
Set<Integer> tempSet = params.getResourceFilesList().stream().map(t->t.getId()).collect(Collectors.toSet()); Set<Integer> tempSet = params.getResourceFilesList().stream().map(t -> t.getId()).collect(Collectors.toSet());
resourceIds.addAll(tempSet); resourceIds.addAll(tempSet);
} }
} }
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
for(int i : resourceIds) { for (int i : resourceIds) {
if (sb.length() > 0) { if (sb.length() > 0) {
sb.append(","); sb.append(",");
} }
@ -198,7 +205,7 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* query process definition list * query process definition list
* *
* @param loginUser login user * @param loginUser login user
* @param projectName project name * @param projectName project name
* @return definition list * @return definition list
*/ */
@ -224,12 +231,12 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* query process definition list paging * query process definition list paging
* *
* @param loginUser login user * @param loginUser login user
* @param projectName project name * @param projectName project name
* @param searchVal search value * @param searchVal search value
* @param pageNo page number * @param pageNo page number
* @param pageSize page size * @param pageSize page size
* @param userId user id * @param userId user id
* @return process definition page * @return process definition page
*/ */
public Map<String, Object> queryProcessDefinitionListPaging(User loginUser, String projectName, String searchVal, Integer pageNo, Integer pageSize, Integer userId) { public Map<String, Object> queryProcessDefinitionListPaging(User loginUser, String projectName, String searchVal, Integer pageNo, Integer pageSize, Integer userId) {
@ -245,10 +252,10 @@ public class ProcessDefinitionService extends BaseDAGService {
Page<ProcessDefinition> page = new Page(pageNo, pageSize); Page<ProcessDefinition> page = new Page(pageNo, pageSize);
IPage<ProcessDefinition> processDefinitionIPage = processDefineMapper.queryDefineListPaging( IPage<ProcessDefinition> processDefinitionIPage = processDefineMapper.queryDefineListPaging(
page, searchVal, userId, project.getId(),isAdmin(loginUser)); page, searchVal, userId, project.getId(), isAdmin(loginUser));
PageInfo pageInfo = new PageInfo<ProcessData>(pageNo, pageSize); PageInfo pageInfo = new PageInfo<ProcessData>(pageNo, pageSize);
pageInfo.setTotalCount((int)processDefinitionIPage.getTotal()); pageInfo.setTotalCount((int) processDefinitionIPage.getTotal());
pageInfo.setLists(processDefinitionIPage.getRecords()); pageInfo.setLists(processDefinitionIPage.getRecords());
result.put(Constants.DATA_LIST, pageInfo); result.put(Constants.DATA_LIST, pageInfo);
putMsg(result, Status.SUCCESS); putMsg(result, Status.SUCCESS);
@ -259,9 +266,9 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* query datail of process definition * query datail of process definition
* *
* @param loginUser login user * @param loginUser login user
* @param projectName project name * @param projectName project name
* @param processId process definition id * @param processId process definition id
* @return process definition detail * @return process definition detail
*/ */
public Map<String, Object> queryProcessDefinitionById(User loginUser, String projectName, Integer processId) { public Map<String, Object> queryProcessDefinitionById(User loginUser, String projectName, Integer processId) {
@ -289,12 +296,12 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* copy process definition * copy process definition
* *
* @param loginUser login user * @param loginUser login user
* @param projectName project name * @param projectName project name
* @param processId process definition id * @param processId process definition id
* @return copy result code * @return copy result code
*/ */
public Map<String, Object> copyProcessDefinition(User loginUser, String projectName, Integer processId) throws JsonProcessingException{ public Map<String, Object> copyProcessDefinition(User loginUser, String projectName, Integer processId) throws JsonProcessingException {
Map<String, Object> result = new HashMap<>(5); Map<String, Object> result = new HashMap<>(5);
Project project = projectMapper.queryByName(projectName); Project project = projectMapper.queryByName(projectName);
@ -313,7 +320,7 @@ public class ProcessDefinitionService extends BaseDAGService {
return createProcessDefinition( return createProcessDefinition(
loginUser, loginUser,
projectName, projectName,
processDefinition.getName()+"_copy_"+System.currentTimeMillis(), processDefinition.getName() + "_copy_" + System.currentTimeMillis(),
processDefinition.getProcessDefinitionJson(), processDefinition.getProcessDefinitionJson(),
processDefinition.getDescription(), processDefinition.getDescription(),
processDefinition.getLocations(), processDefinition.getLocations(),
@ -324,14 +331,14 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* update process definition * update process definition
* *
* @param loginUser login user * @param loginUser login user
* @param projectName project name * @param projectName project name
* @param name process definition name * @param name process definition name
* @param id process definition id * @param id process definition id
* @param processDefinitionJson process definition json * @param processDefinitionJson process definition json
* @param desc description * @param desc description
* @param locations locations for nodes * @param locations locations for nodes
* @param connects connects for nodes * @param connects connects for nodes
* @return update result code * @return update result code
*/ */
public Map<String, Object> updateProcessDefinition(User loginUser, String projectName, int id, String name, public Map<String, Object> updateProcessDefinition(User loginUser, String projectName, int id, String name,
@ -400,9 +407,9 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* verify process definition name unique * verify process definition name unique
* *
* @param loginUser login user * @param loginUser login user
* @param projectName project name * @param projectName project name
* @param name name * @param name name
* @return true if process definition name not exists, otherwise false * @return true if process definition name not exists, otherwise false
*/ */
public Map<String, Object> verifyProcessDefinitionName(User loginUser, String projectName, String name) { public Map<String, Object> verifyProcessDefinitionName(User loginUser, String projectName, String name) {
@ -427,8 +434,8 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* delete process definition by id * delete process definition by id
* *
* @param loginUser login user * @param loginUser login user
* @param projectName project name * @param projectName project name
* @param processDefinitionId process definition id * @param processDefinitionId process definition id
* @return delete result code * @return delete result code
*/ */
@ -459,22 +466,22 @@ public class ProcessDefinitionService extends BaseDAGService {
// check process definition is already online // check process definition is already online
if (processDefinition.getReleaseState() == ReleaseState.ONLINE) { if (processDefinition.getReleaseState() == ReleaseState.ONLINE) {
putMsg(result, Status.PROCESS_DEFINE_STATE_ONLINE,processDefinitionId); putMsg(result, Status.PROCESS_DEFINE_STATE_ONLINE, processDefinitionId);
return result; return result;
} }
// get the timing according to the process definition // get the timing according to the process definition
List<Schedule> schedules = scheduleMapper.queryByProcessDefinitionId(processDefinitionId); List<Schedule> schedules = scheduleMapper.queryByProcessDefinitionId(processDefinitionId);
if (!schedules.isEmpty() && schedules.size() > 1) { if (!schedules.isEmpty() && schedules.size() > 1) {
logger.warn("scheduler num is {},Greater than 1",schedules.size()); logger.warn("scheduler num is {},Greater than 1", schedules.size());
putMsg(result, Status.DELETE_PROCESS_DEFINE_BY_ID_ERROR); putMsg(result, Status.DELETE_PROCESS_DEFINE_BY_ID_ERROR);
return result; return result;
}else if(schedules.size() == 1){ } else if (schedules.size() == 1) {
Schedule schedule = schedules.get(0); Schedule schedule = schedules.get(0);
if(schedule.getReleaseState() == ReleaseState.OFFLINE){ if (schedule.getReleaseState() == ReleaseState.OFFLINE) {
scheduleMapper.deleteById(schedule.getId()); scheduleMapper.deleteById(schedule.getId());
}else if(schedule.getReleaseState() == ReleaseState.ONLINE){ } else if (schedule.getReleaseState() == ReleaseState.ONLINE) {
putMsg(result, Status.SCHEDULE_CRON_STATE_ONLINE,schedule.getId()); putMsg(result, Status.SCHEDULE_CRON_STATE_ONLINE, schedule.getId());
return result; return result;
} }
} }
@ -492,9 +499,9 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* release process definition: online / offline * release process definition: online / offline
* *
* @param loginUser login user * @param loginUser login user
* @param projectName project name * @param projectName project name
* @param id process definition id * @param id process definition id
* @param releaseState release state * @param releaseState release state
* @return release result code * @return release result code
*/ */
@ -513,7 +520,7 @@ public class ProcessDefinitionService extends BaseDAGService {
// check state // check state
if (null == state) { if (null == state) {
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "releaseState"); putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, RELEASESTATE);
return result; return result;
} }
@ -525,12 +532,12 @@ public class ProcessDefinitionService extends BaseDAGService {
String resourceIds = processDefinition.getResourceIds(); String resourceIds = processDefinition.getResourceIds();
if (StringUtils.isNotBlank(resourceIds)) { if (StringUtils.isNotBlank(resourceIds)) {
Integer[] resourceIdArray = Arrays.stream(resourceIds.split(",")).map(Integer::parseInt).toArray(Integer[]::new); Integer[] resourceIdArray = Arrays.stream(resourceIds.split(",")).map(Integer::parseInt).toArray(Integer[]::new);
PermissionCheck<Integer> permissionCheck = new PermissionCheck(AuthorizationType.RESOURCE_FILE_ID,processService,resourceIdArray,loginUser.getId(),logger); PermissionCheck<Integer> permissionCheck = new PermissionCheck<>(AuthorizationType.RESOURCE_FILE_ID, processService, resourceIdArray, loginUser.getId(), logger);
try { try {
permissionCheck.checkPermission(); permissionCheck.checkPermission();
} catch (Exception e) { } catch (Exception e) {
logger.error(e.getMessage(),e); logger.error(e.getMessage(), e);
putMsg(result, Status.RESOURCE_NOT_EXIST_OR_NO_PERMISSION, "releaseState"); putMsg(result, Status.RESOURCE_NOT_EXIST_OR_NO_PERMISSION, RELEASESTATE);
return result; return result;
} }
} }
@ -545,7 +552,7 @@ public class ProcessDefinitionService extends BaseDAGService {
new int[]{processDefinition.getId()} new int[]{processDefinition.getId()}
); );
for(Schedule schedule:scheduleList){ for (Schedule schedule : scheduleList) {
logger.info("set schedule offline, project id: {}, schedule id: {}, process definition id: {}", project.getId(), schedule.getId(), id); logger.info("set schedule offline, project id: {}, schedule id: {}, process definition id: {}", project.getId(), schedule.getId(), id);
// set status // set status
schedule.setReleaseState(ReleaseState.OFFLINE); schedule.setReleaseState(ReleaseState.OFFLINE);
@ -554,7 +561,7 @@ public class ProcessDefinitionService extends BaseDAGService {
} }
break; break;
default: default:
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "releaseState"); putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, RELEASESTATE);
return result; return result;
} }
@ -564,14 +571,15 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* batch export process definition by ids * batch export process definition by ids
*
* @param loginUser * @param loginUser
* @param projectName * @param projectName
* @param processDefinitionIds * @param processDefinitionIds
* @param response * @param response
*/ */
public void batchExportProcessDefinitionByIds(User loginUser, String projectName, String processDefinitionIds, HttpServletResponse response){ public void batchExportProcessDefinitionByIds(User loginUser, String projectName, String processDefinitionIds, HttpServletResponse response) {
if(StringUtils.isEmpty(processDefinitionIds)){ if (StringUtils.isEmpty(processDefinitionIds)) {
return; return;
} }
@ -582,24 +590,25 @@ public class ProcessDefinitionService extends BaseDAGService {
Map<String, Object> checkResult = projectService.checkProjectAndAuth(loginUser, project, projectName); Map<String, Object> checkResult = projectService.checkProjectAndAuth(loginUser, project, projectName);
Status resultStatus = (Status) checkResult.get(Constants.STATUS); Status resultStatus = (Status) checkResult.get(Constants.STATUS);
if(resultStatus != Status.SUCCESS){ if (resultStatus != Status.SUCCESS) {
return; return;
} }
List<ProcessMeta> processDefinitionList = List<ProcessMeta> processDefinitionList =
getProcessDefinitionList(processDefinitionIds); getProcessDefinitionList(processDefinitionIds);
if(CollectionUtils.isNotEmpty(processDefinitionList)){ if (CollectionUtils.isNotEmpty(processDefinitionList)) {
downloadProcessDefinitionFile(response, processDefinitionList); downloadProcessDefinitionFile(response, processDefinitionList);
} }
} }
/** /**
* get process definition list by ids * get process definition list by ids
*
* @param processDefinitionIds * @param processDefinitionIds
* @return * @return
*/ */
private List<ProcessMeta> getProcessDefinitionList(String processDefinitionIds){ private List<ProcessMeta> getProcessDefinitionList(String processDefinitionIds) {
List<ProcessMeta> processDefinitionList = new ArrayList<>(); List<ProcessMeta> processDefinitionList = new ArrayList<>();
String[] processDefinitionIdArray = processDefinitionIds.split(","); String[] processDefinitionIdArray = processDefinitionIds.split(",");
for (String strProcessDefinitionId : processDefinitionIdArray) { for (String strProcessDefinitionId : processDefinitionIdArray) {
@ -616,6 +625,7 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* download the process definition file * download the process definition file
*
* @param response * @param response
* @param processDefinitionList * @param processDefinitionList
*/ */
@ -631,7 +641,7 @@ public class ProcessDefinitionService extends BaseDAGService {
buff.close(); buff.close();
} catch (IOException e) { } catch (IOException e) {
logger.warn("export process fail", e); logger.warn("export process fail", e);
}finally { } finally {
if (null != buff) { if (null != buff) {
try { try {
buff.close(); buff.close();
@ -651,19 +661,21 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* get export process metadata string * get export process metadata string
*
* @param processDefinitionId process definition id * @param processDefinitionId process definition id
* @param processDefinition process definition * @param processDefinition process definition
* @return export process metadata string * @return export process metadata string
*/ */
public String exportProcessMetaDataStr(Integer processDefinitionId, ProcessDefinition processDefinition) { public String exportProcessMetaDataStr(Integer processDefinitionId, ProcessDefinition processDefinition) {
//create workflow json file //create workflow json file
return JSONUtils.toJsonString(exportProcessMetaData(processDefinitionId,processDefinition)); return JSONUtils.toJsonString(exportProcessMetaData(processDefinitionId, processDefinition));
} }
/** /**
* get export process metadata string * get export process metadata string
*
* @param processDefinitionId process definition id * @param processDefinitionId process definition id
* @param processDefinition process definition * @param processDefinition process definition
* @return export process metadata string * @return export process metadata string
*/ */
public ProcessMeta exportProcessMetaData(Integer processDefinitionId, ProcessDefinition processDefinition) { public ProcessMeta exportProcessMetaData(Integer processDefinitionId, ProcessDefinition processDefinition) {
@ -699,17 +711,18 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* correct task param which has datasource or dependent * correct task param which has datasource or dependent
*
* @param processDefinitionJson processDefinitionJson * @param processDefinitionJson processDefinitionJson
* @return correct processDefinitionJson * @return correct processDefinitionJson
*/ */
public String addExportTaskNodeSpecialParam(String processDefinitionJson) { public String addExportTaskNodeSpecialParam(String processDefinitionJson) {
JSONObject jsonObject = JSONUtils.parseObject(processDefinitionJson); ObjectNode jsonObject = JSONUtils.parseObject(processDefinitionJson);
JSONArray jsonArray = (JSONArray) jsonObject.get("tasks"); ArrayNode jsonArray = (ArrayNode) jsonObject.path(TASKS);
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
JSONObject taskNode = jsonArray.getJSONObject(i); JsonNode taskNode = jsonArray.path(i);
if (StringUtils.isNotEmpty(taskNode.getString("type"))) { if (StringUtils.isNotEmpty(taskNode.path("type").asText())) {
String taskType = taskNode.getString("type"); String taskType = taskNode.path("type").asText();
ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType); ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType);
if (null != addTaskParam) { if (null != addTaskParam) {
@ -717,12 +730,13 @@ public class ProcessDefinitionService extends BaseDAGService {
} }
} }
} }
jsonObject.put("tasks", jsonArray); jsonObject.set(TASKS, jsonArray);
return jsonObject.toString(); return jsonObject.toString();
} }
/** /**
* check task if has sub process * check task if has sub process
*
* @param taskType task type * @param taskType task type
* @return if task has sub process return true else false * @return if task has sub process return true else false
*/ */
@ -732,8 +746,9 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* import process definition * import process definition
* @param loginUser login user *
* @param file process metadata json file * @param loginUser login user
* @param file process metadata json file
* @param currentProjectName current project name * @param currentProjectName current project name
* @return import process * @return import process
*/ */
@ -741,7 +756,7 @@ public class ProcessDefinitionService extends BaseDAGService {
public Map<String, Object> importProcessDefinition(User loginUser, MultipartFile file, String currentProjectName) { public Map<String, Object> importProcessDefinition(User loginUser, MultipartFile file, String currentProjectName) {
Map<String, Object> result = new HashMap<>(5); Map<String, Object> result = new HashMap<>(5);
String processMetaJson = FileUtils.file2String(file); String processMetaJson = FileUtils.file2String(file);
List<ProcessMeta> processMetaList = JSON.parseArray(processMetaJson,ProcessMeta.class); List<ProcessMeta> processMetaList = JSON.parseArray(processMetaJson, ProcessMeta.class);
//check file content //check file content
if (CollectionUtils.isEmpty(processMetaList)) { if (CollectionUtils.isEmpty(processMetaList)) {
@ -749,9 +764,9 @@ public class ProcessDefinitionService extends BaseDAGService {
return result; return result;
} }
for(ProcessMeta processMeta:processMetaList){ for (ProcessMeta processMeta : processMetaList) {
if (!checkAndImportProcessDefinition(loginUser, currentProjectName, result, processMeta)){ if (!checkAndImportProcessDefinition(loginUser, currentProjectName, result, processMeta)) {
return result; return result;
} }
} }
@ -761,6 +776,7 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* check and import process definition * check and import process definition
*
* @param loginUser * @param loginUser
* @param currentProjectName * @param currentProjectName
* @param result * @param result
@ -769,7 +785,7 @@ public class ProcessDefinitionService extends BaseDAGService {
*/ */
private boolean checkAndImportProcessDefinition(User loginUser, String currentProjectName, Map<String, Object> result, ProcessMeta processMeta) { private boolean checkAndImportProcessDefinition(User loginUser, String currentProjectName, Map<String, Object> result, ProcessMeta processMeta) {
if(!checkImportanceParams(processMeta,result)){ if (!checkImportanceParams(processMeta, result)) {
return false; return false;
} }
@ -777,7 +793,7 @@ public class ProcessDefinitionService extends BaseDAGService {
String processDefinitionName = processMeta.getProcessDefinitionName(); String processDefinitionName = processMeta.getProcessDefinitionName();
//use currentProjectName to query //use currentProjectName to query
Project targetProject = projectMapper.queryByName(currentProjectName); Project targetProject = projectMapper.queryByName(currentProjectName);
if(null != targetProject){ if (null != targetProject) {
processDefinitionName = recursionProcessDefinitionName(targetProject.getId(), processDefinitionName = recursionProcessDefinitionName(targetProject.getId(),
processDefinitionName, 1); processDefinitionName, 1);
} }
@ -801,14 +817,14 @@ public class ProcessDefinitionService extends BaseDAGService {
processDefinitionName, processDefinitionName,
addImportTaskNodeParam(loginUser, processMeta.getProcessDefinitionJson(), targetProject)); addImportTaskNodeParam(loginUser, processMeta.getProcessDefinitionJson(), targetProject));
if(createProcessResult == null){ if (createProcessResult == null) {
return false; return false;
} }
//create process definition //create process definition
Integer processDefinitionId = Integer processDefinitionId =
Objects.isNull(createProcessResult.get("processDefinitionId"))? Objects.isNull(createProcessResult.get(PROCESSDEFINITIONID)) ?
null:Integer.parseInt(createProcessResult.get("processDefinitionId").toString()); null : Integer.parseInt(createProcessResult.get(PROCESSDEFINITIONID).toString());
//scheduler param //scheduler param
return getImportProcessScheduleResult(loginUser, return getImportProcessScheduleResult(loginUser,
@ -822,6 +838,7 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* get create process result * get create process result
*
* @param loginUser * @param loginUser
* @param currentProjectName * @param currentProjectName
* @param result * @param result
@ -835,12 +852,12 @@ public class ProcessDefinitionService extends BaseDAGService {
Map<String, Object> result, Map<String, Object> result,
ProcessMeta processMeta, ProcessMeta processMeta,
String processDefinitionName, String processDefinitionName,
String importProcessParam){ String importProcessParam) {
Map<String, Object> createProcessResult = null; Map<String, Object> createProcessResult = null;
try { try {
createProcessResult = createProcessDefinition(loginUser createProcessResult = createProcessDefinition(loginUser
,currentProjectName, , currentProjectName,
processDefinitionName+"_import_"+System.currentTimeMillis(), processDefinitionName + "_import_" + System.currentTimeMillis(),
importProcessParam, importProcessParam,
processMeta.getProcessDefinitionDescription(), processMeta.getProcessDefinitionDescription(),
processMeta.getProcessDefinitionLocations(), processMeta.getProcessDefinitionLocations(),
@ -856,6 +873,7 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* get import process schedule result * get import process schedule result
*
* @param loginUser * @param loginUser
* @param currentProjectName * @param currentProjectName
* @param result * @param result
@ -887,11 +905,12 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* check importance params * check importance params
*
* @param processMeta * @param processMeta
* @param result * @param result
* @return * @return
*/ */
private boolean checkImportanceParams(ProcessMeta processMeta,Map<String, Object> result){ private boolean checkImportanceParams(ProcessMeta processMeta, Map<String, Object> result) {
if (StringUtils.isEmpty(processMeta.getProjectName())) { if (StringUtils.isEmpty(processMeta.getProjectName())) {
putMsg(result, Status.DATA_IS_NULL, "projectName"); putMsg(result, Status.DATA_IS_NULL, "projectName");
return false; return false;
@ -910,18 +929,19 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* import process add special task param * import process add special task param
* @param loginUser login user *
* @param loginUser login user
* @param processDefinitionJson process definition json * @param processDefinitionJson process definition json
* @param targetProject target project * @param targetProject target project
* @return import process param * @return import process param
*/ */
private String addImportTaskNodeParam(User loginUser, String processDefinitionJson, Project targetProject) { private String addImportTaskNodeParam(User loginUser, String processDefinitionJson, Project targetProject) {
JSONObject jsonObject = JSONUtils.parseObject(processDefinitionJson); ObjectNode jsonObject = JSONUtils.parseObject(processDefinitionJson);
JSONArray jsonArray = (JSONArray) jsonObject.get("tasks"); ArrayNode jsonArray = (ArrayNode) jsonObject.get(TASKS);
//add sql and dependent param //add sql and dependent param
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
JSONObject taskNode = jsonArray.getJSONObject(i); JsonNode taskNode = jsonArray.path(i);
String taskType = taskNode.getString("type"); String taskType = taskNode.path("type").asText();
ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType); ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType);
if (null != addTaskParam) { if (null != addTaskParam) {
addTaskParam.addImportSpecialParam(taskNode); addTaskParam.addImportSpecialParam(taskNode);
@ -931,25 +951,26 @@ public class ProcessDefinitionService extends BaseDAGService {
//recursive sub-process parameter correction map key for old process id value for new process id //recursive sub-process parameter correction map key for old process id value for new process id
Map<Integer, Integer> subProcessIdMap = new HashMap<>(20); Map<Integer, Integer> subProcessIdMap = new HashMap<>(20);
List<Object> subProcessList = jsonArray.stream() List<Object> subProcessList = StreamUtils.asStream(jsonArray.elements())
.filter(elem -> checkTaskHasSubProcess(JSONUtils.parseObject(elem.toString()).getString("type"))) .filter(elem -> checkTaskHasSubProcess(JSONUtils.parseObject(elem.toString()).path("type").asText()))
.collect(Collectors.toList()); .collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(subProcessList)) { if (CollectionUtils.isNotEmpty(subProcessList)) {
importSubProcess(loginUser, targetProject, jsonArray, subProcessIdMap); importSubProcess(loginUser, targetProject, jsonArray, subProcessIdMap);
} }
jsonObject.put("tasks", jsonArray); jsonObject.set(TASKS, jsonArray);
return jsonObject.toString(); return jsonObject.toString();
} }
/** /**
* import process schedule * import process schedule
* @param loginUser login user *
* @param currentProjectName current project name * @param loginUser login user
* @param processMeta process meta data * @param currentProjectName current project name
* @param processMeta process meta data
* @param processDefinitionName process definition name * @param processDefinitionName process definition name
* @param processDefinitionId process definition id * @param processDefinitionId process definition id
* @return insert schedule flag * @return insert schedule flag
*/ */
public int importProcessSchedule(User loginUser, String currentProjectName, ProcessMeta processMeta, public int importProcessSchedule(User loginUser, String currentProjectName, ProcessMeta processMeta,
@ -998,84 +1019,87 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* check import process has sub process * check import process has sub process
* recursion create sub process * recursion create sub process
* @param loginUser login user *
* @param targetProject target project * @param loginUser login user
* @param jsonArray process task array * @param targetProject target project
* @param jsonArray process task array
* @param subProcessIdMap correct sub process id map * @param subProcessIdMap correct sub process id map
*/ */
public void importSubProcess(User loginUser, Project targetProject, JSONArray jsonArray, Map<Integer, Integer> subProcessIdMap) { public void importSubProcess(User loginUser, Project targetProject, ArrayNode jsonArray, Map<Integer, Integer> subProcessIdMap) {
for (int i = 0; i < jsonArray.size(); i++) { for (int i = 0; i < jsonArray.size(); i++) {
JSONObject taskNode = jsonArray.getJSONObject(i); ObjectNode taskNode = (ObjectNode) jsonArray.path(i);
String taskType = taskNode.getString("type"); String taskType = taskNode.path("type").asText();
if (checkTaskHasSubProcess(taskType)) {
//get sub process info
JSONObject subParams = JSONUtils.parseObject(taskNode.getString("params"));
Integer subProcessId = subParams.getInteger("processDefinitionId");
ProcessDefinition subProcess = processDefineMapper.queryByDefineId(subProcessId);
//check is sub process exist in db
if (null != subProcess) {
String subProcessJson = subProcess.getProcessDefinitionJson();
//check current project has sub process
ProcessDefinition currentProjectSubProcess = processDefineMapper.queryByDefineName(targetProject.getId(), subProcess.getName());
if (null == currentProjectSubProcess) {
JSONArray subJsonArray = (JSONArray) JSONUtils.parseObject(subProcess.getProcessDefinitionJson()).get("tasks");
List<Object> subProcessList = subJsonArray.stream()
.filter(item -> checkTaskHasSubProcess(JSONUtils.parseObject(item.toString()).getString("type")))
.collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(subProcessList)) {
importSubProcess(loginUser, targetProject, subJsonArray, subProcessIdMap);
//sub process processId correct
if (!subProcessIdMap.isEmpty()) {
for (Map.Entry<Integer, Integer> entry : subProcessIdMap.entrySet()) {
String oldSubProcessId = "\"processDefinitionId\":" + entry.getKey();
String newSubProcessId = "\"processDefinitionId\":" + entry.getValue();
subProcessJson = subProcessJson.replaceAll(oldSubProcessId, newSubProcessId);
}
subProcessIdMap.clear();
}
}
//if sub-process recursion if (!checkTaskHasSubProcess(taskType)) {
Date now = new Date(); continue;
//create sub process in target project }
ProcessDefinition processDefine = new ProcessDefinition(); //get sub process info
processDefine.setName(subProcess.getName()); ObjectNode subParams = (ObjectNode) taskNode.path("params");
processDefine.setVersion(subProcess.getVersion()); Integer subProcessId = subParams.path(PROCESSDEFINITIONID).asInt();
processDefine.setReleaseState(subProcess.getReleaseState()); ProcessDefinition subProcess = processDefineMapper.queryByDefineId(subProcessId);
processDefine.setProjectId(targetProject.getId()); //check is sub process exist in db
processDefine.setUserId(loginUser.getId()); if (null == subProcess) {
processDefine.setProcessDefinitionJson(subProcessJson); continue;
processDefine.setDescription(subProcess.getDescription()); }
processDefine.setLocations(subProcess.getLocations()); String subProcessJson = subProcess.getProcessDefinitionJson();
processDefine.setConnects(subProcess.getConnects()); //check current project has sub process
processDefine.setTimeout(subProcess.getTimeout()); ProcessDefinition currentProjectSubProcess = processDefineMapper.queryByDefineName(targetProject.getId(), subProcess.getName());
processDefine.setTenantId(subProcess.getTenantId());
processDefine.setGlobalParams(subProcess.getGlobalParams()); if (null == currentProjectSubProcess) {
processDefine.setCreateTime(now); ArrayNode subJsonArray = (ArrayNode) JSONUtils.parseObject(subProcess.getProcessDefinitionJson()).get(TASKS);
processDefine.setUpdateTime(now);
processDefine.setFlag(subProcess.getFlag()); List<Object> subProcessList = StreamUtils.asStream(subJsonArray.elements())
processDefine.setReceivers(subProcess.getReceivers()); .filter(item -> checkTaskHasSubProcess(JSONUtils.parseObject(item.toString()).path("type").asText()))
processDefine.setReceiversCc(subProcess.getReceiversCc()); .collect(Collectors.toList());
processDefineMapper.insert(processDefine);
if (CollectionUtils.isNotEmpty(subProcessList)) {
logger.info("create sub process, project: {}, process name: {}", targetProject.getName(), processDefine.getName()); importSubProcess(loginUser, targetProject, subJsonArray, subProcessIdMap);
//sub process processId correct
//modify task node if (!subProcessIdMap.isEmpty()) {
ProcessDefinition newSubProcessDefine = processDefineMapper.queryByDefineName(processDefine.getProjectId(),processDefine.getName());
for (Map.Entry<Integer, Integer> entry : subProcessIdMap.entrySet()) {
if (null != newSubProcessDefine) { String oldSubProcessId = "\"processDefinitionId\":" + entry.getKey();
subProcessIdMap.put(subProcessId, newSubProcessDefine.getId()); String newSubProcessId = "\"processDefinitionId\":" + entry.getValue();
subParams.put("processDefinitionId", newSubProcessDefine.getId()); subProcessJson = subProcessJson.replaceAll(oldSubProcessId, newSubProcessId);
taskNode.put("params", subParams);
} }
subProcessIdMap.clear();
} }
} }
//if sub-process recursion
Date now = new Date();
//create sub process in target project
ProcessDefinition processDefine = new ProcessDefinition();
processDefine.setName(subProcess.getName());
processDefine.setVersion(subProcess.getVersion());
processDefine.setReleaseState(subProcess.getReleaseState());
processDefine.setProjectId(targetProject.getId());
processDefine.setUserId(loginUser.getId());
processDefine.setProcessDefinitionJson(subProcessJson);
processDefine.setDescription(subProcess.getDescription());
processDefine.setLocations(subProcess.getLocations());
processDefine.setConnects(subProcess.getConnects());
processDefine.setTimeout(subProcess.getTimeout());
processDefine.setTenantId(subProcess.getTenantId());
processDefine.setGlobalParams(subProcess.getGlobalParams());
processDefine.setCreateTime(now);
processDefine.setUpdateTime(now);
processDefine.setFlag(subProcess.getFlag());
processDefine.setReceivers(subProcess.getReceivers());
processDefine.setReceiversCc(subProcess.getReceiversCc());
processDefineMapper.insert(processDefine);
logger.info("create sub process, project: {}, process name: {}", targetProject.getName(), processDefine.getName());
//modify task node
ProcessDefinition newSubProcessDefine = processDefineMapper.queryByDefineName(processDefine.getProjectId(), processDefine.getName());
if (null != newSubProcessDefine) {
subProcessIdMap.put(subProcessId, newSubProcessDefine.getId());
subParams.put(PROCESSDEFINITIONID, newSubProcessDefine.getId());
taskNode.set("params", subParams);
}
} }
} }
} }
@ -1084,7 +1108,7 @@ public class ProcessDefinitionService extends BaseDAGService {
/** /**
* check the process definition node meets the specifications * check the process definition node meets the specifications
* *
* @param processData process data * @param processData process data
* @param processDefinitionJson process definition json * @param processDefinitionJson process definition json
* @return check result code * @return check result code
*/ */
@ -1094,7 +1118,7 @@ public class ProcessDefinitionService extends BaseDAGService {
try { try {
if (processData == null) { if (processData == null) {
logger.error("process data is null"); logger.error("process data is null");
putMsg(result,Status.DATA_IS_NOT_VALID, processDefinitionJson); putMsg(result, Status.DATA_IS_NOT_VALID, processDefinitionJson);
return result; return result;
} }
@ -1125,7 +1149,7 @@ public class ProcessDefinitionService extends BaseDAGService {
// check extra params // check extra params
CheckUtils.checkOtherParams(taskNode.getExtras()); CheckUtils.checkOtherParams(taskNode.getExtras());
} }
putMsg(result,Status.SUCCESS); putMsg(result, Status.SUCCESS);
} catch (Exception e) { } catch (Exception e) {
result.put(Constants.STATUS, Status.REQUEST_PARAMS_NOT_VALID_ERROR); result.put(Constants.STATUS, Status.REQUEST_PARAMS_NOT_VALID_ERROR);
result.put(Constants.MSG, e.getMessage()); result.put(Constants.MSG, e.getMessage());
@ -1138,9 +1162,8 @@ public class ProcessDefinitionService extends BaseDAGService {
* *
* @param defineId define id * @param defineId define id
* @return task node list * @return task node list
* @throws Exception exception
*/ */
public Map<String, Object> getTaskNodeListByDefinitionId(Integer defineId) throws Exception { public Map<String, Object> getTaskNodeListByDefinitionId(Integer defineId) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
ProcessDefinition processDefinition = processDefineMapper.selectById(defineId); ProcessDefinition processDefinition = processDefineMapper.selectById(defineId);
@ -1158,7 +1181,7 @@ public class ProcessDefinitionService extends BaseDAGService {
//process data check //process data check
if (null == processData) { if (null == processData) {
logger.error("process data is null"); logger.error("process data is null");
putMsg(result,Status.DATA_IS_NOT_VALID, processDefinitionJson); putMsg(result, Status.DATA_IS_NOT_VALID, processDefinitionJson);
return result; return result;
} }
@ -1176,15 +1199,14 @@ public class ProcessDefinitionService extends BaseDAGService {
* *
* @param defineIdList define id list * @param defineIdList define id list
* @return task node list * @return task node list
* @throws Exception exception
*/ */
public Map<String, Object> getTaskNodeListByDefinitionIdList(String defineIdList) throws Exception { public Map<String, Object> getTaskNodeListByDefinitionIdList(String defineIdList) {
Map<String, Object> result = new HashMap<>(); Map<String, Object> result = new HashMap<>();
Map<Integer, List<TaskNode>> taskNodeMap = new HashMap<>(); Map<Integer, List<TaskNode>> taskNodeMap = new HashMap<>();
String[] idList = defineIdList.split(","); String[] idList = defineIdList.split(",");
List<Integer> idIntList = new ArrayList<>(); List<Integer> idIntList = new ArrayList<>();
for(String definitionId : idList) { for (String definitionId : idList) {
idIntList.add(Integer.parseInt(definitionId)); idIntList.add(Integer.parseInt(definitionId));
} }
Integer[] idArray = idIntList.toArray(new Integer[idIntList.size()]); Integer[] idArray = idIntList.toArray(new Integer[idIntList.size()]);
@ -1195,7 +1217,7 @@ public class ProcessDefinitionService extends BaseDAGService {
return result; return result;
} }
for(ProcessDefinition processDefinition : processDefinitionList){ for (ProcessDefinition processDefinition : processDefinitionList) {
String processDefinitionJson = processDefinition.getProcessDefinitionJson(); String processDefinitionJson = processDefinition.getProcessDefinitionJson();
ProcessData processData = JSONUtils.parseObject(processDefinitionJson, ProcessData.class); ProcessData processData = JSONUtils.parseObject(processDefinitionJson, ProcessData.class);
List<TaskNode> taskNodeList = (processData.getTasks() == null) ? new ArrayList<>() : processData.getTasks(); List<TaskNode> taskNodeList = (processData.getTasks() == null) ? new ArrayList<>() : processData.getTasks();
@ -1231,7 +1253,7 @@ public class ProcessDefinitionService extends BaseDAGService {
* Encapsulates the TreeView structure * Encapsulates the TreeView structure
* *
* @param processId process definition id * @param processId process definition id
* @param limit limit * @param limit limit
* @return tree view json data * @return tree view json data
* @throws Exception exception * @throws Exception exception
*/ */
@ -1241,7 +1263,7 @@ public class ProcessDefinitionService extends BaseDAGService {
ProcessDefinition processDefinition = processDefineMapper.selectById(processId); ProcessDefinition processDefinition = processDefineMapper.selectById(processId);
if (null == processDefinition) { if (null == processDefinition) {
logger.info("process define not exists"); logger.info("process define not exists");
putMsg(result,Status.PROCESS_DEFINE_NOT_EXIST, processDefinition); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processDefinition);
return result; return result;
} }
DAG<String, TaskNode, TaskNodeRelation> dag = genDagGraph(processDefinition); DAG<String, TaskNode, TaskNodeRelation> dag = genDagGraph(processDefinition);
@ -1260,8 +1282,8 @@ public class ProcessDefinitionService extends BaseDAGService {
*/ */
List<ProcessInstance> processInstanceList = processInstanceMapper.queryByProcessDefineId(processId, limit); List<ProcessInstance> processInstanceList = processInstanceMapper.queryByProcessDefineId(processId, limit);
for(ProcessInstance processInstance:processInstanceList){ for (ProcessInstance processInstance : processInstanceList) {
processInstance.setDuration(DateUtils.differSec(processInstance.getStartTime(),processInstance.getEndTime())); processInstance.setDuration(DateUtils.differSec(processInstance.getStartTime(), processInstance.getEndTime()));
} }
if (limit > processInstanceList.size()) { if (limit > processInstanceList.size()) {
@ -1364,9 +1386,8 @@ public class ProcessDefinitionService extends BaseDAGService {
* *
* @param processDefinition process definition * @param processDefinition process definition
* @return dag graph * @return dag graph
* @throws Exception if exception happens
*/ */
private DAG<String, TaskNode, TaskNodeRelation> genDagGraph(ProcessDefinition processDefinition) throws Exception { private DAG<String, TaskNode, TaskNodeRelation> genDagGraph(ProcessDefinition processDefinition) {
String processDefinitionJson = processDefinition.getProcessDefinitionJson(); String processDefinitionJson = processDefinition.getProcessDefinitionJson();
@ -1386,8 +1407,6 @@ public class ProcessDefinitionService extends BaseDAGService {
} }
/** /**
* whether the graph has a ring * whether the graph has a ring
* *
@ -1405,7 +1424,7 @@ public class ProcessDefinitionService extends BaseDAGService {
// Fill edge relations // Fill edge relations
for (TaskNode taskNodeResponse : taskNodeResponseList) { for (TaskNode taskNodeResponse : taskNodeResponseList) {
taskNodeResponse.getPreTasks(); taskNodeResponse.getPreTasks();
List<String> preTasks = JSONUtils.toList(taskNodeResponse.getPreTasks(),String.class); List<String> preTasks = JSONUtils.toList(taskNodeResponse.getPreTasks(), String.class);
if (CollectionUtils.isNotEmpty(preTasks)) { if (CollectionUtils.isNotEmpty(preTasks)) {
for (String preTask : preTasks) { for (String preTask : preTasks) {
if (!graph.addEdge(preTask, taskNodeResponse.getName())) { if (!graph.addEdge(preTask, taskNodeResponse.getName())) {
@ -1418,19 +1437,19 @@ public class ProcessDefinitionService extends BaseDAGService {
return graph.hasCycle(); return graph.hasCycle();
} }
private String recursionProcessDefinitionName(Integer projectId,String processDefinitionName,int num){ private String recursionProcessDefinitionName(Integer projectId, String processDefinitionName, int num) {
ProcessDefinition processDefinition = processDefineMapper.queryByDefineName(projectId, processDefinitionName); ProcessDefinition processDefinition = processDefineMapper.queryByDefineName(projectId, processDefinitionName);
if (processDefinition != null) { if (processDefinition != null) {
if(num > 1){ if (num > 1) {
String str = processDefinitionName.substring(0,processDefinitionName.length() - 3); String str = processDefinitionName.substring(0, processDefinitionName.length() - 3);
processDefinitionName = str + "("+num+")"; processDefinitionName = str + "(" + num + ")";
}else{ } else {
processDefinitionName = processDefinition.getName() + "("+num+")"; processDefinitionName = processDefinition.getName() + "(" + num + ")";
} }
}else{ } else {
return processDefinitionName; return processDefinitionName;
} }
return recursionProcessDefinitionName(projectId,processDefinitionName,num + 1); return recursionProcessDefinitionName(projectId, processDefinitionName, num + 1);
} }
} }

5
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
Unescape View File

@ -504,9 +504,8 @@ public class ProcessInstanceService extends BaseDAGService {
* *
* @param processInstanceId process instance id * @param processInstanceId process instance id
* @return variables data * @return variables data
* @throws Exception exception
*/ */
public Map<String, Object> viewVariables( Integer processInstanceId) throws Exception { public Map<String, Object> viewVariables(Integer processInstanceId) {
Map<String, Object> result = new HashMap<>(5); Map<String, Object> result = new HashMap<>(5);
ProcessInstance processInstance = processInstanceMapper.queryDetailById(processInstanceId); ProcessInstance processInstance = processInstanceMapper.queryDetailById(processInstanceId);
@ -537,7 +536,7 @@ public class ProcessInstanceService extends BaseDAGService {
List<TaskNode> taskNodeList = workflowData.getTasks(); List<TaskNode> taskNodeList = workflowData.getTasks();
// global param string // global param string
String globalParamStr = JSON.toJSONString(globalParams); String globalParamStr = JSONUtils.toJson(globalParams);
globalParamStr = ParameterUtils.convertParameterPlaceholders(globalParamStr, timeParams); globalParamStr = ParameterUtils.convertParameterPlaceholders(globalParamStr, timeParams);
globalParams = JSON.parseArray(globalParamStr, Property.class); globalParams = JSON.parseArray(globalParamStr, Property.class);
for (Property property : globalParams) { for (Property property : globalParams) {

21
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/exportprocess/DataSourceParam.java
Unescape View File

@ -16,9 +16,9 @@
*/ */
package org.apache.dolphinscheduler.api.utils.exportprocess; package org.apache.dolphinscheduler.api.utils.exportprocess;
import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.dolphinscheduler.common.enums.TaskType; import org.apache.dolphinscheduler.common.enums.TaskType;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.DataSource; import org.apache.dolphinscheduler.dao.entity.DataSource;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper; import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.InitializingBean;
@ -33,6 +33,7 @@ import java.util.List;
@Service @Service
public class DataSourceParam implements ProcessAddTaskParam, InitializingBean { public class DataSourceParam implements ProcessAddTaskParam, InitializingBean {
private static final String PARAMS = "params";
@Autowired @Autowired
private DataSourceMapper dataSourceMapper; private DataSourceMapper dataSourceMapper;
@ -42,14 +43,14 @@ public class DataSourceParam implements ProcessAddTaskParam, InitializingBean {
* @return task node json object * @return task node json object
*/ */
@Override @Override
public JSONObject addExportSpecialParam(JSONObject taskNode) { public JsonNode addExportSpecialParam(JsonNode taskNode) {
// add sqlParameters // add sqlParameters
JSONObject sqlParameters = JSONUtils.parseObject(taskNode.getString("params")); ObjectNode sqlParameters = (ObjectNode) taskNode.path(PARAMS);
DataSource dataSource = dataSourceMapper.selectById((Integer) sqlParameters.get("datasource")); DataSource dataSource = dataSourceMapper.selectById(sqlParameters.get("datasource").asInt());
if (null != dataSource) { if (null != dataSource) {
sqlParameters.put("datasourceName", dataSource.getName()); sqlParameters.put("datasourceName", dataSource.getName());
} }
taskNode.put("params", sqlParameters); ((ObjectNode)taskNode).set(PARAMS, sqlParameters);
return taskNode; return taskNode;
} }
@ -60,14 +61,14 @@ public class DataSourceParam implements ProcessAddTaskParam, InitializingBean {
* @return task node json object * @return task node json object
*/ */
@Override @Override
public JSONObject addImportSpecialParam(JSONObject taskNode) { public JsonNode addImportSpecialParam(JsonNode taskNode) {
JSONObject sqlParameters = JSONUtils.parseObject(taskNode.getString("params")); ObjectNode sqlParameters = (ObjectNode) taskNode.path(PARAMS);
List<DataSource> dataSources = dataSourceMapper.queryDataSourceByName(sqlParameters.getString("datasourceName")); List<DataSource> dataSources = dataSourceMapper.queryDataSourceByName(sqlParameters.path("datasourceName").asText());
if (!dataSources.isEmpty()) { if (!dataSources.isEmpty()) {
DataSource dataSource = dataSources.get(0); DataSource dataSource = dataSources.get(0);
sqlParameters.put("datasource", dataSource.getId()); sqlParameters.put("datasource", dataSource.getId());
} }
taskNode.put("params", sqlParameters); ((ObjectNode)taskNode).set(PARAMS, sqlParameters);
return taskNode; return taskNode;
} }

40
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/exportprocess/DependentParam.java
Unescape View File

@ -16,8 +16,9 @@
*/ */
package org.apache.dolphinscheduler.api.utils.exportprocess; package org.apache.dolphinscheduler.api.utils.exportprocess;
import com.alibaba.fastjson.JSONArray; import com.fasterxml.jackson.databind.JsonNode;
import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.dolphinscheduler.common.enums.TaskType; import org.apache.dolphinscheduler.common.enums.TaskType;
import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
@ -34,6 +35,7 @@ import org.springframework.stereotype.Service;
@Service @Service
public class DependentParam implements ProcessAddTaskParam, InitializingBean { public class DependentParam implements ProcessAddTaskParam, InitializingBean {
private static final String DEPENDENCE = "dependence";
@Autowired @Autowired
ProcessDefinitionMapper processDefineMapper; ProcessDefinitionMapper processDefineMapper;
@ -47,18 +49,18 @@ public class DependentParam implements ProcessAddTaskParam, InitializingBean {
* @return task node json object * @return task node json object
*/ */
@Override @Override
public JSONObject addExportSpecialParam(JSONObject taskNode) { public JsonNode addExportSpecialParam(JsonNode taskNode) {
// add dependent param // add dependent param
JSONObject dependentParameters = JSONUtils.parseObject(taskNode.getString("dependence")); ObjectNode dependentParameters = JSONUtils.parseObject(taskNode.path(DEPENDENCE).asText());
if (null != dependentParameters) { if (null != dependentParameters) {
JSONArray dependTaskList = (JSONArray) dependentParameters.get("dependTaskList"); ArrayNode dependTaskList = (ArrayNode) dependentParameters.get("dependTaskList");
for (int j = 0; j < dependTaskList.size(); j++) { for (int j = 0; j < dependTaskList.size(); j++) {
JSONObject dependentTaskModel = dependTaskList.getJSONObject(j); JsonNode dependentTaskModel = dependTaskList.path(j);
JSONArray dependItemList = (JSONArray) dependentTaskModel.get("dependItemList"); ArrayNode dependItemList = (ArrayNode) dependentTaskModel.get("dependItemList");
for (int k = 0; k < dependItemList.size(); k++) { for (int k = 0; k < dependItemList.size(); k++) {
JSONObject dependentItem = dependItemList.getJSONObject(k); ObjectNode dependentItem = (ObjectNode) dependItemList.path(k);
int definitionId = dependentItem.getInteger("definitionId"); int definitionId = dependentItem.path("definitionId").asInt();
ProcessDefinition definition = processDefineMapper.queryByDefineId(definitionId); ProcessDefinition definition = processDefineMapper.queryByDefineId(definitionId);
if (null != definition) { if (null != definition) {
dependentItem.put("projectName", definition.getProjectName()); dependentItem.put("projectName", definition.getProjectName());
@ -66,7 +68,7 @@ public class DependentParam implements ProcessAddTaskParam, InitializingBean {
} }
} }
} }
taskNode.put("dependence", dependentParameters); ((ObjectNode)taskNode).set(DEPENDENCE, dependentParameters);
} }
return taskNode; return taskNode;
@ -78,18 +80,18 @@ public class DependentParam implements ProcessAddTaskParam, InitializingBean {
* @return * @return
*/ */
@Override @Override
public JSONObject addImportSpecialParam(JSONObject taskNode) { public JsonNode addImportSpecialParam(JsonNode taskNode) {
JSONObject dependentParameters = JSONUtils.parseObject(taskNode.getString("dependence")); ObjectNode dependentParameters = JSONUtils.parseObject(taskNode.path(DEPENDENCE).asText());
if(dependentParameters != null){ if(dependentParameters != null){
JSONArray dependTaskList = (JSONArray) dependentParameters.get("dependTaskList"); ArrayNode dependTaskList = (ArrayNode) dependentParameters.path("dependTaskList");
for (int h = 0; h < dependTaskList.size(); h++) { for (int h = 0; h < dependTaskList.size(); h++) {
JSONObject dependentTaskModel = dependTaskList.getJSONObject(h); ObjectNode dependentTaskModel = (ObjectNode) dependTaskList.path(h);
JSONArray dependItemList = (JSONArray) dependentTaskModel.get("dependItemList"); ArrayNode dependItemList = (ArrayNode) dependentTaskModel.get("dependItemList");
for (int k = 0; k < dependItemList.size(); k++) { for (int k = 0; k < dependItemList.size(); k++) {
JSONObject dependentItem = dependItemList.getJSONObject(k); ObjectNode dependentItem = (ObjectNode) dependItemList.path(k);
Project dependentItemProject = projectMapper.queryByName(dependentItem.getString("projectName")); Project dependentItemProject = projectMapper.queryByName(dependentItem.path("projectName").asText());
if(dependentItemProject != null){ if(dependentItemProject != null){
ProcessDefinition definition = processDefineMapper.queryByDefineName(dependentItemProject.getId(),dependentItem.getString("definitionName")); ProcessDefinition definition = processDefineMapper.queryByDefineName(dependentItemProject.getId(),dependentItem.path("definitionName").asText());
if(definition != null){ if(definition != null){
dependentItem.put("projectId",dependentItemProject.getId()); dependentItem.put("projectId",dependentItemProject.getId());
dependentItem.put("definitionId",definition.getId()); dependentItem.put("definitionId",definition.getId());
@ -97,7 +99,7 @@ public class DependentParam implements ProcessAddTaskParam, InitializingBean {
} }
} }
} }
taskNode.put("dependence", dependentParameters); ((ObjectNode)taskNode).set(DEPENDENCE, dependentParameters);
} }
return taskNode; return taskNode;
} }

6
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/exportprocess/ProcessAddTaskParam.java
Unescape View File

@ -16,7 +16,7 @@
*/ */
package org.apache.dolphinscheduler.api.utils.exportprocess; package org.apache.dolphinscheduler.api.utils.exportprocess;
import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.JsonNode;
/** /**
* ProcessAddTaskParam * ProcessAddTaskParam
@ -28,12 +28,12 @@ public interface ProcessAddTaskParam {
* @param taskNode task node json object * @param taskNode task node json object
* @return task node json object * @return task node json object
*/ */
JSONObject addExportSpecialParam(JSONObject taskNode); JsonNode addExportSpecialParam(JsonNode taskNode);
/** /**
* add task special param: sql task dependent task * add task special param: sql task dependent task
* @param taskNode task node json object * @param taskNode task node json object
* @return task node json object * @return task node json object
*/ */
JSONObject addImportSpecialParam(JSONObject taskNode); JsonNode addImportSpecialParam(JsonNode taskNode);
} }

8
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
Unescape View File

@ -16,8 +16,8 @@
*/ */
package org.apache.dolphinscheduler.api.service; package org.apache.dolphinscheduler.api.service;
import com.alibaba.fastjson.JSONArray; import com.fasterxml.jackson.databind.node.ArrayNode;
import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.dolphinscheduler.api.ApiApplicationServer; import org.apache.dolphinscheduler.api.ApiApplicationServer;
import org.apache.dolphinscheduler.api.dto.ProcessMeta; import org.apache.dolphinscheduler.api.dto.ProcessMeta;
import org.apache.dolphinscheduler.api.enums.Status; import org.apache.dolphinscheduler.api.enums.Status;
@ -621,8 +621,8 @@ public class ProcessDefinitionServiceTest {
"\"preTasks\":[]}],\"tenantId\":1,\"timeout\":0}"; "\"preTasks\":[]}],\"tenantId\":1,\"timeout\":0}";
JSONObject jsonObject = JSONUtils.parseObject(topProcessJson); ObjectNode jsonObject = JSONUtils.parseObject(topProcessJson);
JSONArray jsonArray = (JSONArray) jsonObject.get("tasks"); ArrayNode jsonArray = (ArrayNode) jsonObject.path("tasks");
String originSubJson = jsonArray.toString(); String originSubJson = jsonArray.toString();

19
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/exportprocess/DataSourceParamTest.java
Unescape View File

@ -16,7 +16,8 @@
*/ */
package org.apache.dolphinscheduler.api.utils.exportprocess; package org.apache.dolphinscheduler.api.utils.exportprocess;
import com.alibaba.fastjson.JSONObject; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.dolphinscheduler.api.ApiApplicationServer; import org.apache.dolphinscheduler.api.ApiApplicationServer;
import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.common.utils.StringUtils; import org.apache.dolphinscheduler.common.utils.StringUtils;
@ -48,13 +49,13 @@ public class DataSourceParamTest {
"\"preTasks\":[\"dependent\"]}"; "\"preTasks\":[\"dependent\"]}";
JSONObject taskNode = JSONUtils.parseObject(sqlJson); ObjectNode taskNode = JSONUtils.parseObject(sqlJson);
if (StringUtils.isNotEmpty(taskNode.getString("type"))) { if (StringUtils.isNotEmpty(taskNode.path("type").asText())) {
String taskType = taskNode.getString("type"); String taskType = taskNode.path("type").asText();
ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType); ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType);
JSONObject sql = addTaskParam.addExportSpecialParam(taskNode); JsonNode sql = addTaskParam.addExportSpecialParam(taskNode);
JSONAssert.assertEquals(taskNode.toString(), sql.toString(), false); JSONAssert.assertEquals(taskNode.toString(), sql.toString(), false);
} }
@ -72,13 +73,13 @@ public class DataSourceParamTest {
"\"taskInstancePriority\":\"MEDIUM\",\"name\":\"mysql\",\"dependence\":{}," + "\"taskInstancePriority\":\"MEDIUM\",\"name\":\"mysql\",\"dependence\":{}," +
"\"retryInterval\":\"1\",\"preTasks\":[\"dependent\"],\"id\":\"tasks-8745\"}"; "\"retryInterval\":\"1\",\"preTasks\":[\"dependent\"],\"id\":\"tasks-8745\"}";
JSONObject taskNode = JSONUtils.parseObject(sqlJson); ObjectNode taskNode = JSONUtils.parseObject(sqlJson);
if (StringUtils.isNotEmpty(taskNode.getString("type"))) { if (StringUtils.isNotEmpty(taskNode.path("type").asText())) {
String taskType = taskNode.getString("type"); String taskType = taskNode.path("type").asText();
ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType); ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType);
JSONObject sql = addTaskParam.addImportSpecialParam(taskNode); JsonNode sql = addTaskParam.addImportSpecialParam(taskNode);
JSONAssert.assertEquals(taskNode.toString(), sql.toString(), false); JSONAssert.assertEquals(taskNode.toString(), sql.toString(), false);
} }

34
dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/utils/exportprocess/DependentParamTest.java
Unescape View File

@ -17,6 +17,8 @@
package org.apache.dolphinscheduler.api.utils.exportprocess; package org.apache.dolphinscheduler.api.utils.exportprocess;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.dolphinscheduler.api.ApiApplicationServer; import org.apache.dolphinscheduler.api.ApiApplicationServer;
import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.common.utils.StringUtils; import org.apache.dolphinscheduler.common.utils.StringUtils;
@ -43,13 +45,13 @@ public class DependentParamTest {
"\"dependItemList\":[{\"projectId\":2,\"definitionId\":46,\"depTasks\":\"ALL\"," + "\"dependItemList\":[{\"projectId\":2,\"definitionId\":46,\"depTasks\":\"ALL\"," +
"\"cycle\":\"day\",\"dateValue\":\"today\"}]}]}}"; "\"cycle\":\"day\",\"dateValue\":\"today\"}]}]}}";
JSONObject taskNode = JSONUtils.parseObject(dependentJson); ObjectNode taskNode = JSONUtils.parseObject(dependentJson);
if (StringUtils.isNotEmpty(taskNode.getString("type"))) { if (StringUtils.isNotEmpty(taskNode.path("type").asText())) {
String taskType = taskNode.getString("type"); String taskType = taskNode.path("type").asText();
ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType); ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType);
JSONObject dependent = addTaskParam.addExportSpecialParam(taskNode); JsonNode dependent = addTaskParam.addExportSpecialParam(taskNode);
JSONAssert.assertEquals(taskNode.toString(), dependent.toString(), false); JSONAssert.assertEquals(taskNode.toString(), dependent.toString(), false);
} }
@ -57,13 +59,13 @@ public class DependentParamTest {
String dependentEmpty = "{\"type\":\"DEPENDENT\",\"id\":\"tasks-33787\"," + String dependentEmpty = "{\"type\":\"DEPENDENT\",\"id\":\"tasks-33787\"," +
"\"name\":\"dependent\",\"params\":{},\"description\":\"\",\"runFlag\":\"NORMAL\"}"; "\"name\":\"dependent\",\"params\":{},\"description\":\"\",\"runFlag\":\"NORMAL\"}";
JSONObject taskEmpty = JSONUtils.parseObject(dependentEmpty); ObjectNode taskEmpty = JSONUtils.parseObject(dependentEmpty);
if (StringUtils.isNotEmpty(taskEmpty.getString("type"))) { if (StringUtils.isNotEmpty(taskEmpty.path("type").asText())) {
String taskType = taskEmpty.getString("type"); String taskType = taskEmpty.path("type").asText();
ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType); ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType);
JSONObject dependent = addTaskParam.addImportSpecialParam(taskEmpty); JsonNode dependent = addTaskParam.addImportSpecialParam(taskEmpty);
JSONAssert.assertEquals(taskEmpty.toString(), dependent.toString(), false); JSONAssert.assertEquals(taskEmpty.toString(), dependent.toString(), false);
} }
@ -81,13 +83,13 @@ public class DependentParamTest {
"\"projectId\":1,\"cycle\":\"day\",\"definitionId\":7}],\"relation\":\"AND\"}]," + "\"projectId\":1,\"cycle\":\"day\",\"definitionId\":7}],\"relation\":\"AND\"}]," +
"\"relation\":\"AND\"},\"retryInterval\":\"1\",\"preTasks\":[],\"id\":\"tasks-55485\"}"; "\"relation\":\"AND\"},\"retryInterval\":\"1\",\"preTasks\":[],\"id\":\"tasks-55485\"}";
JSONObject taskNode = JSONUtils.parseObject(dependentJson); ObjectNode taskNode = JSONUtils.parseObject(dependentJson);
if (StringUtils.isNotEmpty(taskNode.getString("type"))) { if (StringUtils.isNotEmpty(taskNode.path("type").asText())) {
String taskType = taskNode.getString("type"); String taskType = taskNode.path("type").asText();
ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType); ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType);
JSONObject dependent = addTaskParam.addImportSpecialParam(taskNode); JsonNode dependent = addTaskParam.addImportSpecialParam(taskNode);
JSONAssert.assertEquals(taskNode.toString(), dependent.toString(), false); JSONAssert.assertEquals(taskNode.toString(), dependent.toString(), false);
} }
@ -97,13 +99,13 @@ public class DependentParamTest {
"\"strategy\":\"\"},\"maxRetryTimes\":\"0\",\"taskInstancePriority\":\"MEDIUM\"" + "\"strategy\":\"\"},\"maxRetryTimes\":\"0\",\"taskInstancePriority\":\"MEDIUM\"" +
",\"name\":\"dependent\",\"retryInterval\":\"1\",\"preTasks\":[],\"id\":\"tasks-55485\"}"; ",\"name\":\"dependent\",\"retryInterval\":\"1\",\"preTasks\":[],\"id\":\"tasks-55485\"}";
JSONObject taskNodeEmpty = JSONUtils.parseObject(dependentEmpty); JsonNode taskNodeEmpty = JSONUtils.parseObject(dependentEmpty);
if (StringUtils.isNotEmpty(taskNodeEmpty.getString("type"))) { if (StringUtils.isNotEmpty(taskNodeEmpty.path("type").asText())) {
String taskType = taskNodeEmpty.getString("type"); String taskType = taskNodeEmpty.path("type").asText();
ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType); ProcessAddTaskParam addTaskParam = TaskNodeParamFactory.getByTaskType(taskType);
JSONObject dependent = addTaskParam.addImportSpecialParam(taskNode); JsonNode dependent = addTaskParam.addImportSpecialParam(taskNode);
JSONAssert.assertEquals(taskNodeEmpty.toString(), dependent.toString(), false); JSONAssert.assertEquals(taskNodeEmpty.toString(), dependent.toString(), false);
} }

388
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
Unescape View File

@ -16,13 +16,12 @@
*/ */
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonGenerator;
import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.*;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
@ -35,230 +34,233 @@ import java.util.*;
*/ */
public class JSONUtils { public class JSONUtils {
private static final Logger logger = LoggerFactory.getLogger(JSONUtils.class); private static final Logger logger = LoggerFactory.getLogger(JSONUtils.class);
/** /**
* can use static singleton, inject: just make sure to reuse! * can use static singleton, inject: just make sure to reuse!
*/ */
private static final ObjectMapper objectMapper = new ObjectMapper(); private static final ObjectMapper objectMapper = new ObjectMapper();
private JSONUtils() { private JSONUtils() {
//Feature that determines whether encountering of unknown properties, false means not analyzer unknown properties
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setTimeZone(TimeZone.getDefault());
}
/**
* json representation of object
* @param object object
* @return object to json string
*/
public static String toJson(Object object) {
try{
return JSON.toJSONString(object,false);
} catch (Exception e) {
logger.error("object to json exception!",e);
} }
return null; static {
} //Feature that determines whether encountering of unknown properties, false means not analyzer unknown properties
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false).setTimeZone(TimeZone.getDefault());
objectMapper.configure(DeserializationFeature.ACCEPT_EMPTY_ARRAY_AS_NULL_OBJECT, true).setTimeZone(TimeZone.getDefault());
/**
*
* This method deserializes the specified Json into an object of the specified class. It is not
* suitable to use if the specified class is a generic type since it will not have the generic
* type information because of the Type Erasure feature of Java. Therefore, this method should not
* be used if the desired type is a generic type. Note that this method works fine if the any of
* the fields of the specified object are generics, just the object itself should not be a
* generic type.
*
* @param json the string from which the object is to be deserialized
* @param clazz the class of T
* @param <T> T
* @return an object of type T from the string
* classOfT
*/
public static <T> T parseObject(String json, Class<T> clazz) {
if (StringUtils.isEmpty(json)) {
return null;
} }
try { /**
return JSON.parseObject(json, clazz); * json representation of object
} catch (Exception e) { *
logger.error("parse object exception!",e); * @param object object
* @return object to json string
*/
public static String toJson(Object object) {
try {
return objectMapper.writeValueAsString(object);
} catch (Exception e) {
logger.error("object to json exception!", e);
}
return null;
} }
return null;
}
/**
* This method deserializes the specified Json into an object of the specified class. It is not
/** * suitable to use if the specified class is a generic type since it will not have the generic
* json to list * type information because of the Type Erasure feature of Java. Therefore, this method should not
* * be used if the desired type is a generic type. Note that this method works fine if the any of
* @param json json string * the fields of the specified object are generics, just the object itself should not be a
* @param clazz class * generic type.
* @param <T> T *
* @return list * @param json the string from which the object is to be deserialized
*/ * @param clazz the class of T
public static <T> List<T> toList(String json, Class<T> clazz) { * @param <T> T
if (StringUtils.isEmpty(json)) { * @return an object of type T from the string
return new ArrayList<>(); * classOfT
*/
public static <T> T parseObject(String json, Class<T> clazz) {
if (StringUtils.isEmpty(json)) {
return null;
}
try {
return objectMapper.readValue(json, clazz);
} catch (Exception e) {
logger.error("parse object exception!", e);
}
return null;
} }
try {
return JSONArray.parseArray(json, clazz);
} catch (Exception e) { /**
logger.error("JSONArray.parseArray exception!",e); * json to list
*
* @param json json string
* @param clazz class
* @param <T> T
* @return list
*/
public static <T> List<T> toList(String json, Class<T> clazz) {
if (StringUtils.isEmpty(json)) {
return new ArrayList<>();
}
try {
return objectMapper.readValue(json, new TypeReference<List<T>>() {
});
} catch (Exception e) {
logger.error("JSONArray.parseArray exception!", e);
}
return new ArrayList<>();
} }
return new ArrayList<>();
}
/**
* check json object valid
*
* @param json json
* @return true if valid
*/
public static boolean checkJsonValid(String json) {
if (StringUtils.isEmpty(json)) {
return false;
}
/** try {
* check json object valid objectMapper.readTree(json);
* return true;
* @param json json } catch (IOException e) {
* @return true if valid logger.error("check json object valid exception!", e);
*/ }
public static boolean checkJsonValid(String json) {
if (StringUtils.isEmpty(json)) { return false;
return false;
} }
try {
objectMapper.readTree(json);
return true;
} catch (IOException e) {
logger.error("check json object valid exception!",e);
}
return false; /**
} * Method for finding a JSON Object field with specified name in this
* node or its child nodes, and returning value it has.
* If no matching field is found in this node or its descendants, returns null.
/** *
* Method for finding a JSON Object field with specified name in this * @param jsonNode json node
* node or its child nodes, and returning value it has. * @param fieldName Name of field to look for
* If no matching field is found in this node or its descendants, returns null. * @return Value of first matching node found, if any; null if none
* */
* @param jsonNode json node public static String findValue(JsonNode jsonNode, String fieldName) {
* @param fieldName Name of field to look for JsonNode node = jsonNode.findValue(fieldName);
*
* @return Value of first matching node found, if any; null if none
*/
public static String findValue(JsonNode jsonNode, String fieldName) {
JsonNode node = jsonNode.findValue(fieldName);
if (node == null) {
return null;
}
return node.toString(); if (node == null) {
} return null;
}
/**
* json to map
*
* {@link #toMap(String, Class, Class)}
*
* @param json json
* @return json to map
*/
public static Map<String, String> toMap(String json) {
if (StringUtils.isEmpty(json)) {
return null;
}
try { return node.toString();
return JSON.parseObject(json, new TypeReference<HashMap<String, String>>(){});
} catch (Exception e) {
logger.error("json to map exception!",e);
} }
return null;
} /**
* json to map
/** * <p>
* * {@link #toMap(String, Class, Class)}
* json to map *
* * @param json json
* @param json json * @return json to map
* @param classK classK */
* @param classV classV public static Map<String, String> toMap(String json) {
* @param <K> K if (StringUtils.isEmpty(json)) {
* @param <V> V return null;
* @return to map }
*/
public static <K, V> Map<K, V> toMap(String json, Class<K> classK, Class<V> classV) { try {
if (StringUtils.isEmpty(json)) { return objectMapper.readValue(json, new TypeReference<Map<String, String>>() {});
return null; } catch (Exception e) {
logger.error("json to map exception!", e);
}
return null;
} }
try { /**
return JSON.parseObject(json, new TypeReference<HashMap<K, V>>() {}); * json to map
} catch (Exception e) { *
logger.error("json to map exception!",e); * @param json json
* @param classK classK
* @param classV classV
* @param <K> K
* @param <V> V
* @return to map
*/
public static <K, V> Map<K, V> toMap(String json, Class<K> classK, Class<V> classV) {
if (StringUtils.isEmpty(json)) {
return null;
}
try {
return objectMapper.readValue(json, new TypeReference<Map<K, V>>() {
});
} catch (Exception e) {
logger.error("json to map exception!", e);
}
return null;
} }
return null; /**
} * object to json string
*
/** * @param object object
* object to json string * @return json string
* @param object object */
* @return json string public static String toJsonString(Object object) {
*/ try {
public static String toJsonString(Object object) { return objectMapper.writeValueAsString(object);
try{ } catch (Exception e) {
return JSON.toJSONString(object,false); throw new RuntimeException("Object json deserialization exception.", e);
} catch (Exception e) { }
throw new RuntimeException("Object json deserialization exception.", e);
} }
}
public static JSONObject parseObject(String text) { public static ObjectNode parseObject(String text) {
try{ try {
return JSON.parseObject(text); return (ObjectNode) objectMapper.readTree(text);
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("String json deserialization exception.", e); throw new RuntimeException("String json deserialization exception.", e);
}
} }
}
public static JSONArray parseArray(String text) { public static ArrayNode parseArray(String text) {
try{ try {
return JSON.parseArray(text); return (ArrayNode) objectMapper.readTree(text);
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("Json deserialization exception.", e); throw new RuntimeException("Json deserialization exception.", e);
}
} }
}
/**
* json serializer
*/
public static class JsonDataSerializer extends JsonSerializer<String> {
/** @Override
* json serializer public void serialize(String value, JsonGenerator gen, SerializerProvider provider) throws IOException {
*/ gen.writeRawValue(value);
public static class JsonDataSerializer extends JsonSerializer<String> { }
@Override
public void serialize(String value, JsonGenerator gen, SerializerProvider provider) throws IOException {
gen.writeRawValue(value);
} }
} /**
* json data deserializer
*/
public static class JsonDataDeserializer extends JsonDeserializer<String> {
/** @Override
* json data deserializer public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
*/ JsonNode node = p.getCodec().readTree(p);
public static class JsonDataDeserializer extends JsonDeserializer<String> { return node.toString();
}
@Override
public String deserialize(JsonParser p, DeserializationContext ctxt) throws IOException {
JsonNode node = p.getCodec().readTree(p);
return node.toString();
} }
}
} }

2
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java
Unescape View File

@ -196,7 +196,7 @@ public class ParameterUtils {
property.setValue(val); property.setValue(val);
} }
} }
return JSON.toJSONString(globalParamList); return JSONUtils.toJson(globalParamList);
} }

36
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StreamUtils.java
Unescape View File

@ -0,0 +1,36 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.common.utils;
import java.util.Iterator;
import java.util.stream.Stream;
import java.util.stream.StreamSupport;
public class StreamUtils {
private StreamUtils() { }
public static <T> Stream<T> asStream(Iterator<T> sourceIterator) {
return asStream(sourceIterator, false);
}
public static <T> Stream<T> asStream(Iterator<T> sourceIterator, boolean parallel) {
Iterable<T> iterable = () -> sourceIterator;
return StreamSupport.stream(iterable.spliterator(), parallel);
}
}

36
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
Unescape View File

@ -17,6 +17,8 @@
package org.apache.dolphinscheduler.common.utils; package org.apache.dolphinscheduler.common.utils;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.dolphinscheduler.common.enums.DataType; import org.apache.dolphinscheduler.common.enums.DataType;
import org.apache.dolphinscheduler.common.enums.Direct; import org.apache.dolphinscheduler.common.enums.Direct;
import org.apache.dolphinscheduler.common.process.Property; import org.apache.dolphinscheduler.common.process.Property;
@ -101,9 +103,6 @@ public class JSONUtilsTest {
@Test @Test
public void testParseObject() { public void testParseObject() {
Assert.assertEquals("{\"foo\":\"bar\"}", JSONUtils.parseObject(
"{\n" + "\"foo\": \"bar\",\n" + "}", String.class));
Assert.assertNull(JSONUtils.parseObject("", null)); Assert.assertNull(JSONUtils.parseObject("", null));
Assert.assertNull(JSONUtils.parseObject("foo", String.class)); Assert.assertNull(JSONUtils.parseObject("foo", String.class));
} }
@ -134,15 +133,19 @@ public class JSONUtilsTest {
map.put("foo","bar"); map.put("foo","bar");
Assert.assertTrue(map.equals(JSONUtils.toMap( Assert.assertTrue(map.equals(JSONUtils.toMap(
"{\n" + "\"foo\": \"bar\",\n" + "}"))); "{\n" + "\"foo\": \"bar\"\n" + "}")));
Assert.assertFalse(map.equals(JSONUtils.toMap( Assert.assertFalse(map.equals(JSONUtils.toMap(
"{\n" + "\"bar\": \"foo\",\n" + "}"))); "{\n" + "\"bar\": \"foo\"\n" + "}")));
Assert.assertNull(JSONUtils.toMap("3")); Assert.assertNull(JSONUtils.toMap("3"));
Assert.assertNull(JSONUtils.toMap(null)); Assert.assertNull(JSONUtils.toMap(null));
Assert.assertNull(JSONUtils.toMap("3", null, null)); Assert.assertNull(JSONUtils.toMap("3", null, null));
Assert.assertNull(JSONUtils.toMap(null, null, null)); Assert.assertNull(JSONUtils.toMap(null, null, null));
String str = "{\"resourceList\":[],\"localParams\":[],\"rawScript\":\"#!/bin/bash\\necho \\\"shell-1\\\"\"}";
Map<String, String> m = JSONUtils.toMap(str);
Assert.assertNotNull(m);
} }
@Test @Test
@ -155,4 +158,27 @@ public class JSONUtilsTest {
Assert.assertEquals(String.valueOf((Object) null), Assert.assertEquals(String.valueOf((Object) null),
JSONUtils.toJsonString(null)); JSONUtils.toJsonString(null));
} }
@Test
public void parseObject() {
String str = "{\"color\":\"yellow\",\"type\":\"renault\"}";
ObjectNode node = JSONUtils.parseObject(str);
Assert.assertEquals("yellow", node.path("color").asText());
node.put("price", 100);
Assert.assertEquals(100, node.path("price").asInt());
node.put("color", "red");
Assert.assertEquals("red", node.path("color").asText());
}
@Test
public void parseArray() {
String str = "[{\"color\":\"yellow\",\"type\":\"renault\"}]";
ArrayNode node = JSONUtils.parseArray(str);
Assert.assertEquals("yellow", node.path(0).path("color").asText());
}
} }

8
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/ParameterUtilsTest.java
Unescape View File

@ -91,13 +91,13 @@ public class ParameterUtilsTest {
globalParamList.add(property); globalParamList.add(property);
String result2 = ParameterUtils.curingGlobalParams(null,globalParamList,CommandType.START_CURRENT_TASK_PROCESS,scheduleTime); String result2 = ParameterUtils.curingGlobalParams(null,globalParamList,CommandType.START_CURRENT_TASK_PROCESS,scheduleTime);
Assert.assertEquals(result2, JSON.toJSONString(globalParamList)); Assert.assertEquals(result2, JSONUtils.toJson(globalParamList));
String result3 = ParameterUtils.curingGlobalParams(globalParamMap,globalParamList,CommandType.START_CURRENT_TASK_PROCESS,null); String result3 = ParameterUtils.curingGlobalParams(globalParamMap,globalParamList,CommandType.START_CURRENT_TASK_PROCESS,null);
Assert.assertEquals(result3, JSON.toJSONString(globalParamList)); Assert.assertEquals(result3, JSONUtils.toJson(globalParamList));
String result4 = ParameterUtils.curingGlobalParams(globalParamMap, globalParamList, CommandType.START_CURRENT_TASK_PROCESS, scheduleTime); String result4 = ParameterUtils.curingGlobalParams(globalParamMap, globalParamList, CommandType.START_CURRENT_TASK_PROCESS, scheduleTime);
Assert.assertEquals(result4, JSON.toJSONString(globalParamList)); Assert.assertEquals(result4, JSONUtils.toJson(globalParamList));
//test var $ startsWith //test var $ startsWith
globalParamMap.put("bizDate","${system.biz.date}"); globalParamMap.put("bizDate","${system.biz.date}");
@ -113,7 +113,7 @@ public class ParameterUtilsTest {
globalParamList.add(property4); globalParamList.add(property4);
String result5 = ParameterUtils.curingGlobalParams(globalParamMap, globalParamList, CommandType.START_CURRENT_TASK_PROCESS, scheduleTime); String result5 = ParameterUtils.curingGlobalParams(globalParamMap, globalParamList, CommandType.START_CURRENT_TASK_PROCESS, scheduleTime);
Assert.assertEquals(result5,JSONUtils.toJsonString(globalParamList)); Assert.assertEquals(result5, JSONUtils.toJson(globalParamList));
} }
/** /**

39
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/StreamUtilsTest.java
Unescape View File

@ -0,0 +1,39 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.common.utils;
import org.junit.Assert;
import org.junit.Test;
import java.util.Arrays;
import java.util.List;
import java.util.stream.Collectors;
import static org.junit.Assert.*;
public class StreamUtilsTest {
@Test
public void asStream() {
List<String> list = Arrays.asList("a", "b", "c");
List<String> ret = StreamUtils.asStream(list.iterator())
.filter(item -> item.equals("a"))
.collect(Collectors.toList());
Assert.assertEquals("a", ret.get(0));
}
}
Write Preview
Loading…
Cancel
Save