WELD-819

* remove conversions to/from set

impl/src/main/java/org/jboss/weld/bean/builtin/AbstractFacade.java

@@ -17,13 +17,12 @@
 package org.jboss.weld.bean.builtin;
 
 import static org.jboss.weld.logging.messages.BeanMessage.TYPE_PARAMETER_MUST_BE_CONCRETE;
-import static org.jboss.weld.util.reflection.Reflections.EMPTY_ANNOTATIONS;
 
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.Arrays;
+import java.util.Set;
 
 import javax.enterprise.context.spi.CreationalContext;
 import javax.enterprise.inject.spi.InjectionPoint;
@@ -72,9 +71,9 @@ protected BeanManagerImpl getBeanManager()
       return beanManager.getCurrent();
    }
 
-   protected Annotation[] getQualifiers()
+   protected Set<Annotation> getQualifiers()
    {
-      return injectionPoint.getQualifiers().toArray(EMPTY_ANNOTATIONS);
+      return injectionPoint.getQualifiers();
    }
 
    protected Type getType()
@@ -98,7 +97,7 @@ public boolean equals(Object obj)
       if (obj instanceof AbstractFacade<?, ?>)
       {
          AbstractFacade<?, ?> that = (AbstractFacade<?, ?>) obj;
-         return this.getType().equals(that.getType()) && Arrays.equals(this.getQualifiers(), that.getQualifiers());
+         return this.getType().equals(that.getType()) && this.getQualifiers().equals(that.getQualifiers());
       }
       else
       {
@@ -111,7 +110,7 @@ public int hashCode()
    {
       int hashCode = 17;
       hashCode += getType().hashCode() * 5;
-      hashCode += Arrays.hashCode(getQualifiers()) * 7;
+      hashCode += getQualifiers().hashCode() * 7;
       return hashCode;
    }
 

impl/src/main/java/org/jboss/weld/bean/builtin/FacadeInjectionPoint.java

@@ -1,6 +1,6 @@
 package org.jboss.weld.bean.builtin;
 
-import static org.jboss.weld.util.Beans.mergeInQualifiersAsSet;
+import static org.jboss.weld.util.Beans.mergeInQualifiers;
 
 import java.io.Serializable;
 import java.lang.annotation.Annotation;
@@ -22,11 +22,11 @@ public class FacadeInjectionPoint extends ForwardingInjectionPoint implements Se
    private final Type type;
    private final Set<Annotation> qualifiers;
 
-   public FacadeInjectionPoint(InjectionPoint injectionPoint, Type subtype, Annotation[] existingQualifiers, Annotation[] newQualifiers)
+   public FacadeInjectionPoint(InjectionPoint injectionPoint, Type subtype, Set<Annotation> existingQualifiers, Annotation[] newQualifiers)
    {
       this.injectionPoint = injectionPoint;
       this.type = new ParameterizedTypeImpl(Instance.class, new Type[] {subtype}, null);
-      this.qualifiers = mergeInQualifiersAsSet(existingQualifiers, newQualifiers);
+      this.qualifiers = mergeInQualifiers(existingQualifiers, newQualifiers);
    }
 
    @Override

impl/src/main/java/org/jboss/weld/bean/builtin/InstanceImpl.java

@@ -64,11 +64,11 @@ private static class InstanceInjectionPoint extends ForwardingInjectionPoint imp
       private final Type type;
       private final Set<Annotation> qualifiers;
 
-      public InstanceInjectionPoint(InjectionPoint injectionPoint, Type type, Annotation[] qualifiers)
+      public InstanceInjectionPoint(InjectionPoint injectionPoint, Type type, Set<Annotation> qualifiers)
       {
          this.injectionPoint = injectionPoint;
          this.type = type;
-         this.qualifiers = asSet(qualifiers);
+         this.qualifiers = qualifiers;
       }
 
       @Override

impl/src/main/java/org/jboss/weld/manager/BeanManagerImpl.java

@@ -468,6 +468,12 @@ public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(Type eventType,
       return cast(observerResolver.resolve(new ResolvableBuilder().addTypes(new HierarchyDiscovery(eventType).getTypeClosure()).addType(Object.class).addQualifiers(qualifiers).addQualifierIfAbsent(AnyLiteral.INSTANCE).create(), true));
    }
 
+   public <T> Set<ObserverMethod<? super T>> resolveObserverMethods(Type eventType, Set<Annotation> qualifiers)
+   {
+      // We can always cache as this is only ever called by Weld where we avoid non-static inner classes for annotation literals
+      return cast(observerResolver.resolve(new ResolvableBuilder().addTypes(new HierarchyDiscovery(eventType).getTypeClosure()).addType(Object.class).addQualifiers(qualifiers).addQualifierIfAbsent(AnyLiteral.INSTANCE).create(), true));
+   }
+
    /**
     * Enabled Alternatives, Interceptors and Decorators
     * 
@@ -487,6 +493,11 @@ public Set<Bean<?>> getBeans(Type beanType, Annotation... qualifiers)
    {
       return beanResolver.resolve(new ResolvableBuilder(beanType).addQualifiers(qualifiers).create(), isCacheable(qualifiers));
    }
+
+   public Set<Bean<?>> getBeans(Type beanType, Set<Annotation> qualifiers)
+   {
+      return beanResolver.resolve(new ResolvableBuilder(beanType).addQualifiers(qualifiers).create(), isCacheable(qualifiers));
+   }
 
    public Set<Bean<?>> getBeans(InjectionPoint injectionPoint)
    {
@@ -607,6 +618,12 @@ public void fireEvent(Type eventType, Object event, Annotation... qualifiers)
       Observers.checkEventObjectType(event);
       notifyObservers(event, resolveObserverMethods(eventType, qualifiers));
    }
+
+   public void fireEvent(Type eventType, Object event, Set<Annotation> qualifiers)
+   {
+      Observers.checkEventObjectType(event);
+      notifyObservers(event, resolveObserverMethods(eventType, qualifiers));
+   }
 
    private <T> void notifyObservers(final T event, final Set<ObserverMethod<? super T>> observers)
    {

impl/src/main/java/org/jboss/weld/util/Beans.java

@@ -16,6 +16,7 @@
  */
 package org.jboss.weld.util;
 
+import static java.util.Arrays.asList;
 import static org.jboss.weld.logging.Category.BEAN;
 import static org.jboss.weld.logging.LoggerFactory.loggerFactory;
 import static org.jboss.weld.logging.messages.BeanMessage.FOUND_DEFAULT_CONSTRUCTOR;
@@ -910,13 +911,13 @@ public static <T> boolean isDecorator(WeldClass<T> annotatedItem)
 
    public static Annotation[] mergeInQualifiers(Annotation[] qualifiers, Annotation[] newQualifiers)
    {
-      return mergeInQualifiersAsSet(qualifiers, newQualifiers).toArray(Reflections.EMPTY_ANNOTATIONS);
+      return mergeInQualifiers(asList(qualifiers), newQualifiers).toArray(Reflections.EMPTY_ANNOTATIONS);
    }
 
-   public static Set<Annotation> mergeInQualifiersAsSet(Annotation[] qualifiers, Annotation[] newQualifiers)
+   public static Set<Annotation> mergeInQualifiers(Collection<Annotation> qualifiers, Annotation[] newQualifiers)
    {
       Set<Annotation> result = new HashSet<Annotation>();
-      result.addAll(Arrays.asList(qualifiers));
+      result.addAll(qualifiers);
       Set<Annotation> checkedNewQualifiers = new HashSet<Annotation>();
       for (Annotation qualifier : newQualifiers)
       {