diff options
| -rw-r--r-- | src/org/traccar/api/ObjectMapperProvider.java | 44 | ||||
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 2 |
2 files changed, 46 insertions, 0 deletions
diff --git a/src/org/traccar/api/ObjectMapperProvider.java b/src/org/traccar/api/ObjectMapperProvider.java new file mode 100644 index 000000000..b8c0efad2 --- /dev/null +++ b/src/org/traccar/api/ObjectMapperProvider.java @@ -0,0 +1,44 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.api; + +import com.fasterxml.jackson.databind.ObjectMapper; + +import javax.ws.rs.ext.ContextResolver; +import javax.ws.rs.ext.Provider; +import java.text.DateFormat; +import java.text.SimpleDateFormat; +import java.util.TimeZone; + +@Provider +public class ObjectMapperProvider implements ContextResolver<ObjectMapper> { + + private ObjectMapper mapper = new ObjectMapper(); + + public ObjectMapperProvider() { + DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm'Z'"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + + mapper.setConfig(mapper.getSerializationConfig().with(dateFormat)); + mapper.setConfig(mapper.getDeserializationConfig().with(dateFormat)); + } + + @Override + public ObjectMapper getContext(Class<?> type) { + return mapper; + } + +} diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index ebcdc7137..18e013620 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -35,6 +35,7 @@ import org.glassfish.jersey.servlet.ServletContainer; import org.traccar.Config; import org.traccar.api.AsyncSocketServlet; import org.traccar.api.CorsResponseFilter; +import org.traccar.api.ObjectMapperProvider; import org.traccar.api.ResourceErrorHandler; import org.traccar.api.SecurityRequestFilter; import org.traccar.api.resource.CommandResource; @@ -129,6 +130,7 @@ public class WebServer { servletHandler.addServlet(new ServletHolder(new AsyncSocketServlet()), "/socket"); ResourceConfig resourceConfig = new ResourceConfig(); + resourceConfig.register(ObjectMapperProvider.class); resourceConfig.register(ResourceErrorHandler.class); resourceConfig.register(SecurityRequestFilter.class); resourceConfig.register(CorsResponseFilter.class); |