[jackson-annotations] 05/207: Minor clean up; un-deprecating @JsonGetter

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton pushed a commit to branch master
in repository jackson-annotations.

commit 81d42ea82f02da8f868fd093895c60a707ac5f5e
Author: Tatu Saloranta <tsaloranta at gmail.com>
Date:   Sat Dec 24 22:12:14 2011 -0800

    Minor clean up; un-deprecating @JsonGetter
---
 .../java/com/fasterxml/jackson/annotation/JsonAutoDetect.java  | 10 ----------
 src/main/java/com/fasterxml/jackson/annotation/JsonGetter.java |  7 +++++--
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonAutoDetect.java b/src/main/java/com/fasterxml/jackson/annotation/JsonAutoDetect.java
index b1db30a..b1e9f84 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonAutoDetect.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonAutoDetect.java
@@ -98,22 +98,16 @@ public @interface JsonAutoDetect
     
     /**
      * Minimum visibility required for auto-detecting regular getter methods.
-     * 
-     * @since 1.5
      */
     Visibility getterVisibility() default Visibility.DEFAULT;
 
     /**
      * Minimum visibility required for auto-detecting is-getter methods.
-     * 
-     * @since 1.5
      */
     Visibility isGetterVisibility() default Visibility.DEFAULT;
     
     /**
      * Minimum visibility required for auto-detecting setter methods.
-     * 
-     * @since 1.5
      */    
     Visibility setterVisibility() default Visibility.DEFAULT;
 
@@ -121,15 +115,11 @@ public @interface JsonAutoDetect
      * Minimum visibility required for auto-detecting Creator methods,
      * except for no-argument constructors (which are always detected
      * no matter what).
-     * 
-     * @since 1.5
      */
     Visibility creatorVisibility() default Visibility.DEFAULT;
 
     /**
      * Minimum visibility required for auto-detecting member fields.
-     * 
-     * @since 1.5
      */ 
     Visibility fieldVisibility() default Visibility.DEFAULT;
 }
diff --git a/src/main/java/com/fasterxml/jackson/annotation/JsonGetter.java b/src/main/java/com/fasterxml/jackson/annotation/JsonGetter.java
index 33f4ba6..800a561 100644
--- a/src/main/java/com/fasterxml/jackson/annotation/JsonGetter.java
+++ b/src/main/java/com/fasterxml/jackson/annotation/JsonGetter.java
@@ -16,8 +16,11 @@ import java.lang.annotation.Target;
  * this method (possibly inherited from a super class), a call is made
  * through the method, and return value will be serialized as value of
  * the property.
- * 
- * @deprecated Use {@link JsonProperty} instead (deprecated since version 1.5)
+ *<p>
+ * Note that this annotation was deprecated in versions 1.5 - 1.9; but
+ * is not deprecated for Jackson 2.0. This is because we may consider
+ * allowing getters that take contextual (injectable) arguments; as
+ * well as cases where get-/settable name may differ.
  */
 @Target(ElementType.METHOD)
 @Retention(RetentionPolicy.RUNTIME)

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