diff --git a/src/main/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParser.java b/src/main/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParser.java index 8224a06cf..85dc06232 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParser.java +++ b/src/main/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParser.java @@ -8,24 +8,43 @@ import java.util.TimeZone; public class DateTimeJsonParser { - private final SimpleDateFormat dateTimeProto; + private final SimpleDateFormat dateTimeProto20; + private final SimpleDateFormat dateTimeProto22; + private final SimpleDateFormat dateTimeProto23; + private final SimpleDateFormat dateTimeProto24; + public DateTimeJsonParser() { - this("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); + dateTimeProto20 = init("yyyy-MM-dd'T'HH:mm:ss'Z'"); + dateTimeProto22 = init("yyyy-MM-dd'T'HH:mm:ss.S'Z'"); + dateTimeProto23 = init("yyyy-MM-dd'T'HH:mm:ss.SS'Z'"); + dateTimeProto24 = init("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); } - public DateTimeJsonParser(String dateTimeFormat) { - this.dateTimeProto = new SimpleDateFormat(dateTimeFormat); - this.dateTimeProto.setTimeZone(TimeZone.getTimeZone("UTC")); + private SimpleDateFormat init(String dateTimeFormat) { + SimpleDateFormat sdf = new SimpleDateFormat(dateTimeFormat); + sdf.setTimeZone(TimeZone.getTimeZone("UTC")); + return sdf; } - private SimpleDateFormat dtFormat() { - return (SimpleDateFormat) dateTimeProto.clone(); + private SimpleDateFormat dtFormat(int length) { + switch (length) { + case 24: + return (SimpleDateFormat) dateTimeProto24.clone(); + case 23: + return (SimpleDateFormat) dateTimeProto23.clone(); + case 22: + return (SimpleDateFormat) dateTimeProto22.clone(); + case 20: + return (SimpleDateFormat) dateTimeProto20.clone(); + default: + return (SimpleDateFormat) dateTimeProto24.clone(); + } } public Timestamp parse(String jsonDateTime) { try { - java.util.Date d = dtFormat().parse(jsonDateTime); + java.util.Date d = dtFormat(jsonDateTime.length()).parse(jsonDateTime); return new Timestamp(d.getTime()); } catch (ParseException e) { throw new RuntimeException("Error parsing Datetime[" + jsonDateTime + "]", e); @@ -33,6 +52,7 @@ public class DateTimeJsonParser { } public String format(Date value) { - return dtFormat().format(value); + // always format with millisecond precision + return dtFormat(24).format(value); } } diff --git a/src/test/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParserTest.java b/src/test/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParserTest.java new file mode 100644 index 000000000..f158bc681 --- /dev/null +++ b/src/test/java/com/avaje/ebeaninternal/server/type/DateTimeJsonParserTest.java @@ -0,0 +1,71 @@ +package com.avaje.ebeaninternal.server.type; + + +import org.junit.Test; + +import java.sql.Timestamp; + +import static org.assertj.core.api.StrictAssertions.assertThat; + +public class DateTimeJsonParserTest { + + @Test + public void parseFormat_when_hasMillis() throws Exception { + + DateTimeJsonParser parser = new DateTimeJsonParser(); + + String input = "2016-02-28T20:39:00.123Z"; + String formatted = parseAndFormat(parser, input); + + assertThat(formatted).isEqualTo("2016-02-28T20:39:00.123Z"); + } + + @Test + public void parseFormat_when_noMillis() throws Exception { + + DateTimeJsonParser parser = new DateTimeJsonParser(); + + String input = "2016-02-28T20:39:00Z"; + String formatted = parseAndFormat(parser, input); + + assertThat(formatted).isEqualTo("2016-02-28T20:39:00.000Z"); + } + + @Test + public void parseFormat_when_millis_1dp() throws Exception { + + DateTimeJsonParser parser = new DateTimeJsonParser(); + + String input = "2016-02-28T20:39:00.0Z"; + String formatted = parseAndFormat(parser, input); + + assertThat(formatted).isEqualTo("2016-02-28T20:39:00.000Z"); + } + + @Test + public void parseFormat_when_millis_2dp() throws Exception { + + DateTimeJsonParser parser = new DateTimeJsonParser(); + + String input = "2016-02-28T20:39:00.00Z"; + String formatted = parseAndFormat(parser, input); + + assertThat(formatted).isEqualTo("2016-02-28T20:39:00.000Z"); + } + + @Test + public void parseFormat_when_millis_3dp() throws Exception { + + DateTimeJsonParser parser = new DateTimeJsonParser(); + + String input = "2016-02-28T20:39:00.000Z"; + String formatted = parseAndFormat(parser, input); + + assertThat(formatted).isEqualTo("2016-02-28T20:39:00.000Z"); + } + + private String parseAndFormat(DateTimeJsonParser parser, String input) { + Timestamp timestamp = parser.parse(input); + return parser.format(timestamp); + } +} \ No newline at end of file