You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/06/21 08:21:39 UTC
[dolphinscheduler] 01/01: Revert "[Improvement][Api] Interface and entity optimization to improve code scalability. (#10483)"
This is an automated email from the ASF dual-hosted git repository.
caishunfeng pushed a commit to branch revert-10483-improve_interface
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit ceaeea507b33f35217b1fb774d3d51e61cd4f2c6
Author: caishunfeng <ca...@gmail.com>
AuthorDate: Tue Jun 21 16:21:33 2022 +0800
Revert "[Improvement][Api] Interface and entity optimization to improve code scalability. (#10483)"
This reverts commit f1a9c0d8e90e7f03a0065255c097ee3fb9aee580.
---
.../api/service/ProcessDefinitionService.java | 86 ----------------------
.../service/impl/ProcessDefinitionServiceImpl.java | 28 +++----
2 files changed, 10 insertions(+), 104 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
index 421cd920db..49e3be075c 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
@@ -26,7 +26,6 @@ import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.enums.ProcessExecutionTypeEnum;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
-import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.User;
@@ -464,90 +463,5 @@ public interface ProcessDefinitionService {
* @return Json String
*/
String doOtherOperateProcess(User loginUser, ProcessDefinition processDefinition);
-
- /**
- * update dag define
- * @param loginUser
- * @param taskRelationList
- * @param processDefinition
- * @param processDefinitionDeepCopy
- * @param taskDefinitionLogs
- * @param otherParamsJson
- */
- Map<String, Object> updateDagDefine(User loginUser,
- List<ProcessTaskRelationLog> taskRelationList,
- ProcessDefinition processDefinition,
- ProcessDefinition processDefinitionDeepCopy,
- List<TaskDefinitionLog> taskDefinitionLogs,
- String otherParamsJson);
-
- /**
- * check task relation
- * @param taskRelationList
- * @param taskRelationJson
- * @param taskDefinitionLogs
- * @return
- */
- Map<String, Object> checkTaskRelationList(List<ProcessTaskRelationLog> taskRelationList, String taskRelationJson, List<TaskDefinitionLog> taskDefinitionLogs);
-
- /**
- * check task define
- * @param taskDefinitionLogs
- * @param taskDefinitionJson
- * @return
- */
- Map<String, Object> checkTaskDefinitionList(List<TaskDefinitionLog> taskDefinitionLogs, String taskDefinitionJson);
-
- /**
- * create dag define
- * @param loginUser
- * @param taskRelationList
- * @param processDefinition
- * @param taskDefinitionLogs
- * @param otherParamsJson
- * @return
- */
- Map<String, Object> createDagDefine(User loginUser,
- List<ProcessTaskRelationLog> taskRelationList,
- ProcessDefinition processDefinition,
- List<TaskDefinitionLog> taskDefinitionLogs, String otherParamsJson);
-
- /**
- *
- * @param loginUser
- * @param targetProjectCode
- * @param failedProcessList
- * @param processDefinitionCodes
- * @param result
- * @param isCopy
- */
- void doBatchOperateProcessDefinition(User loginUser,
- long targetProjectCode,
- List<String> failedProcessList,
- String processDefinitionCodes,
- Map<String, Object> result,
- boolean isCopy);
-
- /**
- * create dag schedule
- * @param loginUser
- * @param processDefinition
- * @param scheduleJson
- * @return
- */
- Map<String, Object> createDagSchedule(User loginUser, ProcessDefinition processDefinition, String scheduleJson);
-
- /**
- * update dag schedule
- * @param loginUser
- * @param projectCode
- * @param processDefinitionCode
- * @param scheduleJson
- * @return
- */
- Map<String, Object> updateDagSchedule(User loginUser,
- long projectCode,
- long processDefinitionCode,
- String scheduleJson);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 59119e1f57..56893f422f 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -279,8 +279,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
return createDagDefine(loginUser, taskRelationList, processDefinition, taskDefinitionLogs, otherParamsJson);
}
- @Override
- public Map<String, Object> createDagDefine(User loginUser,
+ private Map<String, Object> createDagDefine(User loginUser,
List<ProcessTaskRelationLog> taskRelationList,
ProcessDefinition processDefinition,
List<TaskDefinitionLog> taskDefinitionLogs, String otherParamsJson) {
@@ -311,9 +310,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
return result;
}
-
- @Override
- public Map<String, Object> checkTaskDefinitionList(List<TaskDefinitionLog> taskDefinitionLogs, String taskDefinitionJson) {
+ private Map<String, Object> checkTaskDefinitionList(List<TaskDefinitionLog> taskDefinitionLogs, String taskDefinitionJson) {
Map<String, Object> result = new HashMap<>();
try {
if (taskDefinitionLogs.isEmpty()) {
@@ -341,8 +338,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
return result;
}
- @Override
- public Map<String, Object> checkTaskRelationList(List<ProcessTaskRelationLog> taskRelationList, String taskRelationJson, List<TaskDefinitionLog> taskDefinitionLogs) {
+ private Map<String, Object> checkTaskRelationList(List<ProcessTaskRelationLog> taskRelationList, String taskRelationJson, List<TaskDefinitionLog> taskDefinitionLogs) {
Map<String, Object> result = new HashMap<>();
try {
if (taskRelationList == null || taskRelationList.isEmpty()) {
@@ -618,8 +614,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
return updateDagDefine(loginUser, taskRelationList, processDefinition, processDefinitionDeepCopy, taskDefinitionLogs, otherParamsJson);
}
- @Override
- public Map<String, Object> updateDagDefine(User loginUser,
+ private Map<String, Object> updateDagDefine(User loginUser,
List<ProcessTaskRelationLog> taskRelationList,
ProcessDefinition processDefinition,
ProcessDefinition processDefinitionDeepCopy,
@@ -868,7 +863,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
/**
* download the process definition file
*/
- public void downloadProcessDefinitionFile(HttpServletResponse response, List<DagDataSchedule> dagDataSchedules) {
+ private void downloadProcessDefinitionFile(HttpServletResponse response, List<DagDataSchedule> dagDataSchedules) {
response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE);
BufferedOutputStream buff = null;
ServletOutputStream out = null;
@@ -1148,7 +1143,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
/**
* check and import
*/
- public boolean checkAndImport(User loginUser, long projectCode, Map<String, Object> result, DagDataSchedule dagDataSchedule, String otherParamsJson) {
+ private boolean checkAndImport(User loginUser, long projectCode, Map<String, Object> result, DagDataSchedule dagDataSchedule, String otherParamsJson) {
if (!checkImportanceParams(dagDataSchedule, result)) {
return false;
}
@@ -1637,7 +1632,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
* @param taskNodeResponseList task node response list
* @return if graph has cycle flag
*/
- public boolean graphHasCycle(List<TaskNode> taskNodeResponseList) {
+ private boolean graphHasCycle(List<TaskNode> taskNodeResponseList) {
DAG<String, TaskNode, String> graph = new DAG<>();
// Fill the vertices
for (TaskNode taskNodeResponse : taskNodeResponseList) {
@@ -1738,8 +1733,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
return result;
}
- @Override
- public void doBatchOperateProcessDefinition(User loginUser,
+ private void doBatchOperateProcessDefinition(User loginUser,
long targetProjectCode,
List<String> failedProcessList,
String processDefinitionCodes,
@@ -2045,8 +2039,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
return result;
}
- @Override
- public Map<String, Object> createDagSchedule(User loginUser, ProcessDefinition processDefinition, String scheduleJson) {
+ private Map<String, Object> createDagSchedule(User loginUser, ProcessDefinition processDefinition, String scheduleJson) {
Map<String, Object> result = new HashMap<>();
Schedule scheduleObj = JSONUtils.parseObject(scheduleJson, Schedule.class);
if (scheduleObj == null) {
@@ -2169,8 +2162,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
return result;
}
-
- public Map<String, Object> updateDagSchedule(User loginUser,
+ private Map<String, Object> updateDagSchedule(User loginUser,
long projectCode,
long processDefinitionCode,
String scheduleJson) {