[webbeans-commits] Webbeans SVN: r640 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap.

[webbeans-commits at lists.jboss.org]

Author: gavin.king at jboss.com
Date: 2008-12-20 20:50:49 -0500 (Sat, 20 Dec 2008)
New Revision: 640

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
Log:
test for correct constructor before creating the SimpleBean!

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2008-12-21 01:49:50 UTC (rev 639)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java	2008-12-21 01:50:49 UTC (rev 640)
@@ -33,6 +33,7 @@
 import static org.jboss.webbeans.servlet.Servlet.SERVLET_REQUEST_LISTENER_CLASS;
 
 import java.lang.annotation.Annotation;
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.Arrays;
@@ -40,6 +41,7 @@
 import java.util.Set;
 
 import javax.webbeans.DefinitionException;
+import javax.webbeans.Initializer;
 import javax.webbeans.Observable;
 import javax.webbeans.Observer;
 import javax.webbeans.Observes;
@@ -348,7 +350,32 @@
     */
    protected static boolean isTypeSimpleWebBean(Class<?> type)
    {
-      return !type.isAnnotation() && !Reflections.isAbstract(type) && !SERVLET_CLASS.isAssignableFrom(type) && !FILTER_CLASS.isAssignableFrom(type) && !SERVLET_CONTEXT_LISTENER_CLASS.isAssignableFrom(type) && !HTTP_SESSION_LISTENER_CLASS.isAssignableFrom(type) && !SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(type) && !ENTERPRISE_BEAN_CLASS.isAssignableFrom(type) && !UICOMPONENT_CLASS.isAssignableFrom(type);
+      //TODO: check 3.2.1 for more rules!!!!!!
+      return !type.isAnnotation() && 
+      	    !Reflections.isAbstract(type) && 
+      	    !SERVLET_CLASS.isAssignableFrom(type) && 
+      	    !FILTER_CLASS.isAssignableFrom(type) && 
+      	    !SERVLET_CONTEXT_LISTENER_CLASS.isAssignableFrom(type) && 
+      	    !HTTP_SESSION_LISTENER_CLASS.isAssignableFrom(type) && 
+      	    !SERVLET_REQUEST_LISTENER_CLASS.isAssignableFrom(type) && 
+      	    !ENTERPRISE_BEAN_CLASS.isAssignableFrom(type) && 
+      	    !UICOMPONENT_CLASS.isAssignableFrom(type) &&
+      	    hasSimpleWebBeanConstructor(type);
    }
 
+   private static boolean hasSimpleWebBeanConstructor(Class<?> type) {
+      try {
+         type.getDeclaredConstructor();
+         return true;
+      }
+      catch (NoSuchMethodException nsme)
+      {
+         for (Constructor<?> c: type.getDeclaredConstructors())
+         {
+            if (c.isAnnotationPresent(Initializer.class)) return true;
+         }
+         return false;
+      }
+   }
+
 }