From 6e5145f7c4130658663bbbec7b1c729783ab0acd Mon Sep 17 00:00:00 2001
From: Zhou Zheng <1606079777@qq.comom>
Date: Mon, 24 Aug 2020 16:19:52 +0800
Subject: [PATCH] fix some code smell problems

1. use Collections.isEmpt() instead of size() > 0
2. make if statements more readable
---
 .../api/service/ExecutorService.java          |  2 +-
 .../master/runner/MasterExecThread.java       | 28 +++++++++----------
 .../service/process/ProcessService.java       |  2 +-
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index c44a094b1a..0f6b35822f 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -635,7 +635,7 @@ public class ExecutorService extends BaseService{
      */
     private boolean checkValidForcedSuccessTask(int processInstanceId) {
         List<Integer> forcedSuccessList = processService.findTaskIdByInstanceState(processInstanceId, ExecutionStatus.FORCED_SUCCESS);
-        if (forcedSuccessList != null && forcedSuccessList.size() > 0) {
+        if (forcedSuccessList != null && !forcedSuccessList.isEmpty()) {
             return true;
         }
 
diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
index c0f3eea6f8..6d4906748b 100644
--- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
+++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
@@ -1180,34 +1180,32 @@ public class MasterExecThread implements Runnable {
     /**
      * handling the list of tasks to be submitted
      */
-    private void submitStandByTask(){
-        for(Map.Entry<String, TaskInstance> entry: readyToSubmitTaskList.entrySet()) {
+    private void submitStandByTask() {
+        for (Map.Entry<String, TaskInstance> entry : readyToSubmitTaskList.entrySet()) {
             TaskInstance task = entry.getValue();
             // stop tasks which is retrying if forced success happens
             if (task.taskCanRetry()) {
                 TaskInstance tmpTask = processService.findTaskInstanceById(task.getId());
-                if (tmpTask != null) {
-                    if (tmpTask.getState().equals(ExecutionStatus.FORCED_SUCCESS)) {
-                        task.setState(tmpTask.getState());
-                        logger.info("task: {} has been forced success, put it into complete task list and stop retrying", task.getName());
-                        removeTaskFromStandbyList(task);
-                        completeTaskList.put(task.getName(), task);
-                        submitPostNode(task.getName());
-                        continue;
-                    }
+                if (tmpTask != null && tmpTask.getState().equals(ExecutionStatus.FORCED_SUCCESS)) {
+                    task.setState(tmpTask.getState());
+                    logger.info("task: {} has been forced success, put it into complete task list and stop retrying", task.getName());
+                    removeTaskFromStandbyList(task);
+                    completeTaskList.put(task.getName(), task);
+                    submitPostNode(task.getName());
+                    continue;
                 }
             }
             DependResult dependResult = getDependResultForTask(task);
-            if(DependResult.SUCCESS == dependResult){
-                if(retryTaskIntervalOverTime(task)){
+            if (DependResult.SUCCESS == dependResult) {
+                if (retryTaskIntervalOverTime(task)) {
                     submitTaskExec(task);
                     removeTaskFromStandbyList(task);
                 }
-            }else if(DependResult.FAILED == dependResult){
+            } else if (DependResult.FAILED == dependResult) {
                 // if the dependency fails, the current node is not submitted and the state changes to failure.
                 dependFailedTask.put(entry.getKey(), task);
                 removeTaskFromStandbyList(task);
-                logger.info("task {},id:{} depend result : {}",task.getName(), task.getId(), dependResult);
+                logger.info("task {},id:{} depend result : {}", task.getName(), task.getId(), dependResult);
             }
         }
     }
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index 816791a184..f6b5899848 100644
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -790,7 +790,7 @@ public class ProcessService {
         List<Integer> forcedSuccessList = this.findTaskIdInSubProcessByStatusAndType(taskInstanceId,
                 new ExecutionStatus[]{ExecutionStatus.FORCED_SUCCESS},
                 null);
-        if (forcedSuccessList != null && forcedSuccessList.size() > 0) {
+        if (forcedSuccessList != null && !forcedSuccessList.isEmpty()) {
             return true;
         }