[juneau] branch master updated: JUNEAU-197

[jamesbognar]

This is an automated email from the ASF dual-hosted git repository.

jamesbognar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/juneau.git


The following commit(s) were added to refs/heads/master by this push:
     new aa2f33f  JUNEAU-197
aa2f33f is described below

commit aa2f33f7db55218fb8eb50a71f1d4ae1c7747472
Author: JamesBognar <jamesbog...@apache.org>
AuthorDate: Sun Mar 8 10:37:18 2020 -0400

    JUNEAU-197
    
    @BeanConfig(bpi) does not override @Bean(bpi)
---
 .../java/org/apache/juneau/reflection/ClassInfoTest.java   | 14 --------------
 .../src/main/java/org/apache/juneau/reflect/ClassInfo.java |  3 +--
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git 
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
 
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
index 8052db0..bf2a8f3 100644
--- 
a/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
+++ 
b/juneau-core/juneau-core-utest/src/test/java/org/apache/juneau/reflection/ClassInfoTest.java
@@ -927,13 +927,6 @@ public class ClassInfoTest {
        }
 
        @Test
-       public void getAnnotationsMap() {
-               check("@A(7),@A(6),@A(5),@A(3),@A(1),@A(2),@PA(10)", 
g3.getAnnotationList(null));
-               check("@A(7),@A(6),@A(5),@A(3),@A(1),@A(2),@PA(10)", 
g4.getAnnotationList(null));
-               check("@A(3),@PA(10)", g5.getAnnotationList(null));
-       }
-
-       @Test
        public void getAnnotationsMapParentFirst() {
                check("@PA(10),@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)", 
g3.getAnnotationListParentFirst(null));
                check("@PA(10),@A(2),@A(1),@A(3),@A(5),@A(6),@A(7)", 
g4.getAnnotationListParentFirst(null));
@@ -953,13 +946,6 @@ public class ClassInfoTest {
        static ClassInfo gb3=of(GB3.class), gb4=of(GB4.class), 
gb5=of(GB5.class);
 
        @Test
-       public void getConfigAnnotationsMap() {
-               
check("@AConfig(7),@AConfig(6),@AConfig(5),@AConfig(3),@AConfig(1),@AConfig(2)",
 gb3.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
-               
check("@AConfig(7),@AConfig(6),@AConfig(5),@AConfig(3),@AConfig(1),@AConfig(2)",
 gb4.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
-               check("@AConfig(3)", 
gb5.getAnnotationList(ConfigAnnotationFilter.INSTANCE));
-       }
-
-       @Test
        public void getConfigAnnotationsMapParentFirst() {
                
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
 gb3.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
                
check("@AConfig(2),@AConfig(1),@AConfig(3),@AConfig(5),@AConfig(6),@AConfig(7)",
 gb4.getAnnotationListParentFirst(ConfigAnnotationFilter.INSTANCE));
diff --git 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
index 3dfc99b..76d320a 100644
--- 
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
+++ 
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ClassInfo.java
@@ -1076,8 +1076,7 @@ public final class ClassInfo {
         * @return A new {@link AnnotationList} object on every call.
         */
        public AnnotationList getAnnotationList(Predicate<AnnotationInfo<?>> 
filter) {
-//             return getAnnotationListParentFirst(filter);
-               return appendAnnotationList(new AnnotationList(filter));
+               return getAnnotationListParentFirst(filter);
        }
 
        /**