Author: pete.muir(a)jboss.org Date: 2009-10-30 08:27:32 -0400 (Fri, 30 Oct 2009) New Revision: 4441 Modified: core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java Log: WELD-217, part 1 Modified: core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-10-30 12:24:20 UTC (rev 4440) +++ core/trunk/impl/src/main/java/org/jboss/weld/BeanManagerImpl.java 2009-10-30 12:27:32 UTC (rev 4441) @@ -65,8 +65,6 @@ import org.jboss.weld.bootstrap.events.AbstractProcessInjectionTarget; import org.jboss.weld.context.CreationalContextImpl; import org.jboss.weld.context.WeldCreationalContext; -import org.jboss.weld.serialization.spi.ContextualStore; -import org.jboss.weld.serialization.spi.helpers.SerializableContextual; import org.jboss.weld.ejb.EjbDescriptors; import org.jboss.weld.ejb.spi.EjbDescriptor; import org.jboss.weld.el.Namespace; @@ -88,6 +86,8 @@ import org.jboss.weld.resolution.TypeSafeObserverResolver; import org.jboss.weld.resolution.TypeSafeResolver; import org.jboss.weld.resources.ClassTransformer; +import org.jboss.weld.serialization.spi.ContextualStore; +import org.jboss.weld.serialization.spi.helpers.SerializableContextual; import org.jboss.weld.util.Beans; import org.jboss.weld.util.Observers; import org.jboss.weld.util.Proxies; @@ -216,7 +216,7 @@ private transient final TypeSafeBeanResolver<Bean<?>> beanResolver; private transient final TypeSafeResolver<? extends Resolvable, DecoratorImpl<?>> decoratorResolver; private transient final TypeSafeResolver<? extends Resolvable, InterceptorImpl<?>> interceptorResolver; - private transient final TypeSafeResolver<? extends Resolvable, ObserverMethod<?,?>> observerResolver; + private transient final TypeSafeResolver<? extends Resolvable, ObserverMethod<?>> observerResolver; private transient final NameBasedResolver nameBasedResolver; private transient final ELResolver weldELResolver; private transient Namespace rootNamespace; @@ -234,7 +234,7 @@ private transient final List<DecoratorImpl<?>> decorators; private transient final List<InterceptorImpl<?>> interceptors; private transient final List<String> namespaces; - private transient final List<ObserverMethod<?,?>> observers; + private transient final List<ObserverMethod<?>> observers; /* * These data structures represent the managers *accessible* from this bean @@ -286,7 +286,7 @@ new CopyOnWriteArrayList<Bean<?>>(), new CopyOnWriteArrayList<DecoratorImpl<?>>(), new CopyOnWriteArrayList<InterceptorImpl<?>>(), - new CopyOnWriteArrayList<ObserverMethod<?,?>>(), + new CopyOnWriteArrayList<ObserverMethod<?>>(), new CopyOnWriteArrayList<String>(), new ConcurrentHashMap<EjbDescriptor<?>, SessionBean<?>>(), new ClientProxyProvider(), @@ -314,7 +314,7 @@ new CopyOnWriteArrayList<Bean<?>>(), new CopyOnWriteArrayList<DecoratorImpl<?>>(), new CopyOnWriteArrayList<InterceptorImpl<?>>(), - new CopyOnWriteArrayList<ObserverMethod<?,?>>(), + new CopyOnWriteArrayList<ObserverMethod<?>>(), new CopyOnWriteArrayList<String>(), rootManager.getEnterpriseBeans(), rootManager.getClientProxyProvider(), @@ -340,7 +340,7 @@ List<Bean<?>> beans = new CopyOnWriteArrayList<Bean<?>>(); beans.addAll(parentManager.getBeans()); - List<ObserverMethod<?,?>> registeredObservers = new CopyOnWriteArrayList<ObserverMethod<?,?>>(); + List<ObserverMethod<?>> registeredObservers = new CopyOnWriteArrayList<ObserverMethod<?>>(); registeredObservers.addAll(parentManager.getObservers()); List<String> namespaces = new CopyOnWriteArrayList<String>(); namespaces.addAll(parentManager.getNamespaces()); @@ -376,7 +376,7 @@ List<Bean<?>> beans, List<DecoratorImpl<?>> decorators, List<InterceptorImpl<?>> interceptors, - List<ObserverMethod<?,?>> observers, + List<ObserverMethod<?>> observers, List<String> namespaces, Map<EjbDescriptor<?>, SessionBean<?>> enterpriseBeans, ClientProxyProvider clientProxyProvider, @@ -511,10 +511,10 @@ }; - public static Transform<ObserverMethod<?,?>> EVENT_OBSERVER = new Transform<ObserverMethod<?,?>>() + public static Transform<ObserverMethod<?>> EVENT_OBSERVER = new Transform<ObserverMethod<?>>() { - public Iterable<ObserverMethod<?,?>> transform(BeanManagerImpl beanManager) + public Iterable<ObserverMethod<?>> transform(BeanManagerImpl beanManager) { return beanManager.getObservers(); } @@ -578,7 +578,7 @@ decoratorResolver.clear(); } - public <T> Set<ObserverMethod<?, T>> resolveObserverMethods(T event, Annotation... bindings) + public <T> Set<ObserverMethod<T>> resolveObserverMethods(T event, Annotation... bindings) { Observers.checkEventObjectType(event); return resolveObserverMethods(event.getClass(), bindings); @@ -593,7 +593,7 @@ @SuppressWarnings("unchecked") - private <T> Set<ObserverMethod<?, T>> resolveObserverMethods(Type eventType, Annotation... bindings) + private <T> Set<ObserverMethod<T>> resolveObserverMethods(Type eventType, Annotation... bindings) { checkBindingTypes(Arrays.asList(bindings)); @@ -604,11 +604,11 @@ bindingAnnotations.add(new DefaultLiteral()); } bindingAnnotations.add(new AnyLiteral()); - Set<ObserverMethod<?, T>> observers = new HashSet<ObserverMethod<?, T>>(); - Set<ObserverMethod<?,?>> eventObservers = observerResolver.resolve(ResolvableFactory.of(new Reflections.HierarchyDiscovery(eventType).getTypeClosureAsSet(), bindingAnnotations, null)); - for (ObserverMethod<?,?> observer : eventObservers) + Set<ObserverMethod<T>> observers = new HashSet<ObserverMethod<T>>(); + Set<ObserverMethod<?>> eventObservers = observerResolver.resolve(ResolvableFactory.of(new Reflections.HierarchyDiscovery(eventType).getTypeClosureAsSet(), bindingAnnotations, null)); + for (ObserverMethod<?> observer : eventObservers) { - observers.add((ObserverMethod<?, T>) observer); + observers.add((ObserverMethod<T>) observer); } return observers; } @@ -804,7 +804,7 @@ * * @param observer = */ - public void addObserver(ObserverMethod<?, ?> observer) + public void addObserver(ObserverMethod<?> observer) { //checkEventType(observer.getObservedType()); observers.add(observer); @@ -834,9 +834,9 @@ notifyObservers(event, resolveObserverMethods(eventType, qualifiers)); } - private <T> void notifyObservers(final T event, final Set<ObserverMethod<?, T>> observers) + private <T> void notifyObservers(final T event, final Set<ObserverMethod<T>> observers) { - for (ObserverMethod<?, T> observer : observers) + for (ObserverMethod<T> observer : observers) { observer.notify(event); } @@ -1229,7 +1229,7 @@ return childIds; } - public List<ObserverMethod<?,?>> getObservers() + public List<ObserverMethod<?>> getObservers() { return observers; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java 2009-10-30 12:24:20 UTC (rev 4440) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java 2009-10-30 12:27:32 UTC (rev 4441) @@ -66,7 +66,7 @@ getBeanManager().addContext(context); } - public void addObserverMethod(ObserverMethod<?, ?> observerMethod) + public void addObserverMethod(ObserverMethod<?> observerMethod) { getOrCreateBeanDeployment(observerMethod.getBeanClass()).getBeanManager().addObserver(observerMethod); } Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java 2009-10-30 12:24:20 UTC (rev 4440) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/ProcessObserverMethodImpl.java 2009-10-30 12:27:32 UTC (rev 4441) @@ -44,7 +44,7 @@ } private final AnnotatedMethod<X> beanMethod; - private final ObserverMethod<X, T> observerMethod; + private final ObserverMethod<T> observerMethod; public ProcessObserverMethodImpl(BeanManagerImpl beanManager, AnnotatedMethod<X> beanMethod, ObserverMethodImpl<X, T> observerMethod) { @@ -63,7 +63,7 @@ return beanMethod; } - public ObserverMethod<X, T> getObserverMethod() + public ObserverMethod<T> getObserverMethod() { return observerMethod; } Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-30 12:24:20 UTC (rev 4440) +++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java 2009-10-30 12:27:32 UTC (rev 4441) @@ -59,7 +59,7 @@ * @author David Allen * */ -public class ObserverMethodImpl<X, T> implements ObserverMethod<X, T> +public class ObserverMethodImpl<X, T> implements ObserverMethod<T> { private final Set<Annotation> bindings; Modified: core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java 2009-10-30 12:24:20 UTC (rev 4440) +++ core/trunk/impl/src/main/java/org/jboss/weld/resolution/TypeSafeObserverResolver.java 2009-10-30 12:27:32 UTC (rev 4441) @@ -29,19 +29,19 @@ * @author pmuir * */ -public class TypeSafeObserverResolver extends TypeSafeResolver<Resolvable, ObserverMethod<?,?>> +public class TypeSafeObserverResolver extends TypeSafeResolver<Resolvable, ObserverMethod<?>> { private final BeanManagerImpl manager; - public TypeSafeObserverResolver(BeanManagerImpl manager, Iterable<ObserverMethod<?,?>> observers) + public TypeSafeObserverResolver(BeanManagerImpl manager, Iterable<ObserverMethod<?>> observers) { super(observers); this.manager = manager; } @Override - protected boolean matches(Resolvable resolvable, ObserverMethod<?,?> observer) + protected boolean matches(Resolvable resolvable, ObserverMethod<?> observer) { return Reflections.isAssignableFrom(observer.getObservedType(), resolvable.getTypeClosure()) && Beans.containsAllBindings(observer.getObservedQualifiers(), resolvable.getQualifiers(), manager); } @@ -55,7 +55,7 @@ } @Override - protected Set<ObserverMethod<?,?>> filterResult(Set<ObserverMethod<?,?>> matched) + protected Set<ObserverMethod<?>> filterResult(Set<ObserverMethod<?>> matched) { return matched; } @@ -67,7 +67,7 @@ } @Override - protected Set<ObserverMethod<?,?>> sortResult(Set<ObserverMethod<?,?>> matched) + protected Set<ObserverMethod<?>> sortResult(Set<ObserverMethod<?>> matched) { return matched; }