Merge pull request #350 from lenboo/branch-1.0.2

change jsonToList return empty list

escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java

@@ -293,12 +293,12 @@ public class ProcessDefinitionService extends BaseDAGService {
         processDefine.setTimeout(processData.getTimeout());
 
         //custom global params
-        List<Property> globalParamsList = processData.getGlobalParams();
+        List<Property> globalParamsList = new ArrayList<>();
-        if (globalParamsList != null && globalParamsList.size() > 0) {
+        if (processData.getGlobalParams() != null && processData.getGlobalParams().size() > 0) {
-            Set<Property> userDefParamsSet = new HashSet<>(globalParamsList);
+            Set<Property> userDefParamsSet = new HashSet<>(processData.getGlobalParams());
             globalParamsList = new ArrayList<>(userDefParamsSet);
-            processDefine.setGlobalParamList(globalParamsList);
         }
+        processDefine.setGlobalParamList(globalParamsList);
         processDefine.setUpdateTime(now);
         processDefine.setFlag(Flag.YES);
         if (processDefineMapper.update(processDefine) > 0) {

escheduler-common/src/main/java/cn/escheduler/common/utils/JSONUtils.java

@@ -27,10 +27,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
-import java.util.HashMap;
+import java.util.*;
-import java.util.List;
-import java.util.Map;
-import java.util.TimeZone;
 
 /**
  * json utils
@@ -109,7 +106,7 @@ public class JSONUtils {
    */
   public static <T> List<T> toList(String json, Class<T> clazz) {
     if (StringUtils.isEmpty(json)) {
-      return null;
+      return new ArrayList<>();
     }
     try {
       return JSONArray.parseArray(json, clazz);
@@ -117,7 +114,7 @@ public class JSONUtils {
       logger.error("JSONArray.parseArray exception!",e);
     }
 
-    return null;
+    return new ArrayList<>();
   }