Use util method to avoid warnings

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3527 1c488680-804c-0410-94cd-c6b725194a0e
weld · Aug 16, 2009 · f1ad7c0 · f1ad7c0
1 parent 0cd3edd
commit f1ad7c0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 45 deletions.
diff --git a/impl/src/main/java/org/jboss/webbeans/bean/builtin/ExtensionBean.java b/impl/src/main/java/org/jboss/webbeans/bean/builtin/ExtensionBean.java
@@ -37,12 +37,7 @@ public class ExtensionBean extends AbstractBuiltInBean<Extension>
    private final WBClass<Extension> clazz;
    private final Extension instance;
 
-   public static ExtensionBean of(BeanManagerImpl manager, WBClass<Extension> clazz, Extension instance)
-   {
-      return new ExtensionBean(manager, clazz, instance);
-   }
-
-   protected ExtensionBean(BeanManagerImpl manager, WBClass<Extension> clazz, Extension instance)
+   public ExtensionBean(BeanManagerImpl manager, WBClass<Extension> clazz, Extension instance)
    {
       super(manager);
       this.clazz = clazz;

diff --git a/impl/src/main/java/org/jboss/webbeans/bean/builtin/InjectionPointBean.java b/impl/src/main/java/org/jboss/webbeans/bean/builtin/InjectionPointBean.java
@@ -17,14 +17,13 @@
 package org.jboss.webbeans.bean.builtin;
 
 import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.InjectionPoint;
 
 import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.util.collections.Arrays2;
 
 /**
  * Bean for InjectionPoint metadata
@@ -35,7 +34,7 @@
 public class InjectionPointBean extends AbstractBuiltInBean<InjectionPoint>
 {
 
-   private static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(new Type[] { InjectionPoint.class }));
+   private static final Set<Type> TYPES = Arrays2.<Type>asSet(InjectionPoint.class, Object.class);
 
    /**
     * Creates an InjectionPoint Web Bean for the injection of the containing bean owning
@@ -45,14 +44,8 @@ public class InjectionPointBean extends AbstractBuiltInBean<InjectionPoint>
     * @param <S>
     * @param field The annotated member field/parameter for the injection
     * @param manager The RI manager implementation
-    * @return a new bean for this injection point
     */
-   public static InjectionPointBean of(BeanManagerImpl manager)
-   {
-      return new InjectionPointBean(manager);
-   }
-
-   protected InjectionPointBean(BeanManagerImpl manager)
+   public InjectionPointBean(BeanManagerImpl manager)
    {
       super(manager);
    }

diff --git a/impl/src/main/java/org/jboss/webbeans/bean/builtin/ManagerBean.java b/impl/src/main/java/org/jboss/webbeans/bean/builtin/ManagerBean.java
@@ -17,26 +17,20 @@
 package org.jboss.webbeans.bean.builtin;
 
 import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.HashSet;
 import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.BeanManager;
 
 import org.jboss.webbeans.BeanManagerImpl;
+import org.jboss.webbeans.util.collections.Arrays2;
 
 public class ManagerBean extends AbstractBuiltInBean<BeanManagerImpl>
 {
 
-   private static final Set<Type> TYPES = new HashSet<Type>(Arrays.asList(BeanManagerImpl.class, BeanManager.class));
+   private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, BeanManagerImpl.class, BeanManager.class);
 
-   public static final ManagerBean of(BeanManagerImpl manager)
-   {
-      return new ManagerBean(manager);
-   }
-
-   protected ManagerBean(BeanManagerImpl manager)
+   public ManagerBean(BeanManagerImpl manager)
    {
       super(manager);
    }

diff --git a/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/EventBean.java b/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/EventBean.java
@@ -29,23 +29,18 @@
 import org.jboss.webbeans.event.EventImpl;
 import org.jboss.webbeans.literal.AnyLiteral;
 import org.jboss.webbeans.resolution.ResolvableTransformer;
+import org.jboss.webbeans.util.collections.Arrays2;
 
 public class EventBean extends AbstractFacadeBean<Event<?>>
 {
 
-   private static final Class<Event<?>>                  TYPE                      = new TypeLiteral<Event<?>>(){}.getRawType();
-   private static final Set<Type>                        DEFAULT_TYPES             = new HashSet<Type>(Arrays.asList(TYPE, Object.class));
-   private static final Annotation                       ANY                       = new AnyLiteral();
-   private static final Set<Annotation>                  DEFAULT_BINDINGS          = new HashSet<Annotation>(Arrays.asList(ANY));
-   public static final ResolvableTransformer          TRANSFORMER               = new FacadeBeanResolvableTransformer(TYPE);
+   private static final Class<Event<?>> TYPE = new TypeLiteral<Event<?>>() {}.getRawType();
+   private static final Set<Type> DEFAULT_TYPES = Arrays2.<Type>asSet(TYPE, Object.class);
+   private static final Annotation ANY = new AnyLiteral();
+   private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>(Arrays.asList(ANY));
+   public static final ResolvableTransformer TRANSFORMER = new FacadeBeanResolvableTransformer(TYPE);
 
-
-   public static AbstractFacadeBean<Event<?>> of(BeanManagerImpl manager)
-   {
-      return new EventBean(manager);
-   }
-
-   protected EventBean(BeanManagerImpl manager)
+   public EventBean(BeanManagerImpl manager)
    {
       super(manager);
    }

diff --git a/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceBean.java b/impl/src/main/java/org/jboss/webbeans/bean/builtin/facade/InstanceBean.java
@@ -29,23 +29,18 @@
 import org.jboss.webbeans.BeanManagerImpl;
 import org.jboss.webbeans.literal.AnyLiteral;
 import org.jboss.webbeans.resolution.ResolvableTransformer;
+import org.jboss.webbeans.util.collections.Arrays2;
 
 public class InstanceBean extends AbstractFacadeBean<Instance<?>>
 {
 
    private static final Class<Instance<?>> TYPE = new TypeLiteral<Instance<?>>() {}.getRawType();
-   private static final Set<Type> DEFAULT_TYPES = new HashSet<Type>(Arrays.asList(TYPE, Object.class));
+   private static final Set<Type> DEFAULT_TYPES = Arrays2.<Type>asSet(TYPE, Object.class);
    private static final Any ANY = new AnyLiteral();
    private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>(Arrays.asList(ANY));
    public static final ResolvableTransformer TRANSFORMER = new FacadeBeanResolvableTransformer(TYPE);
 
-
-   public static AbstractFacadeBean<Instance<?>> of(BeanManagerImpl manager)
-   {
-      return new InstanceBean(manager);
-   }
-
-   protected InstanceBean(BeanManagerImpl manager)
+   public InstanceBean(BeanManagerImpl manager)
    {
       super(manager);
    }