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:18:11 UTC
svn commit: r1363057 - in /openwebbeans/trunk/webbeans-impl/src:
main/java/org/apache/webbeans/container/ main/java/org/apache/webbeans/event/
main/java/org/apache/webbeans/inject/instance/
test/java/org/apache/webbeans/test/mock/
Author: struberg
Date: Wed Jul 18 19:18:11 2012
New Revision: 1363057
URL: http://svn.apache.org/viewvc?rev=1363057&view=rev
Log:
OWB-681 more BeanManager cleanup ...
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/container/BeanManagerImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
openwebbeans/trunk/webbeans-impl/src/test/java/org/apache/webbeans/test/mock/MockManager.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=1363057&r1=1363056&r2=1363057&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:18:11 2012
@@ -512,17 +512,6 @@ public class BeanManagerImpl implements
return this;
}
-
- @Deprecated
- public <T> T getInstance(Bean<T> bean, CreationalContext<?> creationalContext)
- {
- if(creationalContext == null)
- {
- creationalContext = createCreationalContext(bean);
- }
- return (T)getReference(bean, null, creationalContext);
- }
-
/**
* {@inheritDoc}
*/
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java?rev=1363057&r1=1363056&r2=1363057&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/ObserverMethodImpl.java Wed Jul 18 19:18:11 2012
@@ -408,7 +408,7 @@ public class ObserverMethodImpl<T> imple
}
CreationalContext<Object> creational = manager.createCreationalContext(injectedBean);
- Object instance = manager.getInstance(injectedBean, creational);
+ Object instance = manager.getReference(injectedBean, null, creational);
if (injectionPointBeanLocalSetOnStack)
{
InjectionPointBean.unsetThreadLocal();
@@ -481,7 +481,7 @@ public class ObserverMethodImpl<T> imple
}
CreationalContext<Object> creational = manager.createCreationalContext(injectedBean);
- Object instance = manager.getInstance(injectedBean, creational);
+ Object instance = manager.getReference(injectedBean, null, creational);
if (injectionPointBeanLocalSetOnStack)
{
Modified: openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java
URL: http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java?rev=1363057&r1=1363056&r2=1363057&view=diff
==============================================================================
--- openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java (original)
+++ openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/inject/instance/InstanceImpl.java Wed Jul 18 19:18:11 2012
@@ -254,7 +254,7 @@ class InstanceImpl<T> implements Instanc
Set<T> instances = new HashSet<T>();
for(Bean<?> bean : beans)
{
- T instance = (T) webBeansContext.getBeanManagerImpl().getInstance(bean,null);
+ T instance = (T) webBeansContext.getBeanManagerImpl().getReference(bean,null, parentCreationalContext);
instances.add(instance);
}
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=1363057&r1=1363056&r2=1363057&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:18:11 2012
@@ -127,7 +127,7 @@ public class MockManager implements Bean
public <T> T getInstance(Bean<T> bean)
{
- return manager.getInstance(bean,null);
+ return (T) manager.getReference(bean,null, manager.createCreationalContext(bean));
}
public <T> T getInstanceByType(Type type, Annotation... bindingTypes)