root
/
fastjson2
mirror of https://github.com/alibaba/fastjson2.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

improve Date process, for issue #1393

This commit is contained in:
shaojin.wensj 2023-04-21 18:27:30 +08:00
parent 60d61b6942
commit 2c1cdb5f75
2 changed files with 259 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/alibaba/fastjson2/reader/FieldReaderDateTimeCodec.java
View File

@ -214,6 +214,8 @@ abstract class FieldReaderDateTimeCodec<T>
accept(object, ((Long) value).longValue());
} else if (value instanceof LocalDateTime) {
accept(object, (LocalDateTime) value);
} else if (value instanceof ZonedDateTime) {
accept(object, (ZonedDateTime) value);
} else {
throw new JSONException("not support value " + value.getClass());
}

257
core/src/test/java/com/alibaba/fastjson2/issues_1000/Issue1393.java Normal file
View File

@ -0,0 +1,257 @@
package com.alibaba.fastjson2.issues_1000;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.util.DateUtils;
import org.junit.jupiter.api.Test;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZonedDateTime;
import java.util.Date;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
public class Issue1393 {
@Test
public void test1() {
String dateStr = "2023-04-21 21:03:43.1";
long millis = DateUtils.parseMillis(dateStr);
JSONObject jsonObject = JSONObject.of(
"date", dateStr,
"ldt", dateStr,
"zdt", dateStr,
"instant", dateStr
);
String json = jsonObject.toString();
Bean bean = JSON.parseObject(json, Bean.class);
assertNotNull(bean.instant);
assertEquals(millis, bean.date.getTime());
assertEquals(millis, bean.ldt.atZone(DateUtils.DEFAULT_ZONE_ID).toInstant().toEpochMilli());
assertEquals(millis, bean.zdt.toInstant().toEpochMilli());
assertEquals(millis, bean.instant.toEpochMilli());
Bean bean1 = jsonObject.toJavaObject(Bean.class);
assertEquals(bean.date.getTime(), bean1.date.getTime());
assertEquals(bean.ldt, bean1.ldt);
assertEquals(bean.zdt, bean1.zdt);
assertEquals(bean.instant, bean1.instant);
}
@Test
public void test2() {
String dateStr = "2023-04-21 21:03:43.12";
long millis = DateUtils.parseMillis(dateStr);
JSONObject jsonObject = JSONObject.of(
"date", dateStr,
"ldt", dateStr,
"zdt", dateStr,
"instant", dateStr
);
String json = jsonObject.toString();
Bean bean = JSON.parseObject(json, Bean.class);
assertNotNull(bean.instant);
assertEquals(millis, bean.date.getTime());
assertEquals(millis, bean.ldt.atZone(DateUtils.DEFAULT_ZONE_ID).toInstant().toEpochMilli());
assertEquals(millis, bean.zdt.toInstant().toEpochMilli());
assertEquals(millis, bean.instant.toEpochMilli());
Bean bean1 = jsonObject.toJavaObject(Bean.class);
assertEquals(bean.date.getTime(), bean1.date.getTime());
assertEquals(bean.ldt, bean1.ldt);
assertEquals(bean.zdt, bean1.zdt);
assertEquals(bean.instant, bean1.instant);
}
@Test
public void test3() {
String dateStr = "2023-04-21 21:03:43.071";
long millis = DateUtils.parseMillis(dateStr);
JSONObject jsonObject = JSONObject.of(
"date", dateStr,
"ldt", dateStr,
"zdt", dateStr,
"instant", dateStr
);
String json = jsonObject.toString();
Bean bean = JSON.parseObject(json, Bean.class);
assertNotNull(bean.instant);
assertEquals(millis, bean.date.getTime());
assertEquals(millis, bean.ldt.atZone(DateUtils.DEFAULT_ZONE_ID).toInstant().toEpochMilli());
assertEquals(millis, bean.zdt.toInstant().toEpochMilli());
assertEquals(millis, bean.instant.toEpochMilli());
Bean bean1 = jsonObject.toJavaObject(Bean.class);
assertEquals(bean.date.getTime(), bean1.date.getTime());
assertEquals(bean.ldt, bean1.ldt);
assertEquals(bean.zdt, bean1.zdt);
assertEquals(bean.instant, bean1.instant);
}
@Test
public void test4() {
String dateStr = "2023-04-21 21:03:43.1234";
long millis = DateUtils.parseMillis(dateStr);
JSONObject jsonObject = JSONObject.of(
"date", dateStr,
"ldt", dateStr,
"zdt", dateStr,
"instant", dateStr
);
String json = jsonObject.toString();
Bean bean = JSON.parseObject(json, Bean.class);
assertNotNull(bean.instant);
assertEquals(millis, bean.date.getTime());
assertEquals(millis, bean.ldt.atZone(DateUtils.DEFAULT_ZONE_ID).toInstant().toEpochMilli());
assertEquals(millis, bean.zdt.toInstant().toEpochMilli());
assertEquals(millis, bean.instant.toEpochMilli());
Bean bean1 = jsonObject.toJavaObject(Bean.class);
assertEquals(bean.date.getTime(), bean1.date.getTime());
assertEquals(bean.ldt, bean1.ldt);
assertEquals(bean.zdt, bean1.zdt);
assertEquals(bean.instant, bean1.instant);
}
@Test
public void test5() {
String dateStr = "2023-04-21 21:03:43.12345";
long millis = DateUtils.parseMillis(dateStr);
JSONObject jsonObject = JSONObject.of(
"date", dateStr,
"ldt", dateStr,
"zdt", dateStr,
"instant", dateStr
);
String json = jsonObject.toString();
Bean bean = JSON.parseObject(json, Bean.class);
assertNotNull(bean.instant);
assertEquals(millis, bean.date.getTime());
assertEquals(millis, bean.ldt.atZone(DateUtils.DEFAULT_ZONE_ID).toInstant().toEpochMilli());
assertEquals(millis, bean.zdt.toInstant().toEpochMilli());
assertEquals(millis, bean.instant.toEpochMilli());
Bean bean1 = jsonObject.toJavaObject(Bean.class);
assertEquals(bean.date.getTime(), bean1.date.getTime());
assertEquals(bean.ldt, bean1.ldt);
assertEquals(bean.zdt, bean1.zdt);
assertEquals(bean.instant, bean1.instant);
}
@Test
public void test6() {
String dateStr = "2023-04-21 21:03:43.123456";
long millis = DateUtils.parseMillis(dateStr);
JSONObject jsonObject = JSONObject.of(
"date", dateStr,
"ldt", dateStr,
"zdt", dateStr,
"instant", dateStr
);
String json = jsonObject.toString();
Bean bean = JSON.parseObject(json, Bean.class);
assertNotNull(bean.instant);
assertEquals(millis, bean.date.getTime());
assertEquals(millis, bean.ldt.atZone(DateUtils.DEFAULT_ZONE_ID).toInstant().toEpochMilli());
assertEquals(millis, bean.zdt.toInstant().toEpochMilli());
assertEquals(millis, bean.instant.toEpochMilli());
Bean bean1 = jsonObject.toJavaObject(Bean.class);
assertEquals(bean.date.getTime(), bean1.date.getTime());
assertEquals(bean.ldt, bean1.ldt);
assertEquals(bean.zdt, bean1.zdt);
assertEquals(bean.instant, bean1.instant);
}
@Test
public void test7() {
String dateStr = "2023-04-21 21:03:43.1234567";
long millis = DateUtils.parseMillis(dateStr);
JSONObject jsonObject = JSONObject.of(
"date", dateStr,
"ldt", dateStr,
"zdt", dateStr,
"instant", dateStr
);
String json = jsonObject.toString();
Bean bean = JSON.parseObject(json, Bean.class);
assertNotNull(bean.instant);
assertEquals(millis, bean.date.getTime());
assertEquals(millis, bean.ldt.atZone(DateUtils.DEFAULT_ZONE_ID).toInstant().toEpochMilli());
assertEquals(millis, bean.zdt.toInstant().toEpochMilli());
assertEquals(millis, bean.instant.toEpochMilli());
Bean bean1 = jsonObject.toJavaObject(Bean.class);
assertEquals(bean.date.getTime(), bean1.date.getTime());
assertEquals(bean.ldt, bean1.ldt);
assertEquals(bean.zdt, bean1.zdt);
assertEquals(bean.instant, bean1.instant);
}
@Test
public void test8() {
String dateStr = "2023-04-21 21:03:43.12345678";
long millis = DateUtils.parseMillis(dateStr);
JSONObject jsonObject = JSONObject.of(
"date", dateStr,
"ldt", dateStr,
"zdt", dateStr,
"instant", dateStr
);
String json = jsonObject.toString();
Bean bean = JSON.parseObject(json, Bean.class);
assertNotNull(bean.instant);
assertEquals(millis, bean.date.getTime());
assertEquals(millis, bean.ldt.atZone(DateUtils.DEFAULT_ZONE_ID).toInstant().toEpochMilli());
assertEquals(millis, bean.zdt.toInstant().toEpochMilli());
assertEquals(millis, bean.instant.toEpochMilli());
Bean bean1 = jsonObject.toJavaObject(Bean.class);
assertEquals(bean.date.getTime(), bean1.date.getTime());
assertEquals(bean.ldt, bean1.ldt);
assertEquals(bean.zdt, bean1.zdt);
assertEquals(bean.instant, bean1.instant);
}
@Test
public void test9() {
String dateStr = "2023-04-21 21:03:43.123456789";
long millis = DateUtils.parseMillis(dateStr);
JSONObject jsonObject = JSONObject.of(
"date", dateStr,
"ldt", dateStr,
"zdt", dateStr,
"instant", dateStr
);
String json = jsonObject.toString();
Bean bean = JSON.parseObject(json, Bean.class);
assertNotNull(bean.instant);
assertEquals(millis, bean.date.getTime());
assertEquals(millis, bean.ldt.atZone(DateUtils.DEFAULT_ZONE_ID).toInstant().toEpochMilli());
assertEquals(millis, bean.zdt.toInstant().toEpochMilli());
assertEquals(millis, bean.instant.toEpochMilli());
Bean bean1 = jsonObject.toJavaObject(Bean.class);
assertEquals(bean.date.getTime(), bean1.date.getTime());
assertEquals(bean.ldt, bean1.ldt);
assertEquals(bean.zdt, bean1.zdt);
assertEquals(bean.instant, bean1.instant);
}
public static class Bean {
public Date date;
public LocalDateTime ldt;
public ZonedDateTime zdt;
public Instant instant;
}
}