more toString simplifications

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@466 1c488680-804c-0410-94cd-c6b725194a0e
weld · Dec 8, 2008 · 0d8610c · 0d8610c
1 parent 1add40f
commit 0d8610c
Show file tree

Hide file tree

Showing 14 changed files with 304 additions and 26 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerBean.java
@@ -9,6 +9,7 @@
 import javax.webbeans.IllegalProductException;
 
 import org.jboss.webbeans.ManagerImpl;
+import org.jboss.webbeans.util.Names;
 
 public abstract class ProducerBean<T, S> extends AbstractBean<T, S> {
 
@@ -107,5 +108,23 @@ protected Object getReceiver() {
       return getAnnotatedItem().isStatic() ? 
               null : manager.getInstance(getDeclaringBean());
    }
+
+   @Override
+   public String toString()
+   {
+      StringBuilder buffer = new StringBuilder();
+      buffer.append("Annotated " + Names.scopeTypeToString(getScopeType()));
+      if (getName() == null)
+      {
+         buffer.append("unnamed producer bean");
+      }
+      else
+      {
+         buffer.append("simple producer bean '" + getName() + "'");
+      }
+      buffer.append(" [" + getType().getName() + "]\n");
+      buffer.append("   API types " + getTypes() + ", binding types " + getBindingTypes() + "\n");
+      return buffer.toString();
+   }     
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerFieldBean.java
@@ -22,6 +22,7 @@
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.introspector.jlr.AnnotatedFieldImpl;
+import org.jboss.webbeans.util.Names;
 
 /**
  * Represents a producer method bean
@@ -96,6 +97,23 @@ protected String getDefaultName()
 
    @Override
    public String toString()
+   {
+      StringBuilder buffer = new StringBuilder();
+      buffer.append("Annotated " + Names.scopeTypeToString(getScopeType()));
+      if (getName() == null)
+      {
+         buffer.append("unnamed producer field bean");
+      }
+      else
+      {
+         buffer.append("simple producer field bean '" + getName() + "'");
+      }
+      buffer.append(" [" + getType().getName() + "]\n");
+      buffer.append("   API types " + getTypes() + ", binding types " + getBindingTypes() + "\n");
+      return buffer.toString();
+   }   
+
+   public String toDetailedString()
    {
       StringBuilder buffer = new StringBuilder();
       buffer.append("ProducerFieldBean:\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/ProducerMethodBean.java
@@ -30,6 +30,7 @@
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.AnnotatedParameter;
 import org.jboss.webbeans.introspector.jlr.AnnotatedMethodImpl;
+import org.jboss.webbeans.util.Names;
 
 /**
  * Represents a producer method bean
@@ -181,8 +182,26 @@ public AnnotatedMethod<?> getDisposalMethod()
       return removeMethod;
    }
 
+
    @Override
    public String toString()
+   {
+      StringBuilder buffer = new StringBuilder();
+      buffer.append("Annotated " + Names.scopeTypeToString(getScopeType()));
+      if (getName() == null)
+      {
+         buffer.append("unnamed producer method bean");
+      }
+      else
+      {
+         buffer.append("simple producer method bean '" + getName() + "'");
+      }
+      buffer.append(" [" + getType().getName() + "]\n");
+      buffer.append("   API types " + getTypes() + ", binding types " + getBindingTypes() + "\n");
+      return buffer.toString();
+   }    
+
+   public String toDetailedString()
    {
       StringBuilder buffer = new StringBuilder();
       buffer.append("ProducerMethodBean:\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedItem.java
@@ -437,13 +437,18 @@ public String toString()
       {
          return toString;
       }
+      toString = "Abstract annotated item " + getName();
+      return toString;
+   }
+
+   public String toDetailedString()
+   {
       StringBuilder buffer = new StringBuilder();
       buffer.append("AbstractAnnotatedItem:\n");
       buffer.append(Strings.collectionToString("Annotations: ", getAnnotations()));
       buffer.append(annotationMap == null ? "" : (annotationMap.toString() + "\n"));
       buffer.append(metaAnnotationMap == null ? "" : (metaAnnotationMap.toString()) + "\n");
-      toString = buffer.toString();
-      return toString;
+      return buffer.toString();
    }
 
    /**

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedMember.java
@@ -156,20 +156,26 @@ public String getName()
     * 
     * @return A string representation
     */
+   @Override
    public String toString()
    {
       if (toString != null)
       {
          return toString;
       }
+      toString = "Abstract annotated member " + getName();
+      return toString;
+   }   
+
+   public String toDetailedString()
+   {
       StringBuilder buffer = new StringBuilder();
       buffer.append("AbstractAnnotatedMember:\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Final: " + isFinal() + "\n");
       buffer.append("Static: " + isStatic() + "\n");
       buffer.append("Name: " + getName() + "\n");
-      toString = buffer.toString();
-      return toString;
+      return buffer.toString();
    }
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AbstractAnnotatedType.java
@@ -106,25 +106,31 @@ public AnnotatedClass<Object> getSuperclass()
    }
 
    /**
-    * Gets a string representation of the annotated type
+    * Gets a string representation of the type
     * 
     * @return A string representation
     */
+   @Override
    public String toString()
    {
       if (toString != null)
       {
          return toString;
       }
+      toString = "Abstract annotated type " + getName();
+      return toString;
+   }
+
+   public String toDetailedString()
+   {
       StringBuilder buffer = new StringBuilder();
       buffer.append("AbstractAnnotatedType:\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Superclass: " + (superclass == null ? "" : superclass.toString()) + "\n");
       buffer.append("Name: " + getName() + "\n");
       buffer.append("Final: " + isFinal() + "\n");
       buffer.append("Static: " + isStatic() + "\n");
-      toString = buffer.toString();
-      return toString;
+      return buffer.toString();
    }
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedAnnotationImpl.java
@@ -172,26 +172,32 @@ public Set<AnnotatedMethod<?>> getAnnotatedMembers(Class<? extends Annotation> a
    {
       return Collections.unmodifiableSet(annotatedMembers.get(annotationType));
    }
-
+   
    /**
-    * Gets a string representation of the constructor
+    * Gets a string representation of the annotation
     * 
     * @return A string representation
     */
+   @Override
    public String toString()
    {
       if (toString != null)
       {
          return toString;
       }
+//      toString = "Annotated annotation " + Names.annotation2String(getDelegate());
+      return toString;
+   }
+
+   public String toDetailedString()
+   {
       StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedConstructorImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Class: " + clazz.toString() + "\n");
       buffer.append(Strings.collectionToString("Members: ", getMembers()));
       buffer.append(annotatedMembers == null ? "" : (annotatedMembers.toString() + "\n"));
-      toString = buffer.toString();
-      return toString;
+      return buffer.toString();
    }
 
    protected Class<T> getDelegate()

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedClassImpl.java
@@ -35,6 +35,7 @@
 import org.jboss.webbeans.introspector.AnnotatedConstructor;
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.introspector.AnnotatedMethod;
+import org.jboss.webbeans.util.Names;
 import org.jboss.webbeans.util.Strings;
 
 import com.google.common.collect.ForwardingMap;
@@ -504,16 +505,23 @@ public Set<AnnotatedMethod<Object>> getMethodsWithAnnotatedParameters(Class<? ex
    }
 
    /**
-    * Gets a string representation of the constructor
+    * Gets a string representation of the class
     * 
     * @return A string representation
     */
+   @Override
    public String toString()
    {
       if (toString != null)
       {
          return toString;
       }
+      toString = "Annotated class " + Names.class2String(getDelegate());
+      return toString;
+   }
+
+   public String toDetailedString()
+   {
       StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedConstructorImpl:\n");
       buffer.append(super.toString() + "\n");
@@ -527,8 +535,7 @@ public String toString()
       buffer.append(annotatedMethods == null ? "" : (annotatedMethods.toString() + "\n"));
       buffer.append(constructorsByArgumentMap == null ? "" : (constructorsByArgumentMap.toString() + "\n"));
       buffer.append(metaAnnotatedFields == null ? "" : (metaAnnotatedFields.toString() + "\n"));
-      toString = buffer.toString();
-      return toString;
+      return buffer.toString();
    }
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedConstructorImpl.java
@@ -33,6 +33,7 @@
 import org.jboss.webbeans.introspector.AnnotatedConstructor;
 import org.jboss.webbeans.introspector.AnnotatedParameter;
 import org.jboss.webbeans.introspector.AnnotatedType;
+import org.jboss.webbeans.util.Names;
 import org.jboss.webbeans.util.Strings;
 
 /**
@@ -270,12 +271,19 @@ public AnnotatedType<T> getDeclaringClass()
     * 
     * @return A string representation
     */
+   @Override
    public String toString()
    {
       if (toString != null)
       {
          return toString;
       }
+      toString = "Annotated method " + Names.constructor2String(constructor);
+      return toString;
+   }   
+
+   public String toDetailedString()
+   {
       StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedConstructorImpl:\n");
       buffer.append(super.toString() + "\n");
@@ -286,8 +294,7 @@ public String toString()
       buffer.append(constructor.toString() + "\n");
       buffer.append(Strings.collectionToString("Parameters: ", getParameters()));
       buffer.append(annotatedParameters.toString() + "\n");
-      toString = buffer.toString();
-      return toString;
+      return buffer.toString();
    }
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedFieldImpl.java
@@ -27,6 +27,7 @@
 import org.jboss.webbeans.ManagerImpl;
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.introspector.AnnotatedType;
+import org.jboss.webbeans.util.Names;
 import org.jboss.webbeans.util.Reflections;
 import org.jboss.webbeans.util.Strings;
 
@@ -127,6 +128,7 @@ public void inject(Manager manager, Object instance)
       Reflections.setAndWrap(getDelegate(), instance, getValue(manager));
    }
 
+   @SuppressWarnings("unchecked")
    public T get(Object instance) {
       return (T) Reflections.getAndWrap(getDelegate(), instance);
    }
@@ -160,21 +162,27 @@ public AnnotatedType<?> getDeclaringClass()
     * 
     * @return A string representation
     */
+   @Override
    public String toString()
    {
       if (toString != null)
       {
          return toString;
       }
+      toString = "Annotated method " + Names.field2String(field);
+      return toString;
+   }
+
+   public String toDetailedString()
+   {
       StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedFieldImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append(Strings.collectionToString("Actual type arguments: ", Arrays.asList(getActualTypeArguments())));
       buffer.append("Declaring class:\n");
       buffer.append(declaringClass.getName() + "[ " + declaringClass.getType() + "]" + "\n");
       buffer.append("Field: " + field + "\n");
-      toString = buffer.toString();
-      return toString;
+      return buffer.toString();
    }
 
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedItemImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedItemImpl.java
@@ -21,6 +21,7 @@
 import java.lang.reflect.Type;
 import java.util.Arrays;
 
+import org.jboss.webbeans.util.Names;
 import org.jboss.webbeans.util.Strings;
 
 /**
@@ -147,19 +148,25 @@ public String getName()
     * 
     * @return A string representation
     */
+   @Override
    public String toString()
    {
       if (toString != null)
       {
          return toString;
       }
+      toString = "Annotated item " + Names.type2String(getDelegate().getClass());
+      return toString;
+   }
+
+   public String toDetailedString()
+   {
       StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedItemImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append(Strings.collectionToString("Actual type arguments: ", Arrays.asList(getActualTypeArguments())));
       buffer.append(Strings.collectionToString("Actual annotations: ", Arrays.asList(getActualAnnotations())));
-      toString = buffer.toString();
-      return toString;
+      return buffer.toString();
    }
 
 }