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

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; + }