From dea2d4634dee5eaf8d4f22c4376032b3d8b1268a Mon Sep 17 00:00:00 2001 From: simon Date: Tue, 2 Jun 2020 20:13:23 +0800 Subject: [PATCH] Using Jackson instead of Fastjson --- .../apache/dolphinscheduler/common/utils/HadoopUtils.java | 2 +- .../dolphinscheduler/common/utils/ParameterUtils.java | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java index c006dec6a8..360f4514b6 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/HadoopUtils.java @@ -406,7 +406,6 @@ public class HadoopUtils implements Closeable { * * @param applicationId application id * @return the return may be null or there may be other parse exceptions - * @throws JSONException json exception */ public ExecutionStatus getApplicationStatus(String applicationId) { if (StringUtils.isEmpty(applicationId)) { @@ -467,6 +466,7 @@ public class HadoopUtils implements Closeable { * hdfs resource dir * * @param tenantCode tenant code + * @param resourceType resource type * @return hdfs resource dir */ public static String getHdfsDir(ResourceType resourceType, String tenantCode) { diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java index cae498340c..aae14a63ec 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/ParameterUtils.java @@ -215,9 +215,10 @@ public class ParameterUtils { /** * new * $[yyyyMMdd] replace scheduler time - * @param text - * @param paramsMap - * @return + * @param text text + * @param scheduleTime scheduleTime + * @param paramsMap paramsMap + * @return text */ public static String replaceScheduleTime(String text, Date scheduleTime, Map paramsMap) { if (paramsMap != null) {