natas_hw
/
dolphinscheduler
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Fix] Fix the JSONUtils tool class time zone problem #10282 (#10284) 

* [Fix] Fix the JSONUtils tool class time zone problem #10282

* [Fix] Fix the JSONUtils tool class time zone problem #10282

* Update JSONUtils.java

remove unnessnary log

* Update JSONUtilsTest.java

add timezone import

Co-authored-by: xiangzihao <460888207@qq.com>
This commit is contained in:
juzimao 2022-06-17 11:08:38 +08:00 committed by GitHub
parent ad2646ff1f
commit 062146eecd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/JSONUtils.java
View File

@ -82,6 +82,10 @@ public class JSONUtils {
throw new UnsupportedOperationException("Construct JSONUtils"); throw new UnsupportedOperationException("Construct JSONUtils");
} }
public static synchronized void setTimeZone(TimeZone timeZone) {
objectMapper.setTimeZone(timeZone);
}
public static ArrayNode createArrayNode() { public static ArrayNode createArrayNode() {
return objectMapper.createArrayNode(); return objectMapper.createArrayNode();
} }

15
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/JSONUtilsTest.java
View File

@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.TimeZone;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
@ -260,10 +261,14 @@ public class JSONUtilsTest {
@Test @Test
public void dateToString() { public void dateToString() {
TimeZone timeZone = TimeZone.getTimeZone("UTC");
TimeZone.setDefault(timeZone);
JSONUtils.setTimeZone(timeZone);
String time = "2022-02-22 13:38:24"; String time = "2022-02-22 13:38:24";
Date date = DateUtils.stringToDate(time); Date date = DateUtils.stringToDate(time);
String json = JSONUtils.toJsonString(date); String json = JSONUtils.toJsonString(date);
Assert.assertEquals(json, "\"" + time + "\""); Assert.assertEquals("\"" + time + "\"", json);
String errorFormatTime = "Tue Feb 22 03:50:00 UTC 2022"; String errorFormatTime = "Tue Feb 22 03:50:00 UTC 2022";
Assert.assertNull(DateUtils.stringToDate(errorFormatTime)); Assert.assertNull(DateUtils.stringToDate(errorFormatTime));
@ -271,9 +276,15 @@ public class JSONUtilsTest {
@Test @Test
public void stringToDate() { public void stringToDate() {
TimeZone timeZone = TimeZone.getTimeZone("UTC");
TimeZone.setDefault(timeZone);
JSONUtils.setTimeZone(timeZone);
String json = "\"2022-02-22 13:38:24\""; String json = "\"2022-02-22 13:38:24\"";
Date date = JSONUtils.parseObject(json, Date.class); Date date = JSONUtils.parseObject(json, Date.class);
Assert.assertEquals(date, DateUtils.stringToDate("2022-02-22 13:38:24")); Assert.assertEquals(DateUtils.stringToDate("2022-02-22 13:38:24"), date);
} }
} }