refactor code styles

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java

@@ -195,7 +195,7 @@ public enum Status {
     QUERY_WORKFLOW_LINEAGE_ERROR(10161, "query workflow lineage error", "查询血缘失败"),
     QUERY_AUTHORIZED_AND_USER_CREATED_PROJECT_ERROR(10162, "query authorized and user created project error error", "查询授权的和用户创建的项目错误"),
     DELETE_PROCESS_DEFINITION_BY_ID_FAIL(10163,"delete process definition by id fail, for there are {0} process instances in executing using it", "删除工作流定义失败，有[{0}]个运行中的工作流实例正在使用"),
-    CHECK_OS_TENANT_CODE_ERROR(10164, "Please enter the English tenant code", "请输入英文租户编码"),
+    CHECK_OS_TENANT_CODE_ERROR(10164, "Please enter the English os tenant code", "请输入英文操作系统租户"),
     FORCE_TASK_SUCCESS_ERROR(10165, "force task success error", "强制成功任务实例错误"),
     TASK_INSTANCE_STATE_OPERATION_ERROR(10166, "the status of task instance {0} is {1},Cannot perform force success operation", "任务实例[{0}]的状态是[{1}]，无法执行强制成功操作"),
 

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java

@@ -609,4 +609,5 @@ public class ExecutorService extends BaseService {
         }
         return null;
     }
+
 }

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java

@@ -18,11 +18,9 @@
 package org.apache.dolphinscheduler.api.service;
 
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyInt;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 
-import org.apache.dolphinscheduler.api.enums.ExecuteType;
 import org.apache.dolphinscheduler.api.enums.Status;
 import org.apache.dolphinscheduler.api.service.impl.ProjectServiceImpl;
 import org.apache.dolphinscheduler.common.Constants;
@@ -31,7 +29,6 @@ import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
 import org.apache.dolphinscheduler.common.enums.Priority;
 import org.apache.dolphinscheduler.common.enums.ReleaseState;
 import org.apache.dolphinscheduler.common.enums.RunMode;
-import org.apache.dolphinscheduler.common.enums.TaskType;
 import org.apache.dolphinscheduler.common.model.Server;
 import org.apache.dolphinscheduler.dao.entity.Command;
 import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;

dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java

@@ -33,43 +33,43 @@ import static org.apache.commons.lang.time.DateUtils.addDays;
  * business time utils
  */
 public class BusinessTimeUtils {
-    private BusinessTimeUtils() {
+  private BusinessTimeUtils() {
-        throw new IllegalStateException("BusinessTimeUtils class");
+    throw new IllegalStateException("BusinessTimeUtils class");
-    }
+  }
-    /**
+  /**
-     * get business time in parameters by different command types
+   * get business time in parameters by different command types
-     *
+   *
-     * @param commandType command type
+   * @param commandType command type
-     * @param runTime run time or schedule time
+   * @param runTime run time or schedule time
-     * @return business time
+   * @return business time
-     */
+   */
-    public static Map<String, String> getBusinessTime(CommandType commandType, Date runTime) {
+  public static Map<String, String> getBusinessTime(CommandType commandType, Date runTime) {
-        Date businessDate = runTime;
+    Date businessDate = runTime;
-        switch (commandType) {
+    switch (commandType) {
-            case COMPLEMENT_DATA:
+      case COMPLEMENT_DATA:
-                break;
+          break;
-            case START_PROCESS:
+      case START_PROCESS:
-            case START_CURRENT_TASK_PROCESS:
+      case START_CURRENT_TASK_PROCESS:
-            case RECOVER_TOLERANCE_FAULT_PROCESS:
+      case RECOVER_TOLERANCE_FAULT_PROCESS:
-            case RECOVER_SUSPENDED_PROCESS:
+      case RECOVER_SUSPENDED_PROCESS:
-            case START_FAILURE_TASK_PROCESS:
+      case START_FAILURE_TASK_PROCESS:
-            case REPEAT_RUNNING:
+      case REPEAT_RUNNING:
-            case SCHEDULER:
+      case SCHEDULER:
-            default:
+      default:
-                businessDate = addDays(new Date(), -1);
+          businessDate = addDays(new Date(), -1);
-                if (runTime != null){
+          if (runTime != null){
-                    /**
+            /**
-                     * If there is a scheduled time, take the scheduling time. Recovery from failed nodes, suspension of recovery, re-run for scheduling
+             * If there is a scheduled time, take the scheduling time. Recovery from failed nodes, suspension of recovery, re-run for scheduling
-                     */
+             */
-                    businessDate = addDays(runTime, -1);
+            businessDate = addDays(runTime, -1);
-                }
+          }
-                break;
+          break;
-        }
-        Date businessCurrentDate = addDays(businessDate, 1);
-        Map<String, String> result = new HashMap<>();
-        result.put(Constants.PARAMETER_CURRENT_DATE, format(businessCurrentDate, PARAMETER_FORMAT_DATE));
-        result.put(Constants.PARAMETER_BUSINESS_DATE, format(businessDate, PARAMETER_FORMAT_DATE));
-        result.put(Constants.PARAMETER_DATETIME, format(businessCurrentDate, PARAMETER_FORMAT_TIME));
-        return result;
     }
+    Date businessCurrentDate = addDays(businessDate, 1);
+    Map<String, String> result = new HashMap<>();
+    result.put(Constants.PARAMETER_CURRENT_DATE, format(businessCurrentDate, PARAMETER_FORMAT_DATE));
+    result.put(Constants.PARAMETER_BUSINESS_DATE, format(businessDate, PARAMETER_FORMAT_DATE));
+    result.put(Constants.PARAMETER_DATETIME, format(businessCurrentDate, PARAMETER_FORMAT_TIME));
+    return result;
+  }
 }

dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java

@@ -708,7 +708,6 @@ public class ProcessService {
                 List<Integer> failedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.FAILURE);
                 List<Integer> toleranceList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.NEED_FAULT_TOLERANCE);
                 List<Integer> killedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL);
-                // List<Integer> forcedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.FORCED_SUCCESS);
                 cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
 
                 failedList.addAll(killedList);