Beans.removeDisabledBeans() - don't use the live view but immutable set

There's no need to use the live view. Note that some Collections2.FilteredCollection operations require some additional overhead. For example size() must always iterate through the unfiltered collection and apply the filter predicate on each element.
weld · Sep 18, 2014 · bd6b9e9 · bd6b9e9
1 parent 47dfd87
commit bd6b9e9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 19 deletions.
diff --git a/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java b/impl/src/main/java/org/jboss/weld/resolution/NameBasedResolver.java
@@ -30,7 +30,6 @@
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
-import com.google.common.collect.ImmutableSet;
 
 /**
  * Implementation of name based bean resolution
@@ -58,8 +57,7 @@ public Set<Bean<?>> load(String from) {
                     matchedBeans.add(bean);
                 }
             }
-            //noinspection unchecked
-            return ImmutableSet.copyOf((Iterable<Bean<?>>) Beans.removeDisabledBeans(matchedBeans, beanManager, registry));
+            return Beans.removeDisabledBeans(matchedBeans, beanManager, registry);
         }
 
     }

diff --git a/impl/src/main/java/org/jboss/weld/util/Beans.java b/impl/src/main/java/org/jboss/weld/util/Beans.java
@@ -96,10 +96,7 @@
 import org.jboss.weld.util.reflection.Reflections;
 import org.jboss.weld.util.reflection.SessionBeanHierarchyDiscovery;
 
-import com.google.common.base.Predicate;
-import com.google.common.collect.Sets;
-
-import edu.umd.cs.findbugs.annotations.SuppressWarnings;
+import com.google.common.collect.ImmutableSet;
 
 /**
  * Helper class for bean inspection
@@ -227,27 +224,25 @@ public static boolean findInterceptorBindingConflicts(BeanManagerImpl manager, S
     }
 
     /**
-     * Retains only beans which have deployment type X.
-     * <p/>
-     * The deployment type X is
+     * Retains only beans which are enabled.
      *
      * @param beans The beans to filter
-     * @param beanManager the bean manager
-     * @return The filtered beans
+     * @param beanManager The bean manager
+     * @param registry
+     * @return An immutable set of enabled beans
      */
     public static <T extends Bean<?>> Set<T> removeDisabledBeans(Set<T> beans, final BeanManagerImpl beanManager,
             final SpecializationAndEnablementRegistry registry) {
         if (beans.size() == 0) {
             return beans;
         } else {
-            return Sets.filter(beans, new Predicate<T>() {
-                @Override
-                @SuppressWarnings("NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE")
-                public boolean apply(T bean) {
-                    Preconditions.checkArgumentNotNull(bean, "bean");
-                    return isBeanEnabled(bean, beanManager.getEnabled());
+            ImmutableSet.Builder<T> builder = ImmutableSet.builder();
+            for (T bean : beans) {
+                if (isBeanEnabled(bean, beanManager.getEnabled())) {
+                    builder.add(bean);
                 }
-            });
+            }
+            return builder.build();
         }
     }