[webbeans-commits] Webbeans SVN: r2832 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/bean and 7 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Mon Jun 15 04:01:01 EDT 2009
Author: pete.muir at jboss.org
Date: 2009-06-15 04:01:01 -0400 (Mon, 15 Jun 2009)
New Revision: 2832
Modified:
ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableWBClass.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBField.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBMember.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotation.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBField.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBMember.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBMember.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java
ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java
ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java
Log:
Start to merge Annotated* into core
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/BeanValidator.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -119,7 +119,7 @@
{
throw new UnproxyableResolutionException("The injection point " + injectionPoint + " has non-proxyable dependencies");
}
- if (Reflections.isPrimitive(annotatedItem.getRawType()) && resolvedBean.isNullable())
+ if (Reflections.isPrimitive(annotatedItem.getJavaClass()) && resolvedBean.isNullable())
{
throw new NullableDependencyException("The injection point " + injectionPoint + " has nullable dependencies");
}
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-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractBean.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -300,7 +300,7 @@
for (WBInjectionPoint<?, ?> injectionPoint : getAnnotatedInjectionPoints())
{
Annotation[] bindings = injectionPoint.getMetaAnnotationsAsArray(BindingType.class);
- Bean<?> resolvedBean = manager.getBeans(injectionPoint.getRawType(), bindings).iterator().next();
+ Bean<?> resolvedBean = manager.getBeans(injectionPoint.getJavaClass(), bindings).iterator().next();
if (passivating)
{
if (Dependent.class.equals(resolvedBean.getScopeType()) && !resolvedBean.isSerializable() && (((injectionPoint instanceof WBField) && !((WBField<?>) injectionPoint).isTransient()) || (injectionPoint instanceof WBParameter)) )
@@ -346,7 +346,7 @@
{
throw new DefinitionException("type: " + getType() + " must specify a deployment type");
}
- else if (deploymentType.equals(Standard.class) && !STANDARD_WEB_BEAN_CLASSES.contains(getAnnotatedItem().getRawType()))
+ else if (deploymentType.equals(Standard.class) && !STANDARD_WEB_BEAN_CLASSES.contains(getAnnotatedItem().getJavaClass()))
{
throw new DefinitionException(getAnnotatedItem().getName() + " cannot have deployment type @Standard");
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -124,7 +124,7 @@
protected void initType()
{
log.trace("Bean type specified in Java");
- this.type = getAnnotatedItem().getRawType();
+ this.type = getAnnotatedItem().getJavaClass();
this.dependencies = new HashSet<String>();
for (Class<?> clazz = type.getSuperclass(); clazz != Object.class; clazz = clazz.getSuperclass())
{
@@ -272,7 +272,7 @@
protected void preSpecialize(BeanDeployerEnvironment environment)
{
super.preSpecialize(environment);
- if (getAnnotatedItem().getSuperclass() == null || getAnnotatedItem().getSuperclass().getRawType().equals(Object.class))
+ if (getAnnotatedItem().getSuperclass() == null || getAnnotatedItem().getSuperclass().getJavaClass().equals(Object.class))
{
throw new DefinitionException("Specializing bean must extend another bean " + toString());
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -126,11 +126,11 @@
{
try
{
- this.type = getAnnotatedItem().getRawType();
+ this.type = getAnnotatedItem().getJavaClass();
}
catch (ClassCastException e)
{
- throw new RuntimeException(" Cannot cast producer type " + getAnnotatedItem().getRawType() + " to bean type " + (getDeclaredBeanType() == null ? " unknown " : getDeclaredBeanType()), e);
+ throw new RuntimeException(" Cannot cast producer type " + getAnnotatedItem().getJavaClass() + " to bean type " + (getDeclaredBeanType() == null ? " unknown " : getDeclaredBeanType()), e);
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DecoratorBean.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -132,7 +132,7 @@
{
if (decoratedType instanceof Class)
{
- if (!((Class<?>) decoratedType).isAssignableFrom(decorates.getRawType()))
+ if (!((Class<?>) decoratedType).isAssignableFrom(decorates.getJavaClass()))
{
throw new DefinitionException("The delegate type must extend or implement every decorated type. Decorated type " + decoratedType + "." + this );
}
@@ -146,7 +146,7 @@
}
if (!Arrays.equals(decorates.getActualTypeArguments(), parameterizedType.getActualTypeArguments()));
Type rawType = ((ParameterizedType) decoratedType).getRawType();
- if (rawType instanceof Class && !((Class<?>) rawType).isAssignableFrom(decorates.getRawType()))
+ if (rawType instanceof Class && !((Class<?>) rawType).isAssignableFrom(decorates.getJavaClass()))
{
throw new DefinitionException("The delegate type must extend or implement every decorated type. Decorated type " + decoratedType + "." + this );
}
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-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/DisposalMethodBean.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -69,7 +69,7 @@
@SuppressWarnings("unchecked")
protected void initType()
{
- this.type = (Class<T>) disposalMethodInjectionPoint.getAnnotatedParameters(Disposes.class).get(0).getRawType();
+ this.type = (Class<T>) disposalMethodInjectionPoint.getAnnotatedParameters(Disposes.class).get(0).getJavaClass();
}
@Override
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -194,7 +194,7 @@
protected void preSpecialize(BeanDeployerEnvironment environment)
{
super.preSpecialize(environment);
- if (!environment.getEjbDescriptors().containsKey(getAnnotatedItem().getSuperclass().getRawType()))
+ if (!environment.getEjbDescriptors().containsKey(getAnnotatedItem().getSuperclass().getJavaClass()))
{
throw new DefinitionException("Annotation defined specializing EJB must have EJB superclass");
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -372,7 +372,7 @@
protected void preSpecialize(BeanDeployerEnvironment environment)
{
super.preSpecialize(environment);
- if (environment.getEjbDescriptors().containsKey(getAnnotatedItem().getSuperclass().getRawType()))
+ if (environment.getEjbDescriptors().containsKey(getAnnotatedItem().getSuperclass().getJavaClass()))
{
throw new DefinitionException("Simple bean must specialize a simple bean");
}
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-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/BeanDeployer.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -120,7 +120,7 @@
{
for (WBClass<?> clazz : classes)
{
- if (environment.getEjbDescriptors().containsKey(clazz.getRawType()))
+ if (environment.getEjbDescriptors().containsKey(clazz.getJavaClass()))
{
createEnterpriseBean(clazz);
}
@@ -316,7 +316,7 @@
*/
private boolean isTypeManagedBeanOrDecorator(WBClass<?> clazz)
{
- Class<?> rawType = clazz.getRawType();
+ Class<?> rawType = clazz.getJavaClass();
EJBApiAbstraction ejbApiAbstraction = manager.getServices().get(EJBApiAbstraction.class);
JsfApiAbstraction jsfApiAbstraction = manager.getServices().get(JsfApiAbstraction.class);
ServletApiAbstraction servletApiAbstraction = manager.getServices().get(ServletApiAbstraction.class);
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ConstructorInjectionPoint.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -21,6 +21,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Member;
import java.lang.reflect.Type;
import java.util.AbstractList;
import java.util.Iterator;
@@ -173,9 +174,14 @@
public Type getType()
{
- return getRawType();
+ return getJavaClass();
}
+ public Member getMember()
+ {
+ return getJavaMember();
+ }
+
public Annotated getAnnotated()
{
return delegate();
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/FieldInjectionPoint.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -20,6 +20,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.Field;
+import java.lang.reflect.Member;
import java.lang.reflect.Type;
import java.util.Set;
@@ -114,4 +115,10 @@
return getBaseType();
}
+ public Member getMember()
+ {
+ return getJavaMember();
+ }
+
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/MethodInjectionPoint.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -20,6 +20,7 @@
import java.lang.annotation.Annotation;
import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Member;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
import java.util.AbstractList;
@@ -285,4 +286,9 @@
return getBaseType();
}
+ public Member getMember()
+ {
+ return getJavaMember();
+ }
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/ParameterInjectionPoint.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -64,9 +64,9 @@
return delegate().getBindings();
}
- public Member getMember()
+ public Member getJavaMember()
{
- return delegate().getDeclaringMember().getMember();
+ return delegate().getDeclaringMember().getJavaMember();
}
public void inject(Object declaringInstance, Object value)
@@ -102,4 +102,10 @@
return getBaseType();
}
+ public Member getMember()
+ {
+ return getJavaMember();
+ }
+
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableWBClass.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableWBClass.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/resolution/ResolvableWBClass.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -160,7 +160,7 @@
}
@Override
- public Class<T> getRawType()
+ public Class<T> getJavaClass()
{
return rawType;
}
@@ -194,7 +194,7 @@
@Override
public Type getBaseType()
{
- return getRawType();
+ return getJavaClass();
}
public boolean isAssignableTo(Class<?> clazz)
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBAnnotated.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -68,9 +68,9 @@
return delegate().getName();
}
- public Class<T> getRawType()
+ public Class<T> getJavaClass()
{
- return delegate().getRawType();
+ return delegate().getJavaClass();
}
public boolean isAssignableFrom(WBAnnotated<?, ?> that)
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBField.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBField.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBField.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -29,11 +29,6 @@
return delegate().get(instance);
}
- public Field getAnnotatedField()
- {
- return delegate().getAnnotatedField();
- }
-
public WBType<?> getDeclaringType()
{
return delegate().getDeclaringType();
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBMember.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBMember.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/ForwardingWBMember.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -24,9 +24,9 @@
@Override
protected abstract WBMember<T, S> delegate();
- public S getMember()
+ public S getJavaMember()
{
- return delegate().getMember();
+ return delegate().getJavaMember();
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotated.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -117,7 +117,7 @@
*
* @return The type of the element
*/
- public Class<T> getRawType();
+ public Class<T> getJavaClass();
/**
* Extends Java Class assignability such that actual type parameters are also
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotation.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotation.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBAnnotation.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -33,7 +33,7 @@
* @return A set of abstracted members
*/
public Set<WBMethod<?>> getMembers();
-
+
/**
* Gets all the members annotated with annotationType
*
@@ -41,7 +41,7 @@
* @return A set of abstracted members with the annotation type
*/
public Set<WBMethod<?>> getAnnotatedMembers(Class<? extends Annotation> annotationType);
-
+
/**
* Get an annotation member by name
*
@@ -49,7 +49,7 @@
* @return
*/
public <A> WBMethod<A> getMember(String memberName, WBClass<A> expectedType);
-
- public Class<T> getRawType();
-
+
+ public Class<T> getJavaClass();
+
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBField.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBField.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBField.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -29,13 +29,6 @@
{
/**
- * Gets the annotated field
- *
- * @return The annotated field
- */
- public Field getAnnotatedField();
-
- /**
* Injects an instance
*
*
@@ -47,13 +40,6 @@
public T get(Object instance);
/**
- * Gets an abstraction of the declaring class
- *
- * @return The declaring class
- */
- public WBType<?> getDeclaringType();
-
- /**
* Gets the property name of the field
*
* @return The name
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBMember.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBMember.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/WBMember.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -26,7 +26,7 @@
public interface WBMember<T, S extends Member> extends WBAnnotated<T, S>
{
- public S getMember();
+ public S getJavaMember();
/**
* Gets an abstraction of the declaring class
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBAnnotated.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -162,7 +162,7 @@
if (other instanceof WBAnnotated)
{
WBAnnotated<?, ?> that = (WBAnnotated<?, ?>) other;
- return this.getAnnotations().equals(that.getAnnotations()) && this.getRawType().equals(that.getRawType());
+ return this.getAnnotations().equals(that.getAnnotations()) && this.getJavaClass().equals(that.getJavaClass());
}
return false;
}
@@ -178,12 +178,12 @@
*/
public boolean isAssignableFrom(WBAnnotated<?, ?> that)
{
- return isAssignableFrom(that.getRawType(), that.getActualTypeArguments());
+ return isAssignableFrom(that.getJavaClass(), that.getActualTypeArguments());
}
public boolean isAssignableFrom(Class<?> type, Type[] actualTypeArguments)
{
- return Reflections.isAssignableFrom(getRawType(), getActualTypeArguments(), type, actualTypeArguments);
+ return Reflections.isAssignableFrom(getJavaClass(), getActualTypeArguments(), type, actualTypeArguments);
}
public boolean isAssignableFrom(Type type)
@@ -199,7 +199,7 @@
@Override
public int hashCode()
{
- return getRawType().hashCode();
+ return getJavaClass().hashCode();
}
/**
@@ -252,7 +252,7 @@
return proxyable;
}
- public Class<T> getRawType()
+ public Class<T> getJavaClass()
{
return rawType;
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBMember.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBMember.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractWBMember.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -136,7 +136,7 @@
return toString;
}
- public S getMember()
+ public S getJavaMember()
{
return getDelegate();
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/ConstructorSignatureImpl.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -32,7 +32,7 @@
this.parameterTypes = new String[method.getParameters().size()];
for (int i = 0; i < method.getParameters().size(); i++)
{
- parameterTypes[i] = method.getParameters().get(i).getRawType().getName();
+ parameterTypes[i] = method.getParameters().get(i).getJavaClass().getName();
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/MethodSignatureImpl.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -36,7 +36,7 @@
this.parameterTypes = new String[method.getParameters().size()];
for (int i = 0; i < method.getParameters().size(); i++)
{
- parameterTypes[i] = method.getParameters().get(i).getRawType().getName();
+ parameterTypes[i] = method.getParameters().get(i).getJavaClass().getName();
}
}
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBClassImpl.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -248,7 +248,7 @@
*/
public Class<? extends T> getAnnotatedClass()
{
- return getRawType();
+ return getJavaClass();
}
/**
@@ -258,7 +258,7 @@
*/
public Class<T> getDelegate()
{
- return getRawType();
+ return getJavaClass();
}
/**
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/introspector/jlr/WBParameterImpl.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -145,7 +145,7 @@
buffer.append("static ");
if (_final)
buffer.append("final ");
- buffer.append(getRawType().getName());
+ buffer.append(getJavaClass().getName());
buffer.append(" for operation ");
buffer.append(getDeclaringMember().toString());
toString = buffer.toString();
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/AnnotationModel.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -81,7 +81,7 @@
*/
public Class<T> getRawType()
{
- return annotatedAnnotation.getRawType();
+ return annotatedAnnotation.getJavaClass();
}
/**
@@ -119,7 +119,7 @@
@Override
public String toString()
{
- return (isValid() ? "Valid" : "Invalid") + " annotation model for " + getRawType();
+ return (isValid() ? "Valid" : "Invalid") + " annotation model for " + getRawType();
}
-
+
}
\ No newline at end of file
Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java
===================================================================
--- ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/impl/src/main/java/org/jboss/webbeans/metadata/BindingTypeModel.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -69,7 +69,7 @@
{
for (WBMethod<?> annotatedMethod : getAnnotatedAnnotation().getMembers())
{
- if ((Reflections.isArrayType(annotatedMethod.getRawType()) || Annotation.class.isAssignableFrom(annotatedMethod.getRawType())) && !nonBindingTypes.contains(annotatedMethod))
+ if ((Reflections.isArrayType(annotatedMethod.getJavaClass()) || Annotation.class.isAssignableFrom(annotatedMethod.getJavaClass())) && !nonBindingTypes.contains(annotatedMethod))
{
throw new DefinitionException("Member of array type or annotation type must be annotated @NonBinding " + annotatedMethod);
}
Modified: ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java
===================================================================
--- ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-06-15 03:46:15 UTC (rev 2831)
+++ ri/trunk/tests/src/test/java/org/jboss/webbeans/test/unit/implementation/annotatedItem/ClassAnnotatedItemTest.java 2009-06-15 08:01:01 UTC (rev 2832)
@@ -27,7 +27,7 @@
WBClass<Order> annotatedElement = WBClassImpl.of(Order.class, transformer);
assert annotatedElement.getAnnotations().size() == 1;
assert annotatedElement.getAnnotation(Production.class) != null;
- assert annotatedElement.getRawType().equals(Order.class);
+ assert annotatedElement.getJavaClass().equals(Order.class);
}
@Test
More information about the weld-commits
mailing list