start working on supporting @JsonValue on fields

Author: cowtowncoder

src/main/java/com/fasterxml/jackson/databind/AnnotationIntrospector.java

@@ -856,13 +856,31 @@ public PropertyName findNameForSerialization(Annotated a) {
      * should be used as "the value" of the object instance; usually
      * serialized as a primitive value such as String or number.
      *
-     * @return True if such annotation is found (and is not disabled);
-     *   false if no enabled annotation is found
+     * @return {@link Boolean#TRUE} if such annotation is found and is not disabled;
+     *   {@link Boolean#FALSE} if disabled annotation (block) is found (to indicate
+     *   accessor is definitely NOT to be used "as value"); or `null` if no
+     *   information found.
+     *   
+     * @since 2.9
      */
+    public Boolean findAsValueAnnotation(Annotated a) {
+        // 20-Nov-2016, tatu: Delegate in 2.9; remove redirect from later versions
+        if (a instanceof AnnotatedMethod) {
+            if (hasAsValueAnnotation((AnnotatedMethod) a)) {
+                return true;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * @deprecated Since 2.9 Use {@link #findAsValueAnnotation(Annotated)} instead.
+     */
+    @Deprecated // since 2.9
     public boolean hasAsValueAnnotation(AnnotatedMethod am) {
         return false;
     }
-
+    
     /**
      * Method for checking whether given method has an annotation
      * that suggests that the method is to serve as "any setter";

src/main/java/com/fasterxml/jackson/databind/deser/std/ArrayBlockingQueueDeserializer.java

@@ -5,7 +5,6 @@
 import java.util.concurrent.ArrayBlockingQueue;
 
 import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.*;
 import com.fasterxml.jackson.databind.deser.ValueInstantiator;
 import com.fasterxml.jackson.databind.jsontype.TypeDeserializer;

src/main/java/com/fasterxml/jackson/databind/introspect/AnnotationIntrospectorPair.java

@@ -563,23 +563,20 @@ public PropertyName findNameForSerialization(Annotated a) {
         }
         return n;
     }
-    
+
     @Override
-    public boolean hasAsValueAnnotation(AnnotatedMethod am) {
-        return _primary.hasAsValueAnnotation(am) || _secondary.hasAsValueAnnotation(am);
+    public Boolean findAsValueAnnotation(Annotated a) {
+        Boolean b = _primary.findAsValueAnnotation(a);
+        if (b == null) {
+            b = _secondary.findAsValueAnnotation(a);
+        }
+        return b;
     }
-
+    
     @Override
     public boolean hasAnyGetterAnnotation(AnnotatedMethod am) {
         return _primary.hasAnyGetterAnnotation(am) || _secondary.hasAnyGetterAnnotation(am);
     }
-    
-    @Override
-    @Deprecated
-    public String findEnumValue(Enum<?> value) {
-        String r = _primary.findEnumValue(value);
-        return (r == null) ? _secondary.findEnumValue(value) : r;
-    }        
 
     @Override
     public  String[] findEnumValues(Class<?> enumType, Enum<?>[] enumValues, String[] names) {
@@ -595,6 +592,19 @@ public Enum<?> findDefaultEnumValue(Class<Enum<?>> enumCls) {
         return (en == null) ? _secondary.findDefaultEnumValue(enumCls) : en;
     }
 
+    @Override
+    @Deprecated // since 2.8
+    public String findEnumValue(Enum<?> value) {
+        String r = _primary.findEnumValue(value);
+        return (r == null) ? _secondary.findEnumValue(value) : r;
+    }        
+
+    @Override
+    @Deprecated // since 2.9
+    public boolean hasAsValueAnnotation(AnnotatedMethod am) {
+        return _primary.hasAsValueAnnotation(am) || _secondary.hasAsValueAnnotation(am);
+    }
+    
     // // // Deserialization: general annotations
 
     @Override

src/main/java/com/fasterxml/jackson/databind/introspect/JacksonAnnotationIntrospector.java

@@ -973,10 +973,12 @@ public PropertyName findNameForSerialization(Annotated a)
     }
 
     @Override
-    public boolean hasAsValueAnnotation(AnnotatedMethod am) {
-        JsonValue ann = _findAnnotation(am, JsonValue.class);
-        // value of 'false' means disabled...
-        return (ann != null && ann.value());
+    public Boolean findAsValueAnnotation(Annotated a) {
+        JsonValue ann = _findAnnotation(a, JsonValue.class);
+        if (ann == null) {
+            return null;
+        }
+        return ann.value();
     }
 
     @Override
@@ -986,6 +988,14 @@ public boolean hasAnyGetterAnnotation(AnnotatedMethod am)
         return _hasAnnotation(am, JsonAnyGetter.class);
     }
 
+    @Override
+    @Deprecated // since 2.9
+    public boolean hasAsValueAnnotation(AnnotatedMethod am) {
+        JsonValue ann = _findAnnotation(am, JsonValue.class);
+        // value of 'false' means disabled...
+        return (ann != null) && ann.value();
+    }
+
     /*
     /**********************************************************
     /* Deserialization: general annotations