diff --git a/src/com/createsend/util/jersey/JsonProvider.java b/src/com/createsend/util/jersey/JsonProvider.java index 8e71392..f750ac3 100644 --- a/src/com/createsend/util/jersey/JsonProvider.java +++ b/src/com/createsend/util/jersey/JsonProvider.java @@ -1,84 +1,84 @@ -/** - * Copyright (c) 2011 Toby Brain - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in - * all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN - * THE SOFTWARE. - */ -package com.createsend.util.jersey; - -import java.io.IOException; -import java.io.InputStream; -import java.io.OutputStream; -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.text.DateFormat; -import java.text.ParsePosition; -import java.text.SimpleDateFormat; -import java.util.Date; - -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.MultivaluedMap; - -import org.codehaus.jackson.jaxrs.JacksonJsonProvider; -import org.codehaus.jackson.map.DeserializationConfig; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; - -/** - * An extension of the Jersey JacksonJsonProvider used to set Jackson - * serialisation/deserialisation properties - */ -public class JsonProvider extends JacksonJsonProvider { - - public static final DateFormat ApiDateFormat = new SimpleDateFormat("yyyy-MM-dd") { - final SimpleDateFormat ApiDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - final SimpleDateFormat ApiDateFormatTz = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); - - @Override - public Date parse(String source, ParsePosition pos) { - if (source.length() - pos.getIndex() == ApiDateFormat.toPattern().length()) - return ApiDateFormat.parse(source, pos); - return ApiDateFormatTz.parse(source, pos); - } - }; - - @Override - public void writeTo(Object value, Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, - OutputStream entityStream) throws IOException { - ObjectMapper mapper = locateMapper(type, mediaType); - mapper.setSerializationInclusion(Inclusion.NON_NULL); - - super.writeTo(value, type, genericType, annotations, mediaType, httpHeaders, - entityStream); - } - - @Override - public Object readFrom(Class type, Type genericType, - Annotation[] annotations, MediaType mediaType, - MultivaluedMap httpHeaders, InputStream entityStream) - throws IOException { - ObjectMapper mapper = locateMapper(type, mediaType); - mapper.setDateFormat(ApiDateFormat); - mapper.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES); - - return super.readFrom(type, genericType, annotations, mediaType, httpHeaders, - entityStream); - } -} +/** + * Copyright (c) 2011 Toby Brain + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + */ +package com.createsend.util.jersey; + +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.text.DateFormat; +import java.text.ParsePosition; +import java.text.SimpleDateFormat; +import java.util.Date; + +import javax.ws.rs.core.MediaType; +import javax.ws.rs.core.MultivaluedMap; + +import org.codehaus.jackson.jaxrs.JacksonJsonProvider; +import org.codehaus.jackson.map.DeserializationConfig; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.map.annotate.JsonSerialize.Inclusion; + +/** + * An extension of the Jersey JacksonJsonProvider used to set Jackson + * serialisation/deserialisation properties + */ +public class JsonProvider extends JacksonJsonProvider { + + public static final DateFormat ApiDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm") { + final SimpleDateFormat ApiDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + final SimpleDateFormat ApiDateFormatTz = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX"); + + @Override + public Date parse(String source, ParsePosition pos) { + if (source.length() - pos.getIndex() == ApiDateFormat.toPattern().length()) + return ApiDateFormat.parse(source, pos); + return ApiDateFormatTz.parse(source, pos); + } + }; + + @Override + public void writeTo(Object value, Class type, Type genericType, + Annotation[] annotations, MediaType mediaType, + MultivaluedMap httpHeaders, + OutputStream entityStream) throws IOException { + ObjectMapper mapper = locateMapper(type, mediaType); + mapper.setSerializationInclusion(Inclusion.NON_NULL); + + super.writeTo(value, type, genericType, annotations, mediaType, httpHeaders, + entityStream); + } + + @Override + public Object readFrom(Class type, Type genericType, + Annotation[] annotations, MediaType mediaType, + MultivaluedMap httpHeaders, InputStream entityStream) + throws IOException { + ObjectMapper mapper = locateMapper(type, mediaType); + mapper.setDateFormat(ApiDateFormat); + mapper.disable(DeserializationConfig.Feature.FAIL_ON_UNKNOWN_PROPERTIES); + + return super.readFrom(type, genericType, annotations, mediaType, httpHeaders, + entityStream); + } +}