Author: dblevins
Date: Thu Jan 27 18:17:10 2011
New Revision: 1064241
URL: http://svn.apache.org/viewvc?rev=1064241&view=rev
Log:
Destatic EJBWebBeansConfigurator and EventImpl
OWB-503 status: 523 code uses
Total of 5546 static synchronized accesses and 6733 hashed calls in 898 tests
Average of 6 static synchronized accesses and 7 hashed calls per test
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java?rev=1064241&r1=1064240&r2=1064241&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/BeansDeployer.java
Thu Jan 27 18:17:10 2011
@@ -535,7 +535,7 @@ public class BeansDeployer
// Try class is EJB bean
if (!isDefined && this.discoverEjb)
{
- if (EJBWebBeansConfigurator.isSessionBean(implClass))
+ if (EJBWebBeansConfigurator.isSessionBean(implClass,
webBeansContext))
{
logger.debug("Found Enterprise Bean with class name : [{0}]",
implClass.getName());
defineEnterpriseWebBean((Class<Object>) implClass,
(ProcessAnnotatedTypeImpl<Object>) processAnnotatedEvent);
@@ -904,7 +904,8 @@ public class BeansDeployer
*/
protected <T> void defineEnterpriseWebBean(Class<T> clazz,
ProcessAnnotatedType<T> processAnnotatedTypeEvent)
{
- InjectionTargetBean<T> bean = (InjectionTargetBean<T>)
EJBWebBeansConfigurator.defineEjbBean(clazz, processAnnotatedTypeEvent);
+ InjectionTargetBean<T> bean = (InjectionTargetBean<T>)
EJBWebBeansConfigurator.defineEjbBean(clazz, processAnnotatedTypeEvent,
+
webBeansContext);
webBeansContext.getWebBeansUtil().setInjectionTargetBeanEnableFlag(bean);
}
}
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java?rev=1064241&r1=1064240&r2=1064241&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/config/EJBWebBeansConfigurator.java
Thu Jan 27 18:17:10 2011
@@ -35,12 +35,13 @@ public final class EJBWebBeansConfigurat
/**
* Returns true if given class is an deployed ejb bean class, false
otherwise.
* @param clazz bean class
+ * @param webBeansContext
* @return true if given class is an deployed ejb bean class
* @throws WebBeansConfigurationException if any exception occurs
*/
- public static boolean isSessionBean(Class<?> clazz) throws
WebBeansConfigurationException
+ public static boolean isSessionBean(Class<?> clazz, WebBeansContext
webBeansContext) throws WebBeansConfigurationException
{
- PluginLoader loader = WebBeansContext.getInstance().getPluginLoader();
+ PluginLoader loader = webBeansContext.getPluginLoader();
OpenWebBeansEjbPlugin ejbPlugin = loader.getEjbPlugin();
//There is no ejb container
@@ -54,13 +55,15 @@ public final class EJBWebBeansConfigurat
/**
* Returns ejb bean.
+ * @param webBeansContext
* @param <T> bean class info
* @param clazz bean class
* @return ejb bean
*/
- public static <T> Bean<T> defineEjbBean(Class<T> clazz,
ProcessAnnotatedType<T> processAnnotatedTypeEvent)
+ public static <T> Bean<T> defineEjbBean(Class<T> clazz,
ProcessAnnotatedType<T> processAnnotatedTypeEvent,
+ WebBeansContext webBeansContext)
{
- PluginLoader loader = WebBeansContext.getInstance().getPluginLoader();
+ PluginLoader loader = webBeansContext.getPluginLoader();
OpenWebBeansEjbPlugin ejbPlugin = loader.getEjbPlugin();
if(ejbPlugin == null)
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java?rev=1064241&r1=1064240&r2=1064241&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/event/EventImpl.java
Thu Jan 27 18:17:10 2011
@@ -164,6 +164,6 @@ public class EventImpl<T> implements Eve
this.eventType = (Type)inputStream.readObject();
this.injectedBindings = (Annotation[])inputStream.readObject();
- this.webBeansContext = WebBeansContext.getInstance();
+ this.webBeansContext = WebBeansContext.currentInstance();
}
}
\ No newline at end of file
Modified:
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
URL:
http://svn.apache.org/viewvc/openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java?rev=1064241&r1=1064240&r2=1064241&view=diff
==============================================================================
---
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
(original)
+++
openwebbeans/trunk/webbeans-impl/src/main/java/org/apache/webbeans/util/WebBeansUtil.java
Thu Jan 27 18:17:10 2011
@@ -653,7 +653,7 @@ public final class WebBeansUtil
DefinitionUtil.defineInjectedFields(comp);
DefinitionUtil.defineInjectedMethods(comp);
}
- else if (EJBWebBeansConfigurator.isSessionBean(clazz))
+ else if (EJBWebBeansConfigurator.isSessionBean(clazz, webBeansContext))
{
comp = new NewBean<T>(clazz, WebBeansType.ENTERPRISE,
webBeansContext);
comp.setImplScopeType(new DependentScopeLiteral());
