[webbeans-commits] Webbeans SVN: r3005 - in ri/trunk: api/src/main/java/javax/enterprise/inject/spi and 8 other directories.

Author: dallen6 Date: 2009-07-04 11:28:43 -0400 (Sat, 04 Jul 2009) New Revision: 3005 Added: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverMethodImpl.java Removed: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java Modified: ri/trunk/api/src/main/java/javax/enterprise/event/Event.java ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeObserverResolver.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java ri/trunk/version-matrix/pom.xml Log: Updated BeanManager API and implementation to latest specification 20090625 Modified: ri/trunk/api/src/main/java/javax/enterprise/event/Event.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/event/Event.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/api/src/main/java/javax/enterprise/event/Event.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -27,6 +27,7 @@ * * @author Gavin King * @author Pete Muir + * @author David Allen * * @param <T> * the type of the event object @@ -39,32 +40,31 @@ * Fire an event * * @param event the event type - * @param bindings the event bindings */ - @Deprecated - public void fire(T event, Annotation... bindings); + public void fire(T event); /** - * Fire an event - * - * @param event the event type + * Returns a child Event with the additional specified bindings. + * @param bindings Additional bindings to add to child Event + * @return new child Event */ - public void fire(T event); + public Event<T> select(Annotation... bindings); - public <U extends T> Event<U> select(Annotation... bindings); + /** + * Returns a child Event of the type specified and additional specified bindings. + * @param <U> The subtype of T for the child Event + * @param subtype The class of the subtype of T + * @param bindings Additional specified bindings + * @return new child Event + */ public <U extends T> Event<U> select(Class<U> subtype, Annotation... bindings); - public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... bindings); - /** - * Register an observer for a specific type - * - * @param observer the observer to register - * @param bindings the bindings to observe the event for - */ - @Deprecated - public void observe(Observer<T> observer, Annotation... bindings); - - - + * Returns a child Event of the type specified and additional specified bindings. + * @param <U> The subtype of T for the child Event + * @param subtype The TypeLiteral of the subtype of T + * @param bindings Additional specified bindings + * @return new child Event + */ + public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... bindings); } Modified: ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java =================================================================== --- ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/api/src/main/java/javax/enterprise/inject/spi/BeanManager.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -175,26 +175,9 @@ * @throws IllegalArgumentException if two instances of the same binding type * are passed */ - @Deprecated - public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings); + public <T> Set<ObserverMethod<?, T>> resolveObserverMethods(T event, Annotation... bindings); /** - * Obtains observers for an event by considering event type and bindings. - * - * @param <T> the type of the event to obtain - * @param event the event object - * @param bindings the bindings used to restrict the matched observers - * @return the resolved observers - * @throws IllegalArgumentException if a parameterized type with a type - * parameter or a wildcard is passed - * @throws IllegalArgumentException if an annotation which is not a event - * binding type is passed - * @throws IllegalArgumentException if two instances of the same binding type - * are passed - */ - public <T> Set<ObserverMethod<T, ?>> resolveObserverMethods(T event, Annotation... bindings); - - /** * Obtains an ordered list of enabled decorators for a set of bean types and * a set of bindings * @@ -319,37 +302,6 @@ public void addBean(Bean<?> bean); /** - * Register an observer with the container, allowing it to begin receiving - * event notifications. - * - * The observed event type is the actual type parameter of Observer declared - * by the class of the observer object. The observer is notified when an - * event object that is assignable to the observed event type is raised with - * the observed event bindings. - * - * @param observer the observer to register - * @param bindings event bindings to further restrict the events observed - * passed - * @throws IllegalArgumentException if an annotation which is not a binding - * type is passed, or if two instances of the same binding type - * are passed, or if the runtime type of the observer object - * contains a type variable - */ - @Deprecated - public void addObserver(Observer<?> observer, Annotation... bindings); - - /** - * Remove an observer registration - * - * @param observer the observer to register - * @throws IllegalArgumentException if an annotation which is not a event - * binding type is passed or if two instances of the same binding - * type are passed - */ - @Deprecated - public void removeObserver(Observer<?> observer); - - /** * Exposes the list of enabled deployment types, in order of lower to higher * precedence, This method may be used by portable extensions to discover * information about the deployment. Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanManagerImpl.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -78,8 +78,6 @@ import org.jboss.webbeans.context.DependentContext; import org.jboss.webbeans.el.Namespace; import org.jboss.webbeans.el.WebBeansELResolverImpl; -import org.jboss.webbeans.event.EventObserver; -import org.jboss.webbeans.event.ObserverImpl; import org.jboss.webbeans.introspector.WBAnnotated; import org.jboss.webbeans.literal.AnyLiteral; import org.jboss.webbeans.literal.CurrentLiteral; @@ -95,7 +93,6 @@ import org.jboss.webbeans.resolution.TypeSafeObserverResolver; import org.jboss.webbeans.resolution.TypeSafeResolver; import org.jboss.webbeans.util.Beans; -import org.jboss.webbeans.util.Observers; import org.jboss.webbeans.util.Proxies; import org.jboss.webbeans.util.Reflections; @@ -228,7 +225,7 @@ */ private transient final TypeSafeResolver<Bean<?>> beanResolver; private transient final TypeSafeResolver<DecoratorBean<?>> decoratorResolver; - private transient final TypeSafeResolver<EventObserver<?>> observerResolver; + private transient final TypeSafeResolver<ObserverMethod<?,?>> observerResolver; private transient final NameBasedResolver nameBasedResolver; private transient final ELResolver webbeansELResolver; private transient Namespace rootNamespace; @@ -245,7 +242,7 @@ private transient final List<Bean<?>> beans; private transient final List<DecoratorBean<?>> decorators; private transient final List<String> namespaces; - private transient final List<EventObserver<?>> observers; + private transient final List<ObserverMethod<?,?>> observers; /* * These data structures represent the managers *accessible* from this bean @@ -295,7 +292,7 @@ serviceRegistry, new CopyOnWriteArrayList<Bean<?>>(), new CopyOnWriteArrayList<DecoratorBean<?>>(), - new CopyOnWriteArrayList<EventObserver<?>>(), + new CopyOnWriteArrayList<ObserverMethod<?,?>>(), new CopyOnWriteArrayList<String>(), new ConcurrentHashMap<Class<?>, EnterpriseBean<?>>(), new ConcurrentHashMap<String, RIBean<?>>(), @@ -317,7 +314,7 @@ List<Bean<?>> beans = new CopyOnWriteArrayList<Bean<?>>(); beans.addAll(parentManager.getBeans()); - List<EventObserver<?>> registeredObservers = new CopyOnWriteArrayList<EventObserver<?>>(); + List<ObserverMethod<?,?>> registeredObservers = new CopyOnWriteArrayList<ObserverMethod<?,?>>(); registeredObservers.addAll(parentManager.getObservers()); List<String> namespaces = new CopyOnWriteArrayList<String>(); namespaces.addAll(parentManager.getNamespaces()); @@ -349,7 +346,7 @@ ServiceRegistry serviceRegistry, List<Bean<?>> beans, List<DecoratorBean<?>> decorators, - List<EventObserver<?>> observers, + List<ObserverMethod<?,?>> observers, List<String> namespaces, Map<Class<?>, EnterpriseBean<?>> newEnterpriseBeans, Map<String, RIBean<?>> riBeans, @@ -469,10 +466,10 @@ }; - public static Transform<EventObserver<?>> EVENT_OBSERVER = new Transform<EventObserver<?>>() + public static Transform<ObserverMethod<?,?>> EVENT_OBSERVER = new Transform<ObserverMethod<?,?>>() { - public Iterable<EventObserver<?>> transform(BeanManagerImpl beanManager) + public Iterable<ObserverMethod<?,?>> transform(BeanManagerImpl beanManager) { return beanManager.getObservers(); } @@ -556,7 +553,8 @@ beanResolver.clear(); } - public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings) + @SuppressWarnings("unchecked") + public <T> Set<ObserverMethod<?, T>> resolveObserverMethods(T event, Annotation... bindings) { Class<?> clazz = event.getClass(); for (Annotation annotation : bindings) @@ -579,20 +577,15 @@ } bindingAnnotations.add(new AnyLiteral()); checkEventType(clazz); - Set<Observer<T>> observers = new HashSet<Observer<T>>(); - Set<EventObserver<?>> eventObservers = observerResolver.resolve(ResolvableFactory.of(new Reflections.HierarchyDiscovery(clazz).getFlattenedTypes(), bindingAnnotations)); - for (EventObserver<?> observer : eventObservers) + Set<ObserverMethod<?, T>> observers = new HashSet<ObserverMethod<?, T>>(); + Set<ObserverMethod<?,?>> eventObservers = observerResolver.resolve(ResolvableFactory.of(new Reflections.HierarchyDiscovery(clazz).getFlattenedTypes(), bindingAnnotations)); + for (ObserverMethod<?,?> observer : eventObservers) { - observers.add((Observer<T>) observer.getObserver()); + observers.add((ObserverMethod<?, T>) observer); } return observers; } - public <T> Set<ObserverMethod<T, ?>> resolveObserverMethods(T event, Annotation... bindings) - { - throw new UnsupportedOperationException(); - } - private void checkEventType(Type eventType) { Type[] types; @@ -774,51 +767,22 @@ contexts.put(context.getScopeType(), context); } - @Deprecated - public void addObserver(Observer<?> observer, Annotation... bindings) - { - addObserver(observer, Observers.getTypeOfObserver(observer), bindings); - } - /** - * Shortcut to register an ObserverImpl - * - * @param <T> - * @param observer - */ - @Deprecated - public <T> void addObserver(ObserverImpl<T> observer) - { - addObserver(observer, observer.getEventType(), observer.getBindingsAsArray()); - } - - /** * Does the actual observer registration * * @param observer - * @param eventType - * @param bindings - * @return - */ - @Deprecated - public void addObserver(Observer<?> observer, Type eventType, Annotation... bindings) += */ + public void addObserver(ObserverMethod<?, ?> observer) { - checkEventType(eventType); - EventObserver<?> eventObserver = EventObserver.of(observer, eventType, this, bindings); - observers.add(eventObserver); - log.trace("Added observer " + observer + " observing event type " + eventType); + checkEventType(observer.getObservedType()); + observers.add(observer); + log.trace("Added observer " + observer); for (BeanManagerImpl childActivity : childActivities) { - childActivity.addObserver(observer, eventType, bindings); + childActivity.addObserver(observer); } } - @Deprecated - public void removeObserver(Observer<?> observer) - { - throw new UnsupportedOperationException(); - } - /** * Fires an event object with given event object for given bindings * @@ -845,11 +809,15 @@ } } - Set<Observer<Object>> observers = resolveObservers(event, bindings); + notifyObservers(event, resolveObserverMethods(event, bindings)); + } + + private <T> void notifyObservers(T event, Set<ObserverMethod<?, T>> observers) + { try { DependentContext.instance().setActive(true); - for (Observer<Object> observer : observers) + for (ObserverMethod<?, T> observer : observers) { observer.notify(event); } @@ -858,7 +826,7 @@ { // TODO This breaks SE shutdown, also we need to tidy up how dependent context is activated.... DependentContext.instance().setActive(false); - } + } } /** @@ -1235,7 +1203,7 @@ return id; } - public List<EventObserver<?>> getObservers() + public List<ObserverMethod<?,?>> getObservers() { return observers; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/AbstractBeanDeployer.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -22,6 +22,7 @@ import javax.enterprise.inject.Disposes; import javax.enterprise.inject.Initializer; import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.ObserverMethod; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.bean.AbstractClassBean; @@ -36,7 +37,7 @@ import org.jboss.webbeans.bean.SimpleBean; import org.jboss.webbeans.ejb.EJBApiAbstraction; import org.jboss.webbeans.event.ObserverFactory; -import org.jboss.webbeans.event.ObserverImpl; +import org.jboss.webbeans.event.ObserverMethodImpl; import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.WBField; import org.jboss.webbeans.introspector.WBMethod; @@ -88,9 +89,8 @@ manager.addRIBean(bean); log.debug("Bean: " + bean); } - for (ObserverImpl<?> observer : environment.getObservers()) + for (ObserverMethod<?, ?> observer : environment.getObservers()) { - observer.initialize(); log.debug("Observer : " + observer); manager.addObserver(observer); } @@ -161,7 +161,7 @@ protected void createObserverMethod(RIBean<?> declaringBean, WBMethod<?> method) { - ObserverImpl<?> observer = ObserverFactory.create(method, declaringBean, manager); + ObserverMethodImpl<?, ?> observer = ObserverFactory.create(method, declaringBean, manager); environment.getObservers().add(observer); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployerEnvironment.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -25,6 +25,7 @@ import java.util.Set; import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.ObserverMethod; import org.jboss.webbeans.BeanManagerImpl; import org.jboss.webbeans.bean.AbstractClassBean; @@ -34,7 +35,6 @@ import org.jboss.webbeans.bean.ProducerMethodBean; import org.jboss.webbeans.bean.RIBean; import org.jboss.webbeans.ejb.EjbDescriptorCache; -import org.jboss.webbeans.event.ObserverImpl; import org.jboss.webbeans.introspector.WBAnnotated; import org.jboss.webbeans.introspector.WBClass; import org.jboss.webbeans.introspector.WBMethod; @@ -49,7 +49,7 @@ private final Map<WBMethod<?>, ProducerMethodBean<?>> producerMethodBeanMap; private final Map<WBMethod<?>, DisposalMethodBean<?>> disposalMethodBeanMap; private final Set<RIBean<?>> beans; - private final Set<ObserverImpl<?>> observers; + private final Set<ObserverMethod<?, ?>> observers; private final List<DisposalMethodBean<?>> allDisposalBeans; private final Set<DisposalMethodBean<?>> resolvedDisposalBeans; private final Set<DecoratorBean<?>> decorators; @@ -66,7 +66,7 @@ this.resolvedDisposalBeans = new HashSet<DisposalMethodBean<?>>(); this.beans = new HashSet<RIBean<?>>(); this.decorators = new HashSet<DecoratorBean<?>>(); - this.observers = new HashSet<ObserverImpl<?>>(); + this.observers = new HashSet<ObserverMethod<?, ?>>(); this.ejbDescriptors = ejbDescriptors; this.disposalMethodResolver = new TypeSafeBeanResolver(manager, allDisposalBeans); this.manager = manager; @@ -149,7 +149,7 @@ return Collections.unmodifiableSet(decorators); } - public Set<ObserverImpl<?>> getObservers() + public Set<ObserverMethod<?, ?>> getObservers() { return observers; } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -21,6 +21,10 @@ import org.jboss.webbeans.log.Logging; /** + * A deferred event notification that will be delivered during the appropriate + * transaction phase, but asynchronously from the thread which generated the + * event. + * * @author David Allen * */ @@ -28,7 +32,7 @@ { private static Log log = Logging.getLog(DeferredEventNotification.class); - public AsynchronousTransactionalEventNotification(T event, ObserverImpl<T> observer) + public AsynchronousTransactionalEventNotification(T event, ObserverMethodImpl<?, T> observer) { super(event, observer); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -33,7 +33,7 @@ private static Log log = Logging.getLog(DeferredEventNotification.class); // The observer - protected ObserverImpl<T> observer; + protected ObserverMethodImpl<?, T> observer; // The event object protected T event; @@ -43,7 +43,7 @@ * @param observer The observer to be notified * @param event The event being fired */ - public DeferredEventNotification(T event, ObserverImpl<T> observer) + public DeferredEventNotification(T event, ObserverMethodImpl<?, T> observer) { this.observer = observer; this.event = event; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventImpl.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -18,6 +18,8 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Type; +import java.util.Arrays; +import java.util.HashSet; import java.util.Set; import javax.enterprise.event.Event; @@ -59,29 +61,6 @@ super(eventType, manager, bindings); } - /** - * Fires an event - * - * @param event The event object - * @param bindings Additional binding types - */ - @Deprecated - public void fire(T event, Annotation... bindings) - { - getManager().fireEvent(event, mergeInBindings(bindings)); - } - - /** - * Registers an observer - * - * @param observer - * @param bindings Additional binding types - */ - public void observe(Observer<T> observer, Annotation... bindings) - { - getManager().addObserver(observer, mergeInBindings(bindings)); - } - @Override public String toString() { @@ -97,19 +76,28 @@ getManager().fireEvent(event, mergeInBindings()); } - public <U extends T> Event<U> select(Annotation... bindings) + public Event<T> select(Annotation... bindings) { - throw new UnsupportedOperationException(); + return new EventImpl<T>( + this.getType(), + this.getManager(), + new HashSet<Annotation>(Arrays.asList(mergeInBindings(bindings)))); } public <U extends T> Event<U> select(Class<U> subtype, Annotation... bindings) { - throw new UnsupportedOperationException(); + return new EventImpl<U>( + subtype, + this.getManager(), + new HashSet<Annotation>(Arrays.asList(mergeInBindings(bindings)))); } public <U extends T> Event<U> select(TypeLiteral<U> subtype, Annotation... bindings) { - throw new UnsupportedOperationException(); + return new EventImpl<U>( + subtype.getType(), + this.getManager(), + new HashSet<Annotation>(Arrays.asList(mergeInBindings(bindings)))); } } Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventObserver.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -1,205 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.event; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.util.HashSet; -import java.util.Set; - -import javax.enterprise.event.Observer; -import javax.enterprise.inject.Current; - -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.metadata.cache.MetaAnnotationStore; -import org.jboss.webbeans.util.Reflections; -import org.jboss.webbeans.util.Strings; - -/** - * <p> - * EventObserver wraps various {@link Observer} objects created by application - * code or by the Web Beans Manager for annotated observer methods. In all - * cases, this wrapper provides consistent object identification and hashing - * based on the type of event being observed and any event binding types - * specified. It also provides a query method to quickly determine if a set of - * event bindings are exactly what the observer is interested in receiving. - * </p> - * - * @author David Allen - * - */ -public class EventObserver<T> -{ - - private final Type eventType; - - private final Set<Annotation> eventBindings; - private final Observer<T> observer; - private final BeanManagerImpl manager; - - public static <T> EventObserver<T> of(Observer<T> observer, final Type eventType, BeanManagerImpl manager, final Annotation[] eventBindings) - { - return new EventObserver<T>(observer, eventType, manager, eventBindings); - } - - /** - * Constructs a new wrapper for an observer. - * - * @param observer The observer - * @param eventType The class of event being observed - * @param eventBindings The array of annotation event bindings, if any - */ - private EventObserver(final Observer<T> observer, final Type eventType, BeanManagerImpl manager, final Annotation... eventBindings) - { - this.observer = observer; - this.eventType = eventType; - this.eventBindings = new HashSet<Annotation>(); - this.manager = manager; - checkEventBindings(eventBindings); - } - - /** - * Checks that each event binding specified on the observer is indeed a - * binding type (annotated with @BindingType) and that there are no duplicate - * bindings specified. If the @Current binding type is found, it is removed - * since this is only a default supplied by the container but no applicable - * for the actual event objects which get fired. - */ - private void checkEventBindings(Annotation[] bindingAnnotations) - { - for (Annotation annotation : bindingAnnotations) - { - if (!Reflections.isBindings(annotation)) - { - throw new IllegalArgumentException(annotation + " is not a binding type for " + this); - } - if (eventBindings.contains(annotation)) - { - throw new IllegalArgumentException(annotation + " is already present in the bindings list for " + this); - } - eventBindings.add(annotation); - } - } - - /** - * @return the eventType - */ - public final Type getEventType() - { - return eventType; - } - - /** - * @return the eventBindings - */ - public final Set<Annotation> getEventBindings() - { - return eventBindings; - } - - /** - * @return the observer - */ - public final Observer<? extends T> getObserver() - { - return observer; - } - - /** - * Query method to determine if this observer should be notified of an event - * based on the event bindings and any member values thereof. - * - * @param bindings The event bindings - * @return true only if all required bindings match - */ - public boolean isObserverInterested(Annotation... bindings) - { - // Simply check that all event bindings specified by the observer are - // in the list provided. - if (this.eventBindings.isEmpty()) - { - return true; - } - else - { - // List<Annotation> bindingsArray = Arrays.asList(bindings); - // return bindingsArray.containsAll(this.eventBindings); - for (Annotation x : eventBindings) - { - boolean found = false; - for (Annotation y : bindings) - { - if (manager.getServices().get(MetaAnnotationStore.class).getBindingTypeModel(x.annotationType()).isEqual(x, y)) - { - found = true; - } - } - if (!found) - { - return false; - } - } - return true; - } - } - - @Override - public int hashCode() - { - final int prime = 31; - int result = 1; - result = prime * result + ((eventBindings == null) ? 0 : eventBindings.hashCode()); - result = prime * result + ((eventType == null) ? 0 : eventType.hashCode()); - result = prime * result + ((observer == null) ? 0 : observer.hashCode()); - return result; - } - - @Override - public boolean equals(Object other) - { - if (other == null || (!(other instanceof EventObserver))) - { - return false; - } - EventObserver<?> otherObserver = (EventObserver<?>) other; - if (!eventType.equals(otherObserver.getEventType())) - { - return false; - } - if (!eventBindings.equals(otherObserver.getEventBindings())) - { - return false; - } - if (!observer.equals(otherObserver.getObserver())) - { - return false; - } - return true; - } - - @Override - public String toString() - { - StringBuilder buffer = new StringBuilder(); - buffer.append("Event Observer:\n"); - buffer.append(" Event Type: " + eventType + "\n"); - buffer.append(Strings.collectionToString(" Event Bindings: ", eventBindings)); - buffer.append(" Observer: " + observer); - return buffer.toString(); - } - -} Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverFactory.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -39,17 +39,17 @@ * @param manager The Web Beans manager * @return An observer implementation built from the method abstraction */ - public static <T> ObserverImpl<T> create(WBMethod<?> method, RIBean<?> declaringBean, BeanManagerImpl manager) + public static <X, T> ObserverMethodImpl<X, T> create(WBMethod<?> method, RIBean<?> declaringBean, BeanManagerImpl manager) { - ObserverImpl<T> result = null; - TransactionPhase transactionPhase = TransactionalObserverImpl.getTransactionalPhase(method); + ObserverMethodImpl<X, T> result = null; + TransactionPhase transactionPhase = TransactionalObserverMethodImpl.getTransactionalPhase(method); if (manager.getServices().contains(TransactionServices.class) && !transactionPhase.equals(TransactionPhase.IN_PROGRESS)) { - result = new TransactionalObserverImpl<T>(method, declaringBean, transactionPhase, manager); + result = new TransactionalObserverMethodImpl<X, T>(method, declaringBean, transactionPhase, manager); } else { - result = new ObserverImpl<T>(method, declaringBean, manager); + result = new ObserverMethodImpl<X, T>(method, declaringBean, manager); } return result; } Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -1,222 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.event; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Type; -import java.lang.reflect.TypeVariable; -import java.lang.reflect.WildcardType; -import java.util.List; - -import javax.enterprise.context.Dependent; -import javax.enterprise.context.spi.CreationalContext; -import javax.enterprise.event.Notify; -import javax.enterprise.event.Observer; -import javax.enterprise.event.ObserverException; -import javax.enterprise.event.Observes; -import javax.enterprise.inject.Disposes; -import javax.enterprise.inject.Initializer; -import javax.enterprise.inject.Produces; - -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.DefinitionException; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.injection.MethodInjectionPoint; -import org.jboss.webbeans.introspector.WBMethod; -import org.jboss.webbeans.introspector.WBParameter; -import org.jboss.webbeans.util.Names; - -/** - * <p> - * Reference implementation for the Observer interface, which represents an - * observer method. Each observer method has an event type which is the class of - * the event object being observed, and event binding types that are annotations - * applied to the event parameter to narrow the event notifications delivered. - * </p> - * - * @author David Allen - * - */ -public class ObserverImpl<T> implements Observer<T> -{ - protected final RIBean<?> observerBean; - protected final MethodInjectionPoint<?> observerMethod; - private final boolean conditional; - protected BeanManagerImpl manager; - private final Type eventType; - private final Annotation[] bindings; - - /** - * Creates an Observer which describes and encapsulates an observer method - * (8.5). - * - * @param observer The observer - * @param observerBean The observer bean - * @param manager The Web Beans manager - */ - protected ObserverImpl(final WBMethod<?> observer, final RIBean<?> observerBean, final BeanManagerImpl manager) - { - this.manager = manager; - this.observerBean = observerBean; - this.observerMethod = MethodInjectionPoint.of(observerBean, observer); - this.eventType = observerMethod.getAnnotatedParameters(Observes.class).get(0).getBaseType(); - - this.bindings = observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingsAsArray(); - Observes observesAnnotation = observerMethod.getAnnotatedParameters(Observes.class).get(0).getAnnotation(Observes.class); - this.conditional = observesAnnotation.notifyObserver().equals(Notify.IF_EXISTS); - } - - /** - * Completes initialization of the observer and allows derived types to - * override behavior. - */ - public void initialize() - { - checkObserverMethod(); - } - - /** - * Performs validation of the observer method for compliance with the - * specifications. - */ - private void checkObserverMethod() - { - // Make sure exactly one and only one parameter is annotated with Observes - List<WBParameter<?>> eventObjects = this.observerMethod.getAnnotatedParameters(Observes.class); - if (eventObjects.size() > 1) - { - throw new DefinitionException(this + " is invalid because it contains more than event parameter annotated @Observes"); - } - // Make sure the event object above is not parameterized with a type - // variable or wildcard - if (eventObjects.size() > 0) - { - WBParameter<?> eventParam = eventObjects.iterator().next(); - if (eventParam.isParameterizedType()) - { - for (Type type : eventParam.getActualTypeArguments()) - { - if (type instanceof TypeVariable) - { - throw new DefinitionException("Cannot use a type variable " + type + " in an parameterized type " + toString()); - } - else if (type instanceof WildcardType) - { - throw new DefinitionException("Cannot use a wildcard variable " + type + " in an parameterized type " + toString()); - } - } - } - } - // Check for parameters annotated with @Disposes - List<WBParameter<?>> disposeParams = this.observerMethod.getAnnotatedParameters(Disposes.class); - if (disposeParams.size() > 0) - { - throw new DefinitionException(this + " cannot have any parameters annotated with @Disposes"); - } - // Check annotations on the method to make sure this is not a producer - // method, initializer method, or destructor method. - if (this.observerMethod.isAnnotationPresent(Produces.class)) - { - throw new DefinitionException(this + " cannot be annotated with @Produces"); - } - if (this.observerMethod.isAnnotationPresent(Initializer.class)) - { - throw new DefinitionException(this + " cannot be annotated with @Initializer"); - } - - } - - public boolean notify(final T event) - { - sendEvent(event); - return false; - } - - /** - * Invokes the observer method immediately passing the event. - * - * @param event The event to notify observer with - */ - protected void sendEvent(final T event) - { - Object instance = null; - CreationalContext<?> creationalContext = null; - try - { - // Get the most specialized instance of the component - if (!conditional) - { - creationalContext = manager.createCreationalContext(observerBean); - } - instance = manager.getReference(observerBean, creationalContext); - if (instance == null) - { - return; - } - // As we are working with the contextual instance, we may not have the actual object, but a container proxy (e.g. EJB) - observerMethod.invokeOnInstanceWithSpecialValue(instance, Observes.class, event, manager, creationalContext, ObserverException.class); - } - finally - { - if (creationalContext != null && Dependent.class.equals(observerBean.getScopeType())) - { - creationalContext.release(); - } - } - } - - /** - * Queues the event for later execution - * @param event - */ - protected void sendEventAsynchronously(final T event) - { - DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, this); - manager.getTaskExecutor().execute(deferredEvent); - } - - /** - * Indicates if the observer is conditional - * - * @return True if conditional, false otherwise - */ - public boolean isConditional() - { - return conditional; - } - - @Override - public String toString() - { - StringBuilder builder = new StringBuilder(); - builder.append("Observer Implementation: \n"); - builder.append(" Observer (Declaring) class: " + Names.typesToString(observerBean.getTypes())); - builder.append(" Observer method: " + observerMethod); - return builder.toString(); - } - - public Type getEventType() - { - return eventType; - } - - public Annotation[] getBindingsAsArray() - { - return bindings; - } - -} Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java (from rev 2956, ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -0,0 +1,245 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.event; + +import java.lang.annotation.Annotation; +import java.lang.reflect.Type; +import java.lang.reflect.TypeVariable; +import java.lang.reflect.WildcardType; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import javax.enterprise.context.Dependent; +import javax.enterprise.context.spi.CreationalContext; +import javax.enterprise.event.Notify; +import javax.enterprise.event.ObserverException; +import javax.enterprise.event.Observes; +import javax.enterprise.event.TransactionPhase; +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Initializer; +import javax.enterprise.inject.Produces; +import javax.enterprise.inject.spi.Bean; +import javax.enterprise.inject.spi.ObserverMethod; + +import org.jboss.webbeans.BeanManagerImpl; +import org.jboss.webbeans.DefinitionException; +import org.jboss.webbeans.bean.RIBean; +import org.jboss.webbeans.injection.MethodInjectionPoint; +import org.jboss.webbeans.introspector.WBMethod; +import org.jboss.webbeans.introspector.WBParameter; +import org.jboss.webbeans.util.Names; + +/** + * <p> + * Reference implementation for the ObserverMethod interface, which represents an + * observer method. Each observer method has an event type which is the class of + * the event object being observed, and event binding types that are annotations + * applied to the event parameter to narrow the event notifications delivered. + * </p> + * + * @author David Allen + * + */ +public class ObserverMethodImpl<X, T> implements ObserverMethod<X, T> +{ + + private final Set<Annotation> bindings; + private final Type eventType; + protected BeanManagerImpl manager; + private final Notify notifyType; + protected final RIBean<?> observerBean; + protected final MethodInjectionPoint<?> observerMethod; + protected TransactionPhase transactionPhase; + + /** + * Creates an Observer which describes and encapsulates an observer method + * (8.5). + * + * @param observer The observer + * @param observerBean The observer bean + * @param manager The Web Beans manager + */ + protected ObserverMethodImpl(final WBMethod<?> observer, final RIBean<?> observerBean, final BeanManagerImpl manager) + { + this.manager = manager; + this.observerBean = observerBean; + this.observerMethod = MethodInjectionPoint.of(observerBean, observer); + this.eventType = observerMethod.getAnnotatedParameters(Observes.class).get(0).getBaseType(); + + this.bindings = new HashSet<Annotation>(Arrays.asList(observerMethod.getAnnotatedParameters(Observes.class).get(0).getBindingsAsArray())); + Observes observesAnnotation = observerMethod.getAnnotatedParameters(Observes.class).get(0).getAnnotation(Observes.class); + this.notifyType = observesAnnotation.notifyObserver(); + transactionPhase = TransactionPhase.IN_PROGRESS; + } + + /** + * Performs validation of the observer method for compliance with the + * specifications. + */ + private void checkObserverMethod() + { + // Make sure exactly one and only one parameter is annotated with Observes + List<WBParameter<?>> eventObjects = this.observerMethod.getAnnotatedParameters(Observes.class); + if (eventObjects.size() > 1) + { + throw new DefinitionException(this + " is invalid because it contains more than event parameter annotated @Observes"); + } + // Make sure the event object above is not parameterized with a type + // variable or wildcard + if (eventObjects.size() > 0) + { + WBParameter<?> eventParam = eventObjects.iterator().next(); + if (eventParam.isParameterizedType()) + { + for (Type type : eventParam.getActualTypeArguments()) + { + if (type instanceof TypeVariable) + { + throw new DefinitionException("Cannot use a type variable " + type + " in an parameterized type " + toString()); + } + else if (type instanceof WildcardType) + { + throw new DefinitionException("Cannot use a wildcard variable " + type + " in an parameterized type " + toString()); + } + } + } + } + // Check for parameters annotated with @Disposes + List<WBParameter<?>> disposeParams = this.observerMethod.getAnnotatedParameters(Disposes.class); + if (disposeParams.size() > 0) + { + throw new DefinitionException(this + " cannot have any parameters annotated with @Disposes"); + } + // Check annotations on the method to make sure this is not a producer + // method, initializer method, or destructor method. + if (this.observerMethod.isAnnotationPresent(Produces.class)) + { + throw new DefinitionException(this + " cannot be annotated with @Produces"); + } + if (this.observerMethod.isAnnotationPresent(Initializer.class)) + { + throw new DefinitionException(this + " cannot be annotated with @Initializer"); + } + + } + + @SuppressWarnings("unchecked") + public Bean<X> getBean() + { + return (Bean<X>) observerBean; + } + + public Annotation[] getBindingsAsArray() + { + return bindings.toArray(new Annotation[0]); + } + + public Type getEventType() + { + return eventType; + } + + public Notify getNotify() + { + return notifyType; + } + + public Set<Annotation> getObservedBindings() + { + return bindings; + } + + public Type getObservedType() + { + return eventType; + } + + public TransactionPhase getTransactionPhase() + { + return TransactionPhase.IN_PROGRESS; + } + + /** + * Completes initialization of the observer and allows derived types to + * override behavior. + */ + public void initialize() + { + checkObserverMethod(); + } + + public void notify(final T event) + { + sendEvent(event); + } + + /** + * Invokes the observer method immediately passing the event. + * + * @param event The event to notify observer with + */ + protected void sendEvent(final T event) + { + Object instance = null; + CreationalContext<?> creationalContext = null; + try + { + // Get the most specialized instance of the component + if (notifyType.equals(Notify.ALWAYS)) + { + creationalContext = manager.createCreationalContext(observerBean); + } + instance = manager.getReference(observerBean, creationalContext); + if (instance == null) + { + return; + } + // As we are working with the contextual instance, we may not have the actual object, but a container proxy (e.g. EJB) + observerMethod.invokeOnInstanceWithSpecialValue(instance, Observes.class, event, manager, creationalContext, ObserverException.class); + } + finally + { + if (creationalContext != null && Dependent.class.equals(observerBean.getScopeType())) + { + creationalContext.release(); + } + } + } + + /** + * Queues the event for later execution + * @param event + */ + protected void sendEventAsynchronously(final T event) + { + DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, this); + manager.getTaskExecutor().execute(deferredEvent); + } + + @Override + public String toString() + { + StringBuilder builder = new StringBuilder(); + builder.append("Observer Implementation: \n"); + builder.append(" Observer (Declaring) class: " + Names.typesToString(observerBean.getTypes())); + builder.append(" Observer method: " + observerMethod); + return builder.toString(); + } + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverMethodImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -1,112 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.webbeans.event; - -import javax.enterprise.event.Observes; -import javax.enterprise.event.TransactionPhase; -import javax.transaction.Synchronization; - -import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.bean.RIBean; -import org.jboss.webbeans.introspector.WBMethod; -import org.jboss.webbeans.introspector.WBParameter; -import org.jboss.webbeans.transaction.spi.TransactionServices; - -/** - * @author David Allen - * - */ -class TransactionalObserverImpl<T> extends ObserverImpl<T> -{ - private TransactionPhase transactionPhase; - - /** - * Tests an observer method to see if it is transactional. - * - * @param observer The observer method - * @return true if the observer method is annotated as transactional - */ - public static TransactionPhase getTransactionalPhase(WBMethod<?> observer) - { - WBParameter<?> parameter = observer.getAnnotatedParameters(Observes.class).iterator().next(); - return parameter.getAnnotationStore().getAnnotation(Observes.class).during(); - } - - /** - * Creates a new instance of a transactional observer method implicit object. - * - * @param observer The observer method - * @param observerBean The bean declaring the observer method - * @param manager The JCDI manager in use - */ - protected TransactionalObserverImpl(WBMethod<?> observer, RIBean<?> observerBean, TransactionPhase transactionPhase, BeanManagerImpl manager) - { - super(observer, observerBean, manager); - this.transactionPhase = transactionPhase; - } - - @Override - public void initialize() - { - super.initialize(); - } - - @Override - public boolean notify(T event) - { - if ((manager.getServices().get(TransactionServices.class) != null) && (manager.getServices().get(TransactionServices.class).isTransactionActive())) - { - deferEvent(event); - } - else - { - sendEvent(event); - } - return false; - } - - /** - * Defers an event for processing in a later phase of the current - * transaction. - * - * @param event The event object - */ - private void deferEvent(T event) - { - DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, this);; - - Synchronization synchronization = null; - if (transactionPhase.equals(transactionPhase.BEFORE_COMPLETION)) - { - synchronization = new TransactionSynchronizedRunnable(deferredEvent, true); - } - else if (transactionPhase.equals(transactionPhase.AFTER_COMPLETION)) - { - synchronization = new TransactionSynchronizedRunnable(deferredEvent, false); - } - else if (transactionPhase.equals(transactionPhase.AFTER_SUCCESS)) - { - synchronization = new TransactionSynchronizedRunnable(deferredEvent, TransactionServices.Status.SUCCESS); - } - else if (transactionPhase.equals(transactionPhase.AFTER_FAILURE)) - { - synchronization = new TransactionSynchronizedRunnable(deferredEvent, TransactionServices.Status.FAILURE); - } - manager.getServices().get(TransactionServices.class).registerSynchronization(synchronization); - } - -} Copied: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverMethodImpl.java (from rev 2956, ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverImpl.java) =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverMethodImpl.java (rev 0) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverMethodImpl.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -0,0 +1,109 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.webbeans.event; + +import javax.enterprise.event.Observes; +import javax.enterprise.event.TransactionPhase; +import javax.transaction.Synchronization; + +import org.jboss.webbeans.BeanManagerImpl; +import org.jboss.webbeans.bean.RIBean; +import org.jboss.webbeans.introspector.WBMethod; +import org.jboss.webbeans.introspector.WBParameter; +import org.jboss.webbeans.transaction.spi.TransactionServices; + +/** + * @author David Allen + * + */ +class TransactionalObserverMethodImpl<X, T> extends ObserverMethodImpl<X, T> +{ + /** + * Tests an observer method to see if it is transactional. + * + * @param observer The observer method + * @return true if the observer method is annotated as transactional + */ + public static TransactionPhase getTransactionalPhase(WBMethod<?> observer) + { + WBParameter<?> parameter = observer.getAnnotatedParameters(Observes.class).iterator().next(); + return parameter.getAnnotationStore().getAnnotation(Observes.class).during(); + } + + /** + * Creates a new instance of a transactional observer method implicit object. + * + * @param observer The observer method + * @param observerBean The bean declaring the observer method + * @param manager The JCDI manager in use + */ + protected TransactionalObserverMethodImpl(WBMethod<?> observer, RIBean<?> observerBean, TransactionPhase transactionPhase, BeanManagerImpl manager) + { + super(observer, observerBean, manager); + this.transactionPhase = transactionPhase; + } + + @Override + public void initialize() + { + super.initialize(); + } + + @Override + public void notify(T event) + { + if ((manager.getServices().get(TransactionServices.class) != null) && (manager.getServices().get(TransactionServices.class).isTransactionActive())) + { + deferEvent(event); + } + else + { + sendEvent(event); + } + } + + /** + * Defers an event for processing in a later phase of the current + * transaction. + * + * @param event The event object + */ + private void deferEvent(T event) + { + DeferredEventNotification<T> deferredEvent = new DeferredEventNotification<T>(event, this);; + + Synchronization synchronization = null; + if (transactionPhase.equals(transactionPhase.BEFORE_COMPLETION)) + { + synchronization = new TransactionSynchronizedRunnable(deferredEvent, true); + } + else if (transactionPhase.equals(transactionPhase.AFTER_COMPLETION)) + { + synchronization = new TransactionSynchronizedRunnable(deferredEvent, false); + } + else if (transactionPhase.equals(transactionPhase.AFTER_SUCCESS)) + { + synchronization = new TransactionSynchronizedRunnable(deferredEvent, TransactionServices.Status.SUCCESS); + } + else if (transactionPhase.equals(transactionPhase.AFTER_FAILURE)) + { + synchronization = new TransactionSynchronizedRunnable(deferredEvent, TransactionServices.Status.FAILURE); + } + manager.getServices().get(TransactionServices.class).registerSynchronization(synchronization); + } + +} Property changes on: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/TransactionalObserverMethodImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeObserverResolver.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeObserverResolver.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/resolution/TypeSafeObserverResolver.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -19,8 +19,9 @@ import java.util.Collections; import java.util.Set; +import javax.enterprise.inject.spi.ObserverMethod; + import org.jboss.webbeans.BeanManagerImpl; -import org.jboss.webbeans.event.EventObserver; import org.jboss.webbeans.util.Beans; import org.jboss.webbeans.util.Reflections; @@ -28,21 +29,21 @@ * @author pmuir * */ -public class TypeSafeObserverResolver extends TypeSafeResolver<EventObserver<?>> +public class TypeSafeObserverResolver extends TypeSafeResolver<ObserverMethod<?,?>> { private final BeanManagerImpl manager; - public TypeSafeObserverResolver(BeanManagerImpl manager, Iterable<EventObserver<?>> observers) + public TypeSafeObserverResolver(BeanManagerImpl manager, Iterable<ObserverMethod<?,?>> observers) { super(observers); this.manager = manager; } @Override - protected boolean matches(Resolvable resolvable, EventObserver<?> observer) + protected boolean matches(Resolvable resolvable, ObserverMethod<?,?> observer) { - return Reflections.isAssignableFrom(observer.getEventType(), resolvable.getTypeClosure()) && Beans.containsAllBindings(observer.getEventBindings(), resolvable.getBindings(), manager); + return Reflections.isAssignableFrom(observer.getObservedType(), resolvable.getTypeClosure()) && Beans.containsAllBindings(observer.getObservedBindings(), resolvable.getBindings(), manager); } /** @@ -54,7 +55,7 @@ } @Override - protected Set<EventObserver<?>> filterResult(Set<EventObserver<?>> matched) + protected Set<ObserverMethod<?,?>> filterResult(Set<ObserverMethod<?,?>> matched) { return matched; } @@ -66,7 +67,7 @@ } @Override - protected Set<EventObserver<?>> sortResult(Set<EventObserver<?>> matched) + protected Set<ObserverMethod<?,?>> sortResult(Set<ObserverMethod<?,?>> matched) { return matched; } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/ActivitiesTest.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -192,15 +192,15 @@ assert childActivity.getInjectableReference(dummyBean.getInjectionPoints().iterator().next(), childActivity.createCreationalContext(dummyBean)) != null; } - @Test - public void testObserverBelongingToParentActivityBelongsToChildActivity() - { - assert getCurrentManager().resolveObservers(new NightTime()).size() == 1; - Observer<?> observer = getCurrentManager().resolveObservers(new NightTime()).iterator().next(); - BeanManager childActivity = getCurrentManager().createActivity(); - assert childActivity.resolveObservers(new NightTime()).size() == 1; - assert childActivity.resolveObservers(new NightTime()).iterator().next().equals(observer); - } +// @Test +// public void testObserverBelongingToParentActivityBelongsToChildActivity() +// { +// assert getCurrentManager().resolveObservers(new NightTime()).size() == 1; +// Observer<?> observer = getCurrentManager().resolveObservers(new NightTime()).iterator().next(); +// BeanManager childActivity = getCurrentManager().createActivity(); +// assert childActivity.resolveObservers(new NightTime()).size() == 1; +// assert childActivity.resolveObservers(new NightTime()).iterator().next().equals(observer); +// } @Test public void testObserverBelongingToParentFiresForChildActivity() @@ -282,7 +282,8 @@ } }; - childActivity.addObserver(observer); + //TODO Fix this test to use an observer method in a child activity +// childActivity.addObserver(observer); getCurrentManager().fireEvent(new NightTime()); } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/activities/current/EventCurrentActivityTest.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -84,10 +84,11 @@ } }; - childActivity.addObserver(observer); - childActivity.setCurrent(dummyContext.getScopeType()); - createContextualInstance(Dusk.class).ping(); - assert observer.isObserved(); + //TODO Fix this test to use observer method within a child activity +// childActivity.addObserver(observer); +// childActivity.setCurrent(dummyContext.getScopeType()); +// createContextualInstance(Dusk.class).ping(); +// assert observer.isObserved(); } } Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java =================================================================== --- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/event/SimpleEventTest.java 2009-07-04 15:28:43 UTC (rev 3005) @@ -83,8 +83,7 @@ public void fireEventByAnnotationLiteral() { - event1.fire("Fired using Event Interface with AnnotationLiteral.", - new AnnotationLiteral<Updated>(){}); + event1.select(new AnnotationLiteral<Updated>(){}).fire("Fired using Event Interface with AnnotationLiteral."); } public void fireEventByBindingDeclaredAtInjectionPoint() Modified: ri/trunk/version-matrix/pom.xml =================================================================== --- ri/trunk/version-matrix/pom.xml 2009-07-03 12:54:28 UTC (rev 3004) +++ ri/trunk/version-matrix/pom.xml 2009-07-04 15:28:43 UTC (rev 3005) @@ -47,7 +47,7 @@ </pluginRepositories> <properties> - <jsr299.tck.version>1.0.0.BETA3</jsr299.tck.version> + <jsr299.tck.version>1.0.0-SNAPSHOT</jsr299.tck.version> <webbeans.version>1.0.0-SNAPSHOT</webbeans.version> <webbeans.servlet.version>1.0.0.CR1</webbeans.servlet.version> <webbeans.se.version>1.0.0.BETA1</webbeans.se.version>