Repaired most of the broken event tests except for 1.

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@1079 1c488680-804c-0410-94cd-c6b725194a0e
weld · Jan 19, 2009 · 86e82c0 · 86e82c0
1 parent a482192
commit 86e82c0
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -57,6 +57,7 @@
 import org.jboss.webbeans.ejb.spi.EjbResolver;
 import org.jboss.webbeans.event.EventManager;
 import org.jboss.webbeans.injection.InjectionPointProvider;
+import org.jboss.webbeans.introspector.AnnotatedClass;
 import org.jboss.webbeans.introspector.AnnotatedItem;
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.jlr.AnnotatedClassImpl;
@@ -202,8 +203,28 @@ public <T> Set<AnnotatedMethod<?>> resolveDisposalMethods(Class<T> apiType, Anno
     * @see javax.webbeans.manager.Manager#resolveObservers(java.lang.Object,
     *      java.lang.annotation.Annotation[])
     */
+   @SuppressWarnings("unchecked")
    public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings)
    {
+      AnnotatedClass<T> element = AnnotatedClassImpl.of((Class<T>)event.getClass());
+      for (Annotation annotation : bindings)
+      {
+         if (!MetaDataCache.instance().getBindingTypeModel(annotation.annotationType()).isValid())
+         {
+            throw new IllegalArgumentException("Not a binding type " + annotation);
+         }
+      }
+      for (Type type : element.getActualTypeArguments())
+      {
+         if (type instanceof WildcardType)
+         {
+            throw new IllegalArgumentException("Cannot resolve an event type parameterized with a wildcard " + element);
+         }
+         if (type instanceof TypeVariable)
+         {
+            throw new IllegalArgumentException("Cannot resolve an event type parameterized with a type parameter " + element);
+         }
+      }
       return eventManager.getObservers(event, bindings);
    }
 

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java b/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
@@ -163,7 +163,6 @@ public <T> Set<Observer<T>> getObservers(T event, Annotation... bindings)
          {
             if (observer.isObserverInterested(bindings))
             {
-               // TODO Fix this!
                @SuppressWarnings("unchecked")
                Observer<T> o = (Observer<T>) observer.getObserver();
                interestedObservers.add(o);