WELD-2221 AnnotatedTypeValidator should consider extended interfaces

weld · Aug 15, 2016 · 51ddb0b · 51ddb0b
1 parent c52175e
commit 51ddb0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/annotated/AnnotatedTypeValidator.java b/impl/src/main/java/org/jboss/weld/annotated/AnnotatedTypeValidator.java
@@ -25,8 +25,8 @@
 import javax.enterprise.inject.spi.AnnotatedType;
 
 import org.jboss.weld.logging.MetadataLogger;
-import org.jboss.weld.util.collections.WeldCollections;
 import org.jboss.weld.util.reflection.Formats;
+import org.jboss.weld.util.reflection.Reflections;
 
 /**
  * Validates that methods of an {@link Annotated} implementation return sane values.
@@ -85,9 +85,8 @@ private static void checkSensibility(AnnotatedType<?> type) {
         Set<Class<?>> hierarchy = new HashSet<Class<?>>();
         for (Class<?> clazz = type.getJavaClass(); clazz != null; clazz = clazz.getSuperclass()) {
             hierarchy.add(clazz);
-            WeldCollections.addAll(hierarchy, clazz.getInterfaces());
+            hierarchy.addAll(Reflections.getInterfaceClosure(clazz));
         }
-
         checkMembersBelongToHierarchy(type.getConstructors(), hierarchy, type);
         checkMembersBelongToHierarchy(type.getMethods(), hierarchy, type);
         checkMembersBelongToHierarchy(type.getFields(), hierarchy, type);

diff --git a/impl/src/main/java/org/jboss/weld/logging/MetadataLogger.java b/impl/src/main/java/org/jboss/weld/logging/MetadataLogger.java
@@ -93,7 +93,7 @@ public interface MetadataLogger extends WeldLogger {
     void noConstructor(Object param1);
 
     @LogMessage(level = Level.WARN)
-    @Message(id = 1117, value = "Member {0} ({1}) does not belong to the actual class hierarchy of the annotatedType {2} ({3})\n\tat {4}\n  StackTrace:", format = Format.MESSAGE_FORMAT)
+    @Message(id = 1117, value = "Member {0} ({1}) does not belong to the actual class hierarchy of the annotatedType {2} ({3})\n\tat {4}", format = Format.MESSAGE_FORMAT)
     void notInHierarchy(Object memberName, Object member, Object annotatedTypeJavaClassName, Object annotatedType, Object stackElement);
 
     @Message(id = 1118, value = "A type variable is not a valid bean type. Bean type {0} of bean {1}", format = Format.MESSAGE_FORMAT)