[webbeans-commits] Webbeans SVN: r245 - in ri/trunk/webbeans-ri/src: main/java/org/jboss/webbeans/introspector and 5 other directories.
webbeans-commits at lists.jboss.org
webbeans-commits at lists.jboss.org
Wed Nov 5 08:07:06 EST 2008
Author: pete.muir at jboss.org
Date: 2008-11-05 08:07:06 -0500 (Wed, 05 Nov 2008)
New Revision: 245
Added:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedMember.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedType.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedAnnotation.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedClass.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedField.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java
Removed:
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedMember.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedType.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedAnnotation.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedClass.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/SimpleAnnotatedItem.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java
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/InjectableMethod.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameter.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ResolverInjectable.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java
ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.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/ClassAnnotatedItemTest.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/DeploymentTypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypesTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeTest.java
ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
Log:
Move impl to it's own package
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-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableField.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -4,7 +4,7 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedField;
-import org.jboss.webbeans.introspector.SimpleAnnotatedField;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedField;
import org.jboss.webbeans.util.Reflections;
/**
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-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableMethod.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -7,7 +7,7 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedItem;
import org.jboss.webbeans.introspector.AnnotatedMethod;
-import org.jboss.webbeans.introspector.SimpleAnnotatedMethod;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedMethod;
public class InjectableMethod<T> extends Unit<T, Method>
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameter.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameter.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/InjectableParameter.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -3,7 +3,7 @@
import java.lang.annotation.Annotation;
import org.jboss.webbeans.bindings.CurrentAnnotationLiteral;
-import org.jboss.webbeans.introspector.SimpleAnnotatedItem;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedItem;
public class InjectableParameter<T> extends Injectable<T, Object>
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ResolverInjectable.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ResolverInjectable.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/ResolverInjectable.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -12,7 +12,7 @@
import org.jboss.webbeans.ModelManager;
import org.jboss.webbeans.bindings.CurrentAnnotationLiteral;
-import org.jboss.webbeans.introspector.SimpleAnnotatedItem;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedItem;
/**
* TODO Rename this to something which implies it only ever used for resolution
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/injectable/SimpleConstructor.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -6,7 +6,7 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.introspector.AnnotatedConstructor;
import org.jboss.webbeans.introspector.AnnotatedItem;
-import org.jboss.webbeans.introspector.SimpleAnnotatedConstructor;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedConstructor;
import org.jboss.webbeans.util.LoggerUtil;
public class SimpleConstructor<T> extends Unit<T, Constructor<T>> implements BeanConstructor<T>
Deleted: 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-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -1,166 +0,0 @@
-package org.jboss.webbeans.introspector;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.AnnotatedElement;
-import java.lang.reflect.Type;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.Map.Entry;
-
-import org.jboss.webbeans.exceptions.TypesafeResolutionLocation;
-import org.jboss.webbeans.util.Reflections;
-
-public abstract class AbstractAnnotatedItem<T, S> implements AnnotatedItem<T, S>
-{
-
- private Map<Class<? extends Annotation>, Annotation> annotationMap;
- private Map<Class<? extends Annotation>, Set<Annotation>> metaAnnotationMap;
- private Set<Annotation> annotationSet;
- private Annotation[] annotationArray;
-
- public AbstractAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap)
- {
- if (annotationMap == null)
- {
- throw new NullPointerException("annotationMap cannot be null");
- }
- this.annotationMap = annotationMap;
- }
-
- protected static Map<Class<? extends Annotation>, Annotation> buildAnnotationMap(AnnotatedElement element)
- {
- return buildAnnotationMap(element.getAnnotations());
- }
-
- protected static Map<Class<? extends Annotation>, Annotation> buildAnnotationMap(Annotation[] annotations)
- {
- Map<Class<? extends Annotation>, Annotation> annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
- for (Annotation annotation : annotations)
- {
- annotationMap.put(annotation.annotationType(), annotation);
- }
- return annotationMap;
- }
-
- protected static Set<Annotation> populateAnnotationSet(Set<Annotation> annotationSet, Map<Class<? extends Annotation>, Annotation> annotationMap)
- {
- for (Entry<Class<? extends Annotation>, Annotation> entry : annotationMap.entrySet())
- {
- annotationSet.add(entry.getValue());
- }
- return annotationSet;
- }
-
- public <A extends Annotation> A getAnnotation(Class<? extends A> annotationType)
- {
- return (A) annotationMap.get(annotationType);
- }
-
- public Set<Annotation> getAnnotations(Class<? extends Annotation> metaAnnotationType)
- {
- if (metaAnnotationMap == null)
- {
- metaAnnotationMap = new HashMap<Class<? extends Annotation>, Set<Annotation>>();
- }
- metaAnnotationMap = populateMetaAnnotationMap(metaAnnotationType, metaAnnotationMap, annotationMap);
- return metaAnnotationMap.get(metaAnnotationType);
- }
-
- public Annotation[] getAnnotationsAsArray(Class<? extends Annotation> metaAnnotationType)
- {
- if (annotationArray == null)
- {
- annotationArray = new Annotation[0];
- annotationArray = getAnnotations(metaAnnotationType).toArray(annotationArray);
- }
- return annotationArray;
- }
-
- public Set<Annotation> getAnnotations()
- {
- if (annotationSet == null)
- {
- annotationSet = populateAnnotationSet(new HashSet<Annotation>(), annotationMap);
- }
- return annotationSet;
- }
-
- public boolean isAnnotationPresent(Class<? extends Annotation> annotatedType)
- {
- return annotationMap.containsKey(annotatedType);
- }
-
- protected static <A extends Annotation> Map<Class<? extends Annotation>, Set<Annotation>> populateMetaAnnotationMap(
- Class<A> metaAnnotationType, Map<Class<? extends Annotation>,
- Set<Annotation>> metaAnnotationMap,
- Map<Class<? extends Annotation>, Annotation> annotationMap)
- {
- if (!metaAnnotationMap.containsKey(metaAnnotationType))
- {
- Set<Annotation> s = new HashSet<Annotation>();
- for (Entry<Class<? extends Annotation>, Annotation> entry : annotationMap.entrySet())
- {
- if (entry.getValue().annotationType().isAnnotationPresent(metaAnnotationType))
- {
- s.add(entry.getValue());
- }
- }
- metaAnnotationMap.put(metaAnnotationType, s);
- }
- return metaAnnotationMap;
- }
-
- protected Map<Class<? extends Annotation>, Annotation> getAnnotationMap()
- {
- return annotationMap;
- }
-
- @Override
- public boolean equals(Object other)
- {
- if (other instanceof AnnotatedItem)
- {
- AnnotatedItem<?, ?> that = (AnnotatedItem<?, ?>) other;
- return this.getAnnotations().equals(that.getAnnotations()) && this.getType().equals(that.getType());
- }
- return false;
- }
-
- public boolean isAssignableFrom(AnnotatedItem<?, ?> that)
- {
- return isAssignableFrom(that.getType(), that.getActualTypeArguments());
- }
-
- public boolean isAssignableFrom(Set<Class<?>> types)
- {
- for (Class<?> type : types)
- {
- if (isAssignableFrom(type, Reflections.getActualTypeArguments(type)))
- {
- return true;
- }
- }
- return false;
- }
-
- private boolean isAssignableFrom(Class<?> type, Type[] actualTypeArguments)
- {
- return getType().isAssignableFrom(type) && Arrays.equals(getActualTypeArguments(), actualTypeArguments);
- }
-
- @Override
- public int hashCode()
- {
- return getType().hashCode();
- }
-
- @Override
- public String toString()
- {
- return TypesafeResolutionLocation.createMessage(getType(), getActualTypeArguments(), getAnnotations());
- }
-
-}
\ No newline at end of file
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedMember.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedMember.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedMember.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -1,27 +0,0 @@
-package org.jboss.webbeans.introspector;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Member;
-import java.util.Map;
-
-import org.jboss.webbeans.util.Reflections;
-
-public abstract class AbstractAnnotatedMember<T, S extends Member> extends AbstractAnnotatedItem<T, S>
-{
-
- public AbstractAnnotatedMember(Map<Class<? extends Annotation>, Annotation> annotationMap)
- {
- super(annotationMap);
- }
-
- public boolean isStatic()
- {
- return Reflections.isStatic(getDelegate());
- }
-
- public boolean isFinal()
- {
- return Reflections.isFinal(getDelegate());
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedType.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedType.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedType.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -1,26 +0,0 @@
-package org.jboss.webbeans.introspector;
-
-import java.lang.annotation.Annotation;
-import java.util.Map;
-
-import org.jboss.webbeans.util.Reflections;
-
-public abstract class AbstractAnnotatedType<T> extends AbstractAnnotatedItem<T, Class<T>>
-{
-
- public AbstractAnnotatedType(Map<Class<? extends Annotation>, Annotation> annotationMap)
- {
- super(annotationMap);
- }
-
- public boolean isStatic()
- {
- return Reflections.isStatic(getDelegate());
- }
-
- public boolean isFinal()
- {
- return Reflections.isFinal(getDelegate());
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedAnnotation.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedAnnotation.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedAnnotation.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -1,96 +0,0 @@
-package org.jboss.webbeans.introspector;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-public class SimpleAnnotatedAnnotation<T extends Annotation> extends AbstractAnnotatedType<T> implements AnnotatedAnnotation<T>
-{
-
- private Map<Class<? extends Annotation>, Set<AnnotatedMethod<?>>> annotatedMembers;
-
- private Class<T> clazz;
-
- private Set<AnnotatedMethod<?>> members;
-
- public SimpleAnnotatedAnnotation(Class<T> annotationType)
- {
- super(buildAnnotationMap(annotationType));
- this.clazz = annotationType;
- }
-
- public Type[] getActualTypeArguments()
- {
- return new Type[0];
- }
-
- public Set<AnnotatedMethod<?>> getMembers()
- {
- if (members == null)
- {
- initMembers();
- }
- return members;
- }
-
- public Class<T> getDelegate()
- {
- return clazz;
- }
-
- public Class<? extends T> getType()
- {
- return clazz;
- }
-
- private void initMembers()
- {
- this.members = new HashSet<AnnotatedMethod<?>>();
- for (Method member : clazz.getDeclaredMethods())
- {
- members.add(new SimpleAnnotatedMethod<Object>(member));
- }
- }
-
- public Set<AnnotatedMethod<?>> getAnnotatedMembers(Class<? extends Annotation> annotationType)
- {
- if (annotatedMembers == null)
- {
- initAnnotatedMembers();
- }
-
- if (!annotatedMembers.containsKey(annotationType))
- {
- return new HashSet<AnnotatedMethod<?>>();
- }
- else
- {
- return annotatedMembers.get(annotationType);
- }
- }
-
- private void initAnnotatedMembers()
- {
- if (members == null)
- {
- initMembers();
- }
- annotatedMembers = new HashMap<Class<? extends Annotation>, Set<AnnotatedMethod<?>>>();
- for (AnnotatedMethod<?> member : members)
- {
- for (Annotation annotation : member.getAnnotations())
- {
- if (!annotatedMembers.containsKey(annotation))
- {
- annotatedMembers.put(annotation.annotationType(), new HashSet<AnnotatedMethod<?>>());
- }
- annotatedMembers.get(annotation.annotationType()).add(member);
- }
- }
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedClass.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedClass.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedClass.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -1,201 +0,0 @@
-package org.jboss.webbeans.introspector;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
-/**
- * Base class for implementing AnnotatedItem. This implementation assumes
- * the annotationMap is immutable.
- *
- * @author pmuir
- *
- */
-public class SimpleAnnotatedClass<T> extends AbstractAnnotatedType<T> implements AnnotatedClass<T>
-{
-
- private Class<T> clazz;
- private Type[] actualTypeArguments;
- private Set<AnnotatedField<Object>> fields;
- private Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> annotatedFields;
- private Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> metaAnnotatedFields;
-
- private Set<AnnotatedMethod<Object>> methods;
- private Map<Class<? extends Annotation>, Set<AnnotatedMethod<Object>>> annotatedMethods;
-
- public SimpleAnnotatedClass(Class<T> annotatedClass, Map<Class<? extends Annotation>, Annotation> annotationMap)
- {
- super(annotationMap);
- this.clazz = annotatedClass;
- if (this.clazz.getGenericSuperclass() instanceof ParameterizedType)
- {
- ParameterizedType type = (ParameterizedType) this.clazz.getGenericSuperclass();
- actualTypeArguments = type.getActualTypeArguments();
- }
- else
- {
- actualTypeArguments = new Type[0];
- }
- }
-
- public SimpleAnnotatedClass(Class<T> annotatedClass)
- {
- this(annotatedClass, buildAnnotationMap(annotatedClass));
- }
-
- public Class<? extends T> getAnnotatedClass()
- {
- return clazz;
- }
-
- public Class<T> getDelegate()
- {
- return clazz;
- }
-
- public Set<AnnotatedField<Object>> getFields()
- {
- if (fields == null)
- {
- initFields();
- }
- return fields;
- }
-
- private void initFields()
- {
- this.fields = new HashSet<AnnotatedField<Object>>();
- for(Field field : clazz.getFields())
- {
- fields.add(new SimpleAnnotatedField<Object>(field));
- }
- }
-
- public Set<AnnotatedField<Object>> getMetaAnnotatedFields(
- Class<? extends Annotation> metaAnnotationType)
- {
- if (metaAnnotatedFields == null)
- {
- metaAnnotatedFields = new HashMap<Class<? extends Annotation>, Set<AnnotatedField<Object>>>();
- }
- if (annotatedFields == null)
- {
- initAnnotatedFields();
- }
- populateMetaAnnotatedFieldMap(metaAnnotationType, annotatedFields, metaAnnotatedFields);
- return metaAnnotatedFields.get(metaAnnotationType);
- }
-
- protected static <T extends Annotation> Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> populateMetaAnnotatedFieldMap(
- Class<T> metaAnnotationType,
- Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> annotatedFields,
- Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> metaAnnotatedFields)
- {
- if (!metaAnnotatedFields.containsKey(metaAnnotationType))
- {
- Set<AnnotatedField<Object>> s = new HashSet<AnnotatedField<Object>>();
- for (Class<? extends Annotation> annotationType: annotatedFields.keySet())
- {
- if (annotationType.isAnnotationPresent(metaAnnotationType))
- {
- s.addAll(annotatedFields.get(annotationType));
- }
- }
- metaAnnotatedFields.put(metaAnnotationType, s);
- }
- return metaAnnotatedFields;
- }
-
- public Set<AnnotatedField<Object>> getAnnotatedFields(
- Class<? extends Annotation> annotationType)
- {
- if (annotatedFields == null)
- {
- initAnnotatedFields();
- }
- return annotatedFields.get(annotationType);
- }
-
- private void initAnnotatedFields()
- {
- if (fields == null)
- {
- initFields();
- }
- annotatedFields = new HashMap<Class<? extends Annotation>, Set<AnnotatedField<Object>>>();
- for (AnnotatedField<Object> field : fields)
- {
- for (Annotation annotation : field.getAnnotations())
- {
- if (!annotatedFields.containsKey(annotation))
- {
- annotatedFields.put(annotation.annotationType(), new HashSet<AnnotatedField<Object>>());
- }
- annotatedFields.get(annotation.annotationType()).add(field);
- }
- }
- }
-
- public Class<T> getType()
- {
- return clazz;
- }
-
- public Type[] getActualTypeArguments()
- {
- return actualTypeArguments;
- }
-
- private void initMethods()
- {
- this.methods = new HashSet<AnnotatedMethod<Object>>();
- for (Method member : clazz.getDeclaredMethods())
- {
- methods.add(new SimpleAnnotatedMethod<Object>(member));
- }
- }
-
- public Set<AnnotatedMethod<Object>> getAnnotatedMethods(Class<? extends Annotation> annotationType)
- {
- if (annotatedMethods == null)
- {
- initAnnotatedMethods();
- }
-
- if (!annotatedMethods.containsKey(annotationType))
- {
- return new HashSet<AnnotatedMethod<Object>>();
- }
- else
- {
- return annotatedMethods.get(annotationType);
- }
- }
-
- private void initAnnotatedMethods()
- {
- if (methods == null)
- {
- initMethods();
- }
- annotatedMethods = new HashMap<Class<? extends Annotation>, Set<AnnotatedMethod<Object>>>();
- for (AnnotatedMethod<Object> member : methods)
- {
- for (Annotation annotation : member.getAnnotations())
- {
- if (!annotatedMethods.containsKey(annotation))
- {
- annotatedMethods.put(annotation.annotationType(), new HashSet<AnnotatedMethod<Object>>());
- }
- annotatedMethods.get(annotation.annotationType()).add(member);
- }
- }
- }
-
-}
\ No newline at end of file
Deleted: 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-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -1,39 +0,0 @@
-package org.jboss.webbeans.introspector;
-
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Type;
-
-public class SimpleAnnotatedConstructor<T> extends AbstractAnnotatedMember<T, Constructor<T>> implements AnnotatedConstructor<T>
-{
-
- private static final Type[] actualTypeArguments = new Type[0];
-
- private Constructor<T> constructor;
-
- public SimpleAnnotatedConstructor(Constructor<T> constructor)
- {
- super(buildAnnotationMap(constructor));
- this.constructor = constructor;
- }
-
- public Constructor<T> getAnnotatedConstructor()
- {
- return constructor;
- }
-
- public Constructor<T> getDelegate()
- {
- return constructor;
- }
-
- public Class<T> getType()
- {
- return constructor.getDeclaringClass();
- }
-
- public Type[] getActualTypeArguments()
- {
- return actualTypeArguments;
- }
-
-}
Deleted: 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-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -1,45 +0,0 @@
-package org.jboss.webbeans.introspector;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-
-public class SimpleAnnotatedField<T> extends AbstractAnnotatedMember<T, Field> implements AnnotatedField<T>
-{
-
- private Type[] actualTypeArguments = new Type[0];
-
- private Field field;
-
- public SimpleAnnotatedField(Field field)
- {
- super(buildAnnotationMap(field));
- this.field = field;
- if (field.getGenericType() instanceof ParameterizedType)
- {
- ParameterizedType type = (ParameterizedType) field.getGenericType();
- actualTypeArguments = type.getActualTypeArguments();
- }
- }
-
- public Field getAnnotatedField()
- {
- return field;
- }
-
- public Field getDelegate()
- {
- return field;
- }
-
- public Class<T> getType()
- {
- return (Class<T>) field.getType();
- }
-
- public Type[] getActualTypeArguments()
- {
- return actualTypeArguments;
- }
-
-}
Deleted: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -1,98 +0,0 @@
-package org.jboss.webbeans.introspector;
-
-import java.lang.annotation.Annotation;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
-import java.util.Map;
-
-import javax.webbeans.TypeLiteral;
-
-public class SimpleAnnotatedItem<T, S> extends AbstractAnnotatedItem<T, S>
-{
-
- private Type[] actualTypeArguments = new Type[0];
- private Class<? extends T> type;
- private Annotation[] actualAnnotations;
-
- private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap)
- {
- super(annotationMap);
- }
-
- private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends T> type)
- {
- super(annotationMap);
- this.type = type;
- }
-
- private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, TypeLiteral<? extends T> apiType)
- {
- super(annotationMap);
- this.type = apiType.getRawType();
- if (apiType.getType() instanceof ParameterizedType)
- {
- actualTypeArguments = ((ParameterizedType) apiType.getType()).getActualTypeArguments();
- }
- }
-
- private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends T> type, Type[] actualTypeArguments)
- {
- this(annotationMap, type);
- this.actualTypeArguments = actualTypeArguments;
- }
-
- public SimpleAnnotatedItem(Annotation[] annotations)
- {
- this(buildAnnotationMap(annotations));
- this.actualAnnotations = annotations;
- }
-
- public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends T> type)
- {
- this(buildAnnotationMap(annotations), type);
- this.actualAnnotations = annotations;
- }
-
- public SimpleAnnotatedItem(Annotation[] annotations, TypeLiteral<? extends T> apiType)
- {
- this(buildAnnotationMap(annotations), apiType);
- this.actualAnnotations = annotations;
- }
-
- public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends T> type, Type[] actualTypeArguments)
- {
- this(buildAnnotationMap(annotations), type, actualTypeArguments);
- this.actualAnnotations = annotations;
- }
-
- public S getDelegate()
- {
- return null;
- }
-
- public Class<? extends T> getType()
- {
- return type;
- }
-
- public Type[] getActualTypeArguments()
- {
- return actualTypeArguments;
- }
-
- public Annotation[] getActualAnnotations()
- {
- return actualAnnotations;
- }
-
- public boolean isStatic()
- {
- return false;
- }
-
- public boolean isFinal()
- {
- return false;
- }
-
-}
Deleted: 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-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -1,39 +0,0 @@
-package org.jboss.webbeans.introspector;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Type;
-
-public class SimpleAnnotatedMethod<T> extends AbstractAnnotatedMember<T, Method> implements AnnotatedMethod<T>
-{
-
- private static final Type[] actualTypeArgements = new Type[0];
-
- private Method method;
-
- public SimpleAnnotatedMethod(Method method)
- {
- super(buildAnnotationMap(method));
- this.method = method;
- }
-
- public Method getAnnotatedMethod()
- {
- return method;
- }
-
- public Method getDelegate()
- {
- return method;
- }
-
- public Class<T> getType()
- {
- return (Class<T>) method.getReturnType();
- }
-
- public Type[] getActualTypeArguments()
- {
- return actualTypeArgements;
- }
-
-}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedItem.java (from rev 242, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedItem.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedItem.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedItem.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -0,0 +1,167 @@
+package org.jboss.webbeans.introspector.impl;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.AnnotatedElement;
+import java.lang.reflect.Type;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.Map.Entry;
+
+import org.jboss.webbeans.exceptions.TypesafeResolutionLocation;
+import org.jboss.webbeans.introspector.AnnotatedItem;
+import org.jboss.webbeans.util.Reflections;
+
+public abstract class AbstractAnnotatedItem<T, S> implements AnnotatedItem<T, S>
+{
+
+ private Map<Class<? extends Annotation>, Annotation> annotationMap;
+ private Map<Class<? extends Annotation>, Set<Annotation>> metaAnnotationMap;
+ private Set<Annotation> annotationSet;
+ private Annotation[] annotationArray;
+
+ public AbstractAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap)
+ {
+ if (annotationMap == null)
+ {
+ throw new NullPointerException("annotationMap cannot be null");
+ }
+ this.annotationMap = annotationMap;
+ }
+
+ protected static Map<Class<? extends Annotation>, Annotation> buildAnnotationMap(AnnotatedElement element)
+ {
+ return buildAnnotationMap(element.getAnnotations());
+ }
+
+ protected static Map<Class<? extends Annotation>, Annotation> buildAnnotationMap(Annotation[] annotations)
+ {
+ Map<Class<? extends Annotation>, Annotation> annotationMap = new HashMap<Class<? extends Annotation>, Annotation>();
+ for (Annotation annotation : annotations)
+ {
+ annotationMap.put(annotation.annotationType(), annotation);
+ }
+ return annotationMap;
+ }
+
+ protected static Set<Annotation> populateAnnotationSet(Set<Annotation> annotationSet, Map<Class<? extends Annotation>, Annotation> annotationMap)
+ {
+ for (Entry<Class<? extends Annotation>, Annotation> entry : annotationMap.entrySet())
+ {
+ annotationSet.add(entry.getValue());
+ }
+ return annotationSet;
+ }
+
+ public <A extends Annotation> A getAnnotation(Class<? extends A> annotationType)
+ {
+ return (A) annotationMap.get(annotationType);
+ }
+
+ public Set<Annotation> getAnnotations(Class<? extends Annotation> metaAnnotationType)
+ {
+ if (metaAnnotationMap == null)
+ {
+ metaAnnotationMap = new HashMap<Class<? extends Annotation>, Set<Annotation>>();
+ }
+ metaAnnotationMap = populateMetaAnnotationMap(metaAnnotationType, metaAnnotationMap, annotationMap);
+ return metaAnnotationMap.get(metaAnnotationType);
+ }
+
+ public Annotation[] getAnnotationsAsArray(Class<? extends Annotation> metaAnnotationType)
+ {
+ if (annotationArray == null)
+ {
+ annotationArray = new Annotation[0];
+ annotationArray = getAnnotations(metaAnnotationType).toArray(annotationArray);
+ }
+ return annotationArray;
+ }
+
+ public Set<Annotation> getAnnotations()
+ {
+ if (annotationSet == null)
+ {
+ annotationSet = populateAnnotationSet(new HashSet<Annotation>(), annotationMap);
+ }
+ return annotationSet;
+ }
+
+ public boolean isAnnotationPresent(Class<? extends Annotation> annotatedType)
+ {
+ return annotationMap.containsKey(annotatedType);
+ }
+
+ protected static <A extends Annotation> Map<Class<? extends Annotation>, Set<Annotation>> populateMetaAnnotationMap(
+ Class<A> metaAnnotationType, Map<Class<? extends Annotation>,
+ Set<Annotation>> metaAnnotationMap,
+ Map<Class<? extends Annotation>, Annotation> annotationMap)
+ {
+ if (!metaAnnotationMap.containsKey(metaAnnotationType))
+ {
+ Set<Annotation> s = new HashSet<Annotation>();
+ for (Entry<Class<? extends Annotation>, Annotation> entry : annotationMap.entrySet())
+ {
+ if (entry.getValue().annotationType().isAnnotationPresent(metaAnnotationType))
+ {
+ s.add(entry.getValue());
+ }
+ }
+ metaAnnotationMap.put(metaAnnotationType, s);
+ }
+ return metaAnnotationMap;
+ }
+
+ protected Map<Class<? extends Annotation>, Annotation> getAnnotationMap()
+ {
+ return annotationMap;
+ }
+
+ @Override
+ public boolean equals(Object other)
+ {
+ if (other instanceof AnnotatedItem)
+ {
+ AnnotatedItem<?, ?> that = (AnnotatedItem<?, ?>) other;
+ return this.getAnnotations().equals(that.getAnnotations()) && this.getType().equals(that.getType());
+ }
+ return false;
+ }
+
+ public boolean isAssignableFrom(AnnotatedItem<?, ?> that)
+ {
+ return isAssignableFrom(that.getType(), that.getActualTypeArguments());
+ }
+
+ public boolean isAssignableFrom(Set<Class<?>> types)
+ {
+ for (Class<?> type : types)
+ {
+ if (isAssignableFrom(type, Reflections.getActualTypeArguments(type)))
+ {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private boolean isAssignableFrom(Class<?> type, Type[] actualTypeArguments)
+ {
+ return getType().isAssignableFrom(type) && Arrays.equals(getActualTypeArguments(), actualTypeArguments);
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return getType().hashCode();
+ }
+
+ @Override
+ public String toString()
+ {
+ return TypesafeResolutionLocation.createMessage(getType(), getActualTypeArguments(), getAnnotations());
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedItem.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedMember.java (from rev 244, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedMember.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedMember.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedMember.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -0,0 +1,27 @@
+package org.jboss.webbeans.introspector.impl;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Member;
+import java.util.Map;
+
+import org.jboss.webbeans.util.Reflections;
+
+public abstract class AbstractAnnotatedMember<T, S extends Member> extends AbstractAnnotatedItem<T, S>
+{
+
+ public AbstractAnnotatedMember(Map<Class<? extends Annotation>, Annotation> annotationMap)
+ {
+ super(annotationMap);
+ }
+
+ public boolean isStatic()
+ {
+ return Reflections.isStatic(getDelegate());
+ }
+
+ public boolean isFinal()
+ {
+ return Reflections.isFinal(getDelegate());
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedMember.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedType.java (from rev 244, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AbstractAnnotatedType.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedType.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedType.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -0,0 +1,26 @@
+package org.jboss.webbeans.introspector.impl;
+
+import java.lang.annotation.Annotation;
+import java.util.Map;
+
+import org.jboss.webbeans.util.Reflections;
+
+public abstract class AbstractAnnotatedType<T> extends AbstractAnnotatedItem<T, Class<T>>
+{
+
+ public AbstractAnnotatedType(Map<Class<? extends Annotation>, Annotation> annotationMap)
+ {
+ super(annotationMap);
+ }
+
+ public boolean isStatic()
+ {
+ return Reflections.isStatic(getDelegate());
+ }
+
+ public boolean isFinal()
+ {
+ return Reflections.isFinal(getDelegate());
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/AbstractAnnotatedType.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedAnnotation.java (from rev 244, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedAnnotation.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedAnnotation.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedAnnotation.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -0,0 +1,99 @@
+package org.jboss.webbeans.introspector.impl;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.webbeans.introspector.AnnotatedAnnotation;
+import org.jboss.webbeans.introspector.AnnotatedMethod;
+
+public class SimpleAnnotatedAnnotation<T extends Annotation> extends AbstractAnnotatedType<T> implements AnnotatedAnnotation<T>
+{
+
+ private Map<Class<? extends Annotation>, Set<AnnotatedMethod<?>>> annotatedMembers;
+
+ private Class<T> clazz;
+
+ private Set<AnnotatedMethod<?>> members;
+
+ public SimpleAnnotatedAnnotation(Class<T> annotationType)
+ {
+ super(buildAnnotationMap(annotationType));
+ this.clazz = annotationType;
+ }
+
+ public Type[] getActualTypeArguments()
+ {
+ return new Type[0];
+ }
+
+ public Set<AnnotatedMethod<?>> getMembers()
+ {
+ if (members == null)
+ {
+ initMembers();
+ }
+ return members;
+ }
+
+ public Class<T> getDelegate()
+ {
+ return clazz;
+ }
+
+ public Class<? extends T> getType()
+ {
+ return clazz;
+ }
+
+ private void initMembers()
+ {
+ this.members = new HashSet<AnnotatedMethod<?>>();
+ for (Method member : clazz.getDeclaredMethods())
+ {
+ members.add(new SimpleAnnotatedMethod<Object>(member));
+ }
+ }
+
+ public Set<AnnotatedMethod<?>> getAnnotatedMembers(Class<? extends Annotation> annotationType)
+ {
+ if (annotatedMembers == null)
+ {
+ initAnnotatedMembers();
+ }
+
+ if (!annotatedMembers.containsKey(annotationType))
+ {
+ return new HashSet<AnnotatedMethod<?>>();
+ }
+ else
+ {
+ return annotatedMembers.get(annotationType);
+ }
+ }
+
+ private void initAnnotatedMembers()
+ {
+ if (members == null)
+ {
+ initMembers();
+ }
+ annotatedMembers = new HashMap<Class<? extends Annotation>, Set<AnnotatedMethod<?>>>();
+ for (AnnotatedMethod<?> member : members)
+ {
+ for (Annotation annotation : member.getAnnotations())
+ {
+ if (!annotatedMembers.containsKey(annotation))
+ {
+ annotatedMembers.put(annotation.annotationType(), new HashSet<AnnotatedMethod<?>>());
+ }
+ annotatedMembers.get(annotation.annotationType()).add(member);
+ }
+ }
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedAnnotation.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedClass.java (from rev 244, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedClass.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedClass.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedClass.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -0,0 +1,205 @@
+package org.jboss.webbeans.introspector.impl;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import org.jboss.webbeans.introspector.AnnotatedClass;
+import org.jboss.webbeans.introspector.AnnotatedField;
+import org.jboss.webbeans.introspector.AnnotatedMethod;
+
+/**
+ * Base class for implementing AnnotatedItem. This implementation assumes
+ * the annotationMap is immutable.
+ *
+ * @author pmuir
+ *
+ */
+public class SimpleAnnotatedClass<T> extends AbstractAnnotatedType<T> implements AnnotatedClass<T>
+{
+
+ private Class<T> clazz;
+ private Type[] actualTypeArguments;
+ private Set<AnnotatedField<Object>> fields;
+ private Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> annotatedFields;
+ private Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> metaAnnotatedFields;
+
+ private Set<AnnotatedMethod<Object>> methods;
+ private Map<Class<? extends Annotation>, Set<AnnotatedMethod<Object>>> annotatedMethods;
+
+ public SimpleAnnotatedClass(Class<T> annotatedClass, Map<Class<? extends Annotation>, Annotation> annotationMap)
+ {
+ super(annotationMap);
+ this.clazz = annotatedClass;
+ if (this.clazz.getGenericSuperclass() instanceof ParameterizedType)
+ {
+ ParameterizedType type = (ParameterizedType) this.clazz.getGenericSuperclass();
+ actualTypeArguments = type.getActualTypeArguments();
+ }
+ else
+ {
+ actualTypeArguments = new Type[0];
+ }
+ }
+
+ public SimpleAnnotatedClass(Class<T> annotatedClass)
+ {
+ this(annotatedClass, buildAnnotationMap(annotatedClass));
+ }
+
+ public Class<? extends T> getAnnotatedClass()
+ {
+ return clazz;
+ }
+
+ public Class<T> getDelegate()
+ {
+ return clazz;
+ }
+
+ public Set<AnnotatedField<Object>> getFields()
+ {
+ if (fields == null)
+ {
+ initFields();
+ }
+ return fields;
+ }
+
+ private void initFields()
+ {
+ this.fields = new HashSet<AnnotatedField<Object>>();
+ for(Field field : clazz.getFields())
+ {
+ fields.add(new SimpleAnnotatedField<Object>(field));
+ }
+ }
+
+ public Set<AnnotatedField<Object>> getMetaAnnotatedFields(
+ Class<? extends Annotation> metaAnnotationType)
+ {
+ if (metaAnnotatedFields == null)
+ {
+ metaAnnotatedFields = new HashMap<Class<? extends Annotation>, Set<AnnotatedField<Object>>>();
+ }
+ if (annotatedFields == null)
+ {
+ initAnnotatedFields();
+ }
+ populateMetaAnnotatedFieldMap(metaAnnotationType, annotatedFields, metaAnnotatedFields);
+ return metaAnnotatedFields.get(metaAnnotationType);
+ }
+
+ protected static <T extends Annotation> Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> populateMetaAnnotatedFieldMap(
+ Class<T> metaAnnotationType,
+ Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> annotatedFields,
+ Map<Class<? extends Annotation>, Set<AnnotatedField<Object>>> metaAnnotatedFields)
+ {
+ if (!metaAnnotatedFields.containsKey(metaAnnotationType))
+ {
+ Set<AnnotatedField<Object>> s = new HashSet<AnnotatedField<Object>>();
+ for (Class<? extends Annotation> annotationType: annotatedFields.keySet())
+ {
+ if (annotationType.isAnnotationPresent(metaAnnotationType))
+ {
+ s.addAll(annotatedFields.get(annotationType));
+ }
+ }
+ metaAnnotatedFields.put(metaAnnotationType, s);
+ }
+ return metaAnnotatedFields;
+ }
+
+ public Set<AnnotatedField<Object>> getAnnotatedFields(
+ Class<? extends Annotation> annotationType)
+ {
+ if (annotatedFields == null)
+ {
+ initAnnotatedFields();
+ }
+ return annotatedFields.get(annotationType);
+ }
+
+ private void initAnnotatedFields()
+ {
+ if (fields == null)
+ {
+ initFields();
+ }
+ annotatedFields = new HashMap<Class<? extends Annotation>, Set<AnnotatedField<Object>>>();
+ for (AnnotatedField<Object> field : fields)
+ {
+ for (Annotation annotation : field.getAnnotations())
+ {
+ if (!annotatedFields.containsKey(annotation))
+ {
+ annotatedFields.put(annotation.annotationType(), new HashSet<AnnotatedField<Object>>());
+ }
+ annotatedFields.get(annotation.annotationType()).add(field);
+ }
+ }
+ }
+
+ public Class<T> getType()
+ {
+ return clazz;
+ }
+
+ public Type[] getActualTypeArguments()
+ {
+ return actualTypeArguments;
+ }
+
+ private void initMethods()
+ {
+ this.methods = new HashSet<AnnotatedMethod<Object>>();
+ for (Method member : clazz.getDeclaredMethods())
+ {
+ methods.add(new SimpleAnnotatedMethod<Object>(member));
+ }
+ }
+
+ public Set<AnnotatedMethod<Object>> getAnnotatedMethods(Class<? extends Annotation> annotationType)
+ {
+ if (annotatedMethods == null)
+ {
+ initAnnotatedMethods();
+ }
+
+ if (!annotatedMethods.containsKey(annotationType))
+ {
+ return new HashSet<AnnotatedMethod<Object>>();
+ }
+ else
+ {
+ return annotatedMethods.get(annotationType);
+ }
+ }
+
+ private void initAnnotatedMethods()
+ {
+ if (methods == null)
+ {
+ initMethods();
+ }
+ annotatedMethods = new HashMap<Class<? extends Annotation>, Set<AnnotatedMethod<Object>>>();
+ for (AnnotatedMethod<Object> member : methods)
+ {
+ for (Annotation annotation : member.getAnnotations())
+ {
+ if (!annotatedMethods.containsKey(annotation))
+ {
+ annotatedMethods.put(annotation.annotationType(), new HashSet<AnnotatedMethod<Object>>());
+ }
+ annotatedMethods.get(annotation.annotationType()).add(member);
+ }
+ }
+ }
+
+}
\ No newline at end of file
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedClass.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java (from rev 244, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedConstructor.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -0,0 +1,41 @@
+package org.jboss.webbeans.introspector.impl;
+
+import java.lang.reflect.Constructor;
+import java.lang.reflect.Type;
+
+import org.jboss.webbeans.introspector.AnnotatedConstructor;
+
+public class SimpleAnnotatedConstructor<T> extends AbstractAnnotatedMember<T, Constructor<T>> implements AnnotatedConstructor<T>
+{
+
+ private static final Type[] actualTypeArguments = new Type[0];
+
+ private Constructor<T> constructor;
+
+ public SimpleAnnotatedConstructor(Constructor<T> constructor)
+ {
+ super(buildAnnotationMap(constructor));
+ this.constructor = constructor;
+ }
+
+ public Constructor<T> getAnnotatedConstructor()
+ {
+ return constructor;
+ }
+
+ public Constructor<T> getDelegate()
+ {
+ return constructor;
+ }
+
+ public Class<T> getType()
+ {
+ return constructor.getDeclaringClass();
+ }
+
+ public Type[] getActualTypeArguments()
+ {
+ return actualTypeArguments;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedConstructor.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedField.java (from rev 244, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedField.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedField.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedField.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -0,0 +1,47 @@
+package org.jboss.webbeans.introspector.impl;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+
+import org.jboss.webbeans.introspector.AnnotatedField;
+
+public class SimpleAnnotatedField<T> extends AbstractAnnotatedMember<T, Field> implements AnnotatedField<T>
+{
+
+ private Type[] actualTypeArguments = new Type[0];
+
+ private Field field;
+
+ public SimpleAnnotatedField(Field field)
+ {
+ super(buildAnnotationMap(field));
+ this.field = field;
+ if (field.getGenericType() instanceof ParameterizedType)
+ {
+ ParameterizedType type = (ParameterizedType) field.getGenericType();
+ actualTypeArguments = type.getActualTypeArguments();
+ }
+ }
+
+ public Field getAnnotatedField()
+ {
+ return field;
+ }
+
+ public Field getDelegate()
+ {
+ return field;
+ }
+
+ public Class<T> getType()
+ {
+ return (Class<T>) field.getType();
+ }
+
+ public Type[] getActualTypeArguments()
+ {
+ return actualTypeArguments;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedField.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedItem.java (from rev 244, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedItem.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedItem.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedItem.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -0,0 +1,98 @@
+package org.jboss.webbeans.introspector.impl;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Map;
+
+import javax.webbeans.TypeLiteral;
+
+public class SimpleAnnotatedItem<T, S> extends AbstractAnnotatedItem<T, S>
+{
+
+ private Type[] actualTypeArguments = new Type[0];
+ private Class<? extends T> type;
+ private Annotation[] actualAnnotations;
+
+ private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap)
+ {
+ super(annotationMap);
+ }
+
+ private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends T> type)
+ {
+ super(annotationMap);
+ this.type = type;
+ }
+
+ private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, TypeLiteral<? extends T> apiType)
+ {
+ super(annotationMap);
+ this.type = apiType.getRawType();
+ if (apiType.getType() instanceof ParameterizedType)
+ {
+ actualTypeArguments = ((ParameterizedType) apiType.getType()).getActualTypeArguments();
+ }
+ }
+
+ private SimpleAnnotatedItem(Map<Class<? extends Annotation>, Annotation> annotationMap, Class<? extends T> type, Type[] actualTypeArguments)
+ {
+ this(annotationMap, type);
+ this.actualTypeArguments = actualTypeArguments;
+ }
+
+ public SimpleAnnotatedItem(Annotation[] annotations)
+ {
+ this(buildAnnotationMap(annotations));
+ this.actualAnnotations = annotations;
+ }
+
+ public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends T> type)
+ {
+ this(buildAnnotationMap(annotations), type);
+ this.actualAnnotations = annotations;
+ }
+
+ public SimpleAnnotatedItem(Annotation[] annotations, TypeLiteral<? extends T> apiType)
+ {
+ this(buildAnnotationMap(annotations), apiType);
+ this.actualAnnotations = annotations;
+ }
+
+ public SimpleAnnotatedItem(Annotation[] annotations, Class<? extends T> type, Type[] actualTypeArguments)
+ {
+ this(buildAnnotationMap(annotations), type, actualTypeArguments);
+ this.actualAnnotations = annotations;
+ }
+
+ public S getDelegate()
+ {
+ return null;
+ }
+
+ public Class<? extends T> getType()
+ {
+ return type;
+ }
+
+ public Type[] getActualTypeArguments()
+ {
+ return actualTypeArguments;
+ }
+
+ public Annotation[] getActualAnnotations()
+ {
+ return actualAnnotations;
+ }
+
+ public boolean isStatic()
+ {
+ return false;
+ }
+
+ public boolean isFinal()
+ {
+ return false;
+ }
+
+}
Copied: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java (from rev 244, ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/SimpleAnnotatedMethod.java)
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java (rev 0)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -0,0 +1,41 @@
+package org.jboss.webbeans.introspector.impl;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Type;
+
+import org.jboss.webbeans.introspector.AnnotatedMethod;
+
+public class SimpleAnnotatedMethod<T> extends AbstractAnnotatedMember<T, Method> implements AnnotatedMethod<T>
+{
+
+ private static final Type[] actualTypeArgements = new Type[0];
+
+ private Method method;
+
+ public SimpleAnnotatedMethod(Method method)
+ {
+ super(buildAnnotationMap(method));
+ this.method = method;
+ }
+
+ public Method getAnnotatedMethod()
+ {
+ return method;
+ }
+
+ public Method getDelegate()
+ {
+ return method;
+ }
+
+ public Class<T> getType()
+ {
+ return (Class<T>) method.getReturnType();
+ }
+
+ public Type[] getActualTypeArguments()
+ {
+ return actualTypeArgements;
+ }
+
+}
Property changes on: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/impl/SimpleAnnotatedMethod.java
___________________________________________________________________
Name: svn:mime-type
+ text/plain
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -5,7 +5,7 @@
import javax.webbeans.DefinitionException;
import org.jboss.webbeans.introspector.AnnotatedAnnotation;
-import org.jboss.webbeans.introspector.SimpleAnnotatedAnnotation;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedAnnotation;
public abstract class AnnotationModel<T extends Annotation>
{
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/AbstractBeanModel.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -24,7 +24,7 @@
import org.jboss.webbeans.injectable.InjectableMethod;
import org.jboss.webbeans.injectable.InjectableParameter;
import org.jboss.webbeans.introspector.AnnotatedItem;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.MergedStereotypesModel;
import org.jboss.webbeans.util.LoggerUtil;
import org.jboss.webbeans.util.Reflections;
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EnterpriseBeanModel.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -22,7 +22,7 @@
import org.jboss.webbeans.injectable.InjectableMethod;
import org.jboss.webbeans.injectable.InjectableParameter;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.util.Reflections;
public class EnterpriseBeanModel<T> extends AbstractEnterpriseBeanModel<T>
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/EventBeanModel.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -13,7 +13,7 @@
import org.jboss.webbeans.injectable.BeanConstructor;
import org.jboss.webbeans.injectable.SimpleConstructor;
import org.jboss.webbeans.introspector.AnnotatedItem;
-import org.jboss.webbeans.introspector.SimpleAnnotatedField;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedField;
import org.jboss.webbeans.util.LoggerUtil;
/**
Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/model/bean/SimpleBeanModel.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -11,7 +11,7 @@
import org.jboss.webbeans.injectable.InjectableParameter;
import org.jboss.webbeans.injectable.SimpleConstructor;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.util.LoggerUtil;
import org.jboss.webbeans.util.Reflections;
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-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/BindingTypeTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -12,7 +12,7 @@
import org.jboss.webbeans.bindings.CurrentAnnotationLiteral;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.BeanModel;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.Asynchronous;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ClassAnnotatedItemTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -9,7 +9,7 @@
import javax.webbeans.Stereotype;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.test.beans.Antelope;
import org.jboss.webbeans.test.beans.Order;
import org.testng.annotations.Test;
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-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeferredEventNotificationTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -13,7 +13,7 @@
import org.jboss.webbeans.event.DeferredEventNotification;
import org.jboss.webbeans.injectable.InjectableMethod;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
import org.jboss.webbeans.test.annotations.Asynchronous;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentTypeTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/DeploymentTypeTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -18,7 +18,7 @@
import javax.webbeans.manager.Bean;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
import org.jboss.webbeans.test.annotations.FishStereotype;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/EventBeanModelTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -12,7 +12,7 @@
import org.jboss.webbeans.event.EventImpl;
import org.jboss.webbeans.injectable.BeanConstructor;
-import org.jboss.webbeans.introspector.SimpleAnnotatedField;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedField;
import org.jboss.webbeans.model.bean.EventBeanModel;
import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
import org.jboss.webbeans.test.beans.DangerCall;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NameTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -12,7 +12,7 @@
import org.jboss.webbeans.bindings.NamedAnnotationLiteral;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.BeanModel;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.RiverFishStereotype;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/NormalContextTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -10,8 +10,8 @@
import org.jboss.webbeans.contexts.AbstractContext;
import org.jboss.webbeans.contexts.RequestContext;
-import org.jboss.webbeans.introspector.SimpleAnnotatedMethod;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedMethod;
import org.jboss.webbeans.model.bean.ProducerMethodBeanModel;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.beans.SpiderProducer;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ObserverTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -12,7 +12,7 @@
import org.jboss.webbeans.injectable.InjectableMethod;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
import org.jboss.webbeans.test.annotations.Asynchronous;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ProducerMethodBeanModelTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -7,8 +7,8 @@
import javax.webbeans.Current;
import javax.webbeans.Dependent;
-import org.jboss.webbeans.introspector.SimpleAnnotatedMethod;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedMethod;
import org.jboss.webbeans.model.bean.ProducerMethodBeanModel;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.AnotherDeploymentType;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ScopeTypeTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -17,7 +17,7 @@
import org.jboss.webbeans.bindings.ConversationScopedAnnotationLiteral;
import org.jboss.webbeans.bindings.RequestScopedAnnotationLiteral;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.AnimalStereotype;
import org.jboss.webbeans.test.annotations.AnotherScopeType;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/SimpleBeanModelTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -13,7 +13,7 @@
import org.jboss.webbeans.bindings.CurrentAnnotationLiteral;
import org.jboss.webbeans.injectable.InjectableParameter;
import org.jboss.webbeans.injectable.SimpleConstructor;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.HeavyDuty;
import org.jboss.webbeans.test.annotations.Motorized;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypesTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypesTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/StereotypesTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -12,7 +12,7 @@
import javax.webbeans.RequestScoped;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.StereotypeModel;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.annotations.AnimalOrderStereotype;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeTest.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/TypeTest.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -2,7 +2,7 @@
import static org.jboss.webbeans.test.util.Util.getEmptyAnnotatedType;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
import org.jboss.webbeans.test.beans.Haddock;
import org.testng.annotations.Test;
Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-05 13:02:04 UTC (rev 244)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/util/Util.java 2008-11-05 13:07:06 UTC (rev 245)
@@ -6,7 +6,7 @@
import org.jboss.webbeans.ManagerImpl;
import org.jboss.webbeans.SimpleBeanImpl;
import org.jboss.webbeans.introspector.AnnotatedClass;
-import org.jboss.webbeans.introspector.SimpleAnnotatedClass;
+import org.jboss.webbeans.introspector.impl.SimpleAnnotatedClass;
import org.jboss.webbeans.model.bean.EnterpriseBeanModel;
import org.jboss.webbeans.model.bean.SimpleBeanModel;
More information about the weld-commits
mailing list