[webbeans-commits] Webbeans SVN: r967 - in ri/trunk/webbeans-ri/src: test/java/org/jboss/webbeans/test and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-01-14 10:22:05 -0500 (Wed, 14 Jan 2009)
New Revision: 967

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java
   ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java
Log:
Remove resolveByType(Object.class);

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java	2009-01-14 15:04:19 UTC (rev 966)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/Resolver.java	2009-01-14 15:22:05 UTC (rev 967)
@@ -196,14 +196,12 @@
     * @param key The resolving criteria
     * @return An unmodifiable set of matching beans
     */
-   @SuppressWarnings("unchecked")
    public <T, S> Set<Bean<T>> get(final AnnotatedItem<T, S> key)
    {
       Set<Bean<T>> beans = new HashSet<Bean<T>>();
 
       final ResolvableAnnotatedItem<T, S> element = new ResolvableAnnotatedItem<T, S>()
       {
-         private static final long serialVersionUID = 1L;
 
          @Override
          public AnnotatedItem<T, S> delegate()
@@ -213,12 +211,8 @@
 
       };
 
-      if (element.getType().equals(Object.class))
+      if (InjectionPoint.class.isAssignableFrom(element.getType()))
       {
-         beans = new HashSet<Bean<T>>((List) manager.getBeans());
-      }
-      else if (InjectionPoint.class.isAssignableFrom(element.getType()))
-      {
          beans.add(InjectionPointBean.of(key, manager));
       }
       else

Modified: ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java
===================================================================
--- ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java	2009-01-14 15:04:19 UTC (rev 966)
+++ ri/trunk/webbeans-ri/src/test/java/org/jboss/webbeans/test/ResolutionByTypeTest.java	2009-01-14 15:22:05 UTC (rev 967)
@@ -262,25 +262,6 @@
       assert manager.resolveByType(Tuna.class, new CurrentBinding()).size() == 0;
    }
    
-   @Test(groups="resolution") @SpecAssertion(section={"5.9.2", "2.2"})
-   public void testResolveObject() throws Exception
-   {
-      Bean<Salmon> salmonBean = SimpleBean.of(Salmon.class, manager);
-      Bean<Sole> soleBean = SimpleBean.of(Sole.class, manager);
-      Bean<Plaice> plaiceBean = SimpleBean.of(Plaice.class, manager);
-      manager.addBean(plaiceBean);
-      manager.addBean(salmonBean);
-      manager.addBean(soleBean);
-      
-      Set<Bean<Object>> beans = manager.resolveByType(Object.class);
-      
-      assert manager.resolveByType(Object.class).size() == 3 +  BUILT_IN_BEANS;
-      assert manager.resolveByType(Object.class).contains(plaiceBean);
-      assert manager.resolveByType(Object.class).contains(salmonBean);
-      assert manager.resolveByType(Object.class).contains(soleBean);
-      
-   }
-   
    @Test(groups="resolution") @SpecAssertion(section="5.9.2.1")
    public void testResolveByTypeWithNonBindingMembers() throws Exception
    {