Skip to content

Fix Rfc3339DateJsonAdapter to use UTC for date-only strings #2124

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

Open
amitmishra11 wants to merge 1 commit into
base: master
Choose a base branch
from
+14 −13
Open

Fix Rfc3339DateJsonAdapter to use UTC for date-only strings #2124

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
12 changes: 10 additions & 2 deletions moshi-adapters/src/main/java/com/squareup/moshi/adapters/Iso8601Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,16 @@ internal fun String.parseIsoDate(): Date {
// if the value has no time component (and no time zone), we are done
val hasT = readChar(this, offset, 'T')
if (!hasT && this.length <= offset) {
// Note that this uses the host machine's time zone. That's a bug.
return GregorianCalendar(year, month - 1, day).time
val calendar: Calendar = GregorianCalendar(TIMEZONE_Z, Locale.US)
calendar.isLenient = false
calendar[Calendar.YEAR] = year
calendar[Calendar.MONTH] = month - 1
calendar[Calendar.DAY_OF_MONTH] = day
calendar[Calendar.HOUR_OF_DAY] = 0
calendar[Calendar.MINUTE] = 0
calendar[Calendar.SECOND] = 0
calendar[Calendar.MILLISECOND] = 0
return calendar.time
}
if (hasT) {
offset++
Expand Down
15 changes: 4 additions & 11 deletions moshi-adapters/src/test/java/com/squareup/moshi/adapters/Rfc3339DateJsonAdapterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,9 @@ public void variableFractionDigits() throws Exception {

@Test
public void absentTimeZone() throws Exception {
assertThat(adapter.fromJson("\"1970-01-01\"")).isEqualTo(newDateWithHostZone(1970, 1, 1));
// A date-only string with no time zone is interpreted as midnight UTC.
assertThat(adapter.fromJson("\"1970-01-01\"")).isEqualTo(newDate(1970, 1, 1, 0, 0, 0, 0, 0));
assertThat(adapter.fromJson("\"2025-11-20\"")).isEqualTo(newDate(2025, 11, 20, 0, 0, 0, 0, 0));
assertThat(adapter.fromJson("\"1970-01-01Z\"")).isEqualTo(newDate(1970, 1, 1, 0, 0, 0, 0, 0));
try {
adapter.fromJson("\"1970-01-01T00:00:00.000\"");
Expand All @@ -112,14 +114,5 @@ private Date newDate(
return new Date(calendar.getTimeInMillis() - TimeUnit.MINUTES.toMillis(offset));
}

/**
* Dates specified without any time or timezone (like "1970-01-01") are returned in the host
* computer's time zone. This is a longstanding bug that we're attempting to stay consistent with.
*/
private Date newDateWithHostZone(int year, int month, int day) {
Calendar calendar = new GregorianCalendar();
calendar.set(year, month - 1, day, 0, 0, 0);
calendar.set(Calendar.MILLISECOND, 0);
return new Date(calendar.getTimeInMillis());
}
}