Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import java.io.IOException;
import java.text.SimpleDateFormat;
import java.time.OffsetDateTime;
import java.time.format.DateTimeParseException;
import java.util.Date;

public class DateDeserializer extends JsonDeserializer<Date> {
Expand All @@ -24,6 +26,11 @@ public Date deserialize(JsonParser p, DeserializationContext ctxt) throws IOExce

@SneakyThrows
public static Date deserializeDate(String date) {
try {
return Date.from(OffsetDateTime.parse(date).toInstant());
} catch (DateTimeParseException e) {
// Preserve support for legacy timestamps without an offset.
}
try {
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
return format.parse(date);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package com.crowdin.client.core.http.impl.json;

import org.junit.jupiter.api.Test;

import java.time.Instant;
import java.util.Date;
import java.util.TimeZone;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;

public class DateDeserializerTest {

@Test
public void testDeserializeWithOffsetsInNonUtcTimeZone() {
TimeZone original = TimeZone.getDefault();
try {
TimeZone.setDefault(TimeZone.getTimeZone("America/New_York"));
JacksonJsonTransformer transformer = new JacksonJsonTransformer();
String[] dates = {
"2019-07-11T07:40:22+00:00",
"2019-07-11T09:40:22+02:00",
"2019-07-11T03:40:22-04:00",
"2019-07-11T07:40:22Z"
};
for (String date : dates) {
assertEquals(Date.from(Instant.parse("2019-07-11T07:40:22Z")),
transformer.parse("\"" + date + "\"", Date.class), date);
}
assertEquals(Date.from(Instant.parse("2019-07-11T07:40:22.123Z")),
transformer.parse("\"2019-07-11T07:40:22.123+00:00\"", Date.class));
} finally {
TimeZone.setDefault(original);
}
}

@Test
public void testLegacyDatesAndEmptyValues() {
TimeZone original = TimeZone.getDefault();
try {
TimeZone.setDefault(TimeZone.getTimeZone("America/New_York"));
Date expected = Date.from(Instant.parse("2019-07-11T11:40:22Z"));
assertEquals(expected, DateDeserializer.deserializeDate("2019-07-11T07:40:22"));
assertEquals(expected, DateDeserializer.deserializeDate("2019-07-11 07:40:22"));
JacksonJsonTransformer transformer = new JacksonJsonTransformer();
assertNull(transformer.parse("\"\"", Date.class));
assertNull(transformer.parse("null", Date.class));
} finally {
TimeZone.setDefault(original);
}
}
}
Loading