Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix LocalDate use millis as default DateFormat, for issue #2477 Monster Yesterday 23:19 #2495

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

fix LocalDate use millis as default DateFormat, for issue #2477 Monster Yesterday 23:19 #2495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5da0394
fix LocalDate use millis as default DateFormat, for issue #2477
FullStackD Apr 28, 2024
970ac37
adding additional test cases that would be affected
FullStackD Apr 28, 2024
dda9028
Merge branch 'alibaba:main' into main
FullStackD Apr 29, 2024
61fc00b
fix Checkstyle violations
FullStackD Apr 29, 2024
c638835
Merge branch 'alibaba:main' into main
FullStackD Apr 30, 2024
4e3b28c
Merge branch 'alibaba:main' into main
FullStackD May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions fastjson1-compatible/src/main/java/com/alibaba/fastjson/JSON.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public abstract class JSON
features |= SerializerFeature.SkipTransientField.getMask();
features |= SerializerFeature.WriteEnumUsingName.getMask();
features |= SerializerFeature.SortField.getMask();

features |= SerializerFeature.UseISO8601DateFormat.getMask();
DEFAULT_GENERATE_FEATURE = features;
}

Expand Down Expand Up @@ -1628,7 +1628,7 @@ public static byte[] toJSONBytes(Object object, int defaultFeatures, SerializerF
}

public static byte[] toJSONBytes(Object object, SerializeFilter filter) {
return toJSONBytes(object, SerializeConfig.global, new SerializeFilter[] {filter}, DEFAULT_GENERATE_FEATURE);
return toJSONBytes(object, SerializeConfig.global, new SerializeFilter[]{filter}, DEFAULT_GENERATE_FEATURE);
}

public static byte[] toJSONBytes(Object object, SerializeFilter filter, SerializerFeature... features) {
Expand Down
26 changes: 26 additions & 0 deletions fastjson1-compatible/src/test/java/com/alibaba/fastjson/issue_2400/Issue2477.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.alibaba.fastjson.issue_2400;

import com.alibaba.fastjson.JSON;
import org.junit.jupiter.api.Test;

import java.time.*;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;

public class Issue2477 {
@Test
public void test_for_issue() {
Map<String, Object> map = new HashMap<>();
map.put("localDate", LocalDate.now());
map.put("date", Date.from(Instant.now()));
map.put("instant", Instant.now());
map.put("localDateTime", LocalDateTime.now());
map.put("localTime", LocalTime.now());
map.put("offsetDateTime", OffsetDateTime.now());
map.put("zonedDateTime", ZonedDateTime.now());
map.put("calendar", Calendar.getInstance());
System.out.println(JSON.toJSONString(map));
}
}