WELD-542

weld · Aug 5, 2010 · ecfb52c · ecfb52c
1 parent 57fe543
commit ecfb52c
Show file tree

Hide file tree

Showing 32 changed files with 463 additions and 399 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/DecoratorImpl.java b/impl/src/main/java/org/jboss/weld/bean/DecoratorImpl.java
@@ -37,10 +37,7 @@
 import javax.enterprise.inject.spi.Decorator;
 import javax.inject.Inject;
 
-import org.jboss.weld.bean.proxy.AbstractDecoratorMethodHandler;
 import org.jboss.weld.bean.proxy.DecoratorProxyFactory;
-import org.jboss.weld.bean.proxy.ProxyFactory;
-import org.jboss.weld.bean.proxy.TargetBeanInstance;
 import org.jboss.weld.bootstrap.BeanDeployerEnvironment;
 import org.jboss.weld.exceptions.DefinitionException;
 import org.jboss.weld.injection.MethodInjectionPoint;
@@ -50,11 +47,11 @@
 import org.jboss.weld.introspector.WeldClass;
 import org.jboss.weld.introspector.WeldConstructor;
 import org.jboss.weld.introspector.WeldMethod;
-import org.jboss.weld.introspector.jlr.WeldClassImpl;
 import org.jboss.weld.introspector.jlr.WeldConstructorImpl;
 import org.jboss.weld.manager.BeanManagerImpl;
 import org.jboss.weld.resources.ClassTransformer;
 import org.jboss.weld.util.Decorators;
+import org.jboss.weld.util.reflection.Formats;
 import org.jboss.weld.util.reflection.Reflections;
 
 public class DecoratorImpl<T> extends ManagedBean<T> implements WeldDecorator<T>
@@ -284,4 +281,10 @@ public Set<MethodSignature> getDecoratedMethodSignatures()
    {
       return decoratedMethodSignatures;
    }
+
+   @Override
+   public String toString()
+   {
+      return "Decorator [" + getBeanClass().toString() + "] decorates [" + Formats.formatTypes(getDecoratedTypes()) + "] with delegate type [" + Formats.formatType(getDelegateType()) + "] and delegate qualifiers [" + Formats.formatAnnotations(getDelegateQualifiers()) + "]";
+   }
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java b/impl/src/main/java/org/jboss/weld/bean/DisposalMethod.java
@@ -268,5 +268,11 @@ public Set<Class<? extends Annotation>> getStereotypes()
    {
       return Collections.emptySet();
    }
+
+   @Override
+   public String toString()
+   {
+      return "Disposer method [" + getDisposesParameter().getDeclaringCallable() + "]";
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java b/impl/src/main/java/org/jboss/weld/bean/InterceptorImpl.java
@@ -37,6 +37,7 @@
 import org.jboss.weld.introspector.WeldClass;
 import org.jboss.weld.manager.BeanManagerImpl;
 import org.jboss.weld.util.Beans;
+import org.jboss.weld.util.reflection.Formats;
 
 /**
  * @author Marius Bogoevici
@@ -114,4 +115,9 @@ protected void defaultPreDestroy(T instance)
       // Lifecycle callbacks not supported
    }
 
+   @Override
+   public String toString()
+   {
+      return "Interceptor [" + getBeanClass() + " intercepts " +  Formats.formatAnnotations(getInterceptorBindings()) + "]";
+   }
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java b/impl/src/main/java/org/jboss/weld/bean/ManagedBean.java
@@ -69,6 +69,7 @@
 import org.jboss.weld.serialization.spi.helpers.SerializableContextual;
 import org.jboss.weld.util.AnnotatedTypes;
 import org.jboss.weld.util.Beans;
+import org.jboss.weld.util.reflection.Formats;
 import org.jboss.weld.util.reflection.Reflections;
 import org.slf4j.cal10n.LocLogger;
 import org.slf4j.ext.XLogger;
@@ -595,5 +596,11 @@ protected T applyInterceptors(T instance, final CreationalContext<T> creationalC
       }
       return instance;
    }
+
+   @Override
+   public String toString()
+   {
+      return "Managed Bean [" + getBeanClass().toString() + "] with qualifiers [" + Formats.formatAnnotations(getQualifiers()) + "]";
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java b/impl/src/main/java/org/jboss/weld/bean/NewManagedBean.java
@@ -124,4 +124,10 @@ public boolean isSpecializing()
       return false;
    }
 
+   @Override
+   public String toString()
+   {
+      return "@New " + super.toString();
+   }
+
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java b/impl/src/main/java/org/jboss/weld/bean/NewSessionBean.java
@@ -131,4 +131,10 @@ protected void registerInterceptors()
    {
       // No - op
    }
+
+   @Override
+   public String toString()
+   {
+      return "@New " + super.toString();
+   }
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/ProducerField.java b/impl/src/main/java/org/jboss/weld/bean/ProducerField.java
@@ -35,6 +35,7 @@
 import org.jboss.weld.introspector.WeldField;
 import org.jboss.weld.manager.BeanManagerImpl;
 import org.jboss.weld.util.AnnotatedTypes;
+import org.jboss.weld.util.reflection.Formats;
 import org.slf4j.cal10n.LocLogger;
 
 /**
@@ -198,5 +199,11 @@ public boolean isSpecializing()
    {
       return false;
    }
+
+   @Override
+   public String toString()
+   {
+      return "Producer Field [" + Formats.formatType(getWeldAnnotated().getBaseType()) + "] with qualifiers [" + Formats.formatAnnotations(getQualifiers()) + "] declared as [" + getWeldAnnotated() + "]";
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java b/impl/src/main/java/org/jboss/weld/bean/ProducerMethod.java
@@ -41,6 +41,7 @@
 import org.jboss.weld.introspector.WeldParameter;
 import org.jboss.weld.manager.BeanManagerImpl;
 import org.jboss.weld.util.AnnotatedTypes;
+import org.jboss.weld.util.reflection.Formats;
 import org.jboss.weld.util.reflection.SecureReflections;
 
 /**
@@ -299,5 +300,11 @@ public String getId()
    {
       return id;
    }
+
+   @Override
+   public String toString()
+   {
+      return "Producer Method [" + Formats.formatType(getWeldAnnotated().getBaseType()) + "] with qualifiers [" + Formats.formatAnnotations(getQualifiers()) + "] declared as [" + getWeldAnnotated() + "]";
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/SessionBean.java b/impl/src/main/java/org/jboss/weld/bean/SessionBean.java
@@ -76,6 +76,7 @@
 import org.jboss.weld.serialization.spi.helpers.SerializableContextual;
 import org.jboss.weld.util.AnnotatedTypes;
 import org.jboss.weld.util.Beans;
+import org.jboss.weld.util.reflection.Formats;
 import org.jboss.weld.util.reflection.HierarchyDiscovery;
 import org.jboss.weld.util.reflection.SecureReflections;
 
@@ -469,5 +470,11 @@ protected void registerInterceptors()
          getBeanManager().getServices().get(EjbServices.class).registerInterceptors(getEjbDescriptor().delegate(), new InterceptorBindingsAdapter(model));
       }
    }
+
+   @Override
+   public String toString()
+   {
+      return "Session bean [" + getBeanClass() + " with qualifiers [" + Formats.formatAnnotations(getQualifiers()) + "]; local interfaces are [" + Formats.formatBusinessInterfaceDescriptors(getEjbDescriptor().getLocalBusinessInterfaces()) +"]";
+   }
 }
 
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractFacade.java b/impl/src/main/java/org/jboss/weld/bean/builtin/AbstractFacade.java
@@ -84,18 +84,6 @@ protected InjectionPoint getInjectionPoint()
    {
       return injectionPoint;
    }
-
-
-   /**
-    * Gets a string representation
-    * 
-    * @return A string representation
-    */
-   @Override
-   public String toString()
-   {
-      return "Abstract facade implmentation";
-   }
 
    @Override
    public boolean equals(Object obj)

diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/BeanManagerBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/BeanManagerBean.java
@@ -59,7 +59,7 @@ public void destroy(BeanManagerImpl instance, CreationalContext<BeanManagerImpl>
    @Override
    public String toString()
    {
-      return "Built-in javax.inject.manager.Manager bean";
+      return "Built-in Bean [javax.enterprise.inject.spi.BeanManager] with qualifiers [@Default]";
    }
 
 

diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/EventBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/EventBean.java
@@ -76,7 +76,7 @@ protected Event<?> newInstance(InjectionPoint injectionPoint)
    @Override
    public String toString()
    {
-      return "Built-in implicit javax.event.Event bean";
+      return "Implicit Bean [javax.enterprise.event.Event] with qualifiers [@Default]";
    }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/ExtensionBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/ExtensionBean.java
@@ -86,5 +86,11 @@ public Class<? extends Annotation> getScope()
    {
       return ApplicationScoped.class;
    }
+
+   @Override
+   public String toString()
+   {
+      return "Extension Bean [" + getType().toString() + "] with qualifiers [@Default]";
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/InjectionPointBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/InjectionPointBean.java
@@ -76,7 +76,7 @@ public Set<Type> getTypes()
    @Override
    public String toString()
    {
-      return "Built-in javax.inject.manager.InjectionPoint bean";
+      return "Implicit Bean [javax.enterprise.inject.spi.InjectionPoint] with qualifiers [@Default]";
    }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceBean.java
@@ -76,7 +76,7 @@ protected Instance<?> newInstance(InjectionPoint injectionPoint)
    @Override
    public String toString()
    {
-      return "Built-in implicit javax.inject.Instance bean";
+      return "Implicit Bean [javax.enterprise.inject.Instance] with qualifiers [@Default]";
    }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java b/impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java
@@ -41,7 +41,7 @@
 import org.jboss.weld.manager.BeanManagerImpl;
 import org.jboss.weld.resolution.ResolvableBuilder;
 import org.jboss.weld.util.Beans;
-import org.jboss.weld.util.Names;
+import org.jboss.weld.util.reflection.Formats;
 
 /**
  * Helper implementation for Instance for getting instances
@@ -92,7 +92,7 @@ public T get()
    @Override
    public String toString()
    {
-      return new StringBuilder().append(Names.toString(getQualifiers())).append(" Instance<").append(getType()).append(">").toString();
+      return Formats.formatAnnotations(getQualifiers()) + " Instance<" + Formats.formatType(getType()) + ">";
    }
 
    private Set<Bean<?>> getBeans()

diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/ee/DefaultValidatorBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/ee/DefaultValidatorBean.java
@@ -54,17 +54,17 @@ public Validator call() throws Exception
          }
       }
 
-      @Override
-      public String toString()
-      {
-         return "Built-in Validator bean";
-      }
-
    }
 
    public DefaultValidatorBean(BeanManagerImpl manager)
    {
       super(Validator.class, new ValidatorCallable(manager), manager);
    }
+
+   @Override
+   public String toString()
+   {
+      return "Built-in Bean [javax.validator.Validator] with qualifiers [@Default]";
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/ee/DefaultValidatorFactoryBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/ee/DefaultValidatorFactoryBean.java
@@ -53,17 +53,17 @@ public ValidatorFactory call() throws Exception
          }
       }
 
-      @Override
-      public String toString()
-      {
-         return "Built-in ValidatorFactory bean";
-      }
-
    }
 
    public DefaultValidatorFactoryBean(BeanManagerImpl beanManager)
    {
       super(ValidatorFactory.class, new ValidatorFactoryCallable(beanManager), beanManager);
    }
+
+   @Override
+   public String toString()
+   {
+      return "Built-in Bean [javax.validator.ValidatorFactory] with qualifiers [@Default]";
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/ee/EEResourceProducerField.java b/impl/src/main/java/org/jboss/weld/bean/builtin/ee/EEResourceProducerField.java
@@ -56,7 +56,7 @@ private static class EEResourceCallable<T> extends AbstractEECallable<T>
       private transient T                instance;
       private final CreationalContext<T> creationalContext;
 
-      public EEResourceCallable(BeanManagerImpl beanManager, ProducerField<?, T> producerField, CreationalContext<T> creationalContext)
+      private EEResourceCallable(BeanManagerImpl beanManager, ProducerField<?, T> producerField, CreationalContext<T> creationalContext)
       {
          super(beanManager);
          this.beanId = producerField.getId();
@@ -86,7 +86,7 @@ public T call() throws Exception
       @Override
       public String toString()
       {
-         return beanId;
+         return instance == null ? "null" : instance.toString();
       }
 
    }
@@ -157,5 +157,11 @@ public boolean isPassivationCapableBean()
    {
       return true;
    }
+
+   @Override
+   public String toString()
+   {
+      return "Resource " + super.toString();
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/ee/PrincipalBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/ee/PrincipalBean.java
@@ -52,18 +52,18 @@ public Principal call() throws Exception
             throw new IllegalStateException(SECURITY_SERVICES_NOT_AVAILABLE);
          }
       }
-
-      @Override
-      public String toString()
-      {
-         return "Built-in Principal bean";
-      }
 
    }
 
    public PrincipalBean(BeanManagerImpl beanManager)
    {
       super(Principal.class, new PrincipalCallable(beanManager), beanManager);
    }
+
+   @Override
+   public String toString()
+   {
+      return "Built-in Bean [java.security.Principal] with qualifiers [@Default]";
+   }
 
 }
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/ee/UserTransactionBean.java b/impl/src/main/java/org/jboss/weld/bean/builtin/ee/UserTransactionBean.java
@@ -53,17 +53,17 @@ public UserTransaction call() throws Exception
          }
       }
 
-      @Override
-      public String toString()
-      {
-         return "Built-in UserTransaction bean";
-      }
-
    }
 
    public UserTransactionBean(BeanManagerImpl beanManager)
    {
       super(UserTransaction.class, new UserTransactionCallable(beanManager), beanManager);
    }
+
+   @Override
+   public String toString()
+   {
+      return "Built-in Bean [javax.transaction.UserTransaction] with qualifiers [@Default]";
+   }
 
 }