You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwebbeans.apache.org by st...@apache.org on 2012/07/18 21:12:10 UTC
svn commit: r1363053 - in /openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/container/ test/java/org/apache/webbeans/test/
test/java/org/apache/webbeans/test/containertests/
test/java/org/apache/webbeans/test/mock/ test/java/org/apac...
Author: struberg
Date: Wed Jul 18 19:12:10 2012
New Revision: 1363053
URL: http://svn.apache.org/viewvc?rev=1363053&view=rev
Log:
OWB-681 remove obsolete methods from the BeanManager
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java?rev=1363053&r1=1363052&r2=1363053&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java Wed Jul 18 19:12:10 2012
@@ -20,7 +20,6 @@ package org.apache.webbeans.container;
import java.io.InputStream;
import java.lang.annotation.Annotation;
-import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.ArrayList;
import java.util.Collections;
@@ -53,7 +52,6 @@ import javax.enterprise.inject.spi.Injec
import javax.enterprise.inject.spi.InterceptionType;
import javax.enterprise.inject.spi.Interceptor;
import javax.enterprise.inject.spi.ObserverMethod;
-import javax.enterprise.util.TypeLiteral;
import javax.inject.Scope;
import javax.interceptor.InterceptorBinding;
import javax.naming.NamingException;
@@ -477,58 +475,6 @@ public class BeanManagerImpl implements
notificationManager.fireEvent(event, bindings);
}
- @Deprecated
- public <T> T getInstanceByType(Class<T> type, Annotation... bindingTypes)
- {
- webBeansContext.getResolutionUtil().getInstanceByTypeConditions(bindingTypes);
- Set<Bean<?>> set = resolveByType(type, bindingTypes);
-
- webBeansContext.getResolutionUtil().checkResolvedBeans(set, type, bindingTypes);
-
- Bean<?> bean = set.iterator().next();
-
- return (T)getInstance(bean, createCreationalContext(bean));
- }
-
- @Deprecated
- public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindingTypes)
- {
- webBeansContext.getResolutionUtil().getInstanceByTypeConditions(bindingTypes);
- Set<Bean<?>> set = resolveByType(type, bindingTypes);
-
- webBeansContext.getResolutionUtil().checkResolvedBeans(set, type.getRawType(), bindingTypes);
-
- Bean<?> bean = set.iterator().next();
-
- return (T)getInstance(bean, createCreationalContext(bean));
- }
-
- @Deprecated
- public Set<Bean<?>> resolveByName(String name)
- {
- return injectionResolver.implResolveByName(name);
- }
-
- @Deprecated
- public Set<Bean<?>> resolveByType(Class<?> apiType, Annotation... bindingTypes)
- {
- webBeansContext.getResolutionUtil().getInstanceByTypeConditions(bindingTypes);
-
- return injectionResolver.implResolveByType(apiType, bindingTypes);
- }
-
- @Deprecated
- public Set<Bean<?>> resolveByType(TypeLiteral<?> apiType, Annotation... bindingTypes)
- {
- ParameterizedType ptype = (ParameterizedType) apiType.getType();
- ResolutionUtil.resolveByTypeConditions(ptype);
-
- webBeansContext.getResolutionUtil().getInstanceByTypeConditions(bindingTypes);
-
- return injectionResolver.implResolveByType(apiType.getType(), bindingTypes);
- }
-
-
public Set<Bean<?>> getComponents()
{
return deploymentBeans;
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java?rev=1363053&r1=1363052&r2=1363053&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/TestContext.java Wed Jul 18 19:12:10 2012
@@ -370,6 +370,11 @@ public abstract class TestContext implem
protected Object getInstanceByName(String name)
{
Bean<?> bean = manager.resolve(manager.getBeans(name));
+ if (bean == null)
+ {
+ return null;
+ }
+
return manager.getReference(bean, Object.class, manager.createCreationalContext(bean));
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java?rev=1363053&r1=1363052&r2=1363053&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/containertests/ComponentResolutionByTypeTest.java Wed Jul 18 19:12:10 2012
@@ -49,6 +49,7 @@ public class ComponentResolutionByTypeTe
NonBindingComponent s5 = null;
private BeanManagerImpl cont;
+
private static final String CLAZZ_NAME = ComponentResolutionByTypeTest.class.getName();
public ComponentResolutionByTypeTest()
@@ -66,25 +67,25 @@ public class ComponentResolutionByTypeTe
@Test
public void testBindingTypeOk() throws Throwable
{
- cont.resolveByType(BindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s1").getAnnotations());
+ cont.getBeans(BindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s1").getAnnotations());
}
@Test
public void testBindingTypeNonOk() throws Throwable
{
- cont.resolveByType(BindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s2").getAnnotations());
+ cont.getBeans(BindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s2").getAnnotations());
}
@Test
public void testNonBindingTypeOk1() throws Throwable
{
- cont.resolveByType(NonBindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s3").getAnnotations());
+ cont.getBeans(NonBindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s3").getAnnotations());
}
@Test
public void testNonBindingTypeOk2() throws Throwable
{
- Set<Bean<?>> beans = cont.resolveByType(NonBindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s4").getAnnotations());
+ Set<Bean<?>> beans = cont.getBeans(NonBindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s4").getAnnotations());
Assert.assertNotNull(beans);
Assert.assertTrue(beans.isEmpty());
}
@@ -92,7 +93,7 @@ public class ComponentResolutionByTypeTe
@Test
public void testNonBindingTypeNonOk() throws Throwable
{
- cont.resolveByType(NonBindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s5").getAnnotations());
+ cont.getBeans(NonBindingComponent.class, ComponentResolutionByTypeTest.class.getDeclaredField("s5").getAnnotations());
}
}
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java?rev=1363053&r1=1363052&r2=1363053&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.java Wed Jul 18 19:12:10 2012
@@ -130,29 +130,29 @@ public class MockManager implements Bean
return manager.getInstance(bean,null);
}
- public <T> T getInstanceByType(Class<T> type, Annotation... bindingTypes)
+ public <T> T getInstanceByType(Type type, Annotation... bindingTypes)
{
- return manager.getInstanceByType(type, bindingTypes);
+ Bean<?> bean = manager.resolve(manager.getBeans(type, bindingTypes));
+ if (bean == null)
+ {
+ return null;
+ }
+ return (T) manager.getReference(bean, type, manager.createCreationalContext(bean));
}
public <T> T getInstanceByType(TypeLiteral<T> type, Annotation... bindingTypes)
{
- return manager.getInstanceByType(type, bindingTypes);
+ return getInstanceByType(type.getType(), bindingTypes);
}
public Set<Bean<?>> resolveByName(String name)
{
- return manager.resolveByName(name);
+ return manager.getBeans(name);
}
public Set<Bean<?>> resolveByType(Class<?> apiType, Annotation... bindingTypes)
{
- return manager.resolveByType(apiType, bindingTypes);
- }
-
- public Set<Bean<?>> resolveByType(TypeLiteral<?> apiType, Annotation... bindingTypes)
- {
- return manager.resolveByType(apiType, bindingTypes);
+ return manager.getBeans(apiType, bindingTypes);
}
public List<Decorator<?>> resolveDecorators(Set<Type> types, Annotation... bindingTypes)
Modified: openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java?rev=1363053&r1=1363052&r2=1363053&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/unittests/typedliteral/TypedLiteralComponentTest.java Wed Jul 18 19:12:10 2012
@@ -99,7 +99,7 @@ public class TypedLiteralComponentTest e
};
- Bean<?> s = WebBeansContext.getInstance().getBeanManagerImpl().resolveByType(tl, anns).iterator().next();
+ Bean<?> s = WebBeansContext.getInstance().getBeanManagerImpl().getBeans(tl.getType(), anns).iterator().next();
Assert.assertNotNull(s);
contextFactory.destroyRequestContext(null);