From c46ac04c0a6a62210a8295d416c4203b35d928f5 Mon Sep 17 00:00:00 2001 From: rob bygrave Date: Sat, 27 Apr 2019 10:33:17 +1200 Subject: [PATCH] #1684 - Fix JSON marshalling on LocalDate, sql.Date etc - explicit UTC Make explicit use of UTC --- .../server/type/ScalarTypeBaseDate.java | 10 ++++------ .../server/type/ScalarTypeJodaLocalDate.java | 3 ++- .../server/type/ScalarTypeLocalDate.java | 14 +++++++------- .../server/type/ScalarTypeYearMonthDate.java | 7 +++---- .../io/ebeaninternal/server/type/JsonTester.java | 5 ++--- .../server/type/ScalarTypeDateTest.java | 9 +++++---- .../server/type/ScalarTypeJodaLocalDateTest.java | 2 +- .../server/type/ScalarTypeLocalDateTest.java | 2 +- .../server/type/ScalarTypeUtilDateTest.java | 5 +++-- .../server/type/ScalarTypeYearMonthDateTest.java | 9 ++++++--- 10 files changed, 34 insertions(+), 32 deletions(-) diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java index 77ccf5fce..22184cad0 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeBaseDate.java @@ -97,12 +97,10 @@ public abstract class ScalarTypeBaseDate extends ScalarTypeBase { @Override public void jsonWrite(JsonGenerator writer, T value) throws IOException { - switch(mode) { - case ISO8601: - writer.writeString(toIsoFormat(value)); - break; - default: - writer.writeNumber(convertToMillis(value)); + if (mode == JsonConfig.Date.ISO8601) { + writer.writeString(toIsoFormat(value)); + } else { + writer.writeNumber(convertToMillis(value)); } } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java index e69bb1697..b3d8aee8b 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDate.java @@ -2,6 +2,7 @@ package io.ebeaninternal.server.type; import io.ebean.config.JsonConfig; import io.ebeaninternal.server.core.BasicTypeConverter; +import org.joda.time.DateTimeZone; import org.joda.time.LocalDate; import java.sql.Date; @@ -28,7 +29,7 @@ public class ScalarTypeJodaLocalDate extends ScalarTypeBaseDate { @Override public long convertToMillis(LocalDate value) { - return value.toDateTimeAtStartOfDay().getMillis(); + return value.toDateTimeAtStartOfDay(DateTimeZone.UTC).getMillis(); } @Override diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java index 8b90b9208..eca6102fa 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeLocalDate.java @@ -7,7 +7,7 @@ import java.sql.Date; import java.sql.Timestamp; import java.sql.Types; import java.time.LocalDate; -import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.ZonedDateTime; /** @@ -23,9 +23,14 @@ public class ScalarTypeLocalDate extends ScalarTypeBaseDate { return value.toString(); } + @Override + public LocalDate convertFromMillis(long systemTimeMillis) { + return new Timestamp(systemTimeMillis).toLocalDateTime().toLocalDate(); + } + @Override public long convertToMillis(LocalDate value) { - ZonedDateTime zonedDateTime = value.atStartOfDay(ZoneId.systemDefault()); + ZonedDateTime zonedDateTime = value.atStartOfDay(ZoneOffset.UTC); return zonedDateTime.toInstant().toEpochMilli(); } @@ -55,9 +60,4 @@ public class ScalarTypeLocalDate extends ScalarTypeBaseDate { return (LocalDate) value; } - @Override - public LocalDate convertFromMillis(long systemTimeMillis) { - return new Timestamp(systemTimeMillis).toLocalDateTime().toLocalDate(); - } - } diff --git a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java index 053950ab7..35b6683fd 100644 --- a/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java +++ b/src/main/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDate.java @@ -8,7 +8,7 @@ import java.sql.Timestamp; import java.sql.Types; import java.time.LocalDate; import java.time.YearMonth; -import java.time.ZoneId; +import java.time.ZoneOffset; import java.time.ZonedDateTime; /** @@ -25,7 +25,7 @@ public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate { } protected LocalDate toLocalDate(YearMonth yearMonth) { - return LocalDate.of(yearMonth.getYear(), yearMonth.getMonth(), 1); + return yearMonth.atDay(1); } protected YearMonth fromLocalDate(LocalDate localDate) { @@ -39,8 +39,7 @@ public class ScalarTypeYearMonthDate extends ScalarTypeBaseDate { @Override public long convertToMillis(YearMonth value) { - LocalDate localDate = toLocalDate(value); - ZonedDateTime zonedDateTime = localDate.atStartOfDay(ZoneId.systemDefault()); + ZonedDateTime zonedDateTime = value.atDay(1).atStartOfDay(ZoneOffset.UTC); return zonedDateTime.toInstant().toEpochMilli(); } diff --git a/src/test/java/io/ebeaninternal/server/type/JsonTester.java b/src/test/java/io/ebeaninternal/server/type/JsonTester.java index de6f2e324..578a1fb89 100644 --- a/src/test/java/io/ebeaninternal/server/type/JsonTester.java +++ b/src/test/java/io/ebeaninternal/server/type/JsonTester.java @@ -1,11 +1,11 @@ package io.ebeaninternal.server.type; -import io.ebean.config.JsonConfig; -import io.ebeaninternal.server.text.json.WriteJson; import com.fasterxml.jackson.core.JsonFactory; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; +import io.ebean.config.JsonConfig; +import io.ebeaninternal.server.text.json.WriteJson; import java.io.IOException; import java.io.StringWriter; @@ -26,7 +26,6 @@ public class JsonTester { } public String test(T value) throws IOException { - StringWriter writer = new StringWriter(); JsonGenerator generator = factory.createGenerator(writer); diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java index 5e938c854..1b4616902 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeDateTest.java @@ -5,7 +5,6 @@ import org.junit.Test; import java.io.IOException; import java.sql.Date; -import java.time.LocalDate; import static org.assertj.core.api.StrictAssertions.assertThat; import static org.junit.Assert.assertEquals; @@ -27,12 +26,14 @@ public class ScalarTypeDateTest { @Test public void json() throws IOException { - Date val = Date.valueOf(LocalDate.of(2019, 5, 9)); + + Date val = new Date(1557360000000L); JsonTester jsonMillis = new JsonTester<>(type); - assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}"); + assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557360000000}"); JsonTester jsonIso = new JsonTester<>(new ScalarTypeDate(JsonConfig.Date.ISO8601)); - assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}"); + Date val1 = jsonIso.type.parse("2019-05-09"); + assertThat(jsonIso.test(val1)).isEqualTo("{\"key\":\"2019-05-09\"}"); } } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java index c5b5bbdb3..fc2246daf 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeJodaLocalDateTest.java @@ -66,7 +66,7 @@ public class ScalarTypeJodaLocalDateTest { LocalDate val = new LocalDate(2019, 5, 9); JsonTester jsonMillis = new JsonTester<>(type); - assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}"); + assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557360000000}"); JsonTester jsonIso = new JsonTester<>(new ScalarTypeJodaLocalDate(JsonConfig.Date.ISO8601) ); assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}"); diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java index e9250a30f..d17deb98e 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeLocalDateTest.java @@ -63,7 +63,7 @@ public class ScalarTypeLocalDateTest { LocalDate val = LocalDate.of(2019, 5, 9); JsonTester jsonMillis = new JsonTester<>(type); - assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}"); + assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557360000000}"); JsonTester jsonIso = new JsonTester<>(new ScalarTypeLocalDate(JsonConfig.Date.ISO8601) ); assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}"); diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java index 4d614655e..29be8e8fa 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeUtilDateTest.java @@ -15,12 +15,13 @@ public class ScalarTypeUtilDateTest { @Test public void json() throws IOException { - Date val = dateType.parse("2019-05-09"); + Date val = new Date(1557316800000L); JsonTester jsonMillis = new JsonTester<>(dateType); assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1557316800000}"); JsonTester jsonIso = new JsonTester<>(new ScalarTypeUtilDate.DateType(JsonConfig.Date.ISO8601) ); - assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-09\"}"); + Date val1 = jsonIso.type.parse("2019-05-09"); + assertThat(jsonIso.test(val1)).isEqualTo("{\"key\":\"2019-05-09\"}"); } } diff --git a/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java index fc57ab04f..ec0979bd6 100644 --- a/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java +++ b/src/test/java/io/ebeaninternal/server/type/ScalarTypeYearMonthDateTest.java @@ -7,6 +7,8 @@ import java.io.IOException; import java.sql.Date; import java.time.LocalDate; import java.time.YearMonth; +import java.time.ZoneOffset; +import java.time.ZonedDateTime; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.Assert.assertEquals; @@ -20,8 +22,9 @@ public class ScalarTypeYearMonthDateTest { LocalDate today = LocalDate.now(); LocalDate firstMonthDay = today.withDayOfMonth(1); - Date date = Date.valueOf(firstMonthDay); - long epochMilli = date.getTime(); + ZonedDateTime zonedDateTime = firstMonthDay.atStartOfDay(ZoneOffset.UTC); + + long epochMilli = zonedDateTime.toInstant().toEpochMilli(); YearMonth yearMonth = type.convertFromMillis(epochMilli); long val1 = type.convertToMillis(yearMonth); @@ -60,7 +63,7 @@ public class ScalarTypeYearMonthDateTest { YearMonth val = YearMonth.of(2019, 5); JsonTester jsonMillis = new JsonTester<>(type); - assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1556625600000}"); + assertThat(jsonMillis.test(val)).isEqualTo("{\"key\":1556668800000}"); JsonTester jsonIso = new JsonTester<>(new ScalarTypeYearMonthDate(JsonConfig.Date.ISO8601) ); assertThat(jsonIso.test(val)).isEqualTo("{\"key\":\"2019-05-01\"}");