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 3b93ba4 JUNEAU-197
3b93ba4 is described below
commit 3b93ba42b40ffd017ad2a4fed4bbafafb27655dd
Author: JamesBognar <[email protected]>
AuthorDate: Mon Mar 9 11:53:38 2020 -0400
JUNEAU-197
@BeanConfig(bpi) does not override @Bean(bpi)
---
.../src/main/java/org/apache/juneau/BeanContext.java | 12 ++++++------
.../src/main/java/org/apache/juneau/MetaProvider.java | 9 ---------
.../main/java/org/apache/juneau/reflect/ConstructorInfo.java | 4 +++-
3 files changed, 9 insertions(+), 16 deletions(-)
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
index 91c63d2..44c9ce7 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/BeanContext.java
@@ -3409,12 +3409,12 @@ public class BeanContext extends Context implements
MetaProvider {
return (List<A>)aa;
}
- @Override
- public <A extends Annotation> A getAnnotation(Class<A> a,
Constructor<?> c) {
- List<A> aa = getAnnotations(a, c);
- return aa.isEmpty() ? null : aa.get(0);
- }
-
+// @Override
+// public <A extends Annotation> A getAnnotation(Class<A> a,
Constructor<?> c) {
+// List<A> aa = getAnnotations(a, c);
+// return aa.isEmpty() ? null : aa.get(0);
+// }
+//
/**
* Finds the specified annotation on the specified constructor.
*
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MetaProvider.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MetaProvider.java
index 29768a9..72ef1b6 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MetaProvider.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/MetaProvider.java
@@ -66,12 +66,6 @@ public interface MetaProvider {
A aa = c.getAnnotation(a);
return aa == null ? emptyList() : singletonList(aa);
}
-
- @Override
- public <A extends Annotation> A getAnnotation(Class<A> a,
Constructor<?> c) {
- List<A> l = getAnnotations(a, c);
- return l.isEmpty() ? null : l.get(0);
- }
};
/**
@@ -123,7 +117,4 @@ public interface MetaProvider {
* @return The annotation, or <jk>null</jk> if not found.
*/
<A extends Annotation> List<A> getAnnotations(Class<A> a,
Constructor<?> c);
-
- // TEMPORARY
- <A extends Annotation> A getAnnotation(Class<A> a, Constructor<?> c);
}
diff --git
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
index c8200fc..17c96c3 100644
---
a/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
+++
b/juneau-core/juneau-marshall/src/main/java/org/apache/juneau/reflect/ConstructorInfo.java
@@ -12,6 +12,8 @@
//
***************************************************************************************************************************
package org.apache.juneau.reflect;
+import static org.apache.juneau.internal.CollectionUtils.*;
+
import java.lang.annotation.*;
import java.lang.reflect.*;
@@ -106,7 +108,7 @@ public final class ConstructorInfo extends ExecutableInfo
implements Comparable<
* The first annotation found, or <jk>null</jk> if it doesn't
exist.
*/
public final <T extends Annotation> T getAnnotation(Class<T> a,
MetaProvider mp) {
- return mp.getAnnotation(a, c);
+ return last(mp.getAnnotations(a, c));
}
/**
