Revert "[Improvement][Api] Interface and entity optimization to improve code scalability. (#10483)" (#10534)

This reverts commit f1a9c0d8e9.

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);
 }
 

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
+    private Map<String, Object> createDagDefine(User loginUser,
-    public 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;
     }
 
-
+    private Map<String, Object> checkTaskDefinitionList(List<TaskDefinitionLog> taskDefinitionLogs, String taskDefinitionJson) {
-    @Override
-    public 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
+    private Map<String, Object> checkTaskRelationList(List<ProcessTaskRelationLog> taskRelationList, String taskRelationJson, List<TaskDefinitionLog> taskDefinitionLogs) {
-    public 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
+    private Map<String, Object> updateDagDefine(User loginUser,
-    public 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
+    private void doBatchOperateProcessDefinition(User loginUser,
-    public 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
+    private Map<String, Object> createDagSchedule(User loginUser, ProcessDefinition processDefinition, String scheduleJson) {
-    public 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;
     }
 
-
+    private Map<String, Object> updateDagSchedule(User loginUser,
-    public Map<String, Object> updateDagSchedule(User loginUser,
                                                   long projectCode,
                                                   long processDefinitionCode,
                                                   String scheduleJson) {