Updated Bean to latest spec 20090625 for real this time.

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@3351 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jul 29, 2009 · 02dc806 · 02dc806
1 parent 77b67d6
commit 02dc806
Show file tree

Hide file tree

Showing 13 changed files with 83 additions and 0 deletions.
diff --git a/api/src/main/java/javax/enterprise/inject/spi/Bean.java b/api/src/main/java/javax/enterprise/inject/spi/Bean.java
@@ -62,6 +62,13 @@ public interface Bean<T> extends Contextual<T>
     */
    public String getName();
 
+   /**
+    * The stereotypes applied to this bean
+    * 
+    * @return stereotypes if any
+    */
+   public Set<Class<? extends Annotation>> getStereotypes();
+
    /**
     * The bean class of the managed bean or session bean or of the bean that
     * declares the producer method or field

diff --git a/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java b/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java
@@ -61,6 +61,11 @@ protected Decorator<T> delegate()
             return decorator;
          }
 
+         public Set<Class<? extends Annotation>> getStereotypes()
+         {
+            return decorator.getStereotypes();
+         }
+
       };
    }
 

diff --git a/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java b/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
@@ -19,6 +19,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -280,4 +281,9 @@ protected void checkDeploymentType()
       // TODO sort out ordering of init, then we can use initDeploymentType and hence checkDeploymentType
    }
 
+   public Set<Class<? extends Annotation>> getStereotypes()
+   {
+      return Collections.emptySet();
+   }
+
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java b/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
@@ -17,9 +17,11 @@
 package org.jboss.webbeans.bean;
 
 import java.io.Serializable;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.Set;
@@ -382,6 +384,11 @@ public boolean isPolicy()
    {
       return false;
    }
+
+   public Set<Class<? extends Annotation>> getStereotypes()
+   {
+      return Collections.emptySet();
+   }
 
 }
 
diff --git a/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java b/impl/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
@@ -16,7 +16,10 @@
  */
 package org.jboss.webbeans.bean;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
+import java.util.Collections;
+import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
 
@@ -159,4 +162,9 @@ protected void initInjectionPoints()
 
    }
 
+   public Set<Class<? extends Annotation>> getStereotypes()
+   {
+      return Collections.emptySet();
+   }
+
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java b/impl/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
@@ -16,8 +16,10 @@
  */
 package org.jboss.webbeans.bean;
 
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;
+import java.util.Collections;
 import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
@@ -275,4 +277,9 @@ public String getId()
       return id;
    }
 
+   public Set<Class<? extends Annotation>> getStereotypes()
+   {
+      return Collections.emptySet();
+   }
+
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java b/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
@@ -553,4 +553,10 @@ public boolean isPolicy()
       return false;
    }
 
+   public Set<Class<? extends Annotation>> getStereotypes()
+   {
+      // TODO Auto-generated method stub
+      return null;
+   }
+
 }
diff --git a/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java b/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java
@@ -79,6 +79,11 @@ public String getName()
       return null;
    }
 
+   public Set<Class<? extends Annotation>> getStereotypes()
+   {
+      return Collections.emptySet();
+   }
+
    @Override
    public Set<WBInjectionPoint<?, ?>> getAnnotatedInjectionPoints()
    {

diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java b/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java
@@ -3,6 +3,7 @@
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Member;
 import java.lang.reflect.Type;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -107,6 +108,11 @@ public boolean isPolicy()
             return false;
          }
 
+         public Set<Class<? extends Annotation>> getStereotypes()
+         {
+            return Collections.emptySet();
+         }
+
       };
       InjectionPoint injectionPoint = new InjectionPoint()
       {
@@ -269,6 +275,11 @@ public Set<Annotation> getBindings()
             return bindingTypes;
          }
 
+         public Set<Class<? extends Annotation>> getStereotypes()
+         {
+            return Collections.emptySet();
+         }
+
             });
       createContextualInstance(Field.class).get();
    }

diff --git a/...t/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java b/...t/java/org/jboss/webbeans/test/unit/activities/child/SameBeanTypeInChildActivityTest.java
@@ -2,6 +2,7 @@
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Type;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -100,6 +101,11 @@ public boolean isPolicy()
             return false;
          }
 
+         public Set<Class<? extends Annotation>> getStereotypes()
+         {
+            return Collections.emptySet();
+         }
+
       };
       return bean;
    }

diff --git a/.../src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java b/.../src/test/java/org/jboss/webbeans/test/unit/activities/current/ELCurrentActivityTest.java
@@ -151,6 +151,11 @@ public boolean isPolicy()
          return false;
       }
 
+      public Set<Class<? extends Annotation>> getStereotypes()
+      {
+         return Collections.emptySet();
+      }
+
    }
 
    @Test

diff --git a/...est/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java b/...est/java/org/jboss/webbeans/test/unit/activities/current/InstanceCurrentActivityTest.java
@@ -159,6 +159,11 @@ public boolean isPolicy()
          return false;
       }
 
+      public Set<Class<? extends Annotation>> getStereotypes()
+      {
+         return Collections.emptySet();
+      }
+
    }
 
    @Test

diff --git a/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java b/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java
@@ -98,6 +98,11 @@ public boolean isPolicy()
       {
          return false;
       }
+
+      public Set<Class<? extends Annotation>> getStereotypes()
+      {
+         return Collections.emptySet();
+      }
 
    }