Skip to content

JSONCommunicator: use ZonedDateTime to parse OCPP DateTime (ISO8601) #73

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

Merged
merged 1 commit into from
Jul 19, 2018
Merged

JSONCommunicator: use ZonedDateTime to parse OCPP DateTime (ISO8601) #73

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
16 changes: 4 additions & 12 deletions ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONCommunicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import org.slf4j.LoggerFactory;

import java.lang.reflect.Type;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.ZonedDateTime;
import java.time.format.DateTimeParseException;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.TimeZone;

Expand Down Expand Up @@ -110,16 +110,8 @@ private class CalendarDeserializer implements JsonDeserializer<Calendar> {
public Calendar deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException {
try {
String dateString = json.getAsJsonPrimitive().getAsString();

hasLongDateFormat = dateString.length() == DATE_FORMAT_WITH_MS_LENGTH;
SimpleDateFormat formatter = new SimpleDateFormat(hasLongDateFormat ? DATE_FORMAT_WITH_MS : DATE_FORMAT);

formatter.setTimeZone(TimeZone.getTimeZone("GMT+00:00"));
Calendar calendar = Calendar.getInstance();
Date date = formatter.parse(dateString);
calendar.setTime(date);
return calendar;
} catch (ParseException e) {
return GregorianCalendar.from(ZonedDateTime.parse(dateString));
} catch (DateTimeParseException e) {
throw new JsonParseException(e);
}
}
Expand Down