Clean up casts and suppression of warnings

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@130 1c488680-804c-0410-94cd-c6b725194a0e

webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java

@@ -16,7 +16,7 @@
  */
 public class BasicContext implements Context
 {
-   private Map<Bean<?>, Object> values;
+   private Map<Bean<? extends Object>, Object> values;
    private Class<? extends Annotation> scopeType;
 
    public BasicContext(Class<? extends Annotation> scopeType)
@@ -25,7 +25,6 @@ public BasicContext(Class<? extends Annotation> scopeType)
       values = new HashMap<Bean<?>,Object>();
    }
 
-   @SuppressWarnings("unchecked")
    public <T> T get(Bean<T> component, boolean create) 
    {
       T instance = (T) values.get(component);
@@ -52,34 +51,29 @@ public Class<? extends Annotation> getScopeType()
       return scopeType;
    }
 
-   @SuppressWarnings("unchecked")
-   public <T> void remove(Manager container, Bean<T> component) 
+   public <T> void remove(Manager container, Bean<T> bean) 
    {
-      T instance = (T) values.get(component);
+      T instance = (T) values.get(bean);
 
       if (instance != null)
       {
-         values.remove(component);
-         component.destroy(instance);
+         values.remove(bean);
+         bean.destroy(instance);
       }
       else
       {
          // TODO is this the correct exception to throw? See section 9.1 of spec
-         throw new RuntimeException("Component " + component.getName() + " cannot be removed as it " + 
+         throw new RuntimeException("Component " + bean.getName() + " cannot be removed as it " + 
                "does not exist in [" + scopeType + "] context.");
       }
    }
 
-   @SuppressWarnings("unchecked")
    public void destroy(Manager container)
    {
-      // TODO this method isn't declared by the interface, but is implied by section 9.1.2 of the spec
-
       for (Bean c : values.keySet())
       {
          c.destroy(values.get(c));
       }
-
       values.clear();
    }
 

webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java

@@ -2,20 +2,16 @@
 
 import java.lang.annotation.Annotation;
 import java.util.Set;
-import java.util.logging.Logger;
 
 import javax.webbeans.manager.Bean;
 
 import org.jboss.webbeans.model.AbstractComponentModel;
-import org.jboss.webbeans.util.LoggerUtil;
 
 public class BeanImpl<T> extends Bean<T>
 {
 
 public static final String LOGGER_NAME = "componentMetaModel";
 
-   private static Logger log = LoggerUtil.getLogger(LOGGER_NAME);
-
    private AbstractComponentModel<T, ?> model;
 
    private ManagerImpl manager;

webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java

@@ -9,6 +9,7 @@
 import java.util.Set;
 
 import javax.webbeans.DeploymentException;
+import javax.webbeans.Observer;
 import javax.webbeans.Production;
 import javax.webbeans.Standard;
 import javax.webbeans.TypeLiteral;
@@ -18,7 +19,6 @@
 import javax.webbeans.manager.InterceptionType;
 import javax.webbeans.manager.Interceptor;
 import javax.webbeans.manager.Manager;
-import javax.webbeans.Observer;
 
 import org.jboss.webbeans.ejb.EjbManager;
 import org.jboss.webbeans.event.EventBus;
@@ -33,8 +33,6 @@ public class ManagerImpl implements Manager
    private EventBus eventBus;
    private ResolutionManager resolutionManager;
 
-   private ThreadLocal<Map<Class<Annotation>, Context>> contexts = new ThreadLocal<Map<Class<Annotation>, Context>>();
-
    private Set<Bean<?>> beans;
 
    public ManagerImpl(List<Class<? extends Annotation>> enabledDeploymentTypes)

webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java

@@ -40,7 +40,6 @@ public void registerInjectionPoints()
       injectionPoints.clear();
    }
 
-   @SuppressWarnings("unchecked")
    public <T> Set<Bean<T>> get(Injectable<T, ?> key)
    {
       return (Set<Bean<T>>) resolvedInjectionPoints.get(key);

webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EJB.java

@@ -2,21 +2,19 @@
 
 import java.lang.annotation.Annotation;
 
-
 import org.jboss.webbeans.util.Reflections;
 
 
-@SuppressWarnings("unchecked")
 public class EJB
 {
 
    public @interface Dummy {}
 
-   public static final Class<Annotation> STATELESS_ANNOTATION;
-   public static final Class<Annotation> STATEFUL_ANNOTATION;
-   public static final Class<Annotation> MESSAGE_DRIVEN_ANNOTATION;
-   public static final Class<Annotation> SINGLETON_ANNOTATION;
-   public static final Class<Annotation> REMOVE_ANNOTATION;
+   public static final Class<? extends Annotation> STATELESS_ANNOTATION;
+   public static final Class<? extends Annotation> STATEFUL_ANNOTATION;
+   public static final Class<? extends Annotation> MESSAGE_DRIVEN_ANNOTATION;
+   public static final Class<? extends Annotation> SINGLETON_ANNOTATION;
+   public static final Class<? extends Annotation> REMOVE_ANNOTATION;
 
    static 
    {
@@ -27,11 +25,12 @@ public class EJB
       REMOVE_ANNOTATION = classForName("javax.ejb.Remove");
    }
 
-   private static Class classForName(String name)
+   @SuppressWarnings("unchecked")
+   private static Class<? extends Annotation> classForName(String name)
    {
       try
       {
-         return Reflections.classForName(name);
+         return (Class<? extends Annotation>) Reflections.classForName(name);
       }
       catch (ClassNotFoundException cnfe)
       {

webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbManager.java

@@ -21,17 +21,16 @@ public EjbManager()
    }
 
    // TODO Should this be static?
-   @SuppressWarnings("unchecked")
    public <T> T lookup(EjbMetaData<T> ejb)
    {
       if (ejb.getEjbLinkJndiName() != null)
       {
-         return (T) JNDI.lookup(ejb.getEjbLinkJndiName());
+         return (T) JNDI.lookup(ejb.getEjbLinkJndiName(), ejb.getType());
       }
       try
       {
          // TODO How is a JNDI lookup failure shown to us?
-         return (T) JNDI.lookup(ejb.getDefaultJndiName());
+         return (T) JNDI.lookup(ejb.getDefaultJndiName(), ejb.getType());
       }
       catch (Exception e) 
       {

webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java

@@ -1,9 +1,9 @@
 package org.jboss.webbeans.ejb;
 
 import static org.jboss.webbeans.ejb.EJB.MESSAGE_DRIVEN_ANNOTATION;
+import static org.jboss.webbeans.ejb.EJB.REMOVE_ANNOTATION;
 import static org.jboss.webbeans.ejb.EJB.SINGLETON_ANNOTATION;
 import static org.jboss.webbeans.ejb.EJB.STATEFUL_ANNOTATION;
-import static org.jboss.webbeans.ejb.EJB.REMOVE_ANNOTATION;
 import static org.jboss.webbeans.ejb.EJB.STATELESS_ANNOTATION;
 import static org.jboss.webbeans.ejb.EjbMetaData.EjbType.MESSAGE_DRIVEN;
 import static org.jboss.webbeans.ejb.EjbMetaData.EjbType.SINGLETON;
@@ -39,10 +39,13 @@ public enum EjbType
    // TODO Initialize the ejb name
    private String ejbName;
 
+   private Class<? extends T> type;
+
 
    public EjbMetaData(Class<? extends T> type)
    {
       // TODO Merge in ejb-jar.xml
+      this.type = type;
       if (type.isAnnotationPresent(STATELESS_ANNOTATION))
       {
          this.ejbType = STATELESS;
@@ -106,4 +109,9 @@ public String getEjbName()
       return ejbName;
    }
 
+   public Class<? extends T> getType()
+   {
+      return type;
+   }
+
 }