Better toString

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@408 1c488680-804c-0410-94cd-c6b725194a0e
weld · Dec 5, 2008 · b808e5a · b808e5a
1 parent 1ddf253
commit b808e5a
Show file tree

Hide file tree

Showing 33 changed files with 87 additions and 38 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -664,7 +664,7 @@ public Resolver getResolver()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append(Strings.collectionToString("Enabled deployment types: ", getEnabledDeploymentTypes()));
       buffer.append(eventManager.toString() + "\n");
       buffer.append(metaDataCache.toString() + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/MetaDataCache.java b/webbeans-ri/src/main/java/org/jboss/webbeans/MetaDataCache.java
@@ -92,7 +92,7 @@ public EjbMetaData<T> call() throws Exception
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("====================\n");
       buffer.append("Metadata cache\n");
       buffer.append("====================\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java b/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java
@@ -79,7 +79,7 @@ public int hashCode()
       @Override
       public String toString()
       {
-         StringBuffer buffer = new StringBuffer();
+         StringBuilder buffer = new StringBuilder();
          buffer.append("Resolvable annotation item\n");
          buffer.append(delegate().toString() + "\n");
          return buffer.toString();
@@ -308,7 +308,7 @@ public List<Interceptor> resolveInterceptors(InterceptionType type, Annotation[]
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("Resolver\n");
       buffer.append(resolvedInjectionPoints.toString() + "\n");
       buffer.append(Strings.collectionToString("Injection points: ", injectionPoints));

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractBean.java
@@ -642,7 +642,7 @@ public boolean isSerializable()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AbstractBean:\n");
       buffer.append("Name: " + name + "\n");
       buffer.append("Type: " + type + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractClassBean.java
@@ -274,7 +274,7 @@ public Set<AnnotatedMethod<Object>> getInitializerMethods()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AbstractClassBean:\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Annotated item: " + annotatedItem.toString() + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
@@ -36,6 +36,7 @@
 import org.jboss.webbeans.introspector.AnnotatedField;
 import org.jboss.webbeans.introspector.AnnotatedMethod;
 import org.jboss.webbeans.introspector.AnnotatedParameter;
+import org.jboss.webbeans.util.Names;
 
 /**
  * An enterprise bean representation
@@ -339,7 +340,7 @@ protected EjbMetaData<T> getEjbMetaData()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       String ejbType = "";
       if (getEjbMetaData().isMessageDriven())
       {
@@ -361,15 +362,24 @@ else if (getEjbMetaData().isStateless())
       {
          ejbType = "unknown";
       }
-      buffer.append("Annotated " + getScopeType().getSimpleName().toLowerCase() + " " + ejbType + " enterprise bean '" + getName() + "' " + "[" + getType().getName() + "]\n");
+      buffer.append("Annotated " + Names.scopeTypeToString(getScopeType()) + ejbType);
+      if (getName() == null)
+      {
+         buffer.append(" unnamed enterprise bean");
+      }
+      else
+      {
+         buffer.append(" enterprise bean '" + getName() + "'");
+      }
+      buffer.append(" [" + getType().getName() + "]\n");
       buffer.append("   EJB name: " + getEjbMetaData().getEjbName() + ", default JNDI name: " + getEjbMetaData().getDefaultJndiName() + ", EJB link JNDI name: " + getEjbMetaData().getEjbLinkJndiName() + "\n");
       buffer.append("   API types " + getTypes() + ", binding types " + getBindingTypes() + "\n");
       return buffer.toString();
    }
 
    public String toDetailedString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("EnterpriseBean:\n");
       buffer.append(super.toString() + "\n");
       buffer.append(ejbMetaData.toString() + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/MergedStereotypes.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/MergedStereotypes.java
@@ -161,7 +161,7 @@ public boolean isDeclaredInXml()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("Merged stereotypes:\n");
       buffer.append("Bean name defaulted: " + beanNameDefaulted + "\n");
       buffer.append("Possible deployment types: " + getPossibleDeploymentTypes().toString());

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
@@ -291,7 +291,7 @@ public AbstractClassBean<?> getDeclaringBean()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("ProducerMethodBean:\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Location: " + location + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/SimpleBean.java
@@ -33,6 +33,7 @@
 import org.jboss.webbeans.introspector.AnnotatedParameter;
 import org.jboss.webbeans.log.LogProvider;
 import org.jboss.webbeans.log.Logging;
+import org.jboss.webbeans.util.Names;
 import org.jboss.webbeans.util.Reflections;
 
 /**
@@ -360,15 +361,24 @@ public AnnotatedMethod<Object> getPreDestroy()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
-      buffer.append("Annotated " + getScopeType().getSimpleName().toLowerCase() + " " + " simple bean '" + getName() + "' " + "[" + getType().getName() + "]\n");
+      StringBuilder buffer = new StringBuilder();
+      buffer.append("Annotated " + Names.scopeTypeToString(getScopeType()));
+      if (getName() == null)
+      {
+         buffer.append("unnamed simple bean");
+      }
+      else
+      {
+         buffer.append("simple bean '" + getName() + "'");
+      }
+      buffer.append(" [" + getType().getName() + "]\n");
       buffer.append("   API types " + getTypes() + ", binding types " + getBindingTypes() + "\n");
       return buffer.toString();
    }
 
    public String toDetailedString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("SimpleBean\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Location: " + location + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlEnterpriseBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlEnterpriseBean.java
@@ -51,7 +51,7 @@ protected boolean isDefinedInXml()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("XmlEnterpriseBean\n");
       buffer.append(super.toString() + "\n");
       return buffer.toString();

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlSimpleBean.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/XmlSimpleBean.java
@@ -51,7 +51,7 @@ protected boolean isDefinedInXml()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("XmlLSimpleBean\n");
       buffer.append(super.toString() + "\n");
       return buffer.toString();

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java
@@ -85,7 +85,7 @@ public Object invoke(Object self, Method method, Method proceed, Object[] args)
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("Proxy method handler\n");
       buffer.append("Bean " + (bean == null ? "null" : bean.toString()) + "\n");
       buffer.append("Bean index: " + beanIndex + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java
@@ -167,7 +167,7 @@ public T call() throws Exception
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("Proxy pool\n");
       buffer.append(pool.toString() + "\n");
       return buffer.toString();

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java b/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/AbstractContext.java
@@ -151,7 +151,7 @@ public void destroy(Manager manager)
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AbstractContext:\n");
       buffer.append("Scope type: " + getScopeType().toString() + "\n");
       buffer.append("Active: " + getActive().toString() + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/contexts/SessionBeanMap.java
@@ -220,7 +220,7 @@ public <T> void put(Contextual<? extends T> bean, T instance)
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       List<Contextual<?>> beans = (List) keySet();
       buffer.append("Bean -> bean instance mappings in HTTP session: " + beans.size() + "\n");
       int i = 0;

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ejb/EjbMetaData.java
@@ -260,7 +260,7 @@ public List<AnnotatedMethod<Object>> getNoArgsRemoveMethods()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("EJB metadata model\n");
       buffer.append("EJB name: " + ejbName + "\n");
       buffer.append("EJB type: " + ejbType + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java b/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventManager.java
@@ -261,7 +261,7 @@ public <T> void removeObserver(Observer<T> observer, Class<T> eventType, Annotat
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("Event manager\n");
       buffer.append(registeredObservers.toString());
       return buffer.toString();

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
@@ -424,7 +424,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AbstractAnnotatedItem:\n");
       buffer.append(Strings.collectionToString("Annotations: ", getAnnotations()));
       buffer.append(annotationMap == null ? "" : (annotationMap.toString() + "\n"));

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
@@ -163,7 +163,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AbstractAnnotatedMember:\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Final: " + isFinal() + "\n");

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
@@ -116,7 +116,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AbstractAnnotatedType:\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Superclass: " + (superclass == null ? "" : superclass.toString()) + "\n");

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
@@ -184,7 +184,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedConstructorImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Class: " + clazz.toString() + "\n");

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
@@ -497,7 +497,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedConstructorImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append(Strings.collectionToString("Actual type arguments: ", Arrays.asList(getActualTypeArguments())));

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
@@ -276,7 +276,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedConstructorImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append(Strings.collectionToString("Actual type arguments: ", Arrays.asList(getActualTypeArguments())));

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
@@ -161,7 +161,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedFieldImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append(Strings.collectionToString("Actual type arguments: ", Arrays.asList(getActualTypeArguments())));

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
@@ -153,7 +153,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedItemImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append(Strings.collectionToString("Actual type arguments: ", Arrays.asList(getActualTypeArguments())));

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
@@ -291,7 +291,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedMethodImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append(Strings.collectionToString("Actual type arguments: ", Arrays.asList(getActualTypeArguments())));

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedParameterImpl.java
@@ -158,7 +158,7 @@ public String toString()
       {
          return toString;
       }
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotatedParameterImpl:\n");
       buffer.append(super.toString() + "\n");
       buffer.append("Type: " + type.toString() + "\n");

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/AnnotationModel.java
@@ -120,7 +120,7 @@ protected AnnotatedAnnotation<T> getAnnotatedAnnotation()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("AnnotationModel:\n");
       buffer.append("Annotated annotation: " + getAnnotatedAnnotation().toString());
       buffer.append("Valid: " + isValid());

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/BindingTypeModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/BindingTypeModel.java
@@ -154,7 +154,7 @@ public boolean isEqual(Annotation instance, Annotation other)
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("BindingTypeModel:\n");
       buffer.append(super.toString());
       buffer.append("Hash code: " + hashCode);

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/ScopeModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/ScopeModel.java
@@ -79,7 +79,7 @@ protected Class<? extends Annotation> getMetaAnnotation()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("ScopeModel:\n");
       buffer.append(super.toString());
       buffer.append("Normal: " + isNormal());

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java b/webbeans-ri/src/main/java/org/jboss/webbeans/model/StereotypeModel.java
@@ -243,7 +243,7 @@ public Class<? extends Annotation> getStereotypeClass()
    @Override
    public String toString()
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       buffer.append("StereotypeModel:\n");
       buffer.append(super.toString());
       buffer.append("Bean name defaulted: " + isBeanNameDefaulted());

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/util/Names.java b/webbeans-ri/src/main/java/org/jboss/webbeans/util/Names.java
@@ -0,0 +1,29 @@
+package org.jboss.webbeans.util;
+
+import java.lang.annotation.Annotation;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Utility class to produce friendly names e.g. for debugging
+ * 
+ * @author Pete Muir
+ *
+ */
+public class Names
+{
+
+   private static Pattern CAPITAL_LETTERS = Pattern.compile("\\p{Upper}{1}\\p{Lower}*");
+
+   public static String scopeTypeToString(Class<? extends Annotation> scopeType)
+   {
+      String scopeName = scopeType.getSimpleName();
+      Matcher matcher = CAPITAL_LETTERS.matcher(scopeName);
+      StringBuilder result = new StringBuilder();
+      while (matcher.find())
+      {
+         result.append(matcher.group().toLowerCase() + " ");
+      }
+      return result.toString();
+   }
+}
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/util/Strings.java b/webbeans-ri/src/main/java/org/jboss/webbeans/util/Strings.java
@@ -79,7 +79,7 @@ public static String[] split(String strings, String delims)
     */
    public static String mapToString(String header, Map<?, ?> map)
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       if (map == null)
       {
          buffer.append(header + "null\n");
@@ -109,7 +109,7 @@ public static String mapToString(String header, Map<?, ?> map)
 
    public static String collectionToString(String header, Collection<?> collection)
    {
-      StringBuffer buffer = new StringBuffer();
+      StringBuilder buffer = new StringBuilder();
       if (collection == null)
       {
          buffer.append(header + "null\n");