diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-01-03 13:44:26 +1300 |
---|---|---|
committer | Anton Tananaev <anton.tananaev@gmail.com> | 2016-01-03 13:44:26 +1300 |
commit | a14db4167bfa4b7bff3a804a0724e7678fd5fe26 (patch) | |
tree | 887f234929ee7ef08d46d248d6f4d3bfe7e4401f /src | |
parent | 0a17447db65e188e8f21000a1e162eb0d73ef1eb (diff) | |
download | trackermap-server-a14db4167bfa4b7bff3a804a0724e7678fd5fe26.tar.gz trackermap-server-a14db4167bfa4b7bff3a804a0724e7678fd5fe26.tar.bz2 trackermap-server-a14db4167bfa4b7bff3a804a0724e7678fd5fe26.zip |
Another update for date serialization
Diffstat (limited to 'src')
-rw-r--r-- | src/org/traccar/api/ObjectMapperProvider.java | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/org/traccar/api/ObjectMapperProvider.java b/src/org/traccar/api/ObjectMapperProvider.java index 5a9cbb9d9..b323a318b 100644 --- a/src/org/traccar/api/ObjectMapperProvider.java +++ b/src/org/traccar/api/ObjectMapperProvider.java @@ -16,6 +16,7 @@ package org.traccar.api; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; import javax.ws.rs.ext.ContextResolver; import javax.ws.rs.ext.Provider; @@ -29,11 +30,7 @@ public class ObjectMapperProvider implements ContextResolver<ObjectMapper> { private ObjectMapper mapper = new ObjectMapper(); public ObjectMapperProvider() { - DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"); - dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); - - mapper.setConfig(mapper.getSerializationConfig().with(dateFormat)); - mapper.setConfig(mapper.getDeserializationConfig().with(dateFormat)); + mapper.setConfig(mapper.getSerializationConfig().without(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)); } @Override |