WELD-305

weld · Dec 3, 2009 · b39d4ac · b39d4ac
1 parent f8b3b2b
commit b39d4ac
Show file tree

Hide file tree

Showing 9 changed files with 75 additions and 9 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java b/impl/src/main/java/org/jboss/weld/bean/AbstractBean.java
@@ -199,7 +199,7 @@ protected void initTypes()
       }
       else
       {
-         this.types = getAnnotatedItem().getTypeClosure();
+         this.types = new HashSet<Type>(getAnnotatedItem().getTypeClosure());
          if (getType().isInterface())
          {
             this.types.add(Object.class);

diff --git a/impl/src/main/java/org/jboss/weld/bean/SessionBean.java b/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
@@ -73,6 +73,7 @@
 import org.jboss.weld.util.Beans;
 import org.jboss.weld.util.Proxies;
 import org.jboss.weld.util.Proxies.TypeInfo;
+import org.jboss.weld.util.Reflections.HierarchyDiscovery;
 
 /**
  * An enterprise bean representation
@@ -206,9 +207,10 @@ public T produce(CreationalContext<T> ctx)
    protected void initTypes()
    {
       Map<Class<?>, Type> types = new LinkedHashMap<Class<?>, Type>();
+
       for (BusinessInterfaceDescriptor<?> businessInterfaceDescriptor : ejbDescriptor.getLocalBusinessInterfaces())
       {
-         types.put(businessInterfaceDescriptor.getInterface(), businessInterfaceDescriptor.getInterface());
+         types.putAll(new HierarchyDiscovery(businessInterfaceDescriptor.getInterface()).getTypeMap());
       }
       if (getAnnotatedItem().isAnnotationPresent(Typed.class))
       {

diff --git a/impl/src/main/java/org/jboss/weld/util/Reflections.java b/impl/src/main/java/org/jboss/weld/util/Reflections.java
@@ -42,7 +42,6 @@
 import java.security.AccessControlException;
 import java.util.Arrays;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -58,6 +57,9 @@
 
 import ch.qos.cal10n.IMessageConveyor;
 
+import com.google.common.collect.BiMap;
+import com.google.common.collect.HashBiMap;
+
 /**
  * Utility class for static reflection-type operations
  * 
@@ -82,7 +84,7 @@ public static class HierarchyDiscovery
 
       private final Type type;
 
-      private Set<Type> typeSet;
+      private BiMap<Type, Class<?>> types;
 
       public HierarchyDiscovery(Type type)
       {
@@ -91,21 +93,30 @@ public HierarchyDiscovery(Type type)
 
       protected void add(Class<?> clazz, Type type)
       {
-         typeSet.add(type);
+         types.forcePut(type, clazz);
       }
 
       public Set<Type> getTypeClosure()
       {
-         if (typeSet == null)
+         if (types == null)
+         {
+            init();
+         }
+         return types.keySet();
+      }
+
+      public Map<Class<?>, Type> getTypeMap()
+      {
+         if (types == null)
          {
             init();
          }
-         return typeSet;
+         return types.inverse();
       }
 
       private void init()
       {
-         this.typeSet = new HashSet<Type>();
+         this.types = HashBiMap.create();
          discoverTypes(type);
       }
 

diff --git a/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java b/tests/src/main/java/org/jboss/weld/test/AbstractWeldTest.java
@@ -90,6 +90,12 @@ public boolean annotationSetMatches(Set<? extends Annotation> annotations, Class
       }
       return annotationTypeList.size() == 0;
    }
+
+   public boolean typeSetMatches(Set<Type> types, Type... requiredTypes)
+   {
+      List<Type> typeList = Arrays.asList(requiredTypes);
+      return requiredTypes.length == types.size() && types.containsAll(typeList);
+   }
 
    protected Iterable<URL> getResources(String name)
    {

diff --git a/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java b/tests/src/test/java/org/jboss/weld/tests/enterprise/Animal.java
@@ -0,0 +1,6 @@
+package org.jboss.weld.tests.enterprise;
+
+public interface Animal
+{
+
+}
diff --git a/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java b/tests/src/test/java/org/jboss/weld/tests/enterprise/Dog.java
@@ -0,0 +1,9 @@
+package org.jboss.weld.tests.enterprise;
+
+import javax.ejb.Local;
+
+@Local
+public interface Dog extends Animal
+{
+
+}
diff --git a/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java b/tests/src/test/java/org/jboss/weld/tests/enterprise/DogBean.java
@@ -0,0 +1,10 @@
+package org.jboss.weld.tests.enterprise;
+
+import javax.ejb.Stateless;
+
+
+@Stateless
+public class DogBean implements Dog
+{
+
+}
diff --git a/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java b/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanDefinitionTest.java
@@ -0,0 +1,23 @@
+package org.jboss.weld.tests.enterprise;
+
+import javax.enterprise.inject.spi.Bean;
+
+import org.jboss.testharness.impl.packaging.Artifact;
+import org.jboss.testharness.impl.packaging.Packaging;
+import org.jboss.testharness.impl.packaging.PackagingType;
+import org.jboss.weld.test.AbstractWeldTest;
+import org.testng.annotations.Test;
+
+@Artifact
+@Packaging(PackagingType.EAR)
+public class EnterpriseBeanDefinitionTest extends AbstractWeldTest
+{
+
+   @Test(description="WELD-305")
+   public void testSuperInterfacesAreBeanTypes()
+   {
+      Bean<?> bean = getBean(Dog.class);
+      assert typeSetMatches(bean.getTypes(), Object.class, Dog.class, Animal.class);
+   }
+
+}
diff --git a/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java b/tests/src/test/java/org/jboss/weld/tests/enterprise/EnterpriseBeanTest.java
@@ -36,5 +36,4 @@ public void testSLSBBusinessMethodThrowsRuntimeException()
       assert false : "Expected a BowlerHatException to be in the cause stack";
    }
 
-
 }