WELD-1811 add warning when decorator declares inappropriate constructor.

weld · Dec 8, 2015 · 6e6114c · 6e6114c
1 parent e7a2ab8
commit 6e6114c
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java b/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployer.java
@@ -219,6 +219,9 @@ protected void createClassBean(SlimAnnotatedType<?> annotatedType, SetMultimap<C
                 createManagedBean(weldClass);
             }
         } else {
+            if(Beans.isDecoratorDeclaringInAppropriateConstructor(annotatedType)){
+                BootstrapLogger.LOG.decoratorWithNonCdiConstructor(annotatedType.getJavaClass().getName());
+            }
             otherWeldClasses.put(annotatedType.getJavaClass(), annotatedType);
         }
     }

diff --git a/impl/src/main/java/org/jboss/weld/bootstrap/FastAnnotatedTypeLoader.java b/impl/src/main/java/org/jboss/weld/bootstrap/FastAnnotatedTypeLoader.java
@@ -82,6 +82,10 @@ public <T> SlimAnnotatedTypeContext<T> loadAnnotatedType(String className, Strin
                 }
             }
 
+            if(Beans.isDecoratorDeclaringInAppropriateConstructor(classFileInfo)){
+                BootstrapLogger.LOG.decoratorWithNonCdiConstructor(classFileInfo.getClassName());
+            }
+
             // lastly, check if this class fulfills CDI managed bean requirements - if it does, add the class
             if (Beans.isTypeManagedBeanOrDecoratorOrInterceptor(classFileInfo)) {
                 return createContext(className, classFileInfo, observerMethods, bdaId);

diff --git a/impl/src/main/java/org/jboss/weld/logging/BootstrapLogger.java b/impl/src/main/java/org/jboss/weld/logging/BootstrapLogger.java
@@ -198,4 +198,8 @@ public interface BootstrapLogger extends WeldLogger {
     @LogMessage(level = Level.WARN)
     @Message(id = 146, value = "BeforeBeanDiscovery.addAnnotatedType(AnnotatedType<?>) used for {0} is deprecated from CDI 1.1!", format = Format.MESSAGE_FORMAT)
     void deprecatedAddAnnotatedTypeMethodUsed(Class<?> clazz);
+
+    @LogMessage(level = Level.WARN)
+    @Message(id = 147, value = "Decorator {0} declares inappropriate constructor therefore will not available as a managed bean!", format = Format.MESSAGE_FORMAT)
+    void decoratorWithNonCdiConstructor(String clazzName);
 }
diff --git a/impl/src/main/java/org/jboss/weld/util/Beans.java b/impl/src/main/java/org/jboss/weld/util/Beans.java
@@ -471,6 +471,14 @@ public static boolean isTypeManagedBeanOrDecoratorOrInterceptor(ClassFileInfo cl
                 && (!Modifier.isAbstract(classFileInfo.getModifiers()) || classFileInfo.isAnnotationDeclared(Decorator.class));
     }
 
+    public static boolean isDecoratorDeclaringInAppropriateConstructor(ClassFileInfo classFileInfo) {
+        return !classFileInfo.hasCdiConstructor() && classFileInfo.isAnnotationDeclared(Decorator.class);
+    }
+
+    public static boolean isDecoratorDeclaringInAppropriateConstructor(AnnotatedType<?> annotatedType) {
+        return !hasSimpleCdiConstructor(annotatedType) && annotatedType.isAnnotationPresent(Decorator.class);
+    }
+
     public static boolean hasSimpleCdiConstructor(AnnotatedType<?> type) {
         for (AnnotatedConstructor<?> constructor : type.getConstructors()) {
             if (constructor.getParameters().isEmpty()) {