October 2008 - weld-commits - Jboss List Archives

[webbeans-commits] Webbeans SVN: r132 - ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager.

by webbeans-commits＠lists.jboss.org

Author: gavin.king(a)jboss.com Date: 2008-10-23 17:02:27 -0400 (Thu, 23 Oct 2008) New Revision: 132 Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java Log: return self Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java 2008-10-23 18:47:13 UTC (rev 131) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Manager.java 2008-10-23 21:02:27 UTC (rev 132) @@ -52,9 +52,9 @@ public void fireEvent(Object event, Annotation... bindings); - public Context getContext(Class<Annotation> scopeType); + public Context getContext(Class<? extends Annotation> scopeType); - public void addContext(Context context); + public Manager addContext(Context context); public Manager addBean(Bean<?> bean); @@ -62,16 +62,16 @@ public Manager addDecorator(Decorator decorator); - public <T> void addObserver(Observer<T> observer, Class<T> eventType, + public <T> Manager addObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); - public <T> void addObserver(Observer<T> observer, TypeLiteral<T> eventType, + public <T> Manager addObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); - public <T> void removeObserver(Observer<T> observer, Class<T> eventType, + public <T> Manager removeObserver(Observer<T> observer, Class<T> eventType, Annotation... bindings); - public <T> void removeObserver(Observer<T> observer, + public <T> Manager removeObserver(Observer<T> observer, TypeLiteral<T> eventType, Annotation... bindings); public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings);

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r131 - in ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test: components and 1 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-23 14:47:13 -0400 (Thu, 23 Oct 2008) New Revision: 131 Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java Log: Fix the test Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java 2008-10-23 18:43:32 UTC (rev 130) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java 2008-10-23 18:47:13 UTC (rev 131) @@ -13,8 +13,8 @@ import org.jboss.webbeans.test.components.Animal; import org.jboss.webbeans.test.components.FishFarm; import org.jboss.webbeans.test.components.Haddock; +import org.jboss.webbeans.test.components.SeaBass; import org.jboss.webbeans.test.components.Tuna; -import org.jboss.webbeans.test.components.broken.Carp; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.Test; @@ -48,14 +48,15 @@ public void testMultipleApiTypeWithCurrent() throws Exception { InjectableField<Animal> animalField = new InjectableField<Animal>(FishFarm.class.getDeclaredField("animal")); - Bean<Carp> carpBean = new BeanImpl<Carp>(new SimpleComponentModel<Carp>(new SimpleAnnotatedType<Carp>(Carp.class), getEmptyAnnotatedItem(Carp.class), super.manager), manager); + Bean<SeaBass> seaBassBean = new BeanImpl<SeaBass>(new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), getEmptyAnnotatedItem(SeaBass.class), super.manager), manager); Bean<Haddock> haddockBean = new BeanImpl<Haddock>(new SimpleComponentModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), getEmptyAnnotatedItem(Haddock.class), super.manager), manager); Set<Bean<?>> beans = new HashSet<Bean<?>>(); - beans.add(carpBean); + beans.add(seaBassBean); beans.add(haddockBean); Set<Bean<?>> possibleTargets = animalField.getPossibleBeans(beans); - assert possibleTargets.size() == 1; - assert possibleTargets.contains(carpBean); + assert possibleTargets.size() == 2; + assert possibleTargets.contains(seaBassBean); + assert possibleTargets.contains(haddockBean); } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java 2008-10-23 18:43:32 UTC (rev 130) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java 2008-10-23 18:47:13 UTC (rev 131) @@ -1,6 +1,7 @@ package org.jboss.webbeans.test.components; import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; +import org.jboss.webbeans.test.components.Animal; @RequestScopedAnimalStereotype public class Carp implements Animal Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java (from rev 125, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Carp.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java 2008-10-23 18:47:13 UTC (rev 131) @@ -0,0 +1,10 @@ +package org.jboss.webbeans.test.components.broken; + +import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; +import org.jboss.webbeans.test.components.Animal; + +@RequestScopedAnimalStereotype +public class Carp implements Animal +{ + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Carp.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r130 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/ejb and 11 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-23 14:43:32 -0400 (Thu, 23 Oct 2008) New Revision: 130 Removed: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/deployment/ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/init/ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EJB.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbManager.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventBus.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableField.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleInjectable.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/RemoteComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/SimpleComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/AnnotationDB.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/ClasspathUrlFinder.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/InputStreamWrapper.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/JNDI.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/broken/StereotypeWithBindingTypes.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java Log: Clean up casts and suppression of warnings Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BasicContext.java 2008-10-23 18:43:32 UTC (rev 130) @@ -16,7 +16,7 @@ */ public class BasicContext implements Context { - private Map<Bean<?>, Object> values; + private Map<Bean<? extends Object>, Object> values; private Class<? extends Annotation> scopeType; public BasicContext(Class<? extends Annotation> scopeType) @@ -25,7 +25,6 @@ values = new HashMap<Bean<?>,Object>(); } - @SuppressWarnings("unchecked") public <T> T get(Bean<T> component, boolean create) { T instance = (T) values.get(component); @@ -52,34 +51,29 @@ return scopeType; } - @SuppressWarnings("unchecked") - public <T> void remove(Manager container, Bean<T> component) + public <T> void remove(Manager container, Bean<T> bean) { - T instance = (T) values.get(component); + T instance = (T) values.get(bean); if (instance != null) { - values.remove(component); - component.destroy(instance); + values.remove(bean); + bean.destroy(instance); } else { // TODO is this the correct exception to throw? See section 9.1 of spec - throw new RuntimeException("Component " + component.getName() + " cannot be removed as it " + + throw new RuntimeException("Component " + bean.getName() + " cannot be removed as it " + "does not exist in [" + scopeType + "] context."); } } - @SuppressWarnings("unchecked") public void destroy(Manager container) { - // TODO this method isn't declared by the interface, but is implied by section 9.1.2 of the spec - for (Bean c : values.keySet()) { c.destroy(values.get(c)); } - values.clear(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java 2008-10-23 18:43:32 UTC (rev 130) @@ -2,20 +2,16 @@ import java.lang.annotation.Annotation; import java.util.Set; -import java.util.logging.Logger; import javax.webbeans.manager.Bean; import org.jboss.webbeans.model.AbstractComponentModel; -import org.jboss.webbeans.util.LoggerUtil; public class BeanImpl<T> extends Bean<T> { public static final String LOGGER_NAME = "componentMetaModel"; - private static Logger log = LoggerUtil.getLogger(LOGGER_NAME); - private AbstractComponentModel<T, ?> model; private ManagerImpl manager; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-10-23 18:43:32 UTC (rev 130) @@ -9,6 +9,7 @@ import java.util.Set; import javax.webbeans.DeploymentException; +import javax.webbeans.Observer; import javax.webbeans.Production; import javax.webbeans.Standard; import javax.webbeans.TypeLiteral; @@ -18,7 +19,6 @@ import javax.webbeans.manager.InterceptionType; import javax.webbeans.manager.Interceptor; import javax.webbeans.manager.Manager; -import javax.webbeans.Observer; import org.jboss.webbeans.ejb.EjbManager; import org.jboss.webbeans.event.EventBus; @@ -33,8 +33,6 @@ private EventBus eventBus; private ResolutionManager resolutionManager; - private ThreadLocal<Map<Class<Annotation>, Context>> contexts = new ThreadLocal<Map<Class<Annotation>, Context>>(); - private Set<Bean<?>> beans; public ManagerImpl(List<Class<? extends Annotation>> enabledDeploymentTypes) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-10-23 18:43:32 UTC (rev 130) @@ -40,7 +40,6 @@ injectionPoints.clear(); } - @SuppressWarnings("unchecked") public <T> Set<Bean<T>> get(Injectable<T, ?> key) { return (Set<Bean<T>>) resolvedInjectionPoints.get(key); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EJB.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EJB.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EJB.java 2008-10-23 18:43:32 UTC (rev 130) @@ -2,21 +2,19 @@ import java.lang.annotation.Annotation; - import org.jboss.webbeans.util.Reflections; -@SuppressWarnings("unchecked") public class EJB { public @interface Dummy {} - public static final Class<Annotation> STATELESS_ANNOTATION; - public static final Class<Annotation> STATEFUL_ANNOTATION; - public static final Class<Annotation> MESSAGE_DRIVEN_ANNOTATION; - public static final Class<Annotation> SINGLETON_ANNOTATION; - public static final Class<Annotation> REMOVE_ANNOTATION; + public static final Class<? extends Annotation> STATELESS_ANNOTATION; + public static final Class<? extends Annotation> STATEFUL_ANNOTATION; + public static final Class<? extends Annotation> MESSAGE_DRIVEN_ANNOTATION; + public static final Class<? extends Annotation> SINGLETON_ANNOTATION; + public static final Class<? extends Annotation> REMOVE_ANNOTATION; static { @@ -27,11 +25,12 @@ REMOVE_ANNOTATION = classForName("javax.ejb.Remove"); } - private static Class classForName(String name) + @SuppressWarnings("unchecked") + private static Class<? extends Annotation> classForName(String name) { try { - return Reflections.classForName(name); + return (Class<? extends Annotation>) Reflections.classForName(name); } catch (ClassNotFoundException cnfe) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbManager.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbManager.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbManager.java 2008-10-23 18:43:32 UTC (rev 130) @@ -21,17 +21,16 @@ } // TODO Should this be static? - @SuppressWarnings("unchecked") public <T> T lookup(EjbMetaData<T> ejb) { if (ejb.getEjbLinkJndiName() != null) { - return (T) JNDI.lookup(ejb.getEjbLinkJndiName()); + return (T) JNDI.lookup(ejb.getEjbLinkJndiName(), ejb.getType()); } try { // TODO How is a JNDI lookup failure shown to us? - return (T) JNDI.lookup(ejb.getDefaultJndiName()); + return (T) JNDI.lookup(ejb.getDefaultJndiName(), ejb.getType()); } catch (Exception e) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,9 +1,9 @@ package org.jboss.webbeans.ejb; import static org.jboss.webbeans.ejb.EJB.MESSAGE_DRIVEN_ANNOTATION; +import static org.jboss.webbeans.ejb.EJB.REMOVE_ANNOTATION; import static org.jboss.webbeans.ejb.EJB.SINGLETON_ANNOTATION; import static org.jboss.webbeans.ejb.EJB.STATEFUL_ANNOTATION; -import static org.jboss.webbeans.ejb.EJB.REMOVE_ANNOTATION; import static org.jboss.webbeans.ejb.EJB.STATELESS_ANNOTATION; import static org.jboss.webbeans.ejb.EjbMetaData.EjbType.MESSAGE_DRIVEN; import static org.jboss.webbeans.ejb.EjbMetaData.EjbType.SINGLETON; @@ -39,10 +39,13 @@ // TODO Initialize the ejb name private String ejbName; + private Class<? extends T> type; + public EjbMetaData(Class<? extends T> type) { // TODO Merge in ejb-jar.xml + this.type = type; if (type.isAnnotationPresent(STATELESS_ANNOTATION)) { this.ejbType = STATELESS; @@ -106,4 +109,9 @@ return ejbName; } + public Class<? extends T> getType() + { + return type; + } + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/DeferredEventNotification.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,7 +1,6 @@ package org.jboss.webbeans.event; import javax.transaction.Synchronization; -import javax.webbeans.manager.Manager; import javax.webbeans.Observer; /** @@ -11,10 +10,10 @@ * @author David Allen * */ -public class DeferredEventNotification implements Synchronization +public class DeferredEventNotification<T> implements Synchronization { - private Observer<Object> observer; - private Object event; + private Observer<T> observer; + private T event; /** * Creates a new deferred event notifier. @@ -23,8 +22,7 @@ * @param observer The observer to be notified * @param event The event being fired */ - @SuppressWarnings("unchecked") - public DeferredEventNotification(Object event, Observer observer) + public DeferredEventNotification(T event, Observer<T> observer) { this.observer = observer; this.event = event; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventBus.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventBus.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventBus.java 2008-10-23 18:43:32 UTC (rev 130) @@ -66,13 +66,13 @@ * @throws IllegalStateException * @throws RollbackException */ - public void deferEvent(Object event, Observer<?> o) throws SystemException, IllegalStateException, RollbackException + public void deferEvent(Object event, Observer<Object> o) throws SystemException, IllegalStateException, RollbackException { if (tm != null) { // Get the current transaction associated with the thread Transaction t = tm.getTransaction(); if (t != null) - t.registerSynchronization(new DeferredEventNotification(event, o)); + t.registerSynchronization(new DeferredEventNotification<Object>(event, o)); } } @@ -83,7 +83,6 @@ * @param bindings Optional event bindings * @return A set of Observers */ - @SuppressWarnings("unchecked") public <T> Set<Observer<T>> getObservers(T event, Annotation... bindings) { Set<Observer<T>> results = new HashSet<Observer<T>>(); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-10-23 18:43:32 UTC (rev 130) @@ -3,15 +3,15 @@ import java.lang.annotation.Annotation; import java.util.Arrays; import java.util.Collection; +import java.util.HashSet; import java.util.Set; -import java.util.HashSet; import javax.webbeans.BindingType; import javax.webbeans.Current; import javax.webbeans.DuplicateBindingTypeException; import javax.webbeans.Event; +import javax.webbeans.Observer; import javax.webbeans.manager.Manager; -import javax.webbeans.Observer; /** * Implementation of the {@link Event} interface used for the container provided Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-10-23 18:43:32 UTC (rev 130) @@ -2,8 +2,8 @@ import java.lang.annotation.Annotation; -import javax.webbeans.manager.Manager; import javax.webbeans.Observer; +import javax.webbeans.manager.Manager; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.injectable.InjectableMethod; @@ -32,7 +32,7 @@ { private final AbstractComponentModel<?, ?> componentModel; - private final InjectableMethod<?> observerMethod; + private final InjectableMethod<? extends Object> observerMethod; private final Class<T> eventType; /** @@ -43,7 +43,6 @@ * @param observer The observer method to notify * @param eventType The type of event being observed */ - @SuppressWarnings("unchecked") public ObserverImpl(AbstractComponentModel<?, ?> componentModel, InjectableMethod<?> observer, Class<T> eventType) { this.componentModel = componentModel; @@ -67,7 +66,6 @@ * @see javax.webbeans.Observer#notify(javax.webbeans.Container, * java.lang.Object) */ - @SuppressWarnings("unchecked") public void notify(final T event) { // Get the most specialized instance of the component @@ -78,10 +76,10 @@ // object so that we know for certain it is the correct one. for (int i = 0; i < observerMethod.getParameters().size(); i++) { - InjectableParameter<?> parameter = observerMethod.getParameters().get(i); + InjectableParameter<? extends Object> parameter = observerMethod.getParameters().get(i); if (parameter.getType().isAssignableFrom(event.getClass())) { - InjectableParameter<?> newParameter = new InjectableParameterWrapper(parameter) + InjectableParameter<?> newParameter = new InjectableParameterWrapper<Object>(parameter) { @Override public Object getValue(ManagerImpl manager) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableField.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableField.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableField.java 2008-10-23 18:43:32 UTC (rev 130) @@ -13,10 +13,9 @@ public class InjectableField<T> extends Injectable<T, Field> { - @SuppressWarnings("unchecked") public InjectableField(Field field) { - super(new SimpleAnnotatedField(field)); + super(new SimpleAnnotatedField<T>(field)); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java 2008-10-23 18:43:32 UTC (rev 130) @@ -20,13 +20,12 @@ this.method = new SimpleAnnotatedMethod<T>(method); } - @SuppressWarnings("unchecked") + public T invoke(ManagerImpl manager, Object instance) { return invoke(manager, instance, getParameterValues(manager)); } - @SuppressWarnings("unchecked") public T invoke(Manager container, Object instance, Object[] parameters) { try Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java 2008-10-23 18:43:32 UTC (rev 130) @@ -10,9 +10,9 @@ public class InjectableParameterWrapper<T> extends InjectableParameter<T> { - private InjectableParameter<T> delegate; + private InjectableParameter<? extends T> delegate; - public InjectableParameterWrapper(InjectableParameter<T> delegate) + public InjectableParameterWrapper(InjectableParameter<? extends T> delegate) { this.delegate = delegate; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleInjectable.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleInjectable.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleInjectable.java 2008-10-23 18:43:32 UTC (rev 130) @@ -7,7 +7,7 @@ public class SimpleInjectable<T> extends Injectable<T, Object> { - public SimpleInjectable(Class<? extends T> type, Annotation[] bindingTypes) + public SimpleInjectable(Class<T> type, Annotation[] bindingTypes) { super(new SimpleAnnotatedItem<T, Object>(bindingTypes, type)); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java 2008-10-23 18:43:32 UTC (rev 130) @@ -17,25 +17,25 @@ parameters = initParameters(parameterTypes, parameterAnnotations); } - public List<InjectableParameter<?>> getParameters() + public List<InjectableParameter<? extends Object>> getParameters() { return parameters; } - @SuppressWarnings("unchecked") - protected static <T> List<InjectableParameter<?>> initParameters(Class<?>[] parameterTypes, Annotation[][] parameterAnnotations) + protected static <T> List<InjectableParameter<?>> initParameters(Class<? extends Object>[] parameterTypes, Annotation[][] parameterAnnotations) { List<InjectableParameter<?>> injectedParameters = new ArrayList<InjectableParameter<?>>(); for (int i = 0; i < parameterTypes.length; i++) { if (parameterAnnotations[i].length > 0) { - InjectableParameter<Object> parameter = new InjectableParameter(parameterAnnotations[i], parameterTypes[i]); + Class<? extends Object> clazz = parameterTypes[i]; + InjectableParameter<? extends Object> parameter = new InjectableParameter<Object>(parameterAnnotations[i], clazz); injectedParameters.add(i, parameter); } else { - InjectableParameter<Object> parameter = new InjectableParameter(parameterTypes[i]); + InjectableParameter<?> parameter = new InjectableParameter<Object>(parameterTypes[i]); injectedParameters.add(i, parameter); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java 2008-10-23 18:43:32 UTC (rev 130) @@ -8,8 +8,6 @@ import java.util.Set; import java.util.Map.Entry; -import org.jboss.webbeans.injectable.Injectable; - public abstract class AbstractAnnotatedItem<T, S> implements AnnotatedItem<T, S> { @@ -50,7 +48,6 @@ return annotationSet; } - @SuppressWarnings("unchecked") public <A extends Annotation> A getAnnotation(Class<? extends A> annotationType) { return (A) annotationMap.get(annotationType); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java 2008-10-23 18:43:32 UTC (rev 130) @@ -29,7 +29,7 @@ return constructor; } - public Class<? extends T> getType() + public Class<T> getType() { return constructor.getDeclaringClass(); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java 2008-10-23 18:43:32 UTC (rev 130) @@ -29,10 +29,9 @@ return field; } - @SuppressWarnings("unchecked") - public Class<? extends T> getType() + public Class<T> getType() { - return (Class<? extends T>) field.getType(); + return (Class<T>) field.getType(); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java 2008-10-23 18:43:32 UTC (rev 130) @@ -29,10 +29,9 @@ return method; } - @SuppressWarnings("unchecked") - public Class<? extends T> getType() + public Class<T> getType() { - return (Class<? extends T>) method.getReturnType(); + return (Class<T>) method.getReturnType(); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java 2008-10-23 18:43:32 UTC (rev 130) @@ -132,7 +132,7 @@ } } - public Class<? extends T> getType() + public Class<T> getType() { return clazz; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-10-23 18:43:32 UTC (rev 130) @@ -34,8 +34,7 @@ * @param xmlAnnotatedItem Annotations read from XML * @param manager */ - @SuppressWarnings("unchecked") - public AbstractClassComponentModel(AnnotatedType<T> annotatedItem, AnnotatedType xmlAnnotatedItem) + public AbstractClassComponentModel(AnnotatedType<T> annotatedItem, AnnotatedType<T> xmlAnnotatedItem) { if (annotatedItem == null) { @@ -73,7 +72,6 @@ return xmlAnnotatedItem; } - @SuppressWarnings("unchecked") protected void initType() { if (getAnnotatedItem().getDelegate() != null && getXmlAnnotatedItem().getDelegate() != null && !getAnnotatedItem().getDelegate().equals(getXmlAnnotatedItem().getDelegate())) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java 2008-10-23 18:43:32 UTC (rev 130) @@ -35,7 +35,7 @@ protected Class<? extends Annotation> scopeType; private MergedStereotypesModel<T, E> mergedStereotypes; protected Class<? extends Annotation> deploymentType; - protected Class<T> type; + protected Class<? extends T> type; protected InjectableMethod<?> removeMethod; private Set<Class<?>> apiTypes; protected Set<Injectable<?, ?>> injectionPoints; @@ -286,7 +286,7 @@ return scopeType; } - public Class<T> getType() + public Class<? extends T> getType() { return type; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java 2008-10-23 18:43:32 UTC (rev 130) @@ -47,12 +47,11 @@ /** * Initializes the constructor field of this class. */ - @SuppressWarnings("unchecked") protected void initConstructor() { // There should only be one constructor for the event implementation used here - Constructor[] constructors = this.annotatedItem.getType().getConstructors(); - Constructor<T> classConstructor = (Constructor<T>)constructors[0]; + // TODO Probably don't need to use reflection as this is a container supplied class + Constructor<T> classConstructor = this.annotatedItem.getType().getConstructors()[0]; constructor = new SimpleConstructor<T>(classConstructor); } @@ -81,18 +80,17 @@ /* (non-Javadoc) * @see org.jboss.webbeans.model.AbstractClassComponentModel#initType() */ - @SuppressWarnings("unchecked") @Override protected void initType() { if (getXmlAnnotatedItem().getDelegate() != null) { log.finest("Component type specified in XML"); - this.type = (Class<T>) xmlAnnotatedItem.getType(); + this.type = xmlAnnotatedItem.getType(); } else if (getAnnotatedItem().getDelegate() != null) { log.finest("Component type specified in Java"); - this.type = (Class<T>) annotatedItem.getType(); + this.type = annotatedItem.getType(); } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java 2008-10-23 18:43:32 UTC (rev 130) @@ -34,8 +34,7 @@ private String location; private Type declaredComponentType; - @SuppressWarnings("unchecked") - public ProducerMethodComponentModel(AnnotatedMethod annotatedMethod, ManagerImpl container) + public ProducerMethodComponentModel(AnnotatedMethod<T> annotatedMethod, ManagerImpl container) { this.annotatedMethod = annotatedMethod; init(container); @@ -106,13 +105,12 @@ } } - @SuppressWarnings("unchecked") protected void initRemoveMethod(ManagerImpl container) { Set<Method> disposalMethods = container.resolveDisposalMethods(getType(), getBindingTypes().toArray(new Annotation[0])); if (disposalMethods.size() == 1) { - removeMethod = new InjectableMethod(disposalMethods.iterator().next()); + removeMethod = new InjectableMethod<Object>(disposalMethods.iterator().next()); } else if (disposalMethods.size() > 1) { @@ -153,13 +151,12 @@ return xmlAnnotatedItem; } - @SuppressWarnings("unchecked") @Override protected void initType() { try { - this.type = (Class<T>) annotatedMethod.getAnnotatedMethod().getReturnType(); + this.type = annotatedMethod.getType(); } catch (ClassCastException e) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/RemoteComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/RemoteComponentModel.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/RemoteComponentModel.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,13 +1,6 @@ package org.jboss.webbeans.model; -import java.lang.reflect.Method; -import java.util.HashSet; -import java.util.Set; - -import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.injectable.ComponentConstructor; -import org.jboss.webbeans.injectable.EnterpriseConstructor; -import org.jboss.webbeans.injectable.InjectableMethod; import org.jboss.webbeans.introspector.AnnotatedType; public class RemoteComponentModel<T> extends AbstractEnterpriseComponentModel<T> Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/SimpleComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/SimpleComponentModel.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/SimpleComponentModel.java 2008-10-23 18:43:32 UTC (rev 130) @@ -29,8 +29,7 @@ * @param xmlAnnotatedItem Annotations read from XML * @param container */ - @SuppressWarnings("unchecked") - public SimpleComponentModel(AnnotatedType annotatedItem, AnnotatedType xmlAnnotatedItem, ManagerImpl container) + public SimpleComponentModel(AnnotatedType<T> annotatedItem, AnnotatedType<T> xmlAnnotatedItem, ManagerImpl container) { super(annotatedItem, xmlAnnotatedItem); init(container); @@ -64,7 +63,6 @@ } } - @SuppressWarnings("unchecked") protected void initConstructor() { if (getType().getConstructors().length == 1) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java 2008-10-23 18:43:32 UTC (rev 130) @@ -20,7 +20,7 @@ * @author pmuir * */ -public class StereotypeModel<T> +public class StereotypeModel<T extends Annotation> { private Class<? extends Annotation> stereotypeClass; @@ -31,7 +31,6 @@ private Set<Class<?>> requiredTypes; private Set<Annotation> interceptorBindings; - @SuppressWarnings("unchecked") public StereotypeModel(AnnotatedType<T> annotatedClass) { initStereotypeClass(annotatedClass); @@ -54,12 +53,11 @@ } } - @SuppressWarnings("unchecked") private void initStereotypeClass(AnnotatedType<T> annotatedClass) { if (Annotation.class.isAssignableFrom(annotatedClass.getAnnotatedClass())) { - this.stereotypeClass = (Class<? extends Annotation>) annotatedClass.getAnnotatedClass(); + this.stereotypeClass = annotatedClass.getAnnotatedClass(); } else { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/AnnotationDB.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/AnnotationDB.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/AnnotationDB.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,13 +1,6 @@ package org.jboss.webbeans.scannotation; -import javassist.bytecode.AnnotationsAttribute; -import javassist.bytecode.ClassFile; -import javassist.bytecode.FieldInfo; -import javassist.bytecode.MethodInfo; -import javassist.bytecode.ParameterAnnotationsAttribute; -import javassist.bytecode.annotation.Annotation; - import java.io.BufferedInputStream; import java.io.DataInputStream; import java.io.IOException; @@ -22,6 +15,13 @@ import java.util.Map; import java.util.Set; +import javassist.bytecode.AnnotationsAttribute; +import javassist.bytecode.ClassFile; +import javassist.bytecode.FieldInfo; +import javassist.bytecode.MethodInfo; +import javassist.bytecode.ParameterAnnotationsAttribute; +import javassist.bytecode.annotation.Annotation; + /** * The class allows you to scan an arbitrary set of "archives" for .class files. These class files * are parsed to see what annotations they use. Two indexes are created. The javax, java, sun, com.sun, and javassist @@ -300,6 +300,7 @@ * * @param cf */ + @SuppressWarnings("unchecked") protected void scanMethods(ClassFile cf) { List methods = cf.getMethods(); @@ -338,6 +339,7 @@ } } + @SuppressWarnings("unchecked") protected void scanFields(ClassFile cf) { List fields = cf.getFields(); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/ClasspathUrlFinder.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/ClasspathUrlFinder.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/ClasspathUrlFinder.java 2008-10-23 18:43:32 UTC (rev 130) @@ -105,7 +105,7 @@ * @param clazz * @return */ - public static URL findClassBase(Class clazz) + public static URL findClassBase(Class<?> clazz) { String resource = clazz.getName().replace('.', '/') + ".class"; return findResourceBase(resource, clazz.getClassLoader()); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/InputStreamWrapper.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/InputStreamWrapper.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/scannotation/InputStreamWrapper.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,7 +1,7 @@ package org.jboss.webbeans.scannotation; +import java.io.IOException; import java.io.InputStream; -import java.io.IOException; /** * Delegate to everything but close(). This object will not close the stream Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansFilter.java 2008-10-23 18:43:32 UTC (rev 130) @@ -12,7 +12,6 @@ import javax.webbeans.manager.Manager; import org.jboss.webbeans.BasicContext; -import org.jboss.webbeans.init.Initialization; /** * @@ -25,8 +24,7 @@ public void init(FilterConfig filterConfig) throws ServletException { - container = (Manager) filterConfig.getServletContext().getAttribute( - Initialization.WEBBEANS_CONTAINER_KEY); + } public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/servlet/WebBeansListener.java 2008-10-23 18:43:32 UTC (rev 130) @@ -5,7 +5,6 @@ import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; -import org.jboss.webbeans.init.Initialization; /** * @@ -18,7 +17,6 @@ public void contextInitialized(ServletContextEvent event) { ServletLifecycle.beginApplication( event.getServletContext() ); - new Initialization( event.getServletContext() ).create().init(); } public void sessionCreated(HttpSessionEvent event) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/JNDI.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/JNDI.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/util/JNDI.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,5 +1,6 @@ package org.jboss.webbeans.util; + public class JNDI { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-10-23 18:43:32 UTC (rev 130) @@ -25,7 +25,7 @@ @Test @SpecAssertion(section={"2.3.3", "2.3.1"}) public void testDefaultBindingTypeDeclaredInJava() { - SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), emptyAnnotatedItem, manager); + SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), getEmptyAnnotatedItem(Order.class), manager); assert order.getBindingTypes().size() == 1; order.getBindingTypes().iterator().next().annotationType().equals(Current.class); } @@ -58,7 +58,7 @@ @Test @SpecAssertion(section="2.3.3") public void testBindingTypesDeclaredInJava() { - SimpleComponentModel<Cat> cat = new SimpleComponentModel<Cat>(new SimpleAnnotatedType(Cat.class), emptyAnnotatedItem, manager); + SimpleComponentModel<Cat> cat = new SimpleComponentModel<Cat>(new SimpleAnnotatedType(Cat.class), getEmptyAnnotatedItem(Cat.class), manager); assert cat.getBindingTypes().size() == 1; assert Reflections.annotationSetMatches(cat.getBindingTypes(), Synchronous.class); } @@ -77,7 +77,7 @@ annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); AnnotatedType annotatedItem = new SimpleAnnotatedType(Antelope.class, annotations); - SimpleComponentModel<Antelope> antelope = new SimpleComponentModel<Antelope>(emptyAnnotatedItem, annotatedItem, manager); + SimpleComponentModel<Antelope> antelope = new SimpleComponentModel<Antelope>(getEmptyAnnotatedItem(Antelope.class), annotatedItem, manager); assert Reflections.annotationSetMatches(antelope.getBindingTypes(), Asynchronous.class); } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,13 +1,8 @@ package org.jboss.webbeans.test; -import java.lang.annotation.Annotation; -import java.util.HashMap; - import javax.webbeans.Current; -import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.injectable.SimpleConstructor; -import org.jboss.webbeans.introspector.AnnotatedType; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.SimpleComponentModel; import org.jboss.webbeans.test.annotations.Synchronous; @@ -19,31 +14,17 @@ import org.jboss.webbeans.test.components.Order; import org.jboss.webbeans.test.components.Sheep; import org.jboss.webbeans.test.components.Turkey; -import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.util.Reflections; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @SpecVersion("20080925") -public class ConstructorModelTest +public class ConstructorModelTest extends AbstractTest { - - private ManagerImpl container; - private AnnotatedType<Object> emptyAnnotatedItem; - - @BeforeMethod - public void before() - { - emptyAnnotatedItem = new SimpleAnnotatedType<Object>(null, new HashMap<Class<? extends Annotation>, Annotation>()); - container = new MockManagerImpl(null); - - } - @Test public void testImplicitConstructor() { - SimpleConstructor<Order> constructor = new SimpleComponentModel<Order>(new SimpleAnnotatedType<Order>(Order.class), emptyAnnotatedItem, container).getConstructor(); + SimpleConstructor<Order> constructor = new SimpleComponentModel<Order>(new SimpleAnnotatedType<Order>(Order.class), getEmptyAnnotatedItem(Order.class), manager).getConstructor(); assert constructor.getAnnotatedItem().getDelegate().getDeclaringClass().equals(Order.class); assert constructor.getAnnotatedItem().getDelegate().getParameterTypes().length == 0; assert constructor.getParameters().size() == 0; @@ -53,7 +34,7 @@ @Test public void testSingleConstructor() { - SimpleConstructor<Donkey> constructor = new SimpleComponentModel<Donkey>(new SimpleAnnotatedType<Donkey>(Donkey.class), emptyAnnotatedItem, container).getConstructor(); + SimpleConstructor<Donkey> constructor = new SimpleComponentModel<Donkey>(new SimpleAnnotatedType<Donkey>(Donkey.class), getEmptyAnnotatedItem(Donkey.class), manager).getConstructor(); assert constructor.getAnnotatedItem().getDelegate().getDeclaringClass().equals(Donkey.class); assert constructor.getAnnotatedItem().getDelegate().getParameterTypes().length == 1; assert constructor.getAnnotatedItem().getDelegate().getParameterTypes()[0].equals(String.class); @@ -67,7 +48,7 @@ @Test public void testInitializerAnnotatedConstructor() { - SimpleConstructor<Sheep> constructor = new SimpleComponentModel<Sheep>(new SimpleAnnotatedType<Sheep>(Sheep.class), emptyAnnotatedItem, container).getConstructor(); + SimpleConstructor<Sheep> constructor = new SimpleComponentModel<Sheep>(new SimpleAnnotatedType<Sheep>(Sheep.class), getEmptyAnnotatedItem(Sheep.class), manager).getConstructor(); assert constructor.getAnnotatedItem().getDelegate().getDeclaringClass().equals(Sheep.class); assert constructor.getAnnotatedItem().getDelegate().getParameterTypes().length == 2; assert constructor.getAnnotatedItem().getDelegate().getParameterTypes()[0].equals(String.class); @@ -85,7 +66,7 @@ @Test public void testBindingTypeAnnotatedConstructor() { - SimpleConstructor<Duck> constructor = new SimpleComponentModel<Duck>(new SimpleAnnotatedType<Duck>(Duck.class), emptyAnnotatedItem, container).getConstructor(); + SimpleConstructor<Duck> constructor = new SimpleComponentModel<Duck>(new SimpleAnnotatedType<Duck>(Duck.class), getEmptyAnnotatedItem(Duck.class), manager).getConstructor(); assert constructor.getAnnotatedItem().getDelegate().getDeclaringClass().equals(Duck.class); assert constructor.getAnnotatedItem().getDelegate().getParameterTypes().length == 2; assert constructor.getAnnotatedItem().getDelegate().getParameterTypes()[0].equals(String.class); @@ -105,7 +86,7 @@ boolean exception = false; try { - new SimpleComponentModel<Chicken>(new SimpleAnnotatedType<Chicken>(Chicken.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Chicken>(new SimpleAnnotatedType<Chicken>(Chicken.class), getEmptyAnnotatedItem(Chicken.class), manager); } catch (Exception e) { @@ -121,7 +102,7 @@ boolean exception = false; try { - new SimpleComponentModel<Turkey>(new SimpleAnnotatedType<Turkey>(Turkey.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Turkey>(new SimpleAnnotatedType<Turkey>(Turkey.class), getEmptyAnnotatedItem(Turkey.class), manager); } catch (Exception e) { @@ -137,7 +118,7 @@ boolean exception = false; try { - new SimpleComponentModel<Goat>(new SimpleAnnotatedType<Goat>(Goat.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Goat>(new SimpleAnnotatedType<Goat>(Goat.class), getEmptyAnnotatedItem(Goat.class), manager); } catch (Exception e) { @@ -153,7 +134,7 @@ boolean exception = false; try { - new SimpleComponentModel<Goose>(new SimpleAnnotatedType<Goose>(Goose.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Goose>(new SimpleAnnotatedType<Goose>(Goose.class), getEmptyAnnotatedItem(Goose.class), manager); } catch (Exception e) { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-23 18:43:32 UTC (rev 130) @@ -80,7 +80,7 @@ Observer<Event> observer = new MockObserverImpl<Event>(tuna, om, Event.class); ((MockObserverImpl<Event>) observer).setInstance(observerInstance); Event event = new Event(); - DeferredEventNotification deferredNotification = new DeferredEventNotification(event, observer); + DeferredEventNotification<Event> deferredNotification = new DeferredEventNotification<Event>(event, observer); deferredNotification.beforeCompletion(); assert observerInstance.notified; } Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentStrategyTest.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,22 +0,0 @@ -package org.jboss.webbeans.test; - -import java.net.URL; - -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.deployment.DeploymentStrategy; -import org.jboss.webbeans.scannotation.ClasspathUrlFinder; -import org.testng.annotations.Test; - -public class DeploymentStrategyTest -{ - - @Test(groups="deployment") - public void testDeploymentStrategy() - { - URL[] urls = {ClasspathUrlFinder.findClassBase(DeploymentStrategyTest.class)}; - ManagerImpl container = new ManagerImpl(null); - DeploymentStrategy deploymentStrategy = new DeploymentStrategy(Thread.currentThread().getContextClassLoader(), container); - deploymentStrategy.scan(urls, "org.jboss.webbeans.test.annotations.broken", "org.jboss.webbeans.test.bindings.broken", "org.jboss.webbeans.test.components.broken"); - } - -} Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java 2008-10-23 18:43:32 UTC (rev 130) @@ -10,8 +10,11 @@ import org.jboss.webbeans.injectable.InjectableField; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.SimpleComponentModel; +import org.jboss.webbeans.test.components.Animal; import org.jboss.webbeans.test.components.FishFarm; +import org.jboss.webbeans.test.components.Haddock; import org.jboss.webbeans.test.components.Tuna; +import org.jboss.webbeans.test.components.broken.Carp; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.Test; @@ -30,7 +33,7 @@ } @Test - public void testPossibleTargets() throws Exception + public void testSingleApiTypeWithCurrent() throws Exception { InjectableField<Tuna> tunaField = new InjectableField<Tuna>(FishFarm.class.getDeclaredField("tuna")); Bean<Tuna> tunaBean = new BeanImpl<Tuna>(new SimpleComponentModel<Tuna>(new SimpleAnnotatedType<Tuna>(Tuna.class), getEmptyAnnotatedItem(Tuna.class), super.manager), manager); @@ -41,4 +44,18 @@ assert possibleTargets.contains(tunaBean); } + @Test + public void testMultipleApiTypeWithCurrent() throws Exception + { + InjectableField<Animal> animalField = new InjectableField<Animal>(FishFarm.class.getDeclaredField("animal")); + Bean<Carp> carpBean = new BeanImpl<Carp>(new SimpleComponentModel<Carp>(new SimpleAnnotatedType<Carp>(Carp.class), getEmptyAnnotatedItem(Carp.class), super.manager), manager); + Bean<Haddock> haddockBean = new BeanImpl<Haddock>(new SimpleComponentModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), getEmptyAnnotatedItem(Haddock.class), super.manager), manager); + Set<Bean<?>> beans = new HashSet<Bean<?>>(); + beans.add(carpBean); + beans.add(haddockBean); + Set<Bean<?>> possibleTargets = animalField.getPossibleBeans(beans); + assert possibleTargets.size() == 1; + assert possibleTargets.contains(carpBean); + } + } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,28 +1,10 @@ package org.jboss.webbeans.test; -import java.lang.annotation.Annotation; -import java.util.HashMap; - -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.introspector.AnnotatedType; -import org.jboss.webbeans.introspector.SimpleAnnotatedType; -import org.jboss.webbeans.test.mock.MockManagerImpl; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -public class ProducerExpressionComponentModelTest +public class ProducerExpressionComponentModelTest extends AbstractTest { - private ManagerImpl container; - private AnnotatedType<?> emptyAnnotatedItem; - - @BeforeMethod - public void before() - { - emptyAnnotatedItem = new SimpleAnnotatedType(null, new HashMap<Class<? extends Annotation>, Annotation>()); - container = new MockManagerImpl(null); - } - @Test(groups="producerExpression") @SpecAssertion(section="3.4") public void testApiTypes() { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java 2008-10-23 18:43:32 UTC (rev 130) @@ -1,25 +1,6 @@ package org.jboss.webbeans.test; -import java.lang.annotation.Annotation; -import java.util.HashMap; -import javax.webbeans.Current; - -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.introspector.AnnotatedType; -import org.jboss.webbeans.introspector.SimpleAnnotatedType; -import org.jboss.webbeans.model.RemoteComponentModel; -import org.jboss.webbeans.test.annotations.Tame; -import org.jboss.webbeans.test.components.Animal; -import org.jboss.webbeans.test.components.Baboon; -import org.jboss.webbeans.test.components.Orangutan; -import org.jboss.webbeans.test.components.TameOrangutan; -import org.jboss.webbeans.test.components.broken.Chimpanzee; -import org.jboss.webbeans.test.components.broken.Gibbon; -import org.jboss.webbeans.test.mock.MockManagerImpl; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - public class RemoteComponentModelTest { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-10-23 18:43:32 UTC (rev 130) @@ -27,7 +27,6 @@ import org.jboss.webbeans.test.bindings.HornedMamalStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral; import org.jboss.webbeans.test.components.Antelope; -import org.jboss.webbeans.test.components.Carp; import org.jboss.webbeans.test.components.Chair; import org.jboss.webbeans.test.components.Cow; import org.jboss.webbeans.test.components.Goldfish; @@ -38,6 +37,7 @@ import org.jboss.webbeans.test.components.Order; import org.jboss.webbeans.test.components.SeaBass; import org.jboss.webbeans.test.components.Tuna; +import org.jboss.webbeans.test.components.broken.Carp; import org.jboss.webbeans.test.components.broken.ComponentWithTooManyDeploymentTypes; import org.jboss.webbeans.test.components.broken.Pig; import org.jboss.webbeans.test.components.broken.OuterComponent.InnerComponent; @@ -87,25 +87,25 @@ { Map<Class<? extends Annotation>, Annotation> xmlDefinedDeploymentTypeAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral()); - AnnotatedType xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedType(ComponentWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); + AnnotatedType<ComponentWithTooManyDeploymentTypes> xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedType<ComponentWithTooManyDeploymentTypes>(ComponentWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); - SimpleComponentModel<ComponentWithTooManyDeploymentTypes> component = new SimpleComponentModel<ComponentWithTooManyDeploymentTypes>(new SimpleAnnotatedType(ComponentWithTooManyDeploymentTypes.class), xmlDefinedDeploymentTypeAnnotatedItem, manager); + SimpleComponentModel<ComponentWithTooManyDeploymentTypes> component = new SimpleComponentModel<ComponentWithTooManyDeploymentTypes>(new SimpleAnnotatedType<ComponentWithTooManyDeploymentTypes>(ComponentWithTooManyDeploymentTypes.class), xmlDefinedDeploymentTypeAnnotatedItem, manager); assert component.getDeploymentType().equals(AnotherDeploymentType.class); } @Test @SpecAssertion(section="2.5.5") public void testXmlDefaultDeploymentType() { - AnnotatedType antelopeAnnotatedItem = new SimpleAnnotatedType(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); - SimpleComponentModel<Antelope> antelope = new SimpleComponentModel<Antelope>(emptyAnnotatedItem, antelopeAnnotatedItem, manager); + AnnotatedType<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedType<Antelope>(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); + SimpleComponentModel<Antelope> antelope = new SimpleComponentModel<Antelope>(getEmptyAnnotatedItem(Antelope.class), antelopeAnnotatedItem, manager); assert antelope.getDeploymentType().equals(Production.class); } @Test @SpecAssertion(section="2.5.4") public void testXmlRespectsJavaDeploymentType() { - AnnotatedType annotatedItem = new SimpleAnnotatedType(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); - SimpleComponentModel<Tuna> tuna = new SimpleComponentModel<Tuna>(new SimpleAnnotatedType(Tuna.class), annotatedItem, manager); + AnnotatedType<Tuna> annotatedItem = new SimpleAnnotatedType<Tuna>(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); + SimpleComponentModel<Tuna> tuna = new SimpleComponentModel<Tuna>(new SimpleAnnotatedType<Tuna>(Tuna.class), annotatedItem, manager); assert tuna.getDeploymentType().equals(AnotherDeploymentType.class); } @@ -114,9 +114,9 @@ { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(HornedMammalStereotype.class, new HornedMamalStereotypeAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(Moose.class, annotations); + AnnotatedType<Moose> annotatedItem = new SimpleAnnotatedType<Moose>(Moose.class, annotations); - SimpleComponentModel<Moose> moose = new SimpleComponentModel<Moose>(new SimpleAnnotatedType(Moose.class), annotatedItem, manager); + SimpleComponentModel<Moose> moose = new SimpleComponentModel<Moose>(new SimpleAnnotatedType<Moose>(Moose.class), annotatedItem, manager); assert moose.getDeploymentType().equals(HornedAnimalDeploymentType.class); } @@ -126,8 +126,8 @@ { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, manager); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); assert trout.getScopeType().equals(RequestScoped.class); } @@ -140,7 +140,7 @@ @Test @SpecAssertion(section="2.6.1") public void testDefaultNamed() { - SimpleComponentModel<Haddock> haddock = new SimpleComponentModel<Haddock>(new SimpleAnnotatedType(Haddock.class), emptyAnnotatedItem, manager); + SimpleComponentModel<Haddock> haddock = new SimpleComponentModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), getEmptyAnnotatedItem(Haddock.class), manager); assert haddock.getName() != null; assert haddock.getName().equals("haddock"); } @@ -150,8 +150,8 @@ { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(Named.class, new NamedAnnotationLiteral("")); - AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, manager); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); assert trout.getName() != null; assert trout.getName().equals("seaBass"); @@ -162,8 +162,8 @@ { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(Named.class, new NamedAnnotationLiteral("aTrout")); - AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, manager); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); assert trout.getName().equals("aTrout"); } @@ -171,14 +171,14 @@ @Test @SpecAssertion(section="2.6.4") public void testNotNamed() { - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), emptyAnnotatedItem, manager); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), getEmptyAnnotatedItem(SeaBass.class), manager); assert trout.getName() == null; } @Test @SpecAssertion(section="2.6.1") public void testNonDefaultNamed() { - SimpleComponentModel<Moose> moose = new SimpleComponentModel<Moose>(new SimpleAnnotatedType(Moose.class), emptyAnnotatedItem, manager); + SimpleComponentModel<Moose> moose = new SimpleComponentModel<Moose>(new SimpleAnnotatedType<Moose>(Moose.class), getEmptyAnnotatedItem(Moose.class), manager); assert moose.getName().equals("aMoose"); } @@ -206,7 +206,7 @@ @Test @SpecAssertion(section="2.7.2") public void testSingleStereotype() { - SimpleComponentModel<Gorilla> gorilla = new SimpleComponentModel<Gorilla>(new SimpleAnnotatedType(Gorilla.class), emptyAnnotatedItem, manager); + SimpleComponentModel<Gorilla> gorilla = new SimpleComponentModel<Gorilla>(new SimpleAnnotatedType<Gorilla>(Gorilla.class), getEmptyAnnotatedItem(Gorilla.class), manager); assert gorilla.getName() == null; assert gorilla.getDeploymentType().equals(Production.class); assert gorilla.getBindingTypes().iterator().next().annotationType().equals(Current.class); @@ -218,7 +218,7 @@ { try { - new SimpleComponentModel<Gorilla>(new SimpleAnnotatedType(Gorilla.class), emptyAnnotatedItem, manager); + new SimpleComponentModel<Gorilla>(new SimpleAnnotatedType<Gorilla>(Gorilla.class), getEmptyAnnotatedItem(Gorilla.class), manager); } catch (Exception e) { @@ -230,7 +230,7 @@ @Test(expectedExceptions=Exception.class) @SpecAssertion(section="2.7.4") public void testRequiredTypeIsNotImplemented() { - new SimpleComponentModel<Chair>(new SimpleAnnotatedType(Chair.class), emptyAnnotatedItem, manager); + new SimpleComponentModel<Chair>(new SimpleAnnotatedType<Chair>(Chair.class), getEmptyAnnotatedItem(Chair.class), manager); } @Test @SpecAssertion(section="2.7.4") @@ -238,7 +238,7 @@ { try { - new SimpleComponentModel<Goldfish>(new SimpleAnnotatedType(Goldfish.class), emptyAnnotatedItem, manager); + new SimpleComponentModel<Goldfish>(new SimpleAnnotatedType<Goldfish>(Goldfish.class), getEmptyAnnotatedItem(Goldfish.class), manager); } catch (Exception e) { @@ -250,7 +250,7 @@ @Test(expectedExceptions=Exception.class) @SpecAssertion(section="2.7.4") public void testScopeIsNotSupported() { - new SimpleComponentModel<Carp>(new SimpleAnnotatedType(Carp.class), emptyAnnotatedItem, manager); + new SimpleComponentModel<Carp>(new SimpleAnnotatedType<Carp>(Carp.class), getEmptyAnnotatedItem(Carp.class), manager); } @Test @SpecAssertion(section="2.7.2") @@ -267,7 +267,7 @@ boolean exception = false; try { - new SimpleComponentModel<Cow>(new SimpleAnnotatedType(Cow.class), emptyAnnotatedItem, manager); + new SimpleComponentModel<Cow>(new SimpleAnnotatedType<Cow>(Cow.class), getEmptyAnnotatedItem(Cow.class), manager); } catch (Exception e) { @@ -282,7 +282,7 @@ boolean exception = false; try { - new SimpleComponentModel<InnerComponent>(new SimpleAnnotatedType(InnerComponent.class), emptyAnnotatedItem, manager); + new SimpleComponentModel<InnerComponent>(new SimpleAnnotatedType<InnerComponent>(InnerComponent.class), getEmptyAnnotatedItem(InnerComponent.class), manager); } catch (Exception e) { @@ -297,7 +297,7 @@ boolean exception = false; try { - new SimpleComponentModel<Horse>(new SimpleAnnotatedType(Horse.class), emptyAnnotatedItem, manager); + new SimpleComponentModel<Horse>(new SimpleAnnotatedType<Horse>(Horse.class), getEmptyAnnotatedItem(Horse.class), manager); } catch (Exception e) { @@ -307,10 +307,10 @@ Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(Dependent.class, new DependentAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(Horse.class, annotations); + AnnotatedType<Horse> annotatedItem = new SimpleAnnotatedType<Horse>(Horse.class, annotations); try { - new SimpleComponentModel<Horse>(new SimpleAnnotatedType(Horse.class), annotatedItem, manager); + new SimpleComponentModel<Horse>(new SimpleAnnotatedType<Horse>(Horse.class), annotatedItem, manager); } catch (Exception e) { @@ -324,7 +324,7 @@ boolean exception = false; try { - new SimpleComponentModel<Pig>(new SimpleAnnotatedType(Pig.class), emptyAnnotatedItem, manager); + new SimpleComponentModel<Pig>(new SimpleAnnotatedType<Pig>(Pig.class), getEmptyAnnotatedItem(Pig.class), manager); } catch (Exception e) { @@ -334,10 +334,10 @@ Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(Dependent.class, new DependentAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(Pig.class, annotations); + AnnotatedType<Pig> annotatedItem = new SimpleAnnotatedType<Pig>(Pig.class, annotations); try { - new SimpleComponentModel<Pig>(new SimpleAnnotatedType(Pig.class), annotatedItem, manager); + new SimpleComponentModel<Pig>(new SimpleAnnotatedType<Pig>(Pig.class), annotatedItem, manager); } catch (Exception e) { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/HornedMammalStereotype.java 2008-10-23 18:43:32 UTC (rev 130) @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.webbeans.Stereotype; import org.jboss.webbeans.test.components.Animal; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/broken/StereotypeWithBindingTypes.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/broken/StereotypeWithBindingTypes.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/annotations/broken/StereotypeWithBindingTypes.java 2008-10-23 18:43:32 UTC (rev 130) @@ -5,6 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; + import javax.webbeans.Stereotype; import org.jboss.webbeans.test.annotations.Asynchronous; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java 2008-10-23 17:14:31 UTC (rev 129) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java 2008-10-23 18:43:32 UTC (rev 130) @@ -7,7 +7,12 @@ public class FishFarm { + @SuppressWarnings("unused") @Current private Tuna tuna; + @SuppressWarnings("unused") + @Current + private Animal animal; + }

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r129 - ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-23 13:14:31 -0400 (Thu, 23 Oct 2008) New Revision: 129 Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java Log: Oops, update Bean too Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java 2008-10-23 17:13:25 UTC (rev 128) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/manager/Bean.java 2008-10-23 17:14:31 UTC (rev 129) @@ -52,9 +52,9 @@ public abstract Set<Annotation> getBindingTypes(); - public abstract Class<Annotation> getScopeType(); + public abstract Class<? extends Annotation> getScopeType(); - public abstract Class<Annotation> getDeploymentType(); + public abstract Class<? extends Annotation> getDeploymentType(); public abstract String getName();

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r128 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans and 6 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-23 13:13:25 -0400 (Thu, 23 Oct 2008) New Revision: 128 Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Pig.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java Removed: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Pig.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockContainerImpl.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableWrapper.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractEnterpriseComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerExpressionComponent.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContainerTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java Log: Switch to using Class<? extends Annotation> from Class<Annotation> and enable some Bean methods Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java 2008-10-23 17:13:25 UTC (rev 128) @@ -0,0 +1,26 @@ +package javax.webbeans; + +public class DeploymentException extends RuntimeException +{ + + public DeploymentException() + { + super(); + } + + public DeploymentException(String arg0, Throwable arg1) + { + super(arg0, arg1); + } + + public DeploymentException(String arg0) + { + super(arg0); + } + + public DeploymentException(Throwable arg0) + { + super(arg0); + } + +} Property changes on: ri/trunk/webbeans-api/src/main/java/javax/webbeans/DeploymentException.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java 2008-10-23 17:13:25 UTC (rev 128) @@ -16,20 +16,20 @@ private static Logger log = LoggerUtil.getLogger(LOGGER_NAME); - private AbstractComponentModel<T, ?> componentMetaModel; + private AbstractComponentModel<T, ?> model; private ManagerImpl manager; - public BeanImpl(AbstractComponentModel<T, ?> componentMetaModel, ManagerImpl manager) + public BeanImpl(AbstractComponentModel<T, ?> model, ManagerImpl manager) { super(manager); - this.componentMetaModel = componentMetaModel; + this.model = model; } @Override public T create() { - return componentMetaModel.getConstructor().invoke(manager); + return model.getConstructor().invoke(manager); } @Override @@ -42,32 +42,31 @@ @Override public Set<Annotation> getBindingTypes() { - return componentMetaModel.getBindingTypes(); + return model.getBindingTypes(); } @Override - public Class<Annotation> getDeploymentType() + public Class<? extends Annotation> getDeploymentType() { - return null; // componentMetaModel.getDeploymentType(); + return model.getDeploymentType(); } @Override public String getName() { - return componentMetaModel.getName(); + return model.getName(); } @Override - public Class<Annotation> getScopeType() + public Class<? extends Annotation> getScopeType() { - return null; //componentMetaModel.getScopeType(); + return model.getScopeType(); } @Override public Set<Class<?>> getTypes() { - // TODO Auto-generated method stub - return null; + return model.getApiTypes(); } @Override Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-10-23 17:13:25 UTC (rev 128) @@ -8,6 +8,8 @@ import java.util.Map; import java.util.Set; +import javax.webbeans.DeploymentException; +import javax.webbeans.Production; import javax.webbeans.Standard; import javax.webbeans.TypeLiteral; import javax.webbeans.manager.Bean; @@ -18,8 +20,6 @@ import javax.webbeans.manager.Manager; import javax.webbeans.Observer; -import org.jboss.webbeans.bindings.ProductionAnnotationLiteral; -import org.jboss.webbeans.bindings.StandardAnnotationLiteral; import org.jboss.webbeans.ejb.EjbManager; import org.jboss.webbeans.event.EventBus; import org.jboss.webbeans.injectable.SimpleInjectable; @@ -27,7 +27,7 @@ public class ManagerImpl implements Manager { - private List<Annotation> enabledDeploymentTypes; + private List<Class<? extends Annotation>> enabledDeploymentTypes; private ModelManager modelManager; private EjbManager ejbLookupManager; private EventBus eventBus; @@ -37,7 +37,7 @@ private Set<Bean<?>> beans; - public ManagerImpl(List<Annotation> enabledDeploymentTypes) + public ManagerImpl(List<Class<? extends Annotation>> enabledDeploymentTypes) { initEnabledDeploymentTypes(enabledDeploymentTypes); this.modelManager = new ModelManager(); @@ -48,20 +48,20 @@ } private void initEnabledDeploymentTypes( - List<Annotation> enabledDeploymentTypes) + List<Class<? extends Annotation>> enabledDeploymentTypes) { - this.enabledDeploymentTypes = new ArrayList<Annotation>(); + this.enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); if (enabledDeploymentTypes == null) { - this.enabledDeploymentTypes.add(0, new StandardAnnotationLiteral()); - this.enabledDeploymentTypes.add(1, new ProductionAnnotationLiteral()); + this.enabledDeploymentTypes.add(0, Standard.class); + this.enabledDeploymentTypes.add(1, Production.class); } else { this.enabledDeploymentTypes.addAll(enabledDeploymentTypes); - if (!this.enabledDeploymentTypes.get(0).annotationType().equals( + if (!this.enabledDeploymentTypes.get(0).equals( Standard.class)) { - throw new RuntimeException( + throw new DeploymentException( "@Standard must be the lowest precedence deployment type"); } } @@ -89,7 +89,7 @@ return (Set<Observer<T>>) eventBus.getObservers(event, bindings); } - public List<Annotation> getEnabledDeploymentTypes() + public List<Class<? extends Annotation>> getEnabledDeploymentTypes() { return enabledDeploymentTypes; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-10-23 17:13:25 UTC (rev 128) @@ -28,7 +28,7 @@ public void registerInjectionPoint(Injectable<?, ?> injectable) { - resolvedInjectionPoints.put(injectable, injectable.getPossibleTargets(manager.getBeans())); + resolvedInjectionPoints.put(injectable, injectable.getPossibleBeans(manager.getBeans())); } public void registerInjectionPoints() Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java 2008-10-23 17:13:25 UTC (rev 128) @@ -56,10 +56,10 @@ return annotatedItem; } - public Set<Bean<?>> getPossibleTargets(Set<Bean<?>> possibleBeans) + public Set<Bean<?>> getPossibleBeans(Set<Bean<?>> beans) { Set<Bean<?>> resolvedBeans = new HashSet<Bean<?>>(); - for (Bean<?> bean : possibleBeans) + for (Bean<?> bean : beans) { if (bean.getTypes().contains(getType())) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java 2008-10-23 17:13:25 UTC (rev 128) @@ -24,9 +24,9 @@ } @Override - public Set<Bean<?>> getPossibleTargets(Set<Bean<?>> possibleBeans) + public Set<Bean<?>> getPossibleBeans(Set<Bean<?>> possibleBeans) { - return delegate.getPossibleTargets(possibleBeans); + return delegate.getPossibleBeans(possibleBeans); } @Override Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableWrapper.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableWrapper.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableWrapper.java 2008-10-23 17:13:25 UTC (rev 128) @@ -24,9 +24,9 @@ } @Override - public Set<Bean<?>> getPossibleTargets(Set<Bean<?>> possibleBeans) + public Set<Bean<?>> getPossibleBeans(Set<Bean<?>> possibleBeans) { - return delegate.getPossibleTargets(possibleBeans); + return delegate.getPossibleBeans(possibleBeans); } @Override Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-10-23 17:13:25 UTC (rev 128) @@ -32,7 +32,7 @@ * * @param annotatedItem Annotations read from java classes * @param xmlAnnotatedItem Annotations read from XML - * @param container + * @param manager */ @SuppressWarnings("unchecked") public AbstractClassComponentModel(AnnotatedType<T> annotatedItem, AnnotatedType xmlAnnotatedItem) @@ -135,12 +135,12 @@ log.finest("Checking if " + getScopeType() + " is allowed for " + type); if (getMergedStereotypes().getSupportedScopes().size() > 0) { - if (!getMergedStereotypes().getSupportedScopes().contains(getScopeType().annotationType())) + if (!getMergedStereotypes().getSupportedScopes().contains(getScopeType())) { throw new RuntimeException("Scope " + getScopeType() + " is not an allowed by the stereotype for " + type); } } - if (isDeclaredFinal(type) && !getScopeType().annotationType().equals(Dependent.class)) + if (isDeclaredFinal(type) && !getScopeType().equals(Dependent.class)) { throw new RuntimeException("Scope " + getScopeType() + " is not allowed as the class is declared final or has methods declared final for " + type + ". Only @Dependent is allowed for final components"); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java 2008-10-23 17:13:25 UTC (rev 128) @@ -8,14 +8,14 @@ import java.util.logging.Logger; import javax.webbeans.BindingType; +import javax.webbeans.Dependent; import javax.webbeans.DeploymentType; import javax.webbeans.Named; +import javax.webbeans.Production; import javax.webbeans.ScopeType; import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bindings.CurrentAnnotationLiteral; -import org.jboss.webbeans.bindings.DependentAnnotationLiteral; -import org.jboss.webbeans.bindings.ProductionAnnotationLiteral; import org.jboss.webbeans.injectable.ComponentConstructor; import org.jboss.webbeans.injectable.Injectable; import org.jboss.webbeans.injectable.InjectableMethod; @@ -32,12 +32,12 @@ private Set<Annotation> bindingTypes; protected String name; - protected Annotation scopeType; + protected Class<? extends Annotation> scopeType; private MergedStereotypesModel<T, E> mergedStereotypes; - protected Annotation deploymentType; + protected Class<? extends Annotation> deploymentType; protected Class<T> type; protected InjectableMethod<?> removeMethod; - private Set<Class> apiTypes; + private Set<Class<?>> apiTypes; protected Set<Injectable<?, ?>> injectionPoints; protected void init(ManagerImpl container) @@ -72,9 +72,9 @@ apiTypes = getTypeHierachy(getType()); } - protected Set<Class> getTypeHierachy(Class clazz) + protected Set<Class<?>> getTypeHierachy(Class<?> clazz) { - Set<Class> classes = new HashSet<Class>(); + Set<Class<?>> classes = new HashSet<Class<?>>(); if (!(clazz == null || clazz == Object.class)) { classes.add(clazz); @@ -132,7 +132,7 @@ if (xmlScopes.size() == 1) { - this.scopeType = xmlScopes.iterator().next(); + this.scopeType = xmlScopes.iterator().next().annotationType(); log.finest("Scope " + scopeType + " specified in XML"); return; } @@ -145,14 +145,14 @@ if (scopes.size() == 1) { - this.scopeType = scopes.iterator().next(); + this.scopeType = scopes.iterator().next().annotationType(); log.finest("Scope " + scopeType + " specified b annotation"); return; } if (getMergedStereotypes().getPossibleScopeTypes().size() == 1) { - this.scopeType = getMergedStereotypes().getPossibleScopeTypes().iterator().next(); + this.scopeType = getMergedStereotypes().getPossibleScopeTypes().iterator().next().annotationType(); log.finest("Scope " + scopeType + " specified by stereotype"); return; } @@ -160,7 +160,7 @@ { throw new RuntimeException("All stereotypes must specify the same scope OR a scope must be specified on the component"); } - this.scopeType = new DependentAnnotationLiteral(); + this.scopeType = Dependent.class; log.finest("Using default @Dependent scope"); } @@ -215,7 +215,7 @@ if (xmlDeploymentTypes.size() == 1) { - this.deploymentType = xmlDeploymentTypes.iterator().next(); + this.deploymentType = xmlDeploymentTypes.iterator().next().annotationType(); log.finest("Deployment type " + deploymentType + " specified in XML"); return; } @@ -229,7 +229,7 @@ } if (deploymentTypes.size() == 1) { - this.deploymentType = deploymentTypes.iterator().next(); + this.deploymentType = deploymentTypes.iterator().next().annotationType(); log.finest("Deployment type " + deploymentType + " specified by annotation"); return; } @@ -243,7 +243,7 @@ if (getXmlAnnotatedItem().getDelegate() != null) { - this.deploymentType = new ProductionAnnotationLiteral(); + this.deploymentType = Production.class; log.finest("Using default @Production deployment type"); return; } @@ -257,11 +257,11 @@ } } - public static Annotation getDeploymentType(List<Annotation> enabledDeploymentTypes, Map<Class<? extends Annotation>, Annotation> possibleDeploymentTypes) + public static Class<? extends Annotation> getDeploymentType(List<Class<? extends Annotation>> enabledDeploymentTypes, Map<Class<? extends Annotation>, Annotation> possibleDeploymentTypes) { for (int i = (enabledDeploymentTypes.size() - 1); i > 0; i--) { - if (possibleDeploymentTypes.containsKey((enabledDeploymentTypes.get(i).annotationType()))) + if (possibleDeploymentTypes.containsKey((enabledDeploymentTypes.get(i)))) { return enabledDeploymentTypes.get(i); } @@ -281,7 +281,7 @@ return bindingTypes; } - public Annotation getScopeType() + public Class<? extends Annotation> getScopeType() { return scopeType; } @@ -291,7 +291,7 @@ return type; } - public Set<Class> getApiTypes() + public Set<Class<?>> getApiTypes() { return apiTypes; } @@ -304,7 +304,7 @@ */ public abstract String getLocation(); - public Annotation getDeploymentType() + public Class<? extends Annotation> getDeploymentType() { return deploymentType; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractEnterpriseComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractEnterpriseComponentModel.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractEnterpriseComponentModel.java 2008-10-23 17:13:25 UTC (rev 128) @@ -39,11 +39,11 @@ */ protected void checkEnterpriseScopeAllowed() { - if (getEjbMetaData().isStateless() && !getScopeType().annotationType().equals(Dependent.class)) + if (getEjbMetaData().isStateless() && !getScopeType().equals(Dependent.class)) { throw new RuntimeException("Scope " + getScopeType() + " is not allowed on stateless enterpise bean components for " + getType() + ". Only @Dependent is allowed on stateless enterprise bean components"); } - if (getEjbMetaData().isSingleton() && (!getScopeType().annotationType().equals(Dependent.class) || !getScopeType().annotationType().equals(ApplicationScoped.class))) + if (getEjbMetaData().isSingleton() && (!getScopeType().equals(Dependent.class) || !getScopeType().equals(ApplicationScoped.class))) { throw new RuntimeException("Scope " + getScopeType() + " is not allowed on singleton enterpise bean components for " + getType() + ". Only @Dependent or @ApplicationScoped is allowed on singleton enterprise bean components"); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java 2008-10-23 17:13:25 UTC (rev 128) @@ -4,9 +4,10 @@ import java.lang.reflect.Field; import java.util.logging.Logger; +import javax.webbeans.Dependent; +import javax.webbeans.Standard; + import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bindings.DependentAnnotationLiteral; -import org.jboss.webbeans.bindings.StandardAnnotationLiteral; import org.jboss.webbeans.injectable.ComponentConstructor; import org.jboss.webbeans.injectable.SimpleConstructor; import org.jboss.webbeans.introspector.AnnotatedItem; @@ -121,7 +122,7 @@ protected void initDeploymentType(ManagerImpl container) { // This is always @Standard per 7.4 - this.deploymentType = new StandardAnnotationLiteral(); + this.deploymentType = Standard.class; } /* (non-Javadoc) @@ -141,7 +142,7 @@ protected void initScopeType() { // This is always @Dependent per 7.4 - this.scopeType = new DependentAnnotationLiteral(); + this.scopeType = Dependent.class; } } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerExpressionComponent.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerExpressionComponent.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerExpressionComponent.java 2008-10-23 17:13:25 UTC (rev 128) @@ -27,7 +27,7 @@ protected void checkApiType() { - if (!getScopeType().annotationType().equals(Dependent.class)) + if (!getScopeType().equals(Dependent.class)) { if (Modifier.isFinal(getType().getModifiers())) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/ProducerMethodComponentModel.java 2008-10-23 17:13:25 UTC (rev 128) @@ -100,7 +100,7 @@ throw new RuntimeException("Producer method cannot be static " + annotatedMethod); } // TODO Check if declaring class is a WB component - if (!getScopeType().annotationType().equals(Dependent.class) && Modifier.isFinal(getAnnotatedItem().getDelegate().getModifiers())) + if (!getScopeType().equals(Dependent.class) && Modifier.isFinal(getAnnotatedItem().getDelegate().getModifiers())) { throw new RuntimeException("Final producer method must have @Dependent scope " + annotatedMethod); } Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -1,56 +0,0 @@ -package org.jboss.webbeans.test; - -import java.lang.annotation.Annotation; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bindings.StandardAnnotationLiteral; -import org.jboss.webbeans.introspector.AnnotatedType; -import org.jboss.webbeans.introspector.SimpleAnnotatedType; -import org.jboss.webbeans.model.StereotypeModel; -import org.jboss.webbeans.test.annotations.AnimalStereotype; -import org.jboss.webbeans.test.annotations.FishStereotype; -import org.jboss.webbeans.test.annotations.HornedMammalStereotype; -import org.jboss.webbeans.test.annotations.MammalStereotype; -import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; -import org.jboss.webbeans.test.annotations.RiverFishStereotype; -import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; -import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeAnnotationLiteral; -import org.jboss.webbeans.test.mock.MockContainerImpl; -import org.jboss.webbeans.test.util.EmptyAnnotatedType; -import org.testng.annotations.BeforeMethod; - -public class AbstractModelTest -{ - - protected ManagerImpl container; - - protected AnnotatedType<?> emptyAnnotatedItem; - - @BeforeMethod - public void before() - { - emptyAnnotatedItem = new EmptyAnnotatedType<Object>(new HashMap<Class<? extends Annotation>, Annotation>()); - - List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>(); - enabledDeploymentTypes.add(new StandardAnnotationLiteral()); - enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral()); - enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeAnnotationLiteral()); - container = new MockContainerImpl(enabledDeploymentTypes); - - initStereotypes(container); - } - - private void initStereotypes(ManagerImpl container) - { - container.getModelManager().addStereotype(new StereotypeModel<AnimalStereotype>(new SimpleAnnotatedType<AnimalStereotype>(AnimalStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel<HornedMammalStereotype>(new SimpleAnnotatedType<HornedMammalStereotype>(HornedMammalStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel<MammalStereotype>(new SimpleAnnotatedType<MammalStereotype>(MammalStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel<FishStereotype>(new SimpleAnnotatedType<FishStereotype>(FishStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel<RiverFishStereotype>(new SimpleAnnotatedType<RiverFishStereotype>(RiverFishStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel<RequestScopedAnimalStereotype>(new SimpleAnnotatedType<RequestScopedAnimalStereotype>(RequestScopedAnimalStereotype.class))); - } - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java (from rev 127, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -0,0 +1,63 @@ +package org.jboss.webbeans.test; + +import java.lang.annotation.Annotation; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import javax.webbeans.Standard; + +import org.jboss.webbeans.ManagerImpl; +import org.jboss.webbeans.introspector.AnnotatedType; +import org.jboss.webbeans.introspector.SimpleAnnotatedType; +import org.jboss.webbeans.model.StereotypeModel; +import org.jboss.webbeans.test.annotations.AnimalStereotype; +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; +import org.jboss.webbeans.test.annotations.FishStereotype; +import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType; +import org.jboss.webbeans.test.annotations.HornedMammalStereotype; +import org.jboss.webbeans.test.annotations.MammalStereotype; +import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; +import org.jboss.webbeans.test.annotations.RiverFishStereotype; +import org.jboss.webbeans.test.mock.MockManagerImpl; +import org.jboss.webbeans.test.util.EmptyAnnotatedType; +import org.testng.annotations.BeforeMethod; + +public class AbstractTest +{ + + protected ManagerImpl manager; + + @Deprecated + protected AnnotatedType<?> emptyAnnotatedItem; + + @BeforeMethod + public void before() + { + emptyAnnotatedItem = new EmptyAnnotatedType<Object>(new HashMap<Class<? extends Annotation>, Annotation>()); + + List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + enabledDeploymentTypes.add(Standard.class); + enabledDeploymentTypes.add(AnotherDeploymentType.class); + enabledDeploymentTypes.add(HornedAnimalDeploymentType.class); + manager = new MockManagerImpl(enabledDeploymentTypes); + + initStereotypes(manager); + } + + private void initStereotypes(ManagerImpl container) + { + container.getModelManager().addStereotype(new StereotypeModel<AnimalStereotype>(new SimpleAnnotatedType<AnimalStereotype>(AnimalStereotype.class))); + container.getModelManager().addStereotype(new StereotypeModel<HornedMammalStereotype>(new SimpleAnnotatedType<HornedMammalStereotype>(HornedMammalStereotype.class))); + container.getModelManager().addStereotype(new StereotypeModel<MammalStereotype>(new SimpleAnnotatedType<MammalStereotype>(MammalStereotype.class))); + container.getModelManager().addStereotype(new StereotypeModel<FishStereotype>(new SimpleAnnotatedType<FishStereotype>(FishStereotype.class))); + container.getModelManager().addStereotype(new StereotypeModel<RiverFishStereotype>(new SimpleAnnotatedType<RiverFishStereotype>(RiverFishStereotype.class))); + container.getModelManager().addStereotype(new StereotypeModel<RequestScopedAnimalStereotype>(new SimpleAnnotatedType<RequestScopedAnimalStereotype>(RequestScopedAnimalStereotype.class))); + } + + protected static <T> AnnotatedType<T> getEmptyAnnotatedItem(Class<T> type) + { + return new SimpleAnnotatedType<T>(type, new HashMap<Class<? extends Annotation>, Annotation>()); + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -18,14 +18,14 @@ import org.jboss.webbeans.util.Reflections; import org.testng.annotations.Test; -public class BindingTypeTest extends AbstractModelTest +public class BindingTypeTest extends AbstractTest { @SuppressWarnings("unchecked") @Test @SpecAssertion(section={"2.3.3", "2.3.1"}) public void testDefaultBindingTypeDeclaredInJava() { - SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), emptyAnnotatedItem, container); + SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), emptyAnnotatedItem, manager); assert order.getBindingTypes().size() == 1; order.getBindingTypes().iterator().next().annotationType().equals(Current.class); } @@ -58,7 +58,7 @@ @Test @SpecAssertion(section="2.3.3") public void testBindingTypesDeclaredInJava() { - SimpleComponentModel<Cat> cat = new SimpleComponentModel<Cat>(new SimpleAnnotatedType(Cat.class), emptyAnnotatedItem, container); + SimpleComponentModel<Cat> cat = new SimpleComponentModel<Cat>(new SimpleAnnotatedType(Cat.class), emptyAnnotatedItem, manager); assert cat.getBindingTypes().size() == 1; assert Reflections.annotationSetMatches(cat.getBindingTypes(), Synchronous.class); } @@ -77,7 +77,7 @@ annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); AnnotatedType annotatedItem = new SimpleAnnotatedType(Antelope.class, annotations); - SimpleComponentModel<Antelope> antelope = new SimpleComponentModel<Antelope>(emptyAnnotatedItem, annotatedItem, container); + SimpleComponentModel<Antelope> antelope = new SimpleComponentModel<Antelope>(emptyAnnotatedItem, annotatedItem, manager); assert Reflections.annotationSetMatches(antelope.getBindingTypes(), Asynchronous.class); } @@ -89,7 +89,7 @@ annotations.put(Asynchronous.class, new AsynchronousAnnotationLiteral()); AnnotatedType annotatedItem = new SimpleAnnotatedType(Cat.class, annotations); - SimpleComponentModel<Cat> cat = new SimpleComponentModel<Cat>(new SimpleAnnotatedType(Cat.class), annotatedItem, container); + SimpleComponentModel<Cat> cat = new SimpleComponentModel<Cat>(new SimpleAnnotatedType(Cat.class), annotatedItem, manager); assert cat.getBindingTypes().size() == 1; assert Reflections.annotationSetMatches(cat.getBindingTypes(), Asynchronous.class); } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -19,7 +19,7 @@ import org.jboss.webbeans.test.components.Order; import org.jboss.webbeans.test.components.Sheep; import org.jboss.webbeans.test.components.Turkey; -import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -36,7 +36,7 @@ public void before() { emptyAnnotatedItem = new SimpleAnnotatedType<Object>(null, new HashMap<Class<? extends Annotation>, Annotation>()); - container = new MockContainerImpl(null); + container = new MockManagerImpl(null); } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContainerTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContainerTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ContainerTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -4,60 +4,49 @@ import java.util.ArrayList; import java.util.List; +import javax.webbeans.DeploymentException; import javax.webbeans.Production; import javax.webbeans.Standard; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bindings.StandardAnnotationLiteral; import org.jboss.webbeans.test.annotations.AnotherDeploymentType; import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType; -import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; -import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeAnnotationLiteral; -import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.mock.MockManagerImpl; import org.testng.annotations.Test; -public class ContainerTest +public class ContainerTest extends AbstractTest { @Test public void testDefaultEnabledDeploymentTypes() { - ManagerImpl container = new MockContainerImpl(null); + ManagerImpl container = new MockManagerImpl(null); assert container.getEnabledDeploymentTypes().size() == 2; - assert container.getEnabledDeploymentTypes().get(0).annotationType().equals(Standard.class); - assert container.getEnabledDeploymentTypes().get(1).annotationType().equals(Production.class); + assert container.getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert container.getEnabledDeploymentTypes().get(1).equals(Production.class); } @Test public void testCustomDeploymentTypes() { - List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>(); - enabledDeploymentTypes.add(new StandardAnnotationLiteral()); - enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral()); - enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeAnnotationLiteral()); - ManagerImpl container = new MockContainerImpl(enabledDeploymentTypes); + List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + enabledDeploymentTypes.add(Standard.class); + enabledDeploymentTypes.add(AnotherDeploymentType.class); + enabledDeploymentTypes.add(HornedAnimalDeploymentType.class); + ManagerImpl container = new MockManagerImpl(enabledDeploymentTypes); assert container.getEnabledDeploymentTypes().size() == 3; - assert container.getEnabledDeploymentTypes().get(0).annotationType().equals(Standard.class); - assert container.getEnabledDeploymentTypes().get(1).annotationType().equals(AnotherDeploymentType.class); - assert container.getEnabledDeploymentTypes().get(2).annotationType().equals(HornedAnimalDeploymentType.class); + assert container.getEnabledDeploymentTypes().get(0).equals(Standard.class); + assert container.getEnabledDeploymentTypes().get(1).equals(AnotherDeploymentType.class); + assert container.getEnabledDeploymentTypes().get(2).equals(HornedAnimalDeploymentType.class); } - @Test + @Test(expectedExceptions=DeploymentException.class) public void testStandardMustBeDeclared() { - List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>(); - enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral()); - enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeAnnotationLiteral()); - boolean exception = false; - try - { - new MockContainerImpl(enabledDeploymentTypes); - } - catch (Exception e) - { - exception = true; - } - assert exception; + List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + enabledDeploymentTypes.add(AnotherDeploymentType.class); + enabledDeploymentTypes.add(HornedAnimalDeploymentType.class); + new MockManagerImpl(enabledDeploymentTypes); } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -8,19 +8,19 @@ import javax.webbeans.Observer; import javax.webbeans.Observes; +import javax.webbeans.Standard; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bindings.StandardAnnotationLiteral; import org.jboss.webbeans.event.DeferredEventNotification; import org.jboss.webbeans.injectable.InjectableMethod; import org.jboss.webbeans.introspector.AnnotatedType; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.SimpleComponentModel; +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; import org.jboss.webbeans.test.annotations.Asynchronous; -import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.AsynchronousAnnotationLiteral; import org.jboss.webbeans.test.components.Tuna; -import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.test.mock.MockObserverImpl; import org.testng.annotations.Test; @@ -31,7 +31,7 @@ * @author David Allen * */ -public class DeferredEventNotificationTest +public class DeferredEventNotificationTest extends AbstractTest { public class Event @@ -64,10 +64,10 @@ ManagerImpl manager; SimpleComponentModel<Tuna> tuna; InjectableMethod<Object> om; - List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>(); - enabledDeploymentTypes.add(new StandardAnnotationLiteral()); - enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral()); - manager = new MockContainerImpl(enabledDeploymentTypes); + List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + enabledDeploymentTypes.add(Standard.class); + enabledDeploymentTypes.add(AnotherDeploymentType.class); + manager = new MockManagerImpl(enabledDeploymentTypes); // Create an observer with known binding types Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -23,12 +23,12 @@ import org.jboss.webbeans.test.components.Panther; import org.jboss.webbeans.test.components.Puma; import org.jboss.webbeans.test.components.Tiger; -import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -public class EnterpriseComponentModelTest +public class EnterpriseComponentModelTest extends AbstractTest { private ManagerImpl container; @@ -40,7 +40,7 @@ public void before() { emptyAnnotatedItem = new SimpleAnnotatedType<Object>(null, new HashMap<Class<? extends Annotation>, Annotation>()); - container = new MockContainerImpl(null); + container = new MockManagerImpl(null); } @Test @SpecAssertion(section="2.7.2") @@ -54,7 +54,7 @@ public void testStateless() { EnterpriseComponentModel<Lion> lion = new EnterpriseComponentModel<Lion>(new SimpleAnnotatedType<Lion>(Lion.class), emptyAnnotatedItem, container); - assert lion.getScopeType().annotationType().equals(Dependent.class); + assert lion.getScopeType().equals(Dependent.class); Reflections.annotationSetMatches(lion.getBindingTypes(), Current.class); assert lion.getName().equals("lion"); } @@ -67,7 +67,7 @@ AnnotatedType annotatedItem = new SimpleAnnotatedType(Giraffe.class, annotations); EnterpriseComponentModel<Giraffe> giraffe = new EnterpriseComponentModel<Giraffe>(new SimpleAnnotatedType(Giraffe.class), annotatedItem, container); - assert giraffe.getScopeType().annotationType().equals(Dependent.class); + assert giraffe.getScopeType().equals(Dependent.class); Reflections.annotationSetMatches(giraffe.getBindingTypes(), Current.class); } @@ -77,7 +77,7 @@ boolean exception = false; try { - new EnterpriseComponentModel<Bear>(new SimpleAnnotatedType<Bear>(Bear.class), emptyAnnotatedItem, container); + new EnterpriseComponentModel<Bear>(new SimpleAnnotatedType<Bear>(Bear.class), getEmptyAnnotatedItem(Bear.class), container); } catch (Exception e) { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -10,14 +10,13 @@ import javax.webbeans.Event; import javax.webbeans.Standard; -import org.jboss.webbeans.bindings.StandardAnnotationLiteral; import org.jboss.webbeans.event.EventImpl; import org.jboss.webbeans.injectable.ComponentConstructor; import org.jboss.webbeans.introspector.SimpleAnnotatedField; import org.jboss.webbeans.model.EventComponentModel; -import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; import org.jboss.webbeans.test.components.DangerCall; -import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.mock.MockManagerImpl; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -30,17 +29,17 @@ */ public class EventComponentModelTest { - private MockContainerImpl manager = null; + private MockManagerImpl manager = null; private EventComponentModel<EventImpl<DangerCall>> eventComponentModel = null; EventImpl<DangerCall> eventModelField = null; @BeforeMethod public void before() throws Exception { - List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>(); - enabledDeploymentTypes.add(new StandardAnnotationLiteral()); - enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral()); - manager = new MockContainerImpl(enabledDeploymentTypes); + List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + enabledDeploymentTypes.add(Standard.class); + enabledDeploymentTypes.add(AnotherDeploymentType.class); + manager = new MockManagerImpl(enabledDeploymentTypes); Field eventModelField = this.getClass().getDeclaredField("eventModelField"); eventComponentModel = new EventComponentModel<EventImpl<DangerCall>>( new SimpleAnnotatedField<EventImpl<DangerCall>>(eventModelField), @@ -64,7 +63,7 @@ @Test(groups = "eventbus") public void testScopeType() { - assert eventComponentModel.getScopeType().annotationType().equals(Dependent.class); + assert eventComponentModel.getScopeType().equals(Dependent.class); } /** @@ -73,15 +72,15 @@ @Test(groups = "eventbus") public void testDeploymentType() { - assert eventComponentModel.getDeploymentType().annotationType().equals(Standard.class); + assert eventComponentModel.getDeploymentType().equals(Standard.class); } @Test(groups = "eventbus") public void testApiTypes() { - Set<Class> apis = eventComponentModel.getApiTypes(); + Set<Class<?>> apis = eventComponentModel.getApiTypes(); assert apis.size() >= 1; - for (Class api : apis) + for (Class<?> api : apis) { api.equals(Event.class); } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -6,18 +6,19 @@ import javax.webbeans.DuplicateBindingTypeException; import javax.webbeans.Event; -import org.jboss.webbeans.bindings.StandardAnnotationLiteral; +import javax.webbeans.Standard; + import org.jboss.webbeans.event.EventImpl; import org.jboss.webbeans.test.annotations.AnimalStereotype; +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; +import org.jboss.webbeans.test.annotations.Synchronous; import org.jboss.webbeans.test.annotations.Tame; -import org.jboss.webbeans.test.annotations.Synchronous; import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral; -import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.FishStereotypeAnnotationLiteral; +import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral; import org.jboss.webbeans.test.bindings.TameAnnotationLiteral; -import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral; import org.jboss.webbeans.test.components.DangerCall; -import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -31,15 +32,15 @@ @SpecVersion("20081012") public class EventTest { - private MockContainerImpl manager = null; + private MockManagerImpl manager = null; @BeforeMethod public void before() throws Exception { - List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>(); - enabledDeploymentTypes.add(new StandardAnnotationLiteral()); - enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral()); - manager = new MockContainerImpl(enabledDeploymentTypes); + List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + enabledDeploymentTypes.add(Standard.class); + enabledDeploymentTypes.add(AnotherDeploymentType.class); + manager = new MockManagerImpl(enabledDeploymentTypes); } /** Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -1,25 +1,44 @@ package org.jboss.webbeans.test; +import java.util.HashSet; +import java.util.Set; + import javax.webbeans.Current; +import javax.webbeans.manager.Bean; +import org.jboss.webbeans.BeanImpl; import org.jboss.webbeans.injectable.InjectableField; -import org.jboss.webbeans.test.components.Farm; -import org.jboss.webbeans.test.components.Pig; +import org.jboss.webbeans.introspector.SimpleAnnotatedType; +import org.jboss.webbeans.model.SimpleComponentModel; +import org.jboss.webbeans.test.components.FishFarm; +import org.jboss.webbeans.test.components.Tuna; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.Test; -public class InjectableTest +public class InjectableTest extends AbstractTest { @SuppressWarnings("unchecked") @Test public void testInjectableField() throws Exception { - InjectableField<Pig> pig = new InjectableField<Pig>(Farm.class.getDeclaredField("pig")); - assert pig.getAnnotatedItem().getType().isAssignableFrom(Pig.class); - assert pig.getBindingTypes().size() == 1; - assert Reflections.annotationSetMatches(pig.getBindingTypes(), Current.class); - assert pig.getType().isAssignableFrom(Pig.class); + InjectableField<Tuna> tuna = new InjectableField<Tuna>(FishFarm.class.getDeclaredField("tuna")); + assert tuna.getAnnotatedItem().getType().isAssignableFrom(Tuna.class); + assert tuna.getBindingTypes().size() == 1; + assert Reflections.annotationSetMatches(tuna.getBindingTypes(), Current.class); + assert tuna.getType().isAssignableFrom(Tuna.class); } + @Test + public void testPossibleTargets() throws Exception + { + InjectableField<Tuna> tunaField = new InjectableField<Tuna>(FishFarm.class.getDeclaredField("tuna")); + Bean<Tuna> tunaBean = new BeanImpl<Tuna>(new SimpleComponentModel<Tuna>(new SimpleAnnotatedType<Tuna>(Tuna.class), getEmptyAnnotatedItem(Tuna.class), super.manager), manager); + Set<Bean<?>> beans = new HashSet<Bean<?>>(); + beans.add(tunaBean); + Set<Bean<?>> possibleTargets = tunaField.getPossibleBeans(beans); + assert possibleTargets.size() == 1; + assert possibleTargets.contains(tunaBean); + } + } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -6,23 +6,22 @@ import java.util.List; import java.util.Map; -import javax.webbeans.Observes; import javax.webbeans.Observer; +import javax.webbeans.Observes; +import javax.webbeans.Standard; import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bindings.StandardAnnotationLiteral; import org.jboss.webbeans.event.ObserverImpl; import org.jboss.webbeans.injectable.InjectableMethod; import org.jboss.webbeans.introspector.AnnotatedType; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.SimpleComponentModel; +import org.jboss.webbeans.test.annotations.AnotherDeploymentType; import org.jboss.webbeans.test.annotations.Asynchronous; -import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.AsynchronousAnnotationLiteral; import org.jboss.webbeans.test.components.Tuna; -import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.mock.MockManagerImpl; import org.jboss.webbeans.test.mock.MockObserverImpl; -import org.jboss.webbeans.util.Reflections; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -58,10 +57,10 @@ @BeforeMethod public void before() throws Exception { - List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>(); - enabledDeploymentTypes.add(new StandardAnnotationLiteral()); - enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral()); - manager = new MockContainerImpl(enabledDeploymentTypes); + List<Class<? extends Annotation>> enabledDeploymentTypes = new ArrayList<Class<? extends Annotation>>(); + enabledDeploymentTypes.add(Standard.class); + enabledDeploymentTypes.add(AnotherDeploymentType.class); + manager = new MockManagerImpl(enabledDeploymentTypes); // Create an observer with known binding types Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerExpressionComponentModelTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -6,7 +6,7 @@ import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedType; import org.jboss.webbeans.introspector.SimpleAnnotatedType; -import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.mock.MockManagerImpl; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -20,7 +20,7 @@ public void before() { emptyAnnotatedItem = new SimpleAnnotatedType(null, new HashMap<Class<? extends Annotation>, Annotation>()); - container = new MockContainerImpl(null); + container = new MockManagerImpl(null); } @Test(groups="producerExpression") @SpecAssertion(section="3.4") Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodComponentModelTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -1,14 +1,10 @@ package org.jboss.webbeans.test; -import java.lang.annotation.Annotation; import java.lang.reflect.Method; -import java.util.HashMap; import javax.webbeans.Current; import javax.webbeans.Dependent; -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.introspector.AnnotatedType; import org.jboss.webbeans.introspector.SimpleAnnotatedMethod; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.ProducerMethodComponentModel; @@ -26,33 +22,21 @@ import org.jboss.webbeans.test.components.TrapdoorSpider; import org.jboss.webbeans.test.components.broken.ComponentWithFinalProducerMethod; import org.jboss.webbeans.test.components.broken.ComponentWithStaticProducerMethod; -import org.jboss.webbeans.test.mock.MockContainerImpl; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -public class ProducerMethodComponentModelTest +public class ProducerMethodComponentModelTest extends AbstractTest { - - private ManagerImpl container; - private AnnotatedType<?> emptyAnnotatedItem; - @BeforeMethod - public void before() - { - emptyAnnotatedItem = new SimpleAnnotatedType(null, new HashMap<Class<? extends Annotation>, Annotation>()); - container = new MockContainerImpl(null); - } - @Test @SpecAssertion(section="3.3") public void testStaticMethod() throws SecurityException, NoSuchMethodException { - SimpleComponentModel<ComponentWithStaticProducerMethod> componentModel = new SimpleComponentModel<ComponentWithStaticProducerMethod>(new SimpleAnnotatedType<ComponentWithStaticProducerMethod>(ComponentWithStaticProducerMethod.class), emptyAnnotatedItem, container); - container.getModelManager().addComponentModel(componentModel); + SimpleComponentModel<ComponentWithStaticProducerMethod> componentModel = new SimpleComponentModel<ComponentWithStaticProducerMethod>(new SimpleAnnotatedType<ComponentWithStaticProducerMethod>(ComponentWithStaticProducerMethod.class), getEmptyAnnotatedItem(ComponentWithStaticProducerMethod.class), manager); + manager.getModelManager().addComponentModel(componentModel); Method method = ComponentWithStaticProducerMethod.class.getMethod("getString"); boolean exception = false; try { - new ProducerMethodComponentModel<String>(new SimpleAnnotatedMethod(method), container); + new ProducerMethodComponentModel<String>(new SimpleAnnotatedMethod<String>(method), manager); } catch (Exception e) { @@ -64,10 +48,10 @@ @Test @SpecAssertion(section="3.3") public void testApiTypes() throws SecurityException, NoSuchMethodException { - SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), emptyAnnotatedItem, container); - container.getModelManager().addComponentModel(componentModel); + SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addComponentModel(componentModel); Method method = SpiderProducer.class.getMethod("produceTarantula"); - ProducerMethodComponentModel<Tarantula> tarantulaModel = new ProducerMethodComponentModel<Tarantula>(new SimpleAnnotatedMethod(method), container); + ProducerMethodComponentModel<Tarantula> tarantulaModel = new ProducerMethodComponentModel<Tarantula>(new SimpleAnnotatedMethod<Tarantula>(method), manager); assert tarantulaModel.getApiTypes().contains(Tarantula.class); assert tarantulaModel.getApiTypes().contains(DeadlySpider.class); assert tarantulaModel.getApiTypes().contains(Spider.class); @@ -79,10 +63,10 @@ @Test @SpecAssertion(section="3.3.1") public void testDefaultBindingType() throws SecurityException, NoSuchMethodException { - SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), emptyAnnotatedItem, container); - container.getModelManager().addComponentModel(componentModel); + SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addComponentModel(componentModel); Method method = SpiderProducer.class.getMethod("produceTarantula"); - ProducerMethodComponentModel<Tarantula> tarantulaModel = new ProducerMethodComponentModel<Tarantula>(new SimpleAnnotatedMethod(method), container); + ProducerMethodComponentModel<Tarantula> tarantulaModel = new ProducerMethodComponentModel<Tarantula>(new SimpleAnnotatedMethod<Tarantula>(method), manager); assert tarantulaModel.getBindingTypes().size() == 1; assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Current.class); } @@ -90,10 +74,10 @@ @Test public void testBindingType() throws SecurityException, NoSuchMethodException { - SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), emptyAnnotatedItem, container); - container.getModelManager().addComponentModel(componentModel); + SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addComponentModel(componentModel); Method method = SpiderProducer.class.getMethod("produceTameTarantula"); - ProducerMethodComponentModel<Tarantula> tarantulaModel = new ProducerMethodComponentModel<Tarantula>(new SimpleAnnotatedMethod(method), container); + ProducerMethodComponentModel<Tarantula> tarantulaModel = new ProducerMethodComponentModel<Tarantula>(new SimpleAnnotatedMethod<Tarantula>(method), manager); assert tarantulaModel.getBindingTypes().size() == 1; assert tarantulaModel.getBindingTypes().iterator().next().annotationType().equals(Tame.class); } @@ -101,13 +85,13 @@ @Test @SpecAssertion(section="3.3") public void testFinalMethod() throws SecurityException, NoSuchMethodException { - SimpleComponentModel<ComponentWithFinalProducerMethod> componentModel = new SimpleComponentModel<ComponentWithFinalProducerMethod>(new SimpleAnnotatedType<ComponentWithFinalProducerMethod>(ComponentWithFinalProducerMethod.class), emptyAnnotatedItem, container); - container.getModelManager().addComponentModel(componentModel); + SimpleComponentModel<ComponentWithFinalProducerMethod> componentModel = new SimpleComponentModel<ComponentWithFinalProducerMethod>(new SimpleAnnotatedType<ComponentWithFinalProducerMethod>(ComponentWithFinalProducerMethod.class), getEmptyAnnotatedItem(ComponentWithFinalProducerMethod.class), manager); + manager.getModelManager().addComponentModel(componentModel); Method method = ComponentWithFinalProducerMethod.class.getMethod("getString"); boolean exception = false; try { - new ProducerMethodComponentModel<String>(new SimpleAnnotatedMethod(method), container); + new ProducerMethodComponentModel<String>(new SimpleAnnotatedMethod<String>(method), manager); } catch (Exception e) { @@ -119,40 +103,40 @@ @Test @SpecAssertion(section="3.3") public void testFinalMethodWithDependentScope() throws SecurityException, NoSuchMethodException { - SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), emptyAnnotatedItem, container); - container.getModelManager().addComponentModel(componentModel); + SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addComponentModel(componentModel); Method method = SpiderProducer.class.getMethod("produceTrapdoorSpider"); - ProducerMethodComponentModel<TrapdoorSpider> trapdoorSpiderModel = new ProducerMethodComponentModel<TrapdoorSpider>(new SimpleAnnotatedMethod(method), container); - assert trapdoorSpiderModel.getScopeType().annotationType().equals(Dependent.class); + ProducerMethodComponentModel<TrapdoorSpider> trapdoorSpiderModel = new ProducerMethodComponentModel<TrapdoorSpider>(new SimpleAnnotatedMethod<TrapdoorSpider>(method), manager); + assert trapdoorSpiderModel.getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section="3.3.6") public void testNamedMethod() throws SecurityException, NoSuchMethodException { - SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), emptyAnnotatedItem, container); - container.getModelManager().addComponentModel(componentModel); + SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addComponentModel(componentModel); Method method = SpiderProducer.class.getMethod("produceBlackWidow"); - ProducerMethodComponentModel<BlackWidow> blackWidowSpiderModel = new ProducerMethodComponentModel<BlackWidow>(new SimpleAnnotatedMethod(method), container); + ProducerMethodComponentModel<BlackWidow> blackWidowSpiderModel = new ProducerMethodComponentModel<BlackWidow>(new SimpleAnnotatedMethod<BlackWidow>(method), manager); assert blackWidowSpiderModel.getName().equals("blackWidow"); } @Test @SpecAssertion(section="3.3.6") public void testDefaultNamedMethod() throws SecurityException, NoSuchMethodException { - SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), emptyAnnotatedItem, container); - container.getModelManager().addComponentModel(componentModel); + SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addComponentModel(componentModel); Method method = SpiderProducer.class.getMethod("produceDaddyLongLegs"); - ProducerMethodComponentModel<DaddyLongLegs> daddyLongLegsSpiderModel = new ProducerMethodComponentModel<DaddyLongLegs>(new SimpleAnnotatedMethod(method), container); + ProducerMethodComponentModel<DaddyLongLegs> daddyLongLegsSpiderModel = new ProducerMethodComponentModel<DaddyLongLegs>(new SimpleAnnotatedMethod<DaddyLongLegs>(method), manager); assert daddyLongLegsSpiderModel.getName().equals("produceDaddyLongLegs"); } @Test @SpecAssertion(section="3.3.6") public void testDefaultNamedJavaBeanMethod() throws SecurityException, NoSuchMethodException { - SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), emptyAnnotatedItem, container); - container.getModelManager().addComponentModel(componentModel); + SimpleComponentModel<SpiderProducer> componentModel = new SimpleComponentModel<SpiderProducer>(new SimpleAnnotatedType<SpiderProducer>(SpiderProducer.class), getEmptyAnnotatedItem(SpiderProducer.class), manager); + manager.getModelManager().addComponentModel(componentModel); Method method = SpiderProducer.class.getMethod("getLadybirdSpider"); - ProducerMethodComponentModel<LadybirdSpider> ladybirdSpiderModel = new ProducerMethodComponentModel<LadybirdSpider>(new SimpleAnnotatedMethod(method), container); + ProducerMethodComponentModel<LadybirdSpider> ladybirdSpiderModel = new ProducerMethodComponentModel<LadybirdSpider>(new SimpleAnnotatedMethod<LadybirdSpider>(method), manager); assert ladybirdSpiderModel.getName().equals("ladybirdSpider"); } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/RemoteComponentModelTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -16,7 +16,7 @@ import org.jboss.webbeans.test.components.TameOrangutan; import org.jboss.webbeans.test.components.broken.Chimpanzee; import org.jboss.webbeans.test.components.broken.Gibbon; -import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.mock.MockManagerImpl; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -27,7 +27,7 @@ import org.jboss.webbeans.test.components.SeaBass; import org.testng.annotations.Test; -public class ScopeTypeTest extends AbstractModelTest +public class ScopeTypeTest extends AbstractTest { @Test @SpecAssertion(section="2.4") @@ -57,8 +57,8 @@ @Test @SpecAssertion(section="2.4.3") public void testScopeDeclaredInJava() { - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), emptyAnnotatedItem, container); - assert trout.getScopeType().annotationType().equals(RequestScoped.class); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), getEmptyAnnotatedItem(SeaBass.class), manager); + assert trout.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="2.4.3") @@ -67,7 +67,7 @@ boolean exception = false; try { - new SimpleComponentModel<ComponentWithTooManyScopeTypes>(new SimpleAnnotatedType(ComponentWithTooManyScopeTypes.class), emptyAnnotatedItem, container); + new SimpleComponentModel<ComponentWithTooManyScopeTypes>(new SimpleAnnotatedType<ComponentWithTooManyScopeTypes>(ComponentWithTooManyScopeTypes.class), getEmptyAnnotatedItem(ComponentWithTooManyScopeTypes.class), manager); } catch (Exception e) { @@ -85,8 +85,8 @@ Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral()); annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral()); - AnnotatedType antelopeAnnotatedItem = new SimpleAnnotatedType(Antelope.class, annotations); - new SimpleComponentModel<Antelope>(emptyAnnotatedItem, antelopeAnnotatedItem, container); + AnnotatedType<Antelope> antelopeAnnotatedItem = new SimpleAnnotatedType<Antelope>(Antelope.class, annotations); + new SimpleComponentModel<Antelope>(getEmptyAnnotatedItem(Antelope.class), antelopeAnnotatedItem, manager); } catch (Exception e) { @@ -100,20 +100,20 @@ { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(RequestScoped.class, new RequestScopedAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(Order.class, annotations); + AnnotatedType<Order> annotatedItem = new SimpleAnnotatedType<Order>(Order.class, annotations); - SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), annotatedItem, container); - assert order.getScopeType().annotationType().equals(RequestScoped.class); + SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType<Order>(Order.class), annotatedItem, manager); + assert order.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="2.4.4") public void testScopeMissingInXml() { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container); - assert trout.getScopeType().annotationType().equals(RequestScoped.class); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + assert trout.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="2.4.4") @@ -121,16 +121,16 @@ { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(ConversationScoped.class, new ConversationScopedAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container); - assert trout.getScopeType().annotationType().equals(ConversationScoped.class); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + assert trout.getScopeType().equals(ConversationScoped.class); } @Test @SpecAssertion(section="2.4.5") public void testDefaultScope() { - SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), emptyAnnotatedItem, container); - assert order.getScopeType().annotationType().equals(Dependent.class); + SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType<Order>(Order.class), getEmptyAnnotatedItem(Order.class), manager); + assert order.getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section={"2.4.5", "2.7.2"}) @@ -138,9 +138,9 @@ { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container); - assert trout.getScopeType().annotationType().equals(RequestScoped.class); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + assert trout.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="2.4.5") @@ -149,12 +149,12 @@ Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral()); annotations.put(AnimalStereotype.class, new AnimalStereotypeAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(Haddock.class, annotations); + AnnotatedType<Haddock> annotatedItem = new SimpleAnnotatedType<Haddock>(Haddock.class, annotations); boolean exception = false; try { - new SimpleComponentModel<Haddock>(new SimpleAnnotatedType(Haddock.class), annotatedItem, container); + new SimpleComponentModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), annotatedItem, manager); } catch (Exception e) { @@ -169,10 +169,10 @@ Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral()); annotations.put(AnimalStereotype.class, new AnimalStereotypeAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); + AnnotatedType<SeaBass> annotatedItem = new SimpleAnnotatedType<SeaBass>(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container); - assert trout.getScopeType().annotationType().equals(RequestScoped.class); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType<SeaBass>(SeaBass.class), annotatedItem, manager); + assert trout.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="2.4.5") @@ -181,10 +181,10 @@ Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral()); annotations.put(RiverFishStereotype.class, new RiverFishStereotypeAnnotationLiteral()); - AnnotatedType annotatedItem = new SimpleAnnotatedType(Haddock.class, annotations); + AnnotatedType<Haddock> annotatedItem = new SimpleAnnotatedType<Haddock>(Haddock.class, annotations); - SimpleComponentModel<Haddock> haddock = new SimpleComponentModel<Haddock>(new SimpleAnnotatedType(Haddock.class), annotatedItem, container); - assert haddock.getScopeType().annotationType().equals(ApplicationScoped.class); + SimpleComponentModel<Haddock> haddock = new SimpleComponentModel<Haddock>(new SimpleAnnotatedType<Haddock>(Haddock.class), annotatedItem, manager); + assert haddock.getScopeType().equals(ApplicationScoped.class); } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-10-23 17:13:25 UTC (rev 128) @@ -36,16 +36,16 @@ import org.jboss.webbeans.test.components.Horse; import org.jboss.webbeans.test.components.Moose; import org.jboss.webbeans.test.components.Order; -import org.jboss.webbeans.test.components.Pig; import org.jboss.webbeans.test.components.SeaBass; import org.jboss.webbeans.test.components.Tuna; import org.jboss.webbeans.test.components.broken.ComponentWithTooManyDeploymentTypes; +import org.jboss.webbeans.test.components.broken.Pig; import org.jboss.webbeans.test.components.broken.OuterComponent.InnerComponent; import org.jboss.webbeans.util.Reflections; import org.testng.annotations.Test; @SpecVersion("20080925") -public class SimpleComponentModelTest extends AbstractModelTest +public class SimpleComponentModelTest extends AbstractTest { private class NamedAnnotationLiteral extends AnnotationLiteral<Named> implements Named @@ -73,7 +73,7 @@ boolean exception = false; try { - new SimpleComponentModel<ComponentWithTooManyDeploymentTypes>(new SimpleAnnotatedType(ComponentWithTooManyDeploymentTypes.class), emptyAnnotatedItem, container); + new SimpleComponentModel<ComponentWithTooManyDeploymentTypes>(new SimpleAnnotatedType<ComponentWithTooManyDeploymentTypes>(ComponentWithTooManyDeploymentTypes.class), getEmptyAnnotatedItem(ComponentWithTooManyDeploymentTypes.class), manager); } catch (Exception e) { @@ -89,24 +89,24 @@ xmlDefinedDeploymentTypeAnnotations.put(AnotherDeploymentType.class, new AnotherDeploymentTypeAnnotationLiteral()); AnnotatedType xmlDefinedDeploymentTypeAnnotatedItem = new SimpleAnnotatedType(ComponentWithTooManyDeploymentTypes.class, xmlDefinedDeploymentTypeAnnotations); - SimpleComponentModel<ComponentWithTooManyDeploymentTypes> component = new SimpleComponentModel<ComponentWithTooManyDeploymentTypes>(new SimpleAnnotatedType(ComponentWithTooManyDeploymentTypes.class), xmlDefinedDeploymentTypeAnnotatedItem, container); - assert component.getDeploymentType().annotationType().equals(AnotherDeploymentType.class); + SimpleComponentModel<ComponentWithTooManyDeploymentTypes> component = new SimpleComponentModel<ComponentWithTooManyDeploymentTypes>(new SimpleAnnotatedType(ComponentWithTooManyDeploymentTypes.class), xmlDefinedDeploymentTypeAnnotatedItem, manager); + assert component.getDeploymentType().equals(AnotherDeploymentType.class); } @Test @SpecAssertion(section="2.5.5") public void testXmlDefaultDeploymentType() { AnnotatedType antelopeAnnotatedItem = new SimpleAnnotatedType(Antelope.class, new HashMap<Class<? extends Annotation>, Annotation>()); - SimpleComponentModel<Antelope> antelope = new SimpleComponentModel<Antelope>(emptyAnnotatedItem, antelopeAnnotatedItem, container); - assert antelope.getDeploymentType().annotationType().equals(Production.class); + SimpleComponentModel<Antelope> antelope = new SimpleComponentModel<Antelope>(emptyAnnotatedItem, antelopeAnnotatedItem, manager); + assert antelope.getDeploymentType().equals(Production.class); } @Test @SpecAssertion(section="2.5.4") public void testXmlRespectsJavaDeploymentType() { AnnotatedType annotatedItem = new SimpleAnnotatedType(Tuna.class, new HashMap<Class<? extends Annotation>, Annotation>()); - SimpleComponentModel<Tuna> tuna = new SimpleComponentModel<Tuna>(new SimpleAnnotatedType(Tuna.class), annotatedItem, container); - assert tuna.getDeploymentType().annotationType().equals(AnotherDeploymentType.class); + SimpleComponentModel<Tuna> tuna = new SimpleComponentModel<Tuna>(new SimpleAnnotatedType(Tuna.class), annotatedItem, manager); + assert tuna.getDeploymentType().equals(AnotherDeploymentType.class); } @Test @SpecAssertion(section="2.5.7") @@ -116,8 +116,8 @@ annotations.put(HornedMammalStereotype.class, new HornedMamalStereotypeAnnotationLiteral()); AnnotatedType annotatedItem = new SimpleAnnotatedType(Moose.class, annotations); - SimpleComponentModel<Moose> moose = new SimpleComponentModel<Moose>(new SimpleAnnotatedType(Moose.class), annotatedItem, container); - assert moose.getDeploymentType().annotationType().equals(HornedAnimalDeploymentType.class); + SimpleComponentModel<Moose> moose = new SimpleComponentModel<Moose>(new SimpleAnnotatedType(Moose.class), annotatedItem, manager); + assert moose.getDeploymentType().equals(HornedAnimalDeploymentType.class); } @@ -127,8 +127,8 @@ Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(FishStereotype.class, new FishStereotypeAnnotationLiteral()); AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container); - assert trout.getScopeType().annotationType().equals(RequestScoped.class); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, manager); + assert trout.getScopeType().equals(RequestScoped.class); } // **** TESTS FOR SCOPES **** // @@ -140,7 +140,7 @@ @Test @SpecAssertion(section="2.6.1") public void testDefaultNamed() { - SimpleComponentModel<Haddock> haddock = new SimpleComponentModel<Haddock>(new SimpleAnnotatedType(Haddock.class), emptyAnnotatedItem, container); + SimpleComponentModel<Haddock> haddock = new SimpleComponentModel<Haddock>(new SimpleAnnotatedType(Haddock.class), emptyAnnotatedItem, manager); assert haddock.getName() != null; assert haddock.getName().equals("haddock"); } @@ -151,7 +151,7 @@ Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(Named.class, new NamedAnnotationLiteral("")); AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, manager); assert trout.getName() != null; assert trout.getName().equals("seaBass"); @@ -163,7 +163,7 @@ Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); annotations.put(Named.class, new NamedAnnotationLiteral("aTrout")); AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, manager); assert trout.getName().equals("aTrout"); } @@ -171,14 +171,14 @@ @Test @SpecAssertion(section="2.6.4") public void testNotNamed() { - SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), emptyAnnotatedItem, container); + SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), emptyAnnotatedItem, manager); assert trout.getName() == null; } @Test @SpecAssertion(section="2.6.1") public void testNonDefaultNamed() { - SimpleComponentModel<Moose> moose = new SimpleComponentModel<Moose>(new SimpleAnnotatedType(Moose.class), emptyAnnotatedItem, container); + SimpleComponentModel<Moose> moose = new SimpleComponentModel<Moose>(new SimpleAnnotatedType(Moose.class), emptyAnnotatedItem, manager); assert moose.getName().equals("aMoose"); } @@ -195,22 +195,22 @@ orderXmlAnnotations.put(Named.class, new NamedAnnotationLiteral ("currentSynchronousOrder")); AnnotatedType currentSynchronousOrderAnnotatedItem = new SimpleAnnotatedType(Order.class, orderXmlAnnotations); - SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), currentSynchronousOrderAnnotatedItem, container); - assert Production.class.equals(order.getDeploymentType().annotationType()); + SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), currentSynchronousOrderAnnotatedItem, manager); + assert Production.class.equals(order.getDeploymentType()); assert "currentSynchronousOrder".equals(order.getName()); assert order.getBindingTypes().size() == 2; assert Reflections.annotationSetMatches(order.getBindingTypes(), Current.class, Synchronous.class); - assert order.getScopeType().annotationType().equals(Dependent.class); + assert order.getScopeType().equals(Dependent.class); } @Test @SpecAssertion(section="2.7.2") public void testSingleStereotype() { - SimpleComponentModel<Gorilla> gorilla = new SimpleComponentModel<Gorilla>(new SimpleAnnotatedType(Gorilla.class), emptyAnnotatedItem, container); + SimpleComponentModel<Gorilla> gorilla = new SimpleComponentModel<Gorilla>(new SimpleAnnotatedType(Gorilla.class), emptyAnnotatedItem, manager); assert gorilla.getName() == null; - assert gorilla.getDeploymentType().annotationType().equals(Production.class); + assert gorilla.getDeploymentType().equals(Production.class); assert gorilla.getBindingTypes().iterator().next().annotationType().equals(Current.class); - assert gorilla.getScopeType().annotationType().equals(RequestScoped.class); + assert gorilla.getScopeType().equals(RequestScoped.class); } @Test @SpecAssertion(section="2.7.4") @@ -218,7 +218,7 @@ { try { - new SimpleComponentModel<Gorilla>(new SimpleAnnotatedType(Gorilla.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Gorilla>(new SimpleAnnotatedType(Gorilla.class), emptyAnnotatedItem, manager); } catch (Exception e) { @@ -230,7 +230,7 @@ @Test(expectedExceptions=Exception.class) @SpecAssertion(section="2.7.4") public void testRequiredTypeIsNotImplemented() { - new SimpleComponentModel<Chair>(new SimpleAnnotatedType(Chair.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Chair>(new SimpleAnnotatedType(Chair.class), emptyAnnotatedItem, manager); } @Test @SpecAssertion(section="2.7.4") @@ -238,7 +238,7 @@ { try { - new SimpleComponentModel<Goldfish>(new SimpleAnnotatedType(Goldfish.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Goldfish>(new SimpleAnnotatedType(Goldfish.class), emptyAnnotatedItem, manager); } catch (Exception e) { @@ -250,7 +250,7 @@ @Test(expectedExceptions=Exception.class) @SpecAssertion(section="2.7.4") public void testScopeIsNotSupported() { - new SimpleComponentModel<Carp>(new SimpleAnnotatedType(Carp.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Carp>(new SimpleAnnotatedType(Carp.class), emptyAnnotatedItem, manager); } @Test @SpecAssertion(section="2.7.2") @@ -267,7 +267,7 @@ boolean exception = false; try { - new SimpleComponentModel<Cow>(new SimpleAnnotatedType(Cow.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Cow>(new SimpleAnnotatedType(Cow.class), emptyAnnotatedItem, manager); } catch (Exception e) { @@ -282,7 +282,7 @@ boolean exception = false; try { - new SimpleComponentModel<InnerComponent>(new SimpleAnnotatedType(InnerComponent.class), emptyAnnotatedItem, container); + new SimpleComponentModel<InnerComponent>(new SimpleAnnotatedType(InnerComponent.class), emptyAnnotatedItem, manager); } catch (Exception e) { @@ -297,7 +297,7 @@ boolean exception = false; try { - new SimpleComponentModel<Horse>(new SimpleAnnotatedType(Horse.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Horse>(new SimpleAnnotatedType(Horse.class), emptyAnnotatedItem, manager); } catch (Exception e) { @@ -310,7 +310,7 @@ AnnotatedType annotatedItem = new SimpleAnnotatedType(Horse.class, annotations); try { - new SimpleComponentModel<Horse>(new SimpleAnnotatedType(Horse.class), annotatedItem, container); + new SimpleComponentModel<Horse>(new SimpleAnnotatedType(Horse.class), annotatedItem, manager); } catch (Exception e) { @@ -324,7 +324,7 @@ boolean exception = false; try { - new SimpleComponentModel<Pig>(new SimpleAnnotatedType(Pig.class), emptyAnnotatedItem, container); + new SimpleComponentModel<Pig>(new SimpleAnnotatedType(Pig.class), emptyAnnotatedItem, manager); } catch (Exception e) { @@ -337,7 +337,7 @@ AnnotatedType annotatedItem = new SimpleAnnotatedType(Pig.class, annotations); try { - new SimpleComponentModel<Pig>(new SimpleAnnotatedType(Pig.class), annotatedItem, container); + new SimpleComponentModel<Pig>(new SimpleAnnotatedType(Pig.class), annotatedItem, manager); } catch (Exception e) { Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java 2008-10-23 17:13:25 UTC (rev 128) @@ -1,13 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Current; -import javax.webbeans.Production; - -@Production -public class Farm -{ - - @Current - private Pig pig; - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java (from rev 127, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java 2008-10-23 17:13:25 UTC (rev 128) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.components; + +import javax.webbeans.Current; +import javax.webbeans.Production; + +@Production +public class FishFarm +{ + + @Current + private Tuna tuna; + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/FishFarm.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Pig.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Pig.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Pig.java 2008-10-23 17:13:25 UTC (rev 128) @@ -1,16 +0,0 @@ -package org.jboss.webbeans.test.components; - -import javax.webbeans.Production; -import javax.webbeans.RequestScoped; - -@Production -@RequestScoped -public class Pig -{ - - public final void washPig() - { - - } - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Pig.java (from rev 125, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Pig.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Pig.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Pig.java 2008-10-23 17:13:25 UTC (rev 128) @@ -0,0 +1,16 @@ +package org.jboss.webbeans.test.components.broken; + +import javax.webbeans.Production; +import javax.webbeans.RequestScoped; + +@Production +@RequestScoped +public class Pig +{ + + public final void washPig() + { + + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/broken/Pig.java ___________________________________________________________________ Name: svn:mime-type + text/plain Deleted: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockContainerImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockContainerImpl.java 2008-10-23 13:45:33 UTC (rev 127) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockContainerImpl.java 2008-10-23 17:13:25 UTC (rev 128) @@ -1,52 +0,0 @@ -package org.jboss.webbeans.test.mock; - -import java.lang.annotation.Annotation; -import java.util.Arrays; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import org.jboss.webbeans.ManagerImpl; - -public class MockContainerImpl extends ManagerImpl -{ - private Object event = null; - private Annotation[] eventBindings = null; - - public MockContainerImpl(List<Annotation> enabledDeploymentTypes) - { - super(enabledDeploymentTypes); - } - - /* (non-Javadoc) - * @see org.jboss.webbeans.ManagerImpl#fireEvent(java.lang.Object, java.lang.annotation.Annotation[]) - */ - @Override - public void fireEvent(Object event, Annotation... bindings) - { - // Record the event - this.event = event; - this.eventBindings = bindings; - } - - /** - * Retrieves the event which was last fired with this manager. - * @return the event - */ - public final Object getEvent() - { - return event; - } - - /** - * @return the eventBindings - */ - public final Set<Annotation> getEventBindings() - { - if (eventBindings != null) - return new HashSet<Annotation>(Arrays.asList(eventBindings)); - else - return null; - } - -} Copied: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java (from rev 125, ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockContainerImpl.java) =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java 2008-10-23 17:13:25 UTC (rev 128) @@ -0,0 +1,52 @@ +package org.jboss.webbeans.test.mock; + +import java.lang.annotation.Annotation; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Set; + +import org.jboss.webbeans.ManagerImpl; + +public class MockManagerImpl extends ManagerImpl +{ + private Object event = null; + private Annotation[] eventBindings = null; + + public MockManagerImpl(List<Class<? extends Annotation>> enabledDeploymentTypes) + { + super(enabledDeploymentTypes); + } + + /* (non-Javadoc) + * @see org.jboss.webbeans.ManagerImpl#fireEvent(java.lang.Object, java.lang.annotation.Annotation[]) + */ + @Override + public void fireEvent(Object event, Annotation... bindings) + { + // Record the event + this.event = event; + this.eventBindings = bindings; + } + + /** + * Retrieves the event which was last fired with this manager. + * @return the event + */ + public final Object getEvent() + { + return event; + } + + /** + * @return the eventBindings + */ + public final Set<Annotation> getEventBindings() + { + if (eventBindings != null) + return new HashSet<Annotation>(Arrays.asList(eventBindings)); + else + return null; + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/mock/MockManagerImpl.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r127 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/bindings and 7 other directories.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-23 09:45:33 -0400 (Thu, 23 Oct 2008) New Revision: 127 Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/EmptyAnnotatedType.java Removed: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ComponentConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableWrapper.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypeModelTest.java Log: All tests which should pass do, use sets consistently Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/BeanImpl.java 2008-10-23 13:45:33 UTC (rev 127) @@ -5,7 +5,6 @@ import java.util.logging.Logger; import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Manager; import org.jboss.webbeans.model.AbstractComponentModel; import org.jboss.webbeans.util.LoggerUtil; @@ -18,6 +17,8 @@ private static Logger log = LoggerUtil.getLogger(LOGGER_NAME); private AbstractComponentModel<T, ?> componentMetaModel; + + private ManagerImpl manager; public BeanImpl(AbstractComponentModel<T, ?> componentMetaModel, ManagerImpl manager) { @@ -28,7 +29,7 @@ @Override public T create() { - return componentMetaModel.getConstructor().invoke(getManager()); + return componentMetaModel.getConstructor().invoke(manager); } @Override Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java 2008-10-23 13:45:33 UTC (rev 127) @@ -24,185 +24,216 @@ import org.jboss.webbeans.event.EventBus; import org.jboss.webbeans.injectable.SimpleInjectable; -public class ManagerImpl implements Manager { +public class ManagerImpl implements Manager +{ - private List<Annotation> enabledDeploymentTypes; - private ModelManager modelManager; - private EjbManager ejbLookupManager; - private EventBus eventBus; - private ResolutionManager resolutionManager; + private List<Annotation> enabledDeploymentTypes; + private ModelManager modelManager; + private EjbManager ejbLookupManager; + private EventBus eventBus; + private ResolutionManager resolutionManager; - private boolean containerInitialized = false; + private ThreadLocal<Map<Class<Annotation>, Context>> contexts = new ThreadLocal<Map<Class<Annotation>, Context>>(); - private ThreadLocal<Map<Class<Annotation>, Context>> contexts = new ThreadLocal<Map<Class<Annotation>, Context>>(); + private Set<Bean<?>> beans; - private Set<Bean<?>> beans; + public ManagerImpl(List<Annotation> enabledDeploymentTypes) + { + initEnabledDeploymentTypes(enabledDeploymentTypes); + this.modelManager = new ModelManager(); + this.ejbLookupManager = new EjbManager(); + this.beans = new HashSet<Bean<?>>(); + this.eventBus = new EventBus(); + resolutionManager = new ResolutionManager(this); + } - public ManagerImpl(List<Annotation> enabledDeploymentTypes) { - initEnabledDeploymentTypes(enabledDeploymentTypes); - this.modelManager = new ModelManager(); - this.ejbLookupManager = new EjbManager(); - this.beans = new HashSet<Bean<?>>(); - this.eventBus = new EventBus(); - resolutionManager = new ResolutionManager(this); - } + private void initEnabledDeploymentTypes( + List<Annotation> enabledDeploymentTypes) + { + this.enabledDeploymentTypes = new ArrayList<Annotation>(); + if (enabledDeploymentTypes == null) + { + this.enabledDeploymentTypes.add(0, new StandardAnnotationLiteral()); + this.enabledDeploymentTypes.add(1, new ProductionAnnotationLiteral()); + } else + { + this.enabledDeploymentTypes.addAll(enabledDeploymentTypes); + if (!this.enabledDeploymentTypes.get(0).annotationType().equals( + Standard.class)) + { + throw new RuntimeException( + "@Standard must be the lowest precedence deployment type"); + } + } + } - private void initEnabledDeploymentTypes( - List<Annotation> enabledDeploymentTypes) { - this.enabledDeploymentTypes = new ArrayList<Annotation>(); - if (enabledDeploymentTypes == null) { - this.enabledDeploymentTypes.add(0, new StandardAnnotationLiteral()); - this.enabledDeploymentTypes.add(1, - new ProductionAnnotationLiteral()); - } else { - this.enabledDeploymentTypes.addAll(enabledDeploymentTypes); - if (!this.enabledDeploymentTypes.get(0).annotationType().equals( - Standard.class)) { - throw new RuntimeException( - "@Standard must be the lowest precedence deployment type"); - } - } - } + public Manager addBean(Bean<?> bean) + { + beans.add(bean); + return this; + } - public Manager addBean(Bean<?> bean) { - beans.add(bean); - if (containerInitialized) { - // TODO Somehow deal with dynamically reigstered components - } - return this; - } + public <T> void removeObserver(Observer<T> observer) + { - public <T> void removeObserver(Observer<T> observer) { + } - } + public <T> Set<Method> resolveDisposalMethods(Class<T> apiType, + Annotation... bindingTypes) + { + return new HashSet<Method>(); + } - public <T> Set<Method> resolveDisposalMethods(Class<T> apiType, - Annotation... bindingTypes) { - return new HashSet<Method>(); - } + public <T> Set<Observer<T>> resolveObservers(T event, Annotation... bindings) + { + return (Set<Observer<T>>) eventBus.getObservers(event, bindings); + } - public <T> Set<Observer<T>> resolveObservers(T event, - Annotation... bindings) { - return (Set<Observer<T>>) eventBus.getObservers(event, bindings); - } + public List<Annotation> getEnabledDeploymentTypes() + { + return enabledDeploymentTypes; + } - public List<Annotation> getEnabledDeploymentTypes() { - return enabledDeploymentTypes; - } + public ModelManager getModelManager() + { + return this.modelManager; + } - public ModelManager getModelManager() { - return this.modelManager; - } + public EjbManager getEjbManager() + { + return ejbLookupManager; + } - public EjbManager getEjbManager() { - return ejbLookupManager; - } + public <T> Set<Bean<T>> resolveByType(Class<T> apiType, + Annotation... bindingTypes) + { + return getResolutionManager().get( + new SimpleInjectable<T>(apiType, bindingTypes)); + } - public <T> Set<Bean<T>> resolveByType(Class<T> apiType, - Annotation... bindingTypes) { - return getResolutionManager().get( - new SimpleInjectable<T>(apiType, bindingTypes)); - } + public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> apiType, + Annotation... bindingTypes) + { + return resolveByType(apiType.getRawType(), bindingTypes); + } - public <T> Set<Bean<T>> resolveByType(TypeLiteral<T> apiType, - Annotation... bindingTypes) { - return resolveByType(apiType.getRawType(), bindingTypes); - } + public ResolutionManager getResolutionManager() + { + return resolutionManager; + } - public ResolutionManager getResolutionManager() { - return resolutionManager; - } + public Set<Bean<?>> getBeans() + { + return beans; + } - public Set<Bean<?>> getBeans() { - return beans; - } + public void addContext(Context context) + { + // TODO Auto-generated method stub - public void addContext(Context context) { - // TODO Auto-generated method stub - - } + } - public Manager addDecorator(Decorator decorator) { - // TODO Auto-generated method stub - return null; - } + public Manager addDecorator(Decorator decorator) + { + // TODO Auto-generated method stub + return null; + } - public Manager addInterceptor(Interceptor interceptor) { - // TODO Auto-generated method stub - return null; - } + public Manager addInterceptor(Interceptor interceptor) + { + // TODO Auto-generated method stub + return null; + } - public <T> void addObserver(Observer<T> observer, Class<T> eventType, - Annotation... bindings) { - // TODO Auto-generated method stub - - } + public <T> void addObserver(Observer<T> observer, Class<T> eventType, + Annotation... bindings) + { + // TODO Auto-generated method stub - public <T> void addObserver(Observer<T> observer, TypeLiteral<T> eventType, - Annotation... bindings) { - // TODO Auto-generated method stub - - } + } - public void fireEvent(Object event, Annotation... bindings) { - // TODO Auto-generated method stub - - } + public <T> void addObserver(Observer<T> observer, TypeLiteral<T> eventType, + Annotation... bindings) + { + // TODO Auto-generated method stub - public Context getContext(Class<Annotation> scopeType) { - // TODO Auto-generated method stub - return null; - } + } - public <T> T getInstance(Bean<T> bean) { - // TODO Auto-generated method stub - return null; - } + public void fireEvent(Object event, Annotation... bindings) + { + // TODO Auto-generated method stub - public Object getInstanceByName(String name) { - // TODO Auto-generated method stub - return null; - } + } - public <T> T getInstanceByType(Class<T> type, Annotation... bindingTypes) { - // TODO Auto-generated method stub - return null; - } + public Context getContext(Class<Annotation> scopeType) + { + // TODO Auto-generated method stub + return null; + } - public <T> T getInstanceByType(TypeLiteral<T> type, - Annotation... bindingTypes) { - // TODO Auto-generated method stub - return null; - } + public <T> T getInstance(Bean<T> bean) + { + // TODO Auto-generated method stub + return null; + } - public <T> void removeObserver(Observer<T> observer, Class<T> eventType, - Annotation... bindings) { - // TODO Auto-generated method stub - - } + public Object getInstanceByName(String name) + { + // TODO Auto-generated method stub + return null; + } - public <T> void removeObserver(Observer<T> observer, - TypeLiteral<T> eventType, Annotation... bindings) { - // TODO Auto-generated method stub - - } + public <T> T getInstanceByType(Class<T> type, Annotation... bindingTypes) + { + // TODO Auto-generated method stub + return null; + } + + public <T> T getInstanceByType(Class<T> type, Set<Annotation> bindingTypes) + { + // TODO Auto-generated method stub + return null; + } - public Set<Bean<?>> resolveByName(String name) { - // TODO Auto-generated method stub - return null; - } + public <T> T getInstanceByType(TypeLiteral<T> type, + Annotation... bindingTypes) + { + // TODO Auto-generated method stub + return null; + } - public List<Decorator> resolveDecorators(Set<Class<?>> types, - Annotation... bindingTypes) { - // TODO Auto-generated method stub - return null; - } + public <T> void removeObserver(Observer<T> observer, Class<T> eventType, + Annotation... bindings) + { + // TODO Auto-generated method stub - public List<Interceptor> resolveInterceptors(InterceptionType type, - Annotation... interceptorBindings) { - // TODO Auto-generated method stub - return null; - } + } + public <T> void removeObserver(Observer<T> observer, + TypeLiteral<T> eventType, Annotation... bindings) + { + // TODO Auto-generated method stub + } + + public Set<Bean<?>> resolveByName(String name) + { + // TODO Auto-generated method stub + return null; + } + + public List<Decorator> resolveDecorators(Set<Class<?>> types, + Annotation... bindingTypes) + { + // TODO Auto-generated method stub + return null; + } + + public List<Interceptor> resolveInterceptors(InterceptionType type, + Annotation... interceptorBindings) + { + // TODO Auto-generated method stub + return null; + } + } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/ResolutionManager.java 2008-10-23 13:45:33 UTC (rev 127) @@ -12,6 +12,7 @@ { private Map<Injectable<?, ?>, Set<?>> resolvedInjectionPoints; + private Set<Injectable<?, ?>> injectionPoints; private ManagerImpl manager; public ResolutionManager(ManagerImpl manager) @@ -20,17 +21,23 @@ this.manager = manager; } + public void addInjectionPoint(Injectable<?, ?> injectable) + { + injectionPoints.add(injectable); + } + public void registerInjectionPoint(Injectable<?, ?> injectable) { - resolvedInjectionPoints.put(injectable, injectable.getPossibleTargets(manager.getBeans())); + resolvedInjectionPoints.put(injectable, injectable.getPossibleTargets(manager.getBeans())); } - public void registerInjectionPoints(Set<Injectable<?, ?>> injectables) + public void registerInjectionPoints() { - for (Injectable<?, ?> injectable : injectables) + for (Injectable<?, ?> injectable : injectionPoints) { registerInjectionPoint(injectable); } + injectionPoints.clear(); } @SuppressWarnings("unchecked") Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bindings/NamedAnnotationLiteral.java 2008-10-23 13:45:33 UTC (rev 127) @@ -1,9 +0,0 @@ -package org.jboss.webbeans.bindings; - -import javax.webbeans.AnnotationLiteral; -import javax.webbeans.Named; - -public abstract class NamedAnnotationLiteral extends AnnotationLiteral<Named> implements Named -{ - -} Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2008-10-23 13:45:33 UTC (rev 127) @@ -5,6 +5,7 @@ import javax.webbeans.manager.Manager; import javax.webbeans.Observer; +import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.injectable.InjectableMethod; import org.jboss.webbeans.injectable.InjectableParameter; import org.jboss.webbeans.injectable.InjectableParameterWrapper; @@ -83,7 +84,7 @@ InjectableParameter<?> newParameter = new InjectableParameterWrapper(parameter) { @Override - public Object getValue(Manager manager) + public Object getValue(ManagerImpl manager) { return event; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ComponentConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ComponentConstructor.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ComponentConstructor.java 2008-10-23 13:45:33 UTC (rev 127) @@ -1,10 +1,10 @@ package org.jboss.webbeans.injectable; -import javax.webbeans.manager.Manager; +import org.jboss.webbeans.ManagerImpl; public interface ComponentConstructor<T> { - public T invoke(Manager container); + public T invoke(ManagerImpl manager); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/EnterpriseConstructor.java 2008-10-23 13:45:33 UTC (rev 127) @@ -1,7 +1,5 @@ package org.jboss.webbeans.injectable; -import javax.webbeans.manager.Manager; - import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.ejb.EjbMetaData; @@ -16,12 +14,12 @@ this.ejbMetaData = ejbMetaData; } - public T invoke(Manager container) + public T invoke(ManagerImpl manager) { // TODO Hmm, this isn't right - if (container instanceof ManagerImpl) + if (manager instanceof ManagerImpl) { - ManagerImpl containerImpl = (ManagerImpl) container; + ManagerImpl containerImpl = (ManagerImpl) manager; return containerImpl.getEjbManager().lookup(ejbMetaData); } else Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java 2008-10-23 13:45:33 UTC (rev 127) @@ -7,8 +7,8 @@ import java.util.Set; import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Manager; +import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedItem; /** @@ -28,9 +28,9 @@ this.annotatedItem = annotatedItem; } - public Annotation[] getBindingTypes() + public Set<Annotation> getBindingTypes() { - return annotatedItem.getAnnotations().toArray(new Annotation[0]); + return annotatedItem.getAnnotations(); } protected Injectable() {} @@ -41,7 +41,7 @@ return getType() + " with binding types " + getBindingTypes(); } - public T getValue(Manager manager) + public T getValue(ManagerImpl manager) { return manager.getInstanceByType(getType(), getBindingTypes()); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java 2008-10-23 13:45:33 UTC (rev 127) @@ -4,6 +4,7 @@ import javax.webbeans.manager.Manager; +import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.AnnotatedMethod; import org.jboss.webbeans.introspector.SimpleAnnotatedMethod; @@ -20,9 +21,9 @@ } @SuppressWarnings("unchecked") - public T invoke(Manager container, Object instance) + public T invoke(ManagerImpl manager, Object instance) { - return invoke(container, instance, getParameterValues(container)); + return invoke(manager, instance, getParameterValues(manager)); } @SuppressWarnings("unchecked") Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameterWrapper.java 2008-10-23 13:45:33 UTC (rev 127) @@ -4,8 +4,9 @@ import java.util.Set; import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Manager; +import org.jboss.webbeans.ManagerImpl; + public class InjectableParameterWrapper<T> extends InjectableParameter<T> { @@ -17,7 +18,7 @@ } @Override - public Annotation[] getBindingTypes() + public Set<Annotation> getBindingTypes() { return delegate.getBindingTypes(); } @@ -35,7 +36,7 @@ } @Override - public T getValue(Manager manager) + public T getValue(ManagerImpl manager) { return delegate.getValue(manager); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableWrapper.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableWrapper.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableWrapper.java 2008-10-23 13:45:33 UTC (rev 127) @@ -4,8 +4,9 @@ import java.util.Set; import javax.webbeans.manager.Bean; -import javax.webbeans.manager.Manager; +import org.jboss.webbeans.ManagerImpl; + public class InjectableWrapper<T, S> extends Injectable<T, S> { @@ -17,7 +18,7 @@ } @Override - public Annotation[] getBindingTypes() + public Set<Annotation> getBindingTypes() { return delegate.getBindingTypes(); } @@ -35,7 +36,7 @@ } @Override - public T getValue(Manager manager) + public T getValue(ManagerImpl manager) { return delegate.getValue(manager); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/JMSConstructor.java 2008-10-23 13:45:33 UTC (rev 127) @@ -1,7 +1,6 @@ package org.jboss.webbeans.injectable; -import javax.webbeans.manager.Manager; - +import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.util.JNDI; public class JMSConstructor<T> implements ComponentConstructor<T> @@ -16,7 +15,7 @@ this.jndiName = jndiName; } - public T invoke(Manager container) + public T invoke(ManagerImpl manager) { return JNDI.lookup(jndiName, type); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/MethodConstructor.java 2008-10-23 13:45:33 UTC (rev 127) @@ -2,7 +2,7 @@ import java.lang.reflect.Method; -import javax.webbeans.manager.Manager; +import org.jboss.webbeans.ManagerImpl; public class MethodConstructor<T> extends InjectableMethod<T> implements ComponentConstructor<T> @@ -13,7 +13,7 @@ super(method); } - public T invoke(Manager container) + public T invoke(ManagerImpl manager) { // TODO Auto-generated method stub return null; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java 2008-10-23 13:45:33 UTC (rev 127) @@ -3,8 +3,7 @@ import java.lang.reflect.Constructor; import java.util.logging.Logger; -import javax.webbeans.manager.Manager; - +import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedConstructor; import org.jboss.webbeans.introspector.AnnotatedItem; import org.jboss.webbeans.introspector.SimpleAnnotatedConstructor; @@ -26,12 +25,12 @@ log.finest("Initialized metadata for " + constructor + " with injectable parameters " + getParameters()); } - public T invoke(Manager container) + public T invoke(ManagerImpl manager) { try { log.finest("Creating new instance of " + constructor.getType() + " with injected parameters " + getParameters()); - return constructor.getAnnotatedConstructor().newInstance(getParameterValues(container)); + return constructor.getAnnotatedConstructor().newInstance(getParameterValues(manager)); } catch (Exception e) { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Unit.java 2008-10-23 13:45:33 UTC (rev 127) @@ -4,8 +4,7 @@ import java.util.ArrayList; import java.util.List; -import javax.webbeans.manager.Manager; - +import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.introspector.AnnotatedItem; public abstract class Unit<T, S> @@ -43,12 +42,12 @@ return injectedParameters; } - public Object[] getParameterValues(Manager container) + public Object[] getParameterValues(ManagerImpl manager) { Object[] parameterValues = new Object[parameters.size()]; for (int i = 0; i < parameterValues.length; i++) { - parameterValues[i] = parameters.get(i).getValue(container); + parameterValues[i] = parameters.get(i).getValue(manager); } return parameterValues; } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java 2008-10-23 13:45:33 UTC (rev 127) @@ -13,9 +13,10 @@ this(annotationMap, null); } - public SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends Object> type) + public SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends T> type) { super(annotationMap); + this.type = type; } public SimpleAnnotatedItem(Annotation[] annotations) @@ -23,7 +24,7 @@ this(annotations, null); } - public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends Object> type) + public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends T> type) { this(buildAnnotationMap(annotations), type); } Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedType.java 2008-10-23 13:45:33 UTC (rev 127) @@ -76,7 +76,7 @@ } if (annotatedFields == null) { - initAnnoatedFields(); + initAnnotatedFields(); } populateMetaAnnotatedFieldMap(metaAnnotationType, annotatedFields, metaAnnotatedFields); return metaAnnotatedFields.get(metaAnnotationType); @@ -84,22 +84,22 @@ protected static <T extends Annotation> Map<Class<? extends Annotation>, Set<AnnotatedField<?>>> populateMetaAnnotatedFieldMap( Class<T> metaAnnotationType, - Map<Class<? extends Annotation>, Set<AnnotatedField<?>>> metaAnnotations, - Map<Class<? extends Annotation>, Set<AnnotatedField<?>>> annotationMap) + Map<Class<? extends Annotation>, Set<AnnotatedField<?>>> annotatedFields, + Map<Class<? extends Annotation>, Set<AnnotatedField<?>>> metaAnnotatedFields) { - if (!metaAnnotations.containsKey(metaAnnotationType)) + if (!metaAnnotatedFields.containsKey(metaAnnotationType)) { Set<AnnotatedField<?>> s = new HashSet<AnnotatedField<?>>(); - for (Class<? extends Annotation> annotationType: annotationMap.keySet()) + for (Class<? extends Annotation> annotationType: annotatedFields.keySet()) { if (annotationType.isAnnotationPresent(metaAnnotationType)) { - s.addAll(annotationMap.get(annotationType)); + s.addAll(annotatedFields.get(annotationType)); } } - metaAnnotations.put(metaAnnotationType, s); + metaAnnotatedFields.put(metaAnnotationType, s); } - return metaAnnotations; + return metaAnnotatedFields; } public Set<AnnotatedField<?>> getAnnotatedField( @@ -107,17 +107,18 @@ { if (annotatedFields == null) { - initAnnoatedFields(); + initAnnotatedFields(); } return annotatedFields.get(annotationType); } - private void initAnnoatedFields() + private void initAnnotatedFields() { if (fields == null) { initFields(); } + annotatedFields = new HashMap<Class<? extends Annotation>, Set<AnnotatedField<?>>>(); for (AnnotatedField<?> field : fields) { for (Annotation annotation : field.getAnnotations()) Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-10-23 13:45:33 UTC (rev 127) @@ -1,9 +1,6 @@ package org.jboss.webbeans.model; -import java.lang.reflect.Field; import java.lang.reflect.Method; -import java.util.Arrays; -import java.util.HashSet; import java.util.logging.Logger; import javax.webbeans.BindingType; Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractComponentModel.java 2008-10-23 13:45:33 UTC (rev 127) @@ -55,6 +55,7 @@ protected void initInjectionPoints() { + injectionPoints = new HashSet<Injectable<?,?>>(); if (removeMethod != null) { for (InjectableParameter<?> injectable : removeMethod.getParameters()) @@ -219,22 +220,19 @@ return; } - if (getXmlAnnotatedItem().getDelegate() == null) - { - Set<Annotation> deploymentTypes = getAnnotatedItem().getAnnotations(DeploymentType.class); - - if (deploymentTypes.size() > 1) - { - throw new RuntimeException("At most one deployment type may be specified (" + deploymentTypes + " are specified) on " + getAnnotatedItem().getDelegate()); - } - if (deploymentTypes.size() == 1) - { - this.deploymentType = deploymentTypes.iterator().next(); - log.finest("Deployment type " + deploymentType + " specified by annotation"); - return; - } + Set<Annotation> deploymentTypes = getAnnotatedItem().getAnnotations(DeploymentType.class); + + if (deploymentTypes.size() > 1) + { + throw new RuntimeException("At most one deployment type may be specified (" + deploymentTypes + " are specified) on " + getAnnotatedItem().getDelegate()); } + if (deploymentTypes.size() == 1) + { + this.deploymentType = deploymentTypes.iterator().next(); + log.finest("Deployment type " + deploymentType + " specified by annotation"); + return; + } if (getMergedStereotypes().getPossibleDeploymentTypes().size() > 0) { Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/AbstractModelTest.java 2008-10-23 13:45:33 UTC (rev 127) @@ -19,6 +19,7 @@ import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeAnnotationLiteral; import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.test.util.EmptyAnnotatedType; import org.testng.annotations.BeforeMethod; public class AbstractModelTest @@ -31,7 +32,7 @@ @BeforeMethod public void before() { - emptyAnnotatedItem = new SimpleAnnotatedType<Object>(null, new HashMap<Class<? extends Annotation>, Annotation>()); + emptyAnnotatedItem = new EmptyAnnotatedType<Object>(new HashMap<Class<? extends Annotation>, Annotation>()); List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>(); enabledDeploymentTypes.add(new StandardAnnotationLiteral()); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ConstructorModelTest.java 2008-10-23 13:45:33 UTC (rev 127) @@ -20,6 +20,7 @@ import org.jboss.webbeans.test.components.Sheep; import org.jboss.webbeans.test.components.Turkey; import org.jboss.webbeans.test.mock.MockContainerImpl; +import org.jboss.webbeans.util.Reflections; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -48,6 +49,7 @@ assert constructor.getParameters().size() == 0; } + @SuppressWarnings("unchecked") @Test public void testSingleConstructor() { @@ -57,10 +59,11 @@ assert constructor.getAnnotatedItem().getDelegate().getParameterTypes()[0].equals(String.class); assert constructor.getParameters().size() == 1; assert constructor.getParameters().get(0).getType().equals(String.class); - assert constructor.getParameters().get(0).getBindingTypes().length == 1; - assert constructor.getParameters().get(0).getBindingTypes()[0].annotationType().equals(Current.class); + assert constructor.getParameters().get(0).getBindingTypes().size() == 1; + assert Reflections.annotationSetMatches(constructor.getParameters().get(0).getBindingTypes(), Current.class); } + @SuppressWarnings("unchecked") @Test public void testInitializerAnnotatedConstructor() { @@ -72,12 +75,13 @@ assert constructor.getParameters().size() == 2; assert constructor.getParameters().get(0).getType().equals(String.class); assert constructor.getParameters().get(1).getType().equals(Double.class); - assert constructor.getParameters().get(0).getBindingTypes().length == 1; - assert constructor.getParameters().get(0).getBindingTypes()[0].annotationType().equals(Current.class); - assert constructor.getParameters().get(1).getBindingTypes().length == 1; - assert constructor.getParameters().get(1).getBindingTypes()[0].annotationType().equals(Current.class); + assert constructor.getParameters().get(0).getBindingTypes().size() == 1; + assert Reflections.annotationSetMatches(constructor.getParameters().get(0).getBindingTypes(), Current.class); + assert constructor.getParameters().get(1).getBindingTypes().size() == 1; + assert Reflections.annotationSetMatches(constructor.getParameters().get(1).getBindingTypes(), Current.class); } + @SuppressWarnings("unchecked") @Test public void testBindingTypeAnnotatedConstructor() { @@ -89,10 +93,10 @@ assert constructor.getParameters().size() == 2; assert constructor.getParameters().get(0).getType().equals(String.class); assert constructor.getParameters().get(1).getType().equals(Integer.class); - assert constructor.getParameters().get(0).getBindingTypes().length == 1; - assert constructor.getParameters().get(0).getBindingTypes()[0].annotationType().equals(Current.class); - assert constructor.getParameters().get(1).getBindingTypes().length == 1; - assert constructor.getParameters().get(1).getBindingTypes()[0].annotationType().equals(Synchronous.class); + assert constructor.getParameters().get(0).getBindingTypes().size() == 1; + assert Reflections.annotationSetMatches(constructor.getParameters().get(0).getBindingTypes(), Current.class); + assert constructor.getParameters().get(1).getBindingTypes().size() == 1; + assert Reflections.annotationSetMatches(constructor.getParameters().get(1).getBindingTypes(), Synchronous.class); } @Test Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EnterpriseComponentModelTest.java 2008-10-23 13:45:33 UTC (rev 127) @@ -33,6 +33,7 @@ private ManagerImpl container; + @SuppressWarnings("unchecked") private AnnotatedType emptyAnnotatedItem; @BeforeMethod @@ -169,17 +170,18 @@ assert exception; } + @SuppressWarnings("unchecked") @Test public void testRemoveMethodWithDefaultBinding() { - AbstractEnterpriseComponentModel<Panther> panther = new EnterpriseComponentModel<Panther>(new SimpleAnnotatedType(Panther.class), emptyAnnotatedItem, container); + AbstractEnterpriseComponentModel<Panther> panther = new EnterpriseComponentModel<Panther>(new SimpleAnnotatedType<Panther>(Panther.class), emptyAnnotatedItem, container); assert panther.getRemoveMethod().getAnnotatedItem().getDelegate().getName().equals("remove"); assert panther.getRemoveMethod().getParameters().size() == 1; assert panther.getRemoveMethod().getParameters().get(0).getType().equals(String.class); - assert panther.getRemoveMethod().getParameters().get(0).getBindingTypes().length == 1; - assert panther.getRemoveMethod().getParameters().get(0).getBindingTypes()[0].annotationType().equals(Current.class); + assert panther.getRemoveMethod().getParameters().get(0).getBindingTypes().size() == 1; + assert Reflections.annotationSetMatches(panther.getRemoveMethod().getParameters().get(0).getBindingTypes(), Current.class); } @SuppressWarnings("unchecked") Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java 2008-10-23 13:45:33 UTC (rev 127) @@ -0,0 +1,25 @@ +package org.jboss.webbeans.test; + +import javax.webbeans.Current; + +import org.jboss.webbeans.injectable.InjectableField; +import org.jboss.webbeans.test.components.Farm; +import org.jboss.webbeans.test.components.Pig; +import org.jboss.webbeans.util.Reflections; +import org.testng.annotations.Test; + +public class InjectableTest +{ + + @SuppressWarnings("unchecked") + @Test + public void testInjectableField() throws Exception + { + InjectableField<Pig> pig = new InjectableField<Pig>(Farm.class.getDeclaredField("pig")); + assert pig.getAnnotatedItem().getType().isAssignableFrom(Pig.class); + assert pig.getBindingTypes().size() == 1; + assert Reflections.annotationSetMatches(pig.getBindingTypes(), Current.class); + assert pig.getType().isAssignableFrom(Pig.class); + } + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/InjectableTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleComponentModelTest.java 2008-10-23 13:45:33 UTC (rev 127) @@ -2,53 +2,33 @@ import java.lang.annotation.Annotation; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; -import javax.webbeans.ApplicationScoped; -import javax.webbeans.ConversationScoped; +import javax.webbeans.AnnotationLiteral; import javax.webbeans.Current; import javax.webbeans.Dependent; import javax.webbeans.Named; import javax.webbeans.Production; import javax.webbeans.RequestScoped; -import org.jboss.webbeans.ManagerImpl; -import org.jboss.webbeans.bindings.ConversationScopedAnnotationLiteral; import org.jboss.webbeans.bindings.CurrentAnnotationLiteral; import org.jboss.webbeans.bindings.DependentAnnotationLiteral; -import org.jboss.webbeans.bindings.NamedAnnotationLiteral; -import org.jboss.webbeans.bindings.RequestScopedAnnotationLiteral; -import org.jboss.webbeans.bindings.StandardAnnotationLiteral; import org.jboss.webbeans.introspector.AnnotatedType; import org.jboss.webbeans.introspector.SimpleAnnotatedType; import org.jboss.webbeans.model.SimpleComponentModel; -import org.jboss.webbeans.model.StereotypeModel; -import org.jboss.webbeans.test.annotations.AnimalStereotype; import org.jboss.webbeans.test.annotations.AnotherDeploymentType; -import org.jboss.webbeans.test.annotations.Asynchronous; import org.jboss.webbeans.test.annotations.FishStereotype; import org.jboss.webbeans.test.annotations.HornedAnimalDeploymentType; import org.jboss.webbeans.test.annotations.HornedMammalStereotype; -import org.jboss.webbeans.test.annotations.MammalStereotype; -import org.jboss.webbeans.test.annotations.RequestScopedAnimalStereotype; -import org.jboss.webbeans.test.annotations.RiverFishStereotype; import org.jboss.webbeans.test.annotations.Synchronous; -import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; -import org.jboss.webbeans.test.bindings.AsynchronousAnnotationLiteral; import org.jboss.webbeans.test.bindings.FishStereotypeAnnotationLiteral; -import org.jboss.webbeans.test.bindings.HornedAnimalDeploymentTypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.HornedMamalStereotypeAnnotationLiteral; -import org.jboss.webbeans.test.bindings.RiverFishStereotypeAnnotationLiteral; import org.jboss.webbeans.test.bindings.SynchronousAnnotationLiteral; import org.jboss.webbeans.test.components.Antelope; import org.jboss.webbeans.test.components.Carp; -import org.jboss.webbeans.test.components.Cat; import org.jboss.webbeans.test.components.Chair; -import org.jboss.webbeans.test.components.ComponentWithTooManyScopeTypes; import org.jboss.webbeans.test.components.Cow; import org.jboss.webbeans.test.components.Goldfish; import org.jboss.webbeans.test.components.Gorilla; @@ -61,45 +41,30 @@ import org.jboss.webbeans.test.components.Tuna; import org.jboss.webbeans.test.components.broken.ComponentWithTooManyDeploymentTypes; import org.jboss.webbeans.test.components.broken.OuterComponent.InnerComponent; -import org.jboss.webbeans.test.mock.MockContainerImpl; import org.jboss.webbeans.util.Reflections; -import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @SpecVersion("20080925") -public class SimpleComponentModelTest +public class SimpleComponentModelTest extends AbstractModelTest { - private ManagerImpl container; - - private AnnotatedType emptyAnnotatedItem; - - @BeforeMethod - public void before() + private class NamedAnnotationLiteral extends AnnotationLiteral<Named> implements Named { - emptyAnnotatedItem = new SimpleAnnotatedType(null, new HashMap<Class<? extends Annotation>, Annotation>()); - List<Annotation> enabledDeploymentTypes = new ArrayList<Annotation>(); - enabledDeploymentTypes.add(new StandardAnnotationLiteral()); - enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral()); - enabledDeploymentTypes.add(new HornedAnimalDeploymentTypeAnnotationLiteral()); - container = new MockContainerImpl(enabledDeploymentTypes); + private String value; + + public NamedAnnotationLiteral(String value) + { + this.value = value; + } + + public String value() + { + return value; + } - initStereotypes(container); } - private void initStereotypes(ManagerImpl container) - { - container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(AnimalStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(HornedMammalStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(MammalStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(FishStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(RiverFishStereotype.class))); - container.getModelManager().addStereotype(new StereotypeModel(new SimpleAnnotatedType(RequestScopedAnimalStereotype.class))); - } - - - // **** TESTS FOR DEPLOYMENT TYPE **** // @Test @SpecAssertion(section="2.5.3") @@ -184,14 +149,7 @@ public void testDefaultXmlNamed() { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral() - { - - public String value() - { - return ""; - } - }); + annotations.put(Named.class, new NamedAnnotationLiteral("")); AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container); @@ -203,14 +161,7 @@ public void testNonDefaultXmlNamed() { Map<Class<? extends Annotation>, Annotation> annotations = new HashMap<Class<? extends Annotation>, Annotation>(); - annotations.put(Named.class, new NamedAnnotationLiteral() - { - - public String value() - { - return "aTrout"; - } - }); + annotations.put(Named.class, new NamedAnnotationLiteral("aTrout")); AnnotatedType annotatedItem = new SimpleAnnotatedType(SeaBass.class, annotations); SimpleComponentModel<SeaBass> trout = new SimpleComponentModel<SeaBass>(new SimpleAnnotatedType(SeaBass.class), annotatedItem, container); @@ -241,13 +192,7 @@ Map<Class<? extends Annotation>, Annotation> orderXmlAnnotations = new HashMap<Class<? extends Annotation>, Annotation>(); orderXmlAnnotations.put(Current.class, new CurrentAnnotationLiteral()); orderXmlAnnotations.put(Synchronous.class, new SynchronousAnnotationLiteral()); - orderXmlAnnotations.put(Named.class, new NamedAnnotationLiteral() - { - public String value() - { - return "currentSynchronousOrder"; - } - }); + orderXmlAnnotations.put(Named.class, new NamedAnnotationLiteral ("currentSynchronousOrder")); AnnotatedType currentSynchronousOrderAnnotatedItem = new SimpleAnnotatedType(Order.class, orderXmlAnnotations); SimpleComponentModel<Order> order = new SimpleComponentModel<Order>(new SimpleAnnotatedType(Order.class), currentSynchronousOrderAnnotatedItem, container); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypeModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypeModelTest.java 2008-10-23 12:30:43 UTC (rev 126) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypeModelTest.java 2008-10-23 13:45:33 UTC (rev 127) @@ -92,7 +92,7 @@ public void testStereotypeWithoutScopeType() { StereotypeModel<HornedMammalStereotype> animalStereotype = new StereotypeModel<HornedMammalStereotype>(new SimpleAnnotatedType<HornedMammalStereotype>(HornedMammalStereotype.class)); - assert animalStereotype.getDefaultScopeType().annotationType() == null; + assert animalStereotype.getDefaultScopeType() == null; } @Test @SpecAssertion(section="2.7.1") Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java 2008-10-23 13:45:33 UTC (rev 127) @@ -0,0 +1,13 @@ +package org.jboss.webbeans.test.components; + +import javax.webbeans.Current; +import javax.webbeans.Production; + +@Production +public class Farm +{ + + @Current + private Pig pig; + +} Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/components/Farm.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/EmptyAnnotatedType.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/EmptyAnnotatedType.java (rev 0) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/EmptyAnnotatedType.java 2008-10-23 13:45:33 UTC (rev 127) @@ -0,0 +1,38 @@ +package org.jboss.webbeans.test.util; + +import java.lang.annotation.Annotation; +import java.util.Map; +import java.util.Set; + +import org.jboss.webbeans.introspector.AnnotatedField; +import org.jboss.webbeans.introspector.SimpleAnnotatedType; + +/** + * An empty annotated type + * + * TODO Update testsuite not to need this hack + * + * @author pmuir + * + */ +public class EmptyAnnotatedType<T> extends SimpleAnnotatedType<T> +{ + + public EmptyAnnotatedType(Map<Class<? extends Annotation>, Annotation> annotationMap) + { + super(null, annotationMap); + } + + public Set<AnnotatedField<?>> getFields() + { + return null; + } + + @Override + public Set<AnnotatedField<?>> getMetaAnnotatedFields( + Class<? extends Annotation> metaAnnotationType) + { + return null; + } + +} \ No newline at end of file Property changes on: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/EmptyAnnotatedType.java ___________________________________________________________________ Name: svn:mime-type + text/plain

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r126 - ri/trunk/webbeans-api/src/main/java/javax/webbeans.

by webbeans-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2008-10-23 08:30:43 -0400 (Thu, 23 Oct 2008) New Revision: 126 Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java Log: minor Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java 2008-10-21 11:42:04 UTC (rev 125) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/New.java 2008-10-23 12:30:43 UTC (rev 126) @@ -32,7 +32,7 @@ * @author Pete Muir */ -@Target( { FIELD, PARAMETER, }) +@Target( { FIELD, PARAMETER }) @Retention(RUNTIME) @Documented @BindingType

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r125 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/injectable and 3 other directories.

by webbeans-commits＠lists.jboss.org

Author: dallen6 Date: 2008-10-21 07:42:04 -0400 (Tue, 21 Oct 2008) New Revision: 125 Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java Log: Finished changes to the container provided Event implementation to use the new Injectables and a few other bug fixes with related classes. Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-10-20 20:37:29 UTC (rev 124) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java 2008-10-21 11:42:04 UTC (rev 125) @@ -29,11 +29,16 @@ @Current protected Manager webBeansManager; - public EventImpl(Annotation... eventBindings) + /** + * Used to set the event bindings for this type of event after it is constructed + * with the default constructor. + * @param eventBindings Annotations that are bindings for the event + */ + public void setEventBindings(Annotation... eventBindings) { this.eventBindings = Arrays.asList(eventBindings); } - + /* * (non-Javadoc) * Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java 2008-10-20 20:37:29 UTC (rev 124) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/Injectable.java 2008-10-21 11:42:04 UTC (rev 125) @@ -30,7 +30,7 @@ public Annotation[] getBindingTypes() { - return (Annotation[]) annotatedItem.getAnnotations().toArray(); + return annotatedItem.getAnnotations().toArray(new Annotation[0]); } protected Injectable() {} Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java 2008-10-20 20:37:29 UTC (rev 124) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java 2008-10-21 11:42:04 UTC (rev 125) @@ -19,7 +19,6 @@ private AnnotatedConstructor<T> constructor; - @SuppressWarnings("unchecked") public SimpleConstructor(Constructor<T> constructor) { super(constructor.getParameterTypes(), constructor.getParameterAnnotations()); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java 2008-10-20 20:37:29 UTC (rev 124) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java 2008-10-21 11:42:04 UTC (rev 125) @@ -21,7 +21,7 @@ @Override public String toString() { - return constructor + " " + getAnnotatedConstructor().toString(); + return constructor.toGenericString(); } public Constructor<T> getDelegate() @@ -29,7 +29,6 @@ return constructor; } - @SuppressWarnings("unchecked") public Class<? extends T> getType() { return constructor.getDeclaringClass(); Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-10-20 20:37:29 UTC (rev 124) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AbstractClassComponentModel.java 2008-10-21 11:42:04 UTC (rev 125) @@ -87,13 +87,11 @@ { log.finest("Component type specified in XML"); this.type = getXmlAnnotatedItem().getDelegate(); - return; } else if (getAnnotatedItem().getDelegate() != null) { log.finest("Component type specified in Java"); this.type = getAnnotatedItem().getDelegate(); - return; } else { Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java =================================================================== --- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java 2008-10-20 20:37:29 UTC (rev 124) +++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/EventComponentModel.java 2008-10-21 11:42:04 UTC (rev 125) @@ -1,11 +1,17 @@ package org.jboss.webbeans.model; +import java.lang.reflect.Constructor; +import java.lang.reflect.Field; +import java.util.logging.Logger; + import org.jboss.webbeans.ManagerImpl; import org.jboss.webbeans.bindings.DependentAnnotationLiteral; import org.jboss.webbeans.bindings.StandardAnnotationLiteral; import org.jboss.webbeans.injectable.ComponentConstructor; +import org.jboss.webbeans.injectable.SimpleConstructor; import org.jboss.webbeans.introspector.AnnotatedItem; -import org.jboss.webbeans.introspector.SimpleAnnotatedItem; +import org.jboss.webbeans.introspector.SimpleAnnotatedField; +import org.jboss.webbeans.util.LoggerUtil; /** * Web Beans component meta model for the container instantiated, injectable, @@ -14,13 +20,16 @@ * @author David Allen * */ -public class EventComponentModel<T> extends AbstractComponentModel<T, Object> +public class EventComponentModel<T> extends AbstractComponentModel<T, Field> { + private static Logger log = LoggerUtil.getLogger(LOGGER_NAME); + private String location; - private AnnotatedItem<T, Object> annotatedItem; - private AnnotatedItem<T, Object> xmlAnnotatedItem; + private SimpleAnnotatedField<T> annotatedItem; + private SimpleAnnotatedField<T> xmlAnnotatedItem; + private ComponentConstructor<T> constructor; - public EventComponentModel(SimpleAnnotatedItem<T, Object> annotatedItem, SimpleAnnotatedItem<T, Object> xmlAnnotatedItem, ManagerImpl manager) + public EventComponentModel(SimpleAnnotatedField<T> annotatedItem, SimpleAnnotatedField<T> xmlAnnotatedItem, ManagerImpl manager) { this.annotatedItem = annotatedItem; this.xmlAnnotatedItem = xmlAnnotatedItem; @@ -28,10 +37,28 @@ } @Override + protected void init(ManagerImpl container) + { + super.init(container); + this.initConstructor(); + } + + /** + * Initializes the constructor field of this class. + */ + @SuppressWarnings("unchecked") + protected void initConstructor() + { + // There should only be one constructor for the event implementation used here + Constructor[] constructors = this.annotatedItem.getType().getConstructors(); + Constructor<T> classConstructor = (Constructor<T>)constructors[0]; + constructor = new SimpleConstructor<T>(classConstructor); + } + + @Override public ComponentConstructor<T> getConstructor() { - // TODO No constructor is needed, but make sure this does not brake instantiation - return null; + return constructor; } @Override @@ -53,15 +80,23 @@ /* (non-Javadoc) * @see org.jboss.webbeans.model.AbstractClassComponentModel#initType() */ + @SuppressWarnings("unchecked") @Override protected void initType() { - // TODO Get the class for Event and use it for the type - this.type = null; + if (getXmlAnnotatedItem().getDelegate() != null) + { + log.finest("Component type specified in XML"); + this.type = (Class<T>) xmlAnnotatedItem.getType(); + } else if (getAnnotatedItem().getDelegate() != null) + { + log.finest("Component type specified in Java"); + this.type = (Class<T>) annotatedItem.getType(); + } } @Override - protected AnnotatedItem<T, Object> getAnnotatedItem() + protected AnnotatedItem<T, Field> getAnnotatedItem() { return this.annotatedItem; } @@ -74,7 +109,7 @@ } @Override - protected AnnotatedItem<T, Object> getXmlAnnotatedItem() + protected AnnotatedItem<T, Field> getXmlAnnotatedItem() { return this.xmlAnnotatedItem; } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java 2008-10-20 20:37:29 UTC (rev 124) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventComponentModelTest.java 2008-10-21 11:42:04 UTC (rev 125) @@ -1,8 +1,8 @@ package org.jboss.webbeans.test; import java.lang.annotation.Annotation; +import java.lang.reflect.Field; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.Set; @@ -11,10 +11,12 @@ import javax.webbeans.Standard; import org.jboss.webbeans.bindings.StandardAnnotationLiteral; +import org.jboss.webbeans.event.EventImpl; import org.jboss.webbeans.injectable.ComponentConstructor; -import org.jboss.webbeans.introspector.SimpleAnnotatedItem; +import org.jboss.webbeans.introspector.SimpleAnnotatedField; import org.jboss.webbeans.model.EventComponentModel; import org.jboss.webbeans.test.bindings.AnotherDeploymentTypeAnnotationLiteral; +import org.jboss.webbeans.test.components.DangerCall; import org.jboss.webbeans.test.mock.MockContainerImpl; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; @@ -29,7 +31,8 @@ public class EventComponentModelTest { private MockContainerImpl manager = null; - private EventComponentModel<Event<? extends Object>> eventComponentModel = null; + private EventComponentModel<EventImpl<DangerCall>> eventComponentModel = null; + EventImpl<DangerCall> eventModelField = null; @BeforeMethod public void before() throws Exception @@ -38,11 +41,10 @@ enabledDeploymentTypes.add(new StandardAnnotationLiteral()); enabledDeploymentTypes.add(new AnotherDeploymentTypeAnnotationLiteral()); manager = new MockContainerImpl(enabledDeploymentTypes); - eventComponentModel = new EventComponentModel<Event<? extends Object>>( - new SimpleAnnotatedItem<Event<? extends Object>, Object>( - new HashMap<Class<? extends Annotation>, Annotation>()), - new SimpleAnnotatedItem<Event<? extends Object>, Object>( - new HashMap<Class<? extends Annotation>, Annotation>()), + Field eventModelField = this.getClass().getDeclaredField("eventModelField"); + eventComponentModel = new EventComponentModel<EventImpl<DangerCall>>( + new SimpleAnnotatedField<EventImpl<DangerCall>>(eventModelField), + new SimpleAnnotatedField<EventImpl<DangerCall>>(eventModelField), manager); } @@ -88,9 +90,9 @@ @Test(groups = "eventbus") public void testConstructor() { - ComponentConstructor<Event<? extends Object>> constructor = eventComponentModel.getConstructor(); + ComponentConstructor<EventImpl<DangerCall>> constructor = eventComponentModel.getConstructor(); assert constructor != null; - Event<? extends Object> event = constructor.invoke(manager); + Event<DangerCall> event = constructor.invoke(manager); assert event != null; } } Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-10-20 20:37:29 UTC (rev 124) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventTest.java 2008-10-21 11:42:04 UTC (rev 125) @@ -28,6 +28,7 @@ * @author David Allen * */ +@SpecVersion("20081012") public class EventTest { private MockContainerImpl manager = null; @@ -42,19 +43,19 @@ } /** - * Tests the {@link Event#fire(Object, Annotation...)} method with a sample - * event component. + * Tests the {@link Event#fire(Object, Annotation...)} method with a locally + * instantiated implementation. */ @SuppressWarnings("unchecked") - @Test(groups = "eventbus") + @Test(groups = "eventbus") @SpecAssertion(section="7.4") public void testFireEvent() { DangerCall anEvent = new DangerCall(); // Create a test annotation for the event and use it to construct the // event object Annotation[] annotations = new Annotation[] { new AnimalStereotypeAnnotationLiteral() }; - EventImpl<DangerCall> eventComponent = new EventImpl<DangerCall>( - annotations); + EventImpl<DangerCall> eventComponent = new EventImpl<DangerCall>(); + eventComponent.setEventBindings(annotations); eventComponent.setManager(manager); eventComponent.fire(anEvent, new TameAnnotationLiteral(), new SynchronousAnnotationLiteral()); Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java =================================================================== --- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-10-20 20:37:29 UTC (rev 124) +++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-10-21 11:42:04 UTC (rev 125) @@ -32,6 +32,7 @@ * @author David Allen * */ +@SpecVersion("20081012") public class ObserverTest { private ManagerImpl manager; @@ -75,7 +76,7 @@ * {@link org.jboss.webbeans.event.ObserverImpl#getEventBindingTypes()}. */ @SuppressWarnings("unchecked") - @Test(groups = "eventbus") + @Test(groups = "eventbus") @SpecAssertion(section="7.3") public final void testGetEventBindingTypes() throws Exception { Observer<Event> o = new ObserverImpl<Event>(tuna, om, Event.class); @@ -91,7 +92,7 @@ * @throws * @throws Exception */ - @Test(groups = "eventbus") + @Test(groups = "eventbus") @SpecAssertion(section="7.3") public final void testGetEventType() throws Exception { Observer<Event> o = new ObserverImpl<Event>(tuna, om, Event.class); @@ -103,7 +104,7 @@ * {@link org.jboss.webbeans.event.ObserverImpl#notify(javax.webbeans.Container, java.lang.Object)} * . */ - @Test(groups = "eventbus") + @Test(groups = "eventbus") @SpecAssertion(section={"7.2","7.3"}) public final void testNotify() throws Exception { AnObserver observerInstance = new AnObserver();

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r124 - ri/trunk/webbeans-api/src/main/java/javax/webbeans.

by webbeans-commits＠lists.jboss.org

Author: gavin.king(a)jboss.com Date: 2008-10-20 16:37:29 -0400 (Mon, 20 Oct 2008) New Revision: 124 Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java Log: format Modified: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java 2008-10-20 20:32:25 UTC (rev 123) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java 2008-10-20 20:37:29 UTC (rev 124) @@ -7,15 +7,17 @@ import java.lang.annotation.Retention; import java.lang.annotation.Target; +/** + * A stereotype for MVC model objects + * + * @author Gavin King + */ + @Named @RequestScoped @Stereotype @Target( { TYPE, METHOD }) @Retention(RUNTIME) -/** - * A stereotype for MVC model objects - * - * @author Gavin King - */ -public @interface Model { +public @interface Model +{ } \ No newline at end of file

15 years, 6 months

1
0
0 / 0

[webbeans-commits] Webbeans SVN: r123 - ri/trunk/webbeans-api/src/main/java/javax/webbeans.

by webbeans-commits＠lists.jboss.org

Author: gavin.king(a)jboss.com Date: 2008-10-20 16:32:25 -0400 (Mon, 20 Oct 2008) New Revision: 123 Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java Log: add Model Added: ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java =================================================================== --- ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java (rev 0) +++ ri/trunk/webbeans-api/src/main/java/javax/webbeans/Model.java 2008-10-20 20:32:25 UTC (rev 123) @@ -0,0 +1,21 @@ +package javax.webbeans; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +@Named +@RequestScoped +@Stereotype +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +/** + * A stereotype for MVC model objects + * + * @author Gavin King + */ +public @interface Model { +} \ No newline at end of file

15 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits October 2008