Merge f1712a6 into a17923a

EricGao888 · web-flow · commit 317d406fc860 · 2022-10-19T15:21:11.000Z
diff --git a/dolphinscheduler-microbench/src/main/java/org/apache/dolphinscheduler/microbench/base/AbstractBaseBenchmark.java b/dolphinscheduler-microbench/src/main/java/org/apache/dolphinscheduler/microbench/base/AbstractBaseBenchmark.java
@@ -117,8 +117,17 @@ private static String getReportDir() {
     }
 
     private static int getForks() {
-        String value = System.getProperty("forkCount");
-        return null != value ? Integer.parseInt(value) : -1;
-    }
+        String forkCount = System.getProperty("forkCount");
+        if (forkCount == null) {
+            return -1;
+        }
 
+        try {
+            return Integer.parseInt(forkCount);
+        } catch (NumberFormatException e) {
+            logger.error("fail to convert forkCount into int", e);
+        }
+
+        return -1;
+    }
 }
diff --git a/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/src/main/java/org/apache/dolphinscheduler/scheduler/quartz/ProcessScheduleTask.java b/dolphinscheduler-scheduler-plugin/dolphinscheduler-scheduler-quartz/src/main/java/org/apache/dolphinscheduler/scheduler/quartz/ProcessScheduleTask.java
@@ -17,7 +17,6 @@
 
 package org.apache.dolphinscheduler.scheduler.quartz;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.CommandType;
 import org.apache.dolphinscheduler.common.enums.ReleaseState;
@@ -27,6 +26,8 @@
 import org.apache.dolphinscheduler.scheduler.quartz.utils.QuartzTaskUtils;
 import org.apache.dolphinscheduler.service.process.ProcessService;
 
+import org.apache.commons.lang3.StringUtils;
+
 import java.util.Date;
 
 import org.quartz.JobDataMap;
diff --git a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
@@ -32,7 +32,6 @@
 import static org.apache.dolphinscheduler.plugin.task.api.enums.Direct.IN;
 import static org.apache.dolphinscheduler.plugin.task.api.utils.DataQualityConstants.TASK_INSTANCE_ID;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.dolphinscheduler.common.Constants;
 import org.apache.dolphinscheduler.common.enums.AuthorizationType;
 import org.apache.dolphinscheduler.common.enums.CommandType;
@@ -138,6 +137,7 @@
 import org.apache.dolphinscheduler.spi.enums.ResourceType;
 
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -416,7 +416,9 @@ public int createCommand(Command command) {
         // add command timezone
         Schedule schedule = scheduleMapper.queryByProcessDefinitionCode(command.getProcessDefinitionCode());
         if (schedule != null) {
-            Map<String, String> commandParams = StringUtils.isNotBlank(command.getCommandParam()) ? JSONUtils.toMap(command.getCommandParam()) : new HashMap<>();
+            Map<String, String> commandParams =
+                    StringUtils.isNotBlank(command.getCommandParam()) ? JSONUtils.toMap(command.getCommandParam())
+                            : new HashMap<>();
             commandParams.put(Constants.SCHEDULE_TIMEZONE, schedule.getTimezoneId());
             command.setCommandParam(JSONUtils.toJsonString(commandParams));
         }
diff --git a/pom.xml b/pom.xml
@@ -640,11 +640,6 @@
                 <version>${spotless.version}</version>
                 <configuration>
                     <java>
-                        <!--TODO: Remove the following excludes section when junit4 removed from e2e and microbench module-->
-                        <excludes>
-                            <exclude>**/e2e/**/*.java</exclude>
-                            <exclude>**/microbench/**/*.java</exclude>
-                        </excludes>
                         <eclipse>
                             <file>style/spotless_dolphinscheduler_formatter.xml</file>
                         </eclipse>
@@ -693,7 +688,6 @@
                             <include>docs/**/*.md</include>
                         </includes>
                         <excludes>
-                            <!--Avoid conflicts with formatting tools in some special modules-->
                             <exclude>**/.github/**/*.md</exclude>
                         </excludes>
                         <flexmark />
