[weld-commits] Weld SVN: r6786 - extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-07-23 18:16:42 -0400 (Fri, 23 Jul 2010)
New Revision: 6786

Modified:
   extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
   extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java
Log:
use Reflections

Modified: extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java
===================================================================
--- extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java	2010-07-23 22:12:08 UTC (rev 6785)
+++ extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/GenericBeanInjectionTargetWrapper.java	2010-07-23 22:16:42 UTC (rev 6786)
@@ -16,13 +16,11 @@
  */
 package org.jboss.weld.extensions.bean.generic;
 
+import static org.jboss.weld.extensions.util.Reflections.getAllFields;
 import static org.jboss.weld.extensions.util.Reflections.getField;
 
 import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.AnnotatedField;
@@ -41,18 +39,6 @@
 public class GenericBeanInjectionTargetWrapper<T> extends ForwardingInjectionTarget<T>
 {
    
-   private static Set<Field> getFields(Class<?> clazz)
-   {
-      Set<Field> fields = new HashSet<Field>();
-      fields.addAll(Arrays.asList(clazz.getDeclaredFields()));
-      Class<?> superClass = clazz.getSuperclass();
-      if (superClass != Object.class)
-      {
-         fields.addAll(getFields(superClass));
-      }
-      return fields;
-   }
-   
    private final InjectionTarget<T> delegate;
    private final Annotation annotation;
    private final AnnotatedType<T> annotatedType;
@@ -73,7 +59,7 @@
    @Override
    public void inject(T instance, CreationalContext<T> ctx)
    {
-      for (Field f : getFields(instance.getClass()))
+      for (Field f : getAllFields(instance.getClass()))
       {
 
          if (annotation.annotationType().isAssignableFrom(f.getType()))

Modified: extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java
===================================================================
--- extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java	2010-07-23 22:12:08 UTC (rev 6785)
+++ extensions/trunk/impl/src/main/java/org/jboss/weld/extensions/bean/generic/InjectConfiguration.java	2010-07-23 22:16:42 UTC (rev 6786)
@@ -22,7 +22,7 @@
 import javax.enterprise.util.AnnotationLiteral;
 
 /**
- * synthetic qualifier that is added to Generic beans to signify configuration annotation injection points
+ * Annotation used to indicate {@link GenericConfiguration} injection points
  * 
  * @author Stuart Douglas <stuart at baileyroberts.com.au>
  *