add timezone support, for pull request #1594

alibaba · Nov 21, 2017 · 327cdb9 · 327cdb9
1 parent eeadb41
commit 327cdb9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/main/java/com/alibaba/fastjson/parser/deserializer/Jdk8DateCodec.java b/src/main/java/com/alibaba/fastjson/parser/deserializer/Jdk8DateCodec.java
@@ -145,13 +145,13 @@ public <T> T deserialze(DefaultJSONParser parser, Type type, Object fieldName, S
             lexer.nextToken();
 
             if (type == LocalDateTime.class) {
-                return (T) LocalDateTime.ofInstant(Instant.ofEpochMilli(millis), ZoneId.systemDefault());
+                return (T) LocalDateTime.ofInstant(Instant.ofEpochMilli(millis), JSON.defaultTimeZone.toZoneId());
             }
             if (type == LocalDate.class) {
-                return (T) LocalDateTime.ofInstant(Instant.ofEpochMilli(millis), ZoneId.systemDefault()).toLocalDate();
+                return (T) LocalDateTime.ofInstant(Instant.ofEpochMilli(millis), JSON.defaultTimeZone.toZoneId()).toLocalDate();
             }
             if (type == LocalTime.class) {
-                return (T) LocalDateTime.ofInstant(Instant.ofEpochMilli(millis), ZoneId.systemDefault()).toLocalTime();
+                return (T) LocalDateTime.ofInstant(Instant.ofEpochMilli(millis), JSON.defaultTimeZone.toZoneId()).toLocalTime();
             }
 
             throw new UnsupportedOperationException();

diff --git a/src/test/java/com/alibaba/json/bvt/jdk8/LocalDateTest.java b/src/test/java/com/alibaba/json/bvt/jdk8/LocalDateTest.java
@@ -1,6 +1,8 @@
 package com.alibaba.json.bvt.jdk8;
 
 import java.time.LocalDate;
+import java.util.Locale;
+import java.util.TimeZone;
 
 import junit.framework.TestCase;
 
@@ -9,6 +11,10 @@
 import com.alibaba.fastjson.JSON;
 
 public class LocalDateTest extends TestCase {
+    protected void setUp() throws Exception {
+        JSON.defaultTimeZone = TimeZone.getTimeZone("Asia/Shanghai");
+        JSON.defaultLocale = Locale.CHINA;
+    }
 
     public void test_for_issue() throws Exception {
         VO vo = new VO();

diff --git a/src/test/java/com/alibaba/json/bvt/jdk8/LocalTimeTest.java b/src/test/java/com/alibaba/json/bvt/jdk8/LocalTimeTest.java
@@ -1,6 +1,8 @@
 package com.alibaba.json.bvt.jdk8;
 
 import java.time.LocalTime;
+import java.util.Locale;
+import java.util.TimeZone;
 
 import junit.framework.TestCase;
 
@@ -9,7 +11,11 @@
 import com.alibaba.fastjson.JSON;
 
 public class LocalTimeTest extends TestCase {
-
+    protected void setUp() throws Exception {
+        JSON.defaultTimeZone = TimeZone.getTimeZone("Asia/Shanghai");
+        JSON.defaultLocale = Locale.CHINA;
+    }
+
     public void test_for_issue() throws Exception {
         VO vo = new VO();
         vo.setDate(LocalTime.now());