You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2013/06/17 15:20:41 UTC

svn commit: r1493754 - in /tomee/tomee/trunk/container: openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/ openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ openejb...

Author: rmannibucau
Date: Mon Jun 17 13:20:41 2013
New Revision: 1493754

URL: http://svn.apache.org/r1493754
Log:
TOMEE-979 propagating CDI scopes too - not sure that's a good idea but seems logical ATM, to refine

Modified:
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java
    tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java
    tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java

Modified: tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java?rev=1493754&r1=1493753&r2=1493754&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java (original)
+++ tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/main/java/org/apache/openejb/concurrencyutilities/ee/task/CUTask.java Mon Jun 17 13:20:41 2013
@@ -17,10 +17,18 @@
 package org.apache.openejb.concurrencyutilities.ee.task;
 
 import org.apache.openejb.OpenEJBRuntimeException;
+import org.apache.openejb.cdi.CdiAppContextsService;
 import org.apache.openejb.core.ThreadContext;
 import org.apache.openejb.loader.SystemInstance;
 import org.apache.openejb.spi.SecurityService;
+import org.apache.webbeans.config.WebBeansContext;
+import org.apache.webbeans.spi.ContextsService;
 
+import javax.enterprise.context.ConversationScoped;
+import javax.enterprise.context.RequestScoped;
+import javax.enterprise.context.SessionScoped;
+import java.util.HashMap;
+import java.util.Map;
 import java.util.concurrent.Callable;
 
 public abstract class CUTask<T> extends ManagedTaskListenerTask {
@@ -62,16 +70,32 @@ public abstract class CUTask<T> extends 
     }
 
     private static class Context {
+        private static final Class<?>[] THREAD_SCOPES = new Class<?>[] {
+                RequestScoped.class, SessionScoped.class, ConversationScoped.class
+        };
+
         private final Object securityServiceState;
         private final ThreadContext threadContext;
         private final ClassLoader loader;
 
+        private final CdiAppContextsService contextService;
+        private final CdiAppContextsService.State cdiState;
+
         private Context currentContext = null;
 
         private Context(final Object initialSecurityServiceState, final ThreadContext initialThreadContext, final ClassLoader initialLoader) {
             this.securityServiceState = initialSecurityServiceState;
             this.threadContext = initialThreadContext;
             this.loader = initialLoader;
+
+            final ContextsService genericContextsService = WebBeansContext.currentInstance().getContextsService();
+            if (CdiAppContextsService.class.isInstance(genericContextsService)) {
+                contextService = CdiAppContextsService.class.cast(genericContextsService);
+                cdiState = contextService.saveState();
+            } else {
+                contextService = null;
+                cdiState = null;
+            }
         }
 
         public void enter() {
@@ -91,13 +115,23 @@ public abstract class CUTask<T> extends 
             SECURITY_SERVICE.setState(securityServiceState);
 
             currentContext = new Context(threadState, oldCtx, oldCl);
+            if (cdiState != null) {
+                contextService.restoreState(cdiState);
+            }
         }
 
         public void exit() {
             SECURITY_SERVICE.setState(currentContext.securityServiceState);
+
             if (currentContext.threadContext != null) {
                 ThreadContext.exit(currentContext.threadContext);
             }
+
+            if (currentContext.cdiState != null) {
+                contextService.restoreState(currentContext.cdiState);
+                contextService.removeThreadLocals();
+            }
+
             Thread.currentThread().setContextClassLoader(currentContext.loader);
             currentContext = null;
         }

Modified: tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java?rev=1493754&r1=1493753&r2=1493754&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java (original)
+++ tomee/tomee/trunk/container/openejb-concurrency-utilities-ee/src/test/java/org/apache/openejb/concurrencyutilities/test/ManagedExecutorServiceTest.java Mon Jun 17 13:20:41 2013
@@ -27,39 +27,44 @@ import javax.annotation.Resource;
 import javax.ejb.EJB;
 import javax.ejb.Singleton;
 import javax.enterprise.concurrent.ManagedExecutorService;
+import javax.enterprise.context.RequestScoped;
 import javax.enterprise.inject.Typed;
+import javax.enterprise.inject.spi.BeanManager;
 import javax.inject.Inject;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Future;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
 @RunWith(ApplicationComposer.class)
 public class ManagedExecutorServiceTest {
-    @Module
-    public Class<?>[] bean() {
-        return new Class<?>[] { ExecutorFacade.class, CdiExecutorFacade.class };
-    }
-
     @EJB
     private ExecutorFacade facade;
-
     @Inject
     private CdiExecutorFacade cdiFacade;
 
+    @Module
+    public Class<?>[] bean() {
+        return new Class<?>[]{ ExecutorFacade.class, CdiExecutorFacade.class, RequestBean.class, MyCallable.class };
+    }
+
     @Before
     public void cleanUpContext() {
         ThreadContext.exit(null);
+        RequestBean.ID = 0;
     }
 
     @Test
     public void checkEjbContext() throws Exception {
         assertTrue(facade.submit().get());
+        assertEquals(1, RequestBean.ID);
     }
 
     @Test
     public void checkCdiContext() throws Exception {
         assertTrue(cdiFacade.submit().get());
+        assertEquals(1, RequestBean.ID);
     }
 
     @Singleton
@@ -69,26 +74,63 @@ public class ManagedExecutorServiceTest 
         private ManagedExecutorService es;
 
         @Override
-        protected boolean isValid() {
+        public boolean isValid() {
             return ThreadContext.getThreadContext().getBeanContext().getBeanClass() == ExecutorFacade.class;
         }
     }
 
     public static class CdiExecutorFacade {
+        protected static long id = -1;
+        protected static CdiExecutorFacade current = null;
+
         @Resource
         private ManagedExecutorService es;
 
+        @Inject
+        private RequestBean bean;
+
+        @Inject
+        private MyCallable callable;
+
         public Future<Boolean> submit() {
-            return es.submit(new Callable<Boolean>() {
-                @Override
-                public Boolean call() throws Exception {
-                    return isValid();
-                }
-            });
+            setContext();
+            return es.submit(callable);
         }
 
-        protected boolean isValid() {
+        protected void setContext() {
+            id = bean.getId();
+            current = this;
+        }
+
+        public boolean isValid() {
             return ThreadContext.getThreadContext() == null;
         }
     }
+
+    @Typed(MyCallable.class)
+    public static class MyCallable implements Callable<Boolean> {
+        @Inject
+        private RequestBean bean;
+
+        @Inject
+        private BeanManager bm;
+
+        @Override
+        public Boolean call() throws Exception {
+            final RequestBean currentRequestBean = RequestBean.class.cast(bm.getReference(bm.resolve(bm.getBeans(RequestBean.class)), RequestBean.class, null));
+            return CdiExecutorFacade.id == bean.getId()
+                    && CdiExecutorFacade.id == currentRequestBean.getId()
+                    && CdiExecutorFacade.current.isValid();
+        }
+    }
+
+    @RequestScoped
+    public static class RequestBean {
+        private static int ID = 0;
+        private int id = ID++;
+
+        public int getId() {
+            return id;
+        }
+    }
 }

Modified: tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java
URL: http://svn.apache.org/viewvc/tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java?rev=1493754&r1=1493753&r2=1493754&view=diff
==============================================================================
--- tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java (original)
+++ tomee/tomee/trunk/container/openejb-core/src/main/java/org/apache/openejb/cdi/CdiAppContextsService.java Mon Jun 17 13:20:41 2013
@@ -504,4 +504,28 @@ public class CdiAppContextsService exten
     public void updateSessionIdMapping(final String oldId, final String newId) {
         sessionCtxManager.updateSessionIdMapping(oldId, newId);
     }
+
+    public State saveState() {
+        return new State(requestContext.get(), sessionContext.get(), conversationContext.get());
+    }
+
+    public State restoreState(final State state) {
+        final State old = saveState();
+        requestContext.set(state.request);
+        sessionContext.set(state.session);
+        conversationContext.set(state.conversation);
+        return old;
+    }
+
+    public static class State {
+        private final RequestContext request;
+        private final SessionContext session;
+        private final ConversationContext conversation;
+
+        public State(final RequestContext request, final SessionContext session, final ConversationContext conversation) {
+            this.request = request;
+            this.session = session;
+            this.conversation = conversation;
+        }
+    }
 }