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

Update ISO8601Utils parser to default to UTC timezone when the value is not provided #2480

Closed
wants to merge 1 commit into from
Closed

Update ISO8601Utils parser to default to UTC timezone when the value is not provided #2480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions gson/src/main/java/com/google/gson/internal/bind/util/ISO8601Utils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ public static Date parse(String date, ParsePosition pos) throws ParseException {

if (!hasT && (date.length() <= offset)) {
Calendar calendar = new GregorianCalendar(year, month - 1, day);
calendar.setTimeZone(TIMEZONE_UTC);
calendar.setLenient(false);

pos.setIndex(offset);
Expand Down
6 changes: 4 additions & 2 deletions gson/src/test/java/com/google/gson/internal/bind/util/ISO8601UtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,12 @@ public void testDateFormatWithTimezone() {

@Test
@SuppressWarnings("UndefinedEquals")
public void testDateParseWithDefaultTimezone() throws ParseException {
public void testDateParseDefaultsToUTC() throws ParseException {
String dateStr = "2018-06-25";
Date date = ISO8601Utils.parse(dateStr, new ParsePosition(0));
Date expectedDate = new GregorianCalendar(2018, Calendar.JUNE, 25).getTime();
GregorianCalendar calendar = createUtcCalendar();
calendar.set(2018, Calendar.JUNE, 25);
Date expectedDate = calendar.getTime();
assertThat(date).isEqualTo(expectedDate);
}

Expand Down