Merge pull request #3 from mkouba/arc-ut-swap

Make BeanContainer.RequestAction more generic

Author: stuartwdouglas

extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/ArcDeploymentTemplate.java

@@ -46,7 +46,7 @@ public void run() {
         return container;
     }
 
-    public BeanContainer initBeanContainer(ArcContainer container, List<BeanContainerListener> beanConfigurators) throws Exception {
+    public BeanContainer initBeanContainer(ArcContainer container, List<BeanContainerListener> listeners) throws Exception {
         BeanContainer beanContainer = new BeanContainer() {
 
             @Override
@@ -64,18 +64,12 @@ public T get() {
             }
 
             @Override
-            public <T, U, R> R withinRequestContext(RequestAction<T, U, R> action, T t, U u) throws Exception {
-                ManagedContext ctx = container.requestContext();
-                ctx.activate();
-                try {
-                    return action.run(t, u);
-                } finally {
-                    ctx.terminate();
-                }
+            public ManagedContext requestContext() {
+                return container.requestContext();
             }
         };
-        for (BeanContainerListener i : beanConfigurators) {
-            i.created(beanContainer);
+        for (BeanContainerListener listener : listeners) {
+            listener.created(beanContainer);
         }
         return beanContainer;
     }

extensions/arc/runtime/src/main/java/org/jboss/shamrock/arc/runtime/BeanContainer.java

@@ -18,6 +18,8 @@
 
 import java.lang.annotation.Annotation;
 
+import org.jboss.protean.arc.ManagedContext;
+
 public interface BeanContainer {
 
     default <T> T instance(Class<T> type, Annotation... qualifiers) {
@@ -27,24 +29,28 @@ default <T> T instance(Class<T> type, Annotation... qualifiers) {
     <T> Factory<T> instanceFactory(Class<T> type, Annotation... qualifiers);
 
     /**
-     * Runs the given action within the scope of the CDI request context
-     *
-     * @param action The action to run
-     * @param t      The first context parameter, this is passed to the action
-     * @param u      The second context parameter, this is passed to the action
-     * @return the value returned by the action
-     * @throws Exception
+     * <pre>
+     * ManagedContext requestContext = beanContainer.requestContext();
+     * if (requestContext.isActive()) {
+     *     // Perform action 
+     * } else {
+     *     try {
+     *         requestContext.activate();
+     *         // Perform action
+     *     } finally {
+     *         requestContext.terminate();
+     *     }
+     * }
+     * </pre>
+     * 
+     * @return the context for {@link javax.enterprise.context.RequestScoped}
+     * @throws IllegalStateException If the container is not running
      */
-    <T, U, R> R withinRequestContext(RequestAction<T, U, R> action, T t, U u) throws Exception;
+    ManagedContext requestContext();
 
     interface Factory<T> {
 
         T get();
     }
 
-    interface RequestAction<T, U, R> {
-
-        R run(T t, U u) throws Exception;
-    }
-
 }

extensions/undertow/runtime/src/main/java/org/jboss/shamrock/undertow/runtime/UndertowDeploymentTemplate.java

@@ -31,6 +31,7 @@
 import javax.servlet.ServletContext;
 import javax.servlet.ServletException;
 
+import org.jboss.protean.arc.ManagedContext;
 import org.jboss.shamrock.arc.runtime.BeanContainer;
 import org.jboss.shamrock.runtime.InjectionFactory;
 import org.jboss.shamrock.runtime.InjectionInstance;
@@ -299,16 +300,20 @@ public void handleDeployment(DeploymentInfo deploymentInfo, ServletContext servl
                 deploymentInfo.addThreadSetupAction(new ThreadSetupHandler() {
                     @Override
                     public <T, C> ThreadSetupHandler.Action<T, C> create(Action<T, C> action) {
-                        BeanContainer.RequestAction<HttpServerExchange, C, T> function = new BeanContainer.RequestAction<HttpServerExchange, C, T>() {
-                            @Override
-                            public T run(HttpServerExchange exchange, C c) throws Exception {
-                                return action.call(exchange, c);
-                            }
-                        };
                         return new Action<T, C>() {
                             @Override
                             public T call(HttpServerExchange exchange, C context) throws Exception {
-                                return beanContainer.withinRequestContext(function, exchange, context);
+                                ManagedContext requestContext = beanContainer.requestContext();
+                                if (requestContext.isActive()) {
+                                    return action.call(exchange, context);
+                                } else {
+                                    try {
+                                        requestContext.activate();
+                                        return action.call(exchange, context);
+                                    } finally {
+                                        requestContext.terminate();
+                                    }
+                                }
                             }
                         };
                     }

independent-projects/arc/runtime/src/main/java/org/jboss/protean/arc/ArcContainerImpl.java

@@ -190,7 +190,6 @@ public ManagedContext requestContext() {
     @Override
     public Runnable withinRequest(Runnable action) {
         return () -> {
-            requireRunning();
             ManagedContext requestContext = requestContext();
             if (requestContext.isActive()) {
                 action.run();
@@ -208,7 +207,6 @@ public Runnable withinRequest(Runnable action) {
     @Override
     public <T> Supplier<T> withinRequest(Supplier<T> action) {
         return () -> {
-            requireRunning();
             ManagedContext requestContext = requestContext();
             if (requestContext.isActive()) {
                 return action.get();