finish override logic and split test logic up

Author: tea-dragon

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

@@ -952,13 +952,13 @@ private void _addOrOverrideAnnotations(AnnotatedMember target, Annotation[] anns
         if (anns != null) {
             List<Annotation[]> bundles = null;
             for (Annotation ann : anns) { // first: direct annotations
-                if (_isAnnotationBundle(ann)) {
+                // note: we will NOT filter out non-Jackson anns any more
+                boolean wasModified = target.addOrOverride(ann);
+                if (wasModified && _isAnnotationBundle(ann)) {
                     if (bundles == null) {
                         bundles = new LinkedList<Annotation[]>();
                     }
                     bundles.add(ann.annotationType().getDeclaredAnnotations());
-                } else { // note: no filtering by jackson-annotations
-                    target.addOrOverride(ann);
                 }
             }
             if (bundles != null) { // and then bundles, if any: important for precedence

src/test/java/com/fasterxml/jackson/databind/introspect/TestAnnotionBundles.java

@@ -67,10 +67,8 @@ public class Bean92 {
     @Retention(RetentionPolicy.RUNTIME)
     static @interface HolderB {}
 
-    static class HolderHolder {
-        @HolderA
-        @InformativeHolder
-        public int unimportant = 42;
+    static class RecursiveHolder {
+        @HolderA public int unimportant = 42;
     }
 
     @JsonProperty
@@ -81,6 +79,10 @@ static class HolderHolder {
         boolean important() default true;
     }
 
+    static class InformingHolder {
+        @InformativeHolder public int unimportant = 42;
+    }
+
     static class BundleAnnotationIntrospector extends JacksonAnnotationIntrospector {
         @Override
         public PropertyName findNameForSerialization(Annotated a)
@@ -104,12 +106,12 @@ public PropertyName findNameForSerialization(Annotated a)
     public void testKeepAnnotationBundle() throws Exception
     {
         MAPPER.setAnnotationIntrospector(new BundleAnnotationIntrospector());
-        assertEquals("{\"important\":42}", MAPPER.writeValueAsString(new HolderHolder()));
+        assertEquals("{\"important\":42}", MAPPER.writeValueAsString(new InformingHolder()));
     }
 
     public void testRecursiveBundles() throws Exception
     {
-        assertEquals("{\"unimportant\":42}", MAPPER.writeValueAsString(new HolderHolder()));
+        assertEquals("{\"unimportant\":42}", MAPPER.writeValueAsString(new RecursiveHolder()));
     }
 
     public void testBundledIgnore() throws Exception