[jackson-jaxrs-providers] 61/162: Add ctor for issue #10

[Timo Aaltonen]

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 9a532217ed69e5ce0d330aef192f3ad366a800f0
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date:   Sat Apr 27 22:54:10 2013 -0700

    Add ctor for issue #10
---
 .../fasterxml/jackson/jaxrs/base/ProviderBase.java | 29 ++++++++++++++++++----
 release-notes/VERSION                              |  3 ++-
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java b/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java
index 221d168..011a854 100644
--- a/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java
+++ b/base/src/main/java/com/fasterxml/jackson/jaxrs/base/ProviderBase.java
@@ -146,9 +146,27 @@ public abstract class ProviderBase<
      */
     protected final MAPPER_CONFIG _mapperConfig;
 
+    /*
+    /**********************************************************
+    /* Life-cycle
+    /**********************************************************
+     */
+    
     protected ProviderBase(MAPPER_CONFIG mconfig) {
         _mapperConfig = mconfig;
     }
+
+    /**
+     * Constructor that is only added to resolve
+     * issue #10; problems with combination of
+     * RESTeasy and CDI.
+     * Should NOT be used by any code explicitly; only exists
+     * for proxy support.
+     */
+    @Deprecated
+    protected ProviderBase() {
+        _mapperConfig = null;
+    }
     
     /*
     /**********************************************************
@@ -333,7 +351,7 @@ public abstract class ProviderBase<
      * given value (of specified type) can be serialized by
      * this provider.
      * Implementation will first check that expected media type is
-     * a JSON type (via call to {@link #isJsonType}; then verify
+     * expected one (by call to {@link #hasMatchingMediaType}); then verify
      * that type is not one of "untouchable" types (types we will never
      * automatically handle), and finally that there is a serializer
      * for type (iff {@link #checkCanSerialize} has been called with
@@ -462,7 +480,8 @@ public abstract class ProviderBase<
      * values of given type (and media type) can be deserialized by
      * this provider.
      * Implementation will first check that expected media type is
-     * a JSON type (via call to {@link #isJsonType}; then verify
+     * a JSON type (via call to {@link #hasMatchingMediaType});
+     * then verify
      * that type is not one of "untouchable" types (types we will never
      * automatically handle), and finally that there is a deserializer
      * for type (iff {@link #checkCanDeserialize} has been called with
@@ -564,7 +583,7 @@ public abstract class ProviderBase<
      * {@link #setMapper} (or non-null instance passed in constructor), that
      * will be used. 
      * If not, will try to locate it using standard JAX-RS
-     * {@link ContextResolver} mechanism, if it has been properly configured
+     * <code>ContextResolver</code> mechanism, if it has been properly configured
      * to access it (by JAX-RS runtime).
      * Finally, if no mapper is found, will return a default unconfigured
      * {@link ObjectMapper} instance (one constructed with default constructor
@@ -573,10 +592,10 @@ public abstract class ProviderBase<
      * @param type Class of object being serialized or deserialized;
      *   not checked at this point, since it is assumed that unprocessable
      *   classes have been already weeded out,
-     *   but will be passed to {@link ContextResolver} as is.
+     *   but will be passed to <code>ContextResolver</code> as is.
      * @param mediaType Declared media type for the instance to process:
      *   not used by this method,
-     *   but will be passed to {@link ContextResolver} as is.
+     *   but will be passed to <code>ContextResolver</code> as is.
      */
     public MAPPER locateMapper(Class<?> type, MediaType mediaType)
     {
diff --git a/release-notes/VERSION b/release-notes/VERSION
index 80bc1b6..0b32a4f 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -3,13 +3,14 @@ Sub-modules:
   jackson-jaxrs-json-provider
   jackson-jaxrs-smile-provider
   jackson-jaxrs-xml-provider
-Version: 2.2.0 (22-Apr-2013)
+Version: 2.2.1 (xx-May-2013)
 
 Changes:
 
 #9: Dependency to Jetty was accidentally left as compile-time; should be
   'test'
  (reported by KlausBrunner at github)
+#10: Problems with proxying of `ProviderBase` (add no-arg constructor)
 
 ------------------------------------------------------------------------
 === History: ===

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git