This is an automated email from the git hooks/post-receive script. tjaalton pushed a commit to branch master in repository jackson-jaxrs-providers.
commit cec7e7d41c72f1d54b4c6d4e25b1c2a20e079e9e Author: Tatu Saloranta <[email protected]> Date: Wed Oct 9 22:02:58 2013 -0700 Mark more of redundant exception mappers as deprecated --- .../jackson/jaxrs/json/JsonMappingExceptionMapper.java | 13 ++----------- .../jackson/jaxrs/json/JsonParseExceptionMapper.java | 11 +---------- .../jackson/jaxrs/smile/JsonMappingExceptionMapper.java | 17 ++++------------- .../jackson/jaxrs/smile/JsonParseExceptionMapper.java | 17 ++++------------- .../jackson/jaxrs/xml/JsonMappingExceptionMapper.java | 15 +++------------ .../jackson/jaxrs/xml/JsonParseExceptionMapper.java | 15 +++------------ 6 files changed, 17 insertions(+), 71 deletions(-) diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMappingExceptionMapper.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMappingExceptionMapper.java index a195f93..f0e4bc1 100644 --- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMappingExceptionMapper.java +++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonMappingExceptionMapper.java @@ -1,19 +1,10 @@ package com.fasterxml.jackson.jaxrs.json; -import com.fasterxml.jackson.databind.JsonMappingException; - -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; /** - * @deprecated Use {@link com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper} instead. + * @deprecated Since 2.2 use {@link com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper} instead. */ @Deprecated @Provider -public class JsonMappingExceptionMapper implements ExceptionMapper<JsonMappingException> { - @Override - public Response toResponse(JsonMappingException exception) { - return Response.status(Response.Status.BAD_REQUEST).entity(exception.getMessage()).type("text/plain").build(); - } -} +public class JsonMappingExceptionMapper extends com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper { } diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonParseExceptionMapper.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonParseExceptionMapper.java index 28e70ff..1254a4c 100644 --- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonParseExceptionMapper.java +++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JsonParseExceptionMapper.java @@ -1,9 +1,5 @@ package com.fasterxml.jackson.jaxrs.json; -import com.fasterxml.jackson.core.JsonParseException; - -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; /** @@ -11,9 +7,4 @@ import javax.ws.rs.ext.Provider; */ @Deprecated @Provider -public class JsonParseExceptionMapper implements ExceptionMapper<JsonParseException> { - @Override - public Response toResponse(JsonParseException exception) { - return Response.status(Response.Status.BAD_REQUEST).entity(exception.getMessage()).type("text/plain").build(); - } -} +public class JsonParseExceptionMapper extends com.fasterxml.jackson.jaxrs.base.JsonParseExceptionMapper { } diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JsonMappingExceptionMapper.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JsonMappingExceptionMapper.java index b1bbbd0..deb3776 100644 --- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JsonMappingExceptionMapper.java +++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JsonMappingExceptionMapper.java @@ -1,19 +1,10 @@ package com.fasterxml.jackson.jaxrs.smile; -import com.fasterxml.jackson.databind.JsonMappingException; - -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; /** -* Implementation if {@link ExceptionMapper} to send down a "400 Bad Request" -* response in the event that unmappable Smile is received. -*/ + * @deprecated Since 2.2 use {@link com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper} instead. + */ +@Deprecated @Provider -public class JsonMappingExceptionMapper implements ExceptionMapper<JsonMappingException> { - @Override - public Response toResponse(JsonMappingException exception) { - return Response.status(Response.Status.BAD_REQUEST).entity(exception.getMessage()).type("text/plain").build(); - } -} \ No newline at end of file +public class JsonMappingExceptionMapper extends com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper { } diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JsonParseExceptionMapper.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JsonParseExceptionMapper.java index 1787f99..9a2af89 100644 --- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JsonParseExceptionMapper.java +++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JsonParseExceptionMapper.java @@ -1,19 +1,10 @@ package com.fasterxml.jackson.jaxrs.smile; -import com.fasterxml.jackson.core.JsonParseException; - -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; /** -* Implementation of {@link ExceptionMapper} to send down a "400 Bad Request" -* in the event unparsable Smile is received. -*/ + * @deprecated Use {@link com.fasterxml.jackson.jaxrs.base.JsonParseExceptionMapper} instead. + */ +@Deprecated @Provider -public class JsonParseExceptionMapper implements ExceptionMapper<JsonParseException> { - @Override - public Response toResponse(JsonParseException exception) { - return Response.status(Response.Status.BAD_REQUEST).entity(exception.getMessage()).type("text/plain").build(); - } -} +public class JsonParseExceptionMapper extends com.fasterxml.jackson.jaxrs.base.JsonParseExceptionMapper { } diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JsonMappingExceptionMapper.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JsonMappingExceptionMapper.java index 7a9316f..100234a 100644 --- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JsonMappingExceptionMapper.java +++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JsonMappingExceptionMapper.java @@ -1,19 +1,10 @@ package com.fasterxml.jackson.jaxrs.xml; -import com.fasterxml.jackson.databind.JsonMappingException; - -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; /** - * Implementation if {@link ExceptionMapper} to send down a "400 Bad Request" - * response in the event that unprocessable XML is received. + * @deprecated Since 2.2 use {@link com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper} instead. */ +@Deprecated @Provider -public class JsonMappingExceptionMapper implements ExceptionMapper<JsonMappingException> { - @Override - public Response toResponse(JsonMappingException exception) { - return Response.status(Response.Status.BAD_REQUEST).entity(exception.getMessage()).type("text/plain").build(); - } -} +public class JsonMappingExceptionMapper extends com.fasterxml.jackson.jaxrs.base.JsonMappingExceptionMapper { } diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JsonParseExceptionMapper.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JsonParseExceptionMapper.java index 1623924..fdc2f30 100644 --- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JsonParseExceptionMapper.java +++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JsonParseExceptionMapper.java @@ -1,19 +1,10 @@ package com.fasterxml.jackson.jaxrs.xml; -import com.fasterxml.jackson.core.JsonParseException; - -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; import javax.ws.rs.ext.Provider; /** - * Implementation of {@link ExceptionMapper} to send down a "400 Bad Request" - * in the event unprocessable XML is received. + * @deprecated Use {@link com.fasterxml.jackson.jaxrs.base.JsonParseExceptionMapper} instead. */ +@Deprecated @Provider -public class JsonParseExceptionMapper implements ExceptionMapper<JsonParseException> { - @Override - public Response toResponse(JsonParseException exception) { - return Response.status(Response.Status.BAD_REQUEST).entity(exception.getMessage()).type("text/plain").build(); - } -} +public class JsonParseExceptionMapper extends com.fasterxml.jackson.jaxrs.base.JsonParseExceptionMapper { } -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
