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 a3a1e9910103f0043687f48e0d74ee3d3fbde3d7 Author: Tatu Saloranta <tatu.salora...@iki.fi> Date: Wed Mar 5 22:16:53 2014 -0800 Trying further fix for #41 --- .../jackson/jaxrs/json/JacksonJsonProvider.java | 18 ++++++++++++++++++ release-notes/VERSION | 14 ++++++++++---- .../jackson/jaxrs/smile/JacksonSmileProvider.java | 18 ++++++++++++++++++ .../jackson/jaxrs/xml/JacksonXMLProvider.java | 18 ++++++++++++++++++ 4 files changed, 64 insertions(+), 4 deletions(-) diff --git a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java index 753927a..7dd3ee6 100644 --- a/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java +++ b/json/src/main/java/com/fasterxml/jackson/jaxrs/json/JacksonJsonProvider.java @@ -231,4 +231,22 @@ public class JacksonJsonProvider return JsonEndpointConfig.forWriting(writer, annotations, _jsonpFunctionName); } + + /** + * @deprecated Since 2.3, use variant that takes explicit defaultView + */ + @Deprecated + @Override + protected JsonEndpointConfig _configForReading(ObjectMapper mapper, Annotation[] annotations) { + return _configForReading(mapper, annotations, _defaultReadView); + } + + /** + * @deprecated Since 2.3, use variant that takes explicit defaultView + */ + @Deprecated + @Override + protected JsonEndpointConfig _configForWriting(ObjectMapper mapper, Annotation[] annotations) { + return _configForWriting(mapper, annotations, _defaultWriteView); + } } diff --git a/release-notes/VERSION b/release-notes/VERSION index 0e67303..8848316 100644 --- a/release-notes/VERSION +++ b/release-notes/VERSION @@ -4,6 +4,16 @@ Sub-modules: jackson-jaxrs-smile-provider jackson-jaxrs-xml-provider +2.3.3 (xx-xxx-2013) + +#41: Try to resolve problems with RESTeasy, missing `_configForWriting` + override. + (reported by `tbroyer@github`) + +------------------------------------------------------------------------ +=== History: === +------------------------------------------------------------------------ + 2.3.2 (01-Mar-2014) #40: Allow use of "text/x-json" content type by default @@ -12,10 +22,6 @@ Sub-modules: #43: Verify that format-specific mappers are properly overridden (like `XmlMapper` for xml) ------------------------------------------------------------------------- -=== History: === ------------------------------------------------------------------------- - 2.3.1 (28-Dec-2013) #37: Enable use of JAX-RS 2.0 API diff --git a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java index 1ace7b4..9dfdfc7 100644 --- a/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java +++ b/smile/src/main/java/com/fasterxml/jackson/jaxrs/smile/JacksonSmileProvider.java @@ -222,4 +222,22 @@ extends ProviderBase<JacksonSmileProvider, Annotation[] annotations) { return SmileEndpointConfig.forWriting(writer, annotations); } + + /** + * @deprecated Since 2.3, use variant that takes explicit defaultView + */ + @Deprecated + @Override + protected SmileEndpointConfig _configForReading(ObjectMapper mapper, Annotation[] annotations) { + return _configForReading(mapper, annotations, _defaultReadView); + } + + /** + * @deprecated Since 2.3, use variant that takes explicit defaultView + */ + @Deprecated + @Override + protected SmileEndpointConfig _configForWriting(ObjectMapper mapper, Annotation[] annotations) { + return _configForWriting(mapper, annotations, _defaultWriteView); + } } diff --git a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java index 71aed35..81c72ee 100644 --- a/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java +++ b/xml/src/main/java/com/fasterxml/jackson/jaxrs/xml/JacksonXMLProvider.java @@ -142,6 +142,24 @@ public class JacksonXMLProvider Annotation[] annotations) { return XMLEndpointConfig.forWriting(writer, annotations); } + + /** + * @deprecated Since 2.3, use variant that takes explicit defaultView + */ + @Deprecated + @Override + protected XMLEndpointConfig _configForReading(XmlMapper mapper, Annotation[] annotations) { + return _configForReading(mapper, annotations, _defaultReadView); + } + + /** + * @deprecated Since 2.3, use variant that takes explicit defaultView + */ + @Deprecated + @Override + protected XMLEndpointConfig _configForWriting(XmlMapper mapper, Annotation[] annotations) { + return _configForWriting(mapper, annotations, _defaultWriteView); + } /** * @deprecated Since 2.2 use {@link #hasMatchingMediaType(MediaType)} instead -- 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 pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits