[webbeans-commits] Webbeans SVN: r2461 - in ri/trunk/impl/src/main/java/org/jboss/webbeans: util and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-04-17 07:47:03 -0400 (Fri, 17 Apr 2009)
New Revision: 2461

Modified:
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceMethodHandler.java
   ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Proxies.java
Log:
minor

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java	2009-04-17 11:46:22 UTC (rev 2460)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java	2009-04-17 11:47:03 UTC (rev 2461)
@@ -29,11 +29,13 @@
 
 import javax.context.CreationalContext;
 import javax.context.Dependent;
+import javax.inject.Production;
 
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.bean.RIBean;
 import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
 import org.jboss.webbeans.injection.AnnotatedInjectionPoint;
+import org.jboss.webbeans.literal.CurrentLiteral;
 import org.jboss.webbeans.util.Proxies;
 
 /**
@@ -45,6 +47,13 @@
 public abstract class AbstractJavaEEResourceBean<T> extends RIBean<T>
 {
    
+   private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>();
+   
+   static
+   {
+      DEFAULT_BINDINGS.add(new CurrentLiteral());
+   }
+   
    private final Class<? extends Annotation> deploymentType;
    private final Set<Annotation> bindings;
    private final Class<T> type;
@@ -71,8 +80,30 @@
    protected AbstractJavaEEResourceBean(ManagerImpl manager, Class<? extends Annotation> deploymentType, Set<Annotation> bindings, Class<T> type, Type... types)
    {
       super(manager);
-      this.deploymentType = deploymentType;
-      this.bindings = bindings;
+      if (deploymentType != null)
+      {
+         this.deploymentType = deploymentType;
+      }
+      else
+      {
+         this.deploymentType = Production.class;
+      }
+      if (bindings != null)
+      {
+         this.bindings = bindings;
+      }
+      else
+      {
+         this.bindings = DEFAULT_BINDINGS;
+      }
+      if (type == null)
+      {
+         throw new IllegalStateException("Type must be specified");
+      }
+      if (types == null || types.length == 0)
+      {
+         throw new IllegalStateException("Types must be specified");
+      }
       this.type = type;
       this.types = new HashSet<Type>();
       this.types.addAll(Arrays.asList(types));

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceMethodHandler.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceMethodHandler.java	2009-04-17 11:46:22 UTC (rev 2460)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceMethodHandler.java	2009-04-17 11:47:03 UTC (rev 2461)
@@ -36,7 +36,7 @@
    
    private static final long serialVersionUID = -3171683636451762591L;
    
-   private static final transient Log log = Logging.getLog(AbstractJavaEEResourceMethodHandler.class);
+   private static final Log log = Logging.getLog(AbstractJavaEEResourceMethodHandler.class);
 
    /**
     * 

Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Proxies.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Proxies.java	2009-04-17 11:46:22 UTC (rev 2460)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/util/Proxies.java	2009-04-17 11:47:03 UTC (rev 2461)
@@ -55,7 +55,7 @@
       {
          if (classes.isEmpty())
          {
-            throw new AssertionError("TypeInfo not properly initialized");
+            return null;
          }
          Iterator<Class<?>> it = classes.iterator();
          Class<?> superclass = it.next();
@@ -79,7 +79,7 @@
       {
          ProxyFactory proxyFactory = new ProxyFactory();
          Class<?> superClass = getSuperClass();
-         if(superClass != Object.class)
+         if(superClass != null && superClass != Object.class)
          {
             proxyFactory.setSuperclass(superClass);
          }