[webbeans-commits] Webbeans SVN: r2663 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/bean and 10 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Thu May 7 06:56:51 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-05-07 06:56:51 -0400 (Thu, 07 May 2009)
New Revision: 2663
Modified:
ri/trunk/api/src/main/java/javax/inject/manager/Bean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanAnnotatedItemTransformer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java
Log:
update api to remove bounded wildcards
Modified: ri/trunk/api/src/main/java/javax/inject/manager/Bean.java
===================================================================
--- ri/trunk/api/src/main/java/javax/inject/manager/Bean.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/api/src/main/java/javax/inject/manager/Bean.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -60,7 +60,7 @@
*
* @return the bean types
*/
- public abstract Set<? extends Type> getTypes();
+ public abstract Set<Type> getTypes();
/**
* The bindings of a bean
@@ -109,6 +109,6 @@
*
* @return the injection points of a bean
*/
- public abstract Set<? extends InjectionPoint> getInjectionPoints();
+ public abstract Set<InjectionPoint> getInjectionPoints();
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -105,7 +105,7 @@
// The type
protected Class<T> type;
// The API types
- protected Set<? extends Type> types;
+ protected Set<Type> types;
// The injection points
protected Set<AnnotatedInjectionPoint<?, ?>> injectionPoints;
// If the type a primitive?
@@ -262,7 +262,7 @@
private boolean checkInjectionPointsAreSerializable()
{
boolean passivating = manager.getServices().get(MetaDataCache.class).getScopeModel(this.getScopeType()).isPassivating();
- for (AnnotatedInjectionPoint<?, ?> injectionPoint : getInjectionPoints())
+ for (AnnotatedInjectionPoint<?, ?> injectionPoint : getAnnotatedInjectionPoints())
{
Annotation[] bindings = injectionPoint.getMetaAnnotationsAsArray(BindingType.class);
Bean<?> resolvedBean = manager.resolveByType(injectionPoint.getRawType(), bindings).iterator().next();
@@ -402,7 +402,7 @@
}
@Override
- public Set<AnnotatedInjectionPoint<?, ?>> getInjectionPoints()
+ public Set<AnnotatedInjectionPoint<?, ?>> getAnnotatedInjectionPoints()
{
return injectionPoints;
}
@@ -462,7 +462,7 @@
* @see javax.inject.manager.Bean#getTypes()
*/
@Override
- public Set<? extends Type> getTypes()
+ public Set<Type> getTypes()
{
return types;
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -66,7 +66,7 @@
private DisposalMethodBean<?> specializedBean;
protected MethodInjectionPoint<T> disposalMethodInjectionPoint;
protected Set<AnnotatedInjectionPoint<?, ?>> disposalInjectionPoints;
- private String id;
+ private final String id;
@SuppressWarnings("unchecked")
@@ -75,6 +75,7 @@
this.type = (Class<T>) disposalMethodInjectionPoint.getAnnotatedParameters(Disposes.class).get(0).getRawType();
}
+ @Override
public AnnotatedMethod<T> getAnnotatedItem()
{
return disposalMethodInjectionPoint;
@@ -132,7 +133,8 @@
super.types = types;
}
- public Set<AnnotatedInjectionPoint<?, ?>> getInjectionPoints()
+ @Override
+ public Set<AnnotatedInjectionPoint<?, ?>> getAnnotatedInjectionPoints()
{
return injectionPoints;
}
@@ -150,7 +152,7 @@
}
@Override
- public Set<? extends Type> getTypes()
+ public Set<Type> getTypes()
{
return types;
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ForwardingBean.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -115,7 +115,7 @@
* @return The API types
*/
@Override
- public Set<? extends Type> getTypes()
+ public Set<Type> getTypes()
{
return delegate().getTypes();
}
@@ -143,7 +143,7 @@
}
@Override
- public Set<? extends InjectionPoint> getInjectionPoints()
+ public Set<InjectionPoint> getInjectionPoints()
{
return delegate().getInjectionPoints();
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/RIBean.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -23,6 +23,7 @@
import javax.context.Dependent;
import javax.inject.manager.Bean;
+import javax.inject.manager.InjectionPoint;
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.bootstrap.BeanDeployerEnvironment;
@@ -74,7 +75,13 @@
public abstract boolean isPrimitive();
- public abstract Set<AnnotatedInjectionPoint<?, ?>> getInjectionPoints();
+ public abstract Set<AnnotatedInjectionPoint<?, ?>> getAnnotatedInjectionPoints();
+
+ @Override
+ public Set<InjectionPoint> getInjectionPoints()
+ {
+ return (Set) getAnnotatedInjectionPoints();
+ }
public abstract RIBean<?> getSpecializedBean();
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/ee/AbstractJavaEEResourceBean.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -146,7 +146,7 @@
}
@Override
- public Set<? extends Type> getTypes()
+ public Set<Type> getTypes()
{
return Collections.unmodifiableSet(types);
}
@@ -170,7 +170,7 @@
}
@Override
- public Set<AnnotatedInjectionPoint<?, ?>> getInjectionPoints()
+ public Set<AnnotatedInjectionPoint<?, ?>> getAnnotatedInjectionPoints()
{
return Collections.emptySet();
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractStandardBean.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -84,7 +84,7 @@
}
@Override
- public Set<AnnotatedInjectionPoint<?, ?>> getInjectionPoints()
+ public Set<AnnotatedInjectionPoint<?, ?>> getAnnotatedInjectionPoints()
{
return Collections.emptySet();
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/EventBean.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -36,7 +36,7 @@
{
private static final Class<Event<?>> TYPE = new TypeLiteral<Event<?>>() {}.getRawType();
- private static final Set<? extends Type> DEFAULT_TYPES = new HashSet<Type>(Arrays.asList(TYPE, Object.class));
+ private static final Set<Type> DEFAULT_TYPES = new HashSet<Type>(Arrays.asList(TYPE, Object.class));
private static final Fires FIRES = new FiresLiteral();
private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>(Arrays.asList(FIRES));
public static final AnnotatedItemTransformer TRANSFORMER = new FacadeBeanAnnotatedItemTransformer(Event.class, FIRES);
@@ -60,7 +60,7 @@
}
@Override
- public Set<? extends Type> getTypes()
+ public Set<Type> getTypes()
{
return DEFAULT_TYPES;
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanAnnotatedItemTransformer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanAnnotatedItemTransformer.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/FacadeBeanAnnotatedItemTransformer.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -40,7 +40,7 @@
private final Class<?> clazz;
private final Annotation annotation;
private final Set<Annotation> annotations;
- private final Set<? extends Type> flattenedTypes;
+ private final Set<Type> flattenedTypes;
public FacadeBeanAnnotatedItemTransformer(Class<?> clazz, Annotation annotation)
{
@@ -87,7 +87,7 @@
}
@Override
- public Set<? extends Type> getFlattenedTypeHierarchy()
+ public Set<Type> getFlattenedTypeHierarchy()
{
return flattenedTypes;
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/InstanceBean.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -35,7 +35,7 @@
{
private static final Class<Instance<?>> TYPE = new TypeLiteral<Instance<?>>() {}.getRawType();
- private static final Set<? extends Type> DEFAULT_TYPES = new HashSet<Type>(Arrays.asList(TYPE, Object.class));
+ private static final Set<Type> DEFAULT_TYPES = new HashSet<Type>(Arrays.asList(TYPE, Object.class));
private static final Obtains OBTAINS = new ObtainsLiteral();
private static final Set<Annotation> DEFAULT_BINDINGS = new HashSet<Annotation>(Arrays.asList(OBTAINS));
private static final Set<Class<? extends Annotation>> FILTERED_ANNOTATION_TYPES = new HashSet<Class<? extends Annotation>>(Arrays.asList(Obtains.class));
@@ -59,7 +59,7 @@
}
@Override
- public Set<? extends Type> getTypes()
+ public Set<Type> getTypes()
{
return DEFAULT_TYPES;
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -187,7 +187,7 @@
addBean(bean);
- manager.getResolver().addInjectionPoints(bean.getInjectionPoints());
+ manager.getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints());
createProducerMethods(bean, annotatedClass);
createProducerFields(bean, annotatedClass);
@@ -216,7 +216,7 @@
{
DisposalMethodBean<?> disposalBean = DisposalMethodBean.of(manager, method, declaringBean);
environment.addAllDisposalBean(disposalBean);
- manager.getResolver().addInjectionPoints(disposalBean.getInjectionPoints());
+ manager.getResolver().addInjectionPoints(disposalBean.getAnnotatedInjectionPoints());
manager.addBean(disposalBean);
}
}
@@ -225,7 +225,7 @@
{
ProducerMethodBean<T> bean = ProducerMethodBean.of(annotatedMethod, declaringBean, manager);
addBean(bean);
- manager.getResolver().addInjectionPoints(bean.getInjectionPoints());
+ manager.getResolver().addInjectionPoints(bean.getAnnotatedInjectionPoints());
}
private void createRealizedProducerMethods(AbstractClassBean<?> declaringBean, AnnotatedClass<?> realizingClass)
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -63,7 +63,7 @@
}
@Override
- public Set<? extends InjectionPoint> getInjectionPoints()
+ public Set<InjectionPoint> getInjectionPoints()
{
return Collections.emptySet();
}
@@ -81,7 +81,7 @@
}
@Override
- public Set<? extends Type> getTypes()
+ public Set<Type> getTypes()
{
return Collections.emptySet();
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableAnnotatedClass.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -111,6 +111,7 @@
return rawType;
}
+ @Override
public Type[] getActualTypeArguments()
{
return actualTypeArguments;
@@ -121,6 +122,7 @@
throw new UnsupportedOperationException();
}
+ @Override
public Class<T> getRawType()
{
return rawType;
@@ -147,7 +149,8 @@
throw new UnsupportedOperationException();
}
- public Set<? extends Type> getFlattenedTypeHierarchy()
+ @Override
+ public Set<Type> getFlattenedTypeHierarchy()
{
throw new UnsupportedOperationException();
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/AnnotatedItem.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -86,6 +86,7 @@
* if there are no matches.
* @deprecated This reflection type should not know about JSR-299 binding types
*/
+ @Deprecated
public Set<Annotation> getBindings();
/**
@@ -95,6 +96,7 @@
* array if there are no matches.
* @deprecated This reflection type should not know about JSR-299 binding types
*/
+ @Deprecated
public Annotation[] getBindingsAsArray();
/**
@@ -105,7 +107,7 @@
*/
public <A extends Annotation> A getAnnotation(Class<A> annotationType);
- public Set<? extends Type> getFlattenedTypeHierarchy();
+ public Set<Type> getFlattenedTypeHierarchy();
/**
* Indicates if an annotation type specified is present
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingAnnotatedItem.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -218,7 +218,7 @@
return delegate().isDeclaredAnnotationPresent(annotationType);
}
- public Set<? extends Type> getFlattenedTypeHierarchy()
+ public Set<Type> getFlattenedTypeHierarchy()
{
return delegate().getFlattenedTypeHierarchy();
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -58,7 +58,7 @@
private final Class<T> rawType;
private final Type[] actualTypeArguments;
private final Type type;
- private final Set<? extends Type> flattenedTypes;
+ private final Set<Type> flattenedTypes;
private final boolean proxyable;
private final boolean _parameterizedType;
@@ -297,7 +297,7 @@
return actualTypeArguments;
}
- public Set<? extends Type> getFlattenedTypeHierarchy()
+ public Set<Type> getFlattenedTypeHierarchy()
{
return flattenedTypes;
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/NewEnterpriseBeanTest.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -56,8 +56,8 @@
public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
{
initNewBean();
- Set<? extends AnnotatedItem<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getInjectionPoints();
- Set<? extends AnnotatedItem<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getInjectionPoints();
+ Set<? extends AnnotatedItem<?, ?>> wrappedBeanInjectionPoints = wrappedEnterpriseBean.getAnnotatedInjectionPoints();
+ Set<? extends AnnotatedItem<?, ?>> newBeanInjectionPoints = newEnterpriseBean.getAnnotatedInjectionPoints();
assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/newsimple/NewSimpleBeanTest.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -63,8 +63,8 @@
public void testNewBeanHasSameInjectedFieldsAsWrappedBean()
{
initNewBean();
- Set<? extends AnnotatedItem<?, ?>> wrappedBeanInjectionPoints = wrappedSimpleBean.getInjectionPoints();
- Set<? extends AnnotatedItem<?, ?>> newBeanInjectionPoints = newSimpleBean.getInjectionPoints();
+ Set<? extends AnnotatedItem<?, ?>> wrappedBeanInjectionPoints = wrappedSimpleBean.getAnnotatedInjectionPoints();
+ Set<? extends AnnotatedItem<?, ?>> newBeanInjectionPoints = newSimpleBean.getAnnotatedInjectionPoints();
assert wrappedBeanInjectionPoints.equals(newBeanInjectionPoints);
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-05-07 10:36:37 UTC (rev 2662)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/manager/ManagerTest.java 2009-05-07 10:56:51 UTC (rev 2663)
@@ -63,7 +63,7 @@
}
@Override
- public Set<? extends InjectionPoint> getInjectionPoints()
+ public Set<InjectionPoint> getInjectionPoints()
{
return Collections.emptySet();
}
@@ -81,7 +81,7 @@
}
@Override
- public Set<? extends Type> getTypes()
+ public Set<Type> getTypes()
{
return TYPES;
}
More information about the weld-commits
mailing list