Merge pull request #1752 from deki/reintroduce-annotations

Reintroduce Annotated.annotations() method as deprecated

Author: cowtowncoder

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

@@ -76,6 +76,16 @@ public Type getGenericType() {
      */
     public abstract Class<?> getRawType();
 
+    /**
+     * Accessor that can be used to iterate over all the annotations
+     * associated with annotated component.
+     *
+     * @since 2.3
+     * @deprecated Since 2.9 should instead use {@link #getAnnotated()}
+     */
+    @Deprecated
+    public abstract Iterable<Annotation> annotations();
+
     // Also: ensure we can use #equals, #hashCode
 
     @Override

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

@@ -247,6 +247,18 @@ public Class<?> getRawType() {
         return _class;
     }
 
+    @Override
+    @Deprecated
+    public Iterable<Annotation> annotations() {
+        if (_classAnnotations instanceof AnnotationMap) {
+            return ((AnnotationMap) _classAnnotations).annotations();
+        } else if (_classAnnotations instanceof AnnotationCollector.OneAnnotation ||
+           _classAnnotations instanceof AnnotationCollector.TwoAnnotations) {
+            throw new UnsupportedOperationException("please use getAnnotations/ hasAnnotation to check for Annotations");
+        }
+        return Collections.emptyList();
+    }
+
     @Override
     public JavaType getType() {
         return _type;

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

@@ -2,6 +2,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
+import java.util.Collections;
 
 import com.fasterxml.jackson.databind.util.ClassUtil;
 
@@ -103,6 +104,15 @@ public boolean hasOneOf(Class<? extends Annotation>[] annoClasses) {
         return _annotations.hasOneOf(annoClasses);
     }
 
+    @Override
+    @Deprecated
+    public Iterable<Annotation> annotations() {
+        if (_annotations == null) {
+            return Collections.emptyList();
+        }
+        return _annotations.annotations();
+    }
+
     /**
      *<p>
      * NOTE: promoted in 2.9 from `Annotated` up