[webbeans-commits] Webbeans SVN: r2365 - in ri/trunk: impl/src/main/java/org/jboss/webbeans/bean and 9 other directories.

Author: pete.muir(a)jboss.org Date: 2009-04-09 11:52:54 -0400 (Thu, 09 Apr 2009) New Revision: 2365 Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/el/RunInDependentContext.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java Log: encapsulate static access in contexts Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/ManagerImpl.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -1130,9 +1130,9 @@ log.trace("Ending application"); shutdownExecutors(); CurrentManager.cleanup(); - ApplicationContext.INSTANCE.destroy(); - ApplicationContext.INSTANCE.setActive(false); - ApplicationContext.INSTANCE.setBeanStore(null); + ApplicationContext.instance().destroy(); + ApplicationContext.instance().setActive(false); + ApplicationContext.instance().setBeanStore(null); getServices().get(NamingContext.class).unbind(ManagerImpl.JNDI_KEY); } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/AbstractProducerBean.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -331,9 +331,9 @@ { if (getDeclaringBean().isDependent()) { - DependentContext.INSTANCE.startCollectingDependents(dependentStorageRequest); + DependentContext.instance().startCollectingDependents(dependentStorageRequest); } - DependentContext.INSTANCE.setActive(true); + DependentContext.instance().setActive(true); T instance = produceInstance(creationalContext); checkReturnValue(instance); return instance; @@ -342,10 +342,10 @@ { if (getDeclaringBean().isDependent()) { - DependentContext.INSTANCE.stopCollectingDependents(dependentStorageRequest); + DependentContext.instance().stopCollectingDependents(dependentStorageRequest); dependentInstancesStore.destroyDependentInstances(dependentStorageRequest.getKey()); } - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -228,7 +228,7 @@ { try { - DependentContext.INSTANCE.setActive(true); + DependentContext.instance().setActive(true); T instance = proxyClass.newInstance(); creationalContext.push(instance); ((ProxyObject) instance).setHandler(new EnterpriseBeanProxyMethodHandler(this)); @@ -250,7 +250,7 @@ } finally { - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); } } @@ -321,15 +321,15 @@ public void push(T incompleteInstance) {}; }; - DependentContext.INSTANCE.startCollectingDependents(dependentStorageRequest); - DependentContext.INSTANCE.setActive(true); + DependentContext.instance().startCollectingDependents(dependentStorageRequest); + DependentContext.instance().setActive(true); injectBoundFields(instance, creationalContext); callInitializers(instance, creationalContext); } finally { - DependentContext.INSTANCE.stopCollectingDependents(dependentStorageRequest); - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().stopCollectingDependents(dependentStorageRequest); + DependentContext.instance().setActive(false); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/SimpleBean.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -113,7 +113,7 @@ { try { - DependentContext.INSTANCE.setActive(true); + DependentContext.instance().setActive(true); T instance = null; DependentStorageRequest dependentStorageRequest = null; try @@ -121,7 +121,7 @@ instance = constructor.newInstance(manager, creationalContext); creationalContext.push(instance); dependentStorageRequest = DependentStorageRequest.of(dependentInstancesStore, instance); - DependentContext.INSTANCE.startCollectingDependents(dependentStorageRequest); + DependentContext.instance().startCollectingDependents(dependentStorageRequest); injectEjbAndCommonFields(instance); injectBoundFields(instance, creationalContext); callInitializers(instance, creationalContext); @@ -129,13 +129,13 @@ } finally { - DependentContext.INSTANCE.stopCollectingDependents(dependentStorageRequest); + DependentContext.instance().stopCollectingDependents(dependentStorageRequest); } return instance; } finally { - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); } } @@ -148,7 +148,7 @@ { try { - DependentContext.INSTANCE.setActive(true); + DependentContext.instance().setActive(true); callPreDestroy(instance); dependentInstancesStore.destroyDependentInstances(instance); } @@ -158,7 +158,7 @@ } finally { - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bean/standard/AbstractFacadeBean.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -28,7 +28,7 @@ { try { - DependentContext.INSTANCE.setActive(true); + DependentContext.instance().setActive(true); InjectionPoint injectionPoint = this.getManager().getInjectionPoint(); if (injectionPoint != null) { @@ -51,7 +51,7 @@ } finally { - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -248,21 +248,21 @@ protected void beginApplication(BeanStore applicationBeanStore) { log.trace("Starting application"); - ApplicationContext.INSTANCE.setBeanStore(applicationBeanStore); - ApplicationContext.INSTANCE.setActive(true); + ApplicationContext.instance().setBeanStore(applicationBeanStore); + ApplicationContext.instance().setActive(true); } protected void beginDeploy(BeanStore requestBeanStore) { - RequestContext.INSTANCE.setBeanStore(requestBeanStore); - RequestContext.INSTANCE.setActive(true); + RequestContext.instance().setBeanStore(requestBeanStore); + RequestContext.instance().setActive(true); } protected void endDeploy(BeanStore requestBeanStore) { - RequestContext.INSTANCE.setBeanStore(null); - RequestContext.INSTANCE.setActive(false); + RequestContext.instance().setBeanStore(null); + RequestContext.instance().setActive(false); } public void shutdown() Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ApplicationContext.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -33,18 +33,23 @@ public class ApplicationContext extends AbstractMapContext { - public static ApplicationContext INSTANCE; - + private static ApplicationContext INSTANCE; + + public static ApplicationContext instance() + { + return INSTANCE; + } + public static ApplicationContext create() { INSTANCE = new ApplicationContext(); - return INSTANCE; + return instance(); } // The beans private BeanStore beanStore; // Is the context active? - private AtomicBoolean active; + private final AtomicBoolean active; /** * Constructor Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/ContextLifecycle.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -34,36 +34,36 @@ protected void restoreSession(String id, BeanStore sessionBeanStore) { log.trace("Restoring session " + id); - SessionContext.INSTANCE.setBeanStore(sessionBeanStore); - SessionContext.INSTANCE.setActive(true); + SessionContext.instance().setBeanStore(sessionBeanStore); + SessionContext.instance().setActive(true); } protected void endSession(String id, BeanStore sessionBeanStore) { log.trace("Ending session " + id); - SessionContext.INSTANCE.setActive(true); + SessionContext.instance().setActive(true); ConversationManager conversationManager = CurrentManager.rootManager().getInstanceByType(ConversationManager.class); conversationManager.destroyAllConversations(); - SessionContext.INSTANCE.destroy(); - SessionContext.INSTANCE.setBeanStore(null); - SessionContext.INSTANCE.setActive(false); + SessionContext.instance().destroy(); + SessionContext.instance().setBeanStore(null); + SessionContext.instance().setActive(false); } public void beginRequest(String id, BeanStore requestBeanStore) { log.trace("Starting request " + id); - RequestContext.INSTANCE.setBeanStore(requestBeanStore); - RequestContext.INSTANCE.setActive(true); - DependentContext.INSTANCE.setActive(true); + RequestContext.instance().setBeanStore(requestBeanStore); + RequestContext.instance().setActive(true); + DependentContext.instance().setActive(true); } public void endRequest(String id, BeanStore requestBeanStore) { log.trace("Ending request " + id); - RequestContext.INSTANCE.setBeanStore(requestBeanStore); - DependentContext.INSTANCE.setActive(false); - RequestContext.INSTANCE.destroy(); - RequestContext.INSTANCE.setActive(false); + RequestContext.instance().setBeanStore(requestBeanStore); + DependentContext.instance().setActive(false); + RequestContext.instance().destroy(); + RequestContext.instance().setActive(false); } protected void restoreConversation(String id, BeanStore conversationBeanStore) Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/DependentContext.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -31,17 +31,22 @@ */ public class DependentContext extends AbstractContext { - public static DependentContext INSTANCE; + private static DependentContext INSTANCE; + public static DependentContext instance() + { + return INSTANCE; + } + public static DependentContext create() { INSTANCE = new DependentContext(); - return INSTANCE; + return instance(); } - private ThreadLocal<AtomicInteger> reentrantActiveCount; + private final ThreadLocal<AtomicInteger> reentrantActiveCount; // A (possible null) request to store dependents created - private ThreadLocal<DependentStorageRequest> dependentStorageRequest; + private final ThreadLocal<DependentStorageRequest> dependentStorageRequest; /** * Constructor Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/RequestContext.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -27,12 +27,17 @@ public class RequestContext extends AbstractThreadLocalMapContext { - public static RequestContext INSTANCE; - + private static RequestContext INSTANCE; + + public static RequestContext instance() + { + return INSTANCE; + } + public static RequestContext create() { INSTANCE = new RequestContext(); - return INSTANCE; + return instance(); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/context/SessionContext.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -31,12 +31,17 @@ { private static LogProvider log = Logging.getLogProvider(SessionContext.class); - public static SessionContext INSTANCE; - + private static SessionContext INSTANCE; + + public static SessionContext instance() + { + return INSTANCE; + } + public static SessionContext create() { INSTANCE = new SessionContext(); - return INSTANCE; + return instance(); } /** Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/el/RunInDependentContext.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/el/RunInDependentContext.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/el/RunInDependentContext.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -19,16 +19,16 @@ private void setup() { - DependentContext.INSTANCE.setActive(true); - DependentContext.INSTANCE.startCollectingDependents(dependentStorageRequest); + DependentContext.instance().setActive(true); + DependentContext.instance().startCollectingDependents(dependentStorageRequest); } private void cleanup() { - DependentContext.INSTANCE.stopCollectingDependents(dependentStorageRequest); + DependentContext.instance().stopCollectingDependents(dependentStorageRequest); // TODO kinky dependentStorageRequest.getDependentInstancesStore().destroyDependentInstances(dependentStorageRequest.getKey()); - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); } protected abstract void execute() throws Exception; Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/AsynchronousTransactionalEventNotification.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -38,7 +38,7 @@ public void run() { // Let the event be deferred again as just an asynchronous event - DependentContext.INSTANCE.setActive(true); + DependentContext.instance().setActive(true); try { log.trace("Sending event [" + event + "] asynchronously to transaction observer " + observer); @@ -50,7 +50,7 @@ } finally { - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/EventManager.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -108,7 +108,7 @@ { try { - DependentContext.INSTANCE.setActive(true); + DependentContext.instance().setActive(true); for (Observer<T> observer : observers) { observer.notify(event); @@ -116,7 +116,7 @@ } finally { - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/event/ObserverImpl.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -176,7 +176,7 @@ { if (Dependent.class.equals(observerBean.getScopeType()) && observerBean instanceof RIBean) { - DependentContext.INSTANCE.startCollectingDependents(dependentStorageRequest); + DependentContext.instance().startCollectingDependents(dependentStorageRequest); } // Get the most specialized instance of the component instance = getInstance(observerBean); @@ -191,7 +191,7 @@ { if (Dependent.class.equals(observerBean.getScopeType())) { - DependentContext.INSTANCE.stopCollectingDependents(dependentStorageRequest); + DependentContext.instance().stopCollectingDependents(dependentStorageRequest); dependentStorageRequest.getDependentInstancesStore().destroyDependentInstances(dependentStorageRequest.getKey()); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/injection/NonContextualInjector.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -95,10 +95,10 @@ public void inject(final Object instance) { - if (DependentContext.INSTANCE != null && ApplicationContext.INSTANCE != null) + if (DependentContext.instance() != null && ApplicationContext.instance() != null) { - DependentContext.INSTANCE.setActive(true); - ApplicationContext.INSTANCE.setActive(true); + DependentContext.instance().setActive(true); + ApplicationContext.instance().setActive(true); Set<FieldInjectionPoint<?>> injectionPoints = instances.putIfAbsent(instance.getClass(), new Callable<Set<FieldInjectionPoint<?>>>() { @@ -113,8 +113,8 @@ { injectionPoint.inject(instance, manager, null); } - DependentContext.INSTANCE.setActive(false); - ApplicationContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); + ApplicationContext.instance().setActive(false); } } Modified: ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java =================================================================== --- ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/impl/src/main/java/org/jboss/webbeans/servlet/ServletLifecycle.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -124,7 +124,7 @@ } super.endRequest(request.getRequestURI(), beanStore); request.removeAttribute(REQUEST_ATTRIBUTE_NAME); - SessionContext.INSTANCE.setBeanStore(null); + SessionContext.instance().setBeanStore(null); } } Modified: ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java =================================================================== --- ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/porting-package/src/main/java/org/jboss/webbeans/tck/ContextsImpl.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -11,7 +11,7 @@ public RequestContext getRequestContext() { - return RequestContext.INSTANCE; + return RequestContext.instance(); } public void setActive(AbstractContext context) @@ -26,7 +26,7 @@ public AbstractContext getDependentContext() { - return DependentContext.INSTANCE; + return DependentContext.instance(); } public void destroyContext(AbstractContext context) Modified: ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java =================================================================== --- ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-04-09 15:45:47 UTC (rev 2364) +++ ri/trunk/tests/src/main/java/org/jboss/webbeans/test/AbstractWebBeansTest.java 2009-04-09 15:52:54 UTC (rev 2365) @@ -31,12 +31,12 @@ protected void setup() { - DependentContext.INSTANCE.setActive(true); + DependentContext.instance().setActive(true); } protected void cleanup() { - DependentContext.INSTANCE.setActive(false); + DependentContext.instance().setActive(false); } public final void run() throws Exception