Simplify resolution a bit

weld · Feb 16, 2010 · 1a65a56 · 1a65a56
1 parent 85d8e8d
commit 1a65a56
Show file tree

Hide file tree

Showing 12 changed files with 86 additions and 325 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/bean/builtin/FacadeBeanResolvableTransformer.java b/impl/src/main/java/org/jboss/weld/bean/builtin/FacadeBeanResolvableTransformer.java
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
@@ -66,7 +66,7 @@ private InstanceImpl(Type type, Annotation[] qualifiers, InjectionPoint injectio
 
    public T get()
    {      
-      Bean<?> bean = getBeanManager().getBean(new ResolvableBuilder().setType(getType()).addQualifiers(getQualifiers()).setDeclaringBean(getInjectionPoint().getBean()).create());
+      Bean<?> bean = getBeanManager().getBean(new ResolvableBuilder(getType()).addQualifiers(getQualifiers()).setDeclaringBean(getInjectionPoint().getBean()).create());
       // Push in an empty CC to ensure that we don't get the CC of whatever is injecting the bean containing the Instance injection point
       try
       {

diff --git a/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java b/impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java
@@ -543,7 +543,7 @@ public void setEnabledInterceptorClasses(List<Class<?>> enabledInterceptorClasse
 
    public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers)
    {
-      return beanResolver.resolve(new ResolvableBuilder().setType(beanType).addQualifiers(qualifiers).create());
+      return beanResolver.resolve(new ResolvableBuilder(beanType).addQualifiers(qualifiers).create());
    }
 
    public Set<Bean<?>> getBeans(InjectionPoint injectionPoint)
@@ -555,7 +555,7 @@ public Set<Bean<?>> getBeans(InjectionPoint injectionPoint)
          {
             Container.instance().services().get(CurrentInjectionPoint.class).push(injectionPoint);
          }
-         return beanResolver.resolve(new ResolvableBuilder().setInjectionPoint(injectionPoint).create());
+         return beanResolver.resolve(new ResolvableBuilder(injectionPoint).create());
       }
       finally
       {
@@ -798,7 +798,7 @@ public Object getInjectableReference(InjectionPoint injectionPoint, CreationalCo
    {
       if (!injectionPoint.isDelegate())
       {
-         Bean<?> resolvedBean = getBean(new ResolvableBuilder().setInjectionPoint(injectionPoint).create());
+         Bean<?> resolvedBean = getBean(new ResolvableBuilder(injectionPoint).create());
          return getReference(injectionPoint, resolvedBean, creationalContext);
       }
       else
@@ -863,7 +863,7 @@ private void checkResolveDecoratorsArguments(Set<Type> types)
     */
    public List<Interceptor<?>> resolveInterceptors(InterceptionType type, Annotation... interceptorBindings)
    {
-      return new ArrayList<Interceptor<?>>(interceptorResolver.resolve(new InterceptorResolvableBuilder().setInterceptionType(type).setType(Object.class).addQualifiers(interceptorBindings).create()));
+      return new ArrayList<Interceptor<?>>(interceptorResolver.resolve(new InterceptorResolvableBuilder(Object.class).setInterceptionType(type).addQualifiers(interceptorBindings).create()));
    }
 
    /**

diff --git a/impl/src/main/java/org/jboss/weld/resolution/InterceptorResolvableBuilder.java b/impl/src/main/java/org/jboss/weld/resolution/InterceptorResolvableBuilder.java
@@ -11,7 +11,6 @@
 import java.util.Set;
 
 import javax.enterprise.inject.spi.Bean;
-import javax.enterprise.inject.spi.InjectionPoint;
 import javax.enterprise.inject.spi.InterceptionType;
 
 import org.jboss.weld.Container;
@@ -21,6 +20,16 @@
 public class InterceptorResolvableBuilder extends ResolvableBuilder
 {
 
+   public InterceptorResolvableBuilder()
+   {
+      super();
+   }
+
+   public InterceptorResolvableBuilder(Type type)
+   {
+      super(type);
+   }
+
    private InterceptionType interceptionType;
 
    @Override
@@ -84,20 +93,6 @@ public InterceptorResolvableBuilder setDeclaringBean(Bean<?> declaringBean)
       return this;
    }
 
-   @Override
-   public InterceptorResolvableBuilder setInjectionPoint(InjectionPoint injectionPoint)
-   {
-      super.setInjectionPoint(injectionPoint);
-      return this;
-   }
-
-   @Override
-   public InterceptorResolvableBuilder setType(Type type)
-   {
-      super.setType(type);
-      return this;
-   }
-
    @Override
    public InterceptorResolvable create()
    {

diff --git a/impl/src/main/java/org/jboss/weld/resolution/NewResolvableTransformer.java b/impl/src/main/java/org/jboss/weld/resolution/NewResolvableTransformer.java