svn commit: r1003073 - /incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadataCollector.java

[bl...@apache.org]

Author: bluk
Date: Thu Sep 30 14:23:03 2010
New Revision: 1003073

URL: http://svn.apache.org/viewvc?rev=1003073&view=rev
Log:
Allow interfaces to be used

Modified:
    incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadataCollector.java

Modified: incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadataCollector.java
URL: http://svn.apache.org/viewvc/incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadataCollector.java?rev=1003073&r1=1003072&r2=1003073&view=diff
==============================================================================
--- incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadataCollector.java (original)
+++ incubator/wink/trunk/wink-common/src/main/java/org/apache/wink/common/internal/registry/metadata/AbstractMetadataCollector.java Thu Sep 30 14:23:03 2010
@@ -28,18 +28,23 @@ import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 import javax.ws.rs.Encoded;
 
 import org.apache.wink.common.internal.registry.Injectable;
 import org.apache.wink.common.internal.registry.InjectableFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Collects common class meta data of JAX-RS Resources and Providers
  */
 public abstract class AbstractMetadataCollector {
-
+    
+    private static final Logger logger = LoggerFactory.getLogger(AbstractMetadataCollector.class);
+    
     private final ClassMetadata metadata;
 
     public AbstractMetadataCollector(Class<?> clazz) {
@@ -57,12 +62,13 @@ public abstract class AbstractMetadataCo
         Class<?> resourceClass = metadata.getResourceClass();
 
         List<Injectable> injectableFields = metadata.getInjectableFields();
-
+        
         // add fields
-        while (resourceClass != Object.class) {
+        while (resourceClass != Object.class && resourceClass != null) {
             for (Field field : resourceClass.getDeclaredFields()) {
                 Type fieldType = field.getGenericType();
                 Injectable injectable = parseAccessibleObject(field, fieldType);
+                logger.trace("Field is {} and injectable is {}", fieldType, injectable);
 
                 if (injectable != null) {
                     injectableFields.add(injectable);
@@ -70,9 +76,13 @@ public abstract class AbstractMetadataCo
             }
             resourceClass = resourceClass.getSuperclass();
         }
+        logger.trace("Injectable fields: {}", injectableFields);
 
         // add properties
         PropertyDescriptor[] propertyDescriptors = metadata.getBeanInfo().getPropertyDescriptors();
+        if(logger.isTraceEnabled()) {
+            logger.trace("Property descriptors are: {}", Arrays.asList(propertyDescriptors));
+        }
         if (propertyDescriptors != null) {
             l: for (PropertyDescriptor pd : propertyDescriptors) {
                 Method writeMethod = pd.getWriteMethod();
@@ -80,11 +90,17 @@ public abstract class AbstractMetadataCo
                     // the property cannot be written, ignore it.
                     continue l;
                 }
+                if(logger.isTraceEnabled()) {
+                    logger.trace("Method under inspection: {}", writeMethod.getName());
+                }
                 Type genericReturnType = writeMethod.getParameterTypes()[0];
                 Injectable injectable = parseAccessibleObject(writeMethod, genericReturnType);
                 if (injectable != null) {
                     injectableFields.add(injectable);
                 }
+                if(logger.isTraceEnabled()) {
+                    logger.trace("Injectable under inspection: {}", injectable);
+                }
             }
         }
     }