Remove Undertow dependency from ArC

Author: stuartwdouglas

core/deployment/src/main/java/org/jboss/shamrock/deployment/Capabilities.java

@@ -22,13 +22,11 @@
 
 /**
  * The list of capabilities.
- *
  */
 public final class Capabilities extends SimpleBuildItem {
 
     public static final String CDI_ARC = "org.jboss.shamrock.cdi";
     public static final String TRANSACTIONS = "org.jboss.shamrock.transactions";
-    public static final String UNDERTOW = "org.jboss.shamrock.undertow";
 
     private final Set<String> capabilities;
 
@@ -43,5 +41,5 @@ public Capabilities(Set<String> capabilities) {
     public Set<String> getCapabilities() {
         return capabilities;
     }
-    
+
 }

extensions/arc/deployment/pom.xml

@@ -42,10 +42,6 @@
       <groupId>org.jboss.protean.arc</groupId>
       <artifactId>arc-processor</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.shamrock</groupId>
-      <artifactId>shamrock-undertow-deployment</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.jboss.shamrock</groupId>

extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/ArcAnnotationProcessor.java

@@ -62,7 +62,6 @@
 import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveClassBuildItem;
 import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveFieldBuildItem;
 import org.jboss.shamrock.deployment.builditem.substrate.ReflectiveMethodBuildItem;
-import org.jboss.shamrock.undertow.ServletExtensionBuildItem;
 
 public class ArcAnnotationProcessor {
 
@@ -104,7 +103,7 @@ public class ArcAnnotationProcessor {
     @BuildStep(providesCapabilities = Capabilities.CDI_ARC, applicationArchiveMarkers = { "META-INF/beans.xml",
             "META-INF/services/javax.enterprise.inject.spi.Extension" })
     @Record(STATIC_INIT)
-    public BeanContainerBuildItem build(ArcDeploymentTemplate arcTemplate, BuildProducer<ServletExtensionBuildItem> extensions,
+    public BeanContainerBuildItem build(ArcDeploymentTemplate arcTemplate,
             BuildProducer<InjectionProviderBuildItem> injectionProvider, List<BeanContainerListenerBuildItem> beanContainerListenerBuildItems,
             ApplicationArchivesBuildItem applicationArchivesBuildItem, List<GeneratedBeanBuildItem> generatedBeans,
             List<AnnotationsTransformerBuildItem> annotationTransformers, ShutdownContextBuildItem shutdown, BuildProducer<FeatureBuildItem> feature)
@@ -196,7 +195,6 @@ public void writeResource(Resource resource) throws IOException {
         BeanContainer bc = arcTemplate.initBeanContainer(container,
                 beanContainerListenerBuildItems.stream().map(BeanContainerListenerBuildItem::getBeanContainerListener).collect(Collectors.toList()));
         injectionProvider.produce(new InjectionProviderBuildItem(arcTemplate.setupInjection(container)));
-        extensions.produce(new ServletExtensionBuildItem(arcTemplate.setupRequestScope(container)));
 
         return new BeanContainerBuildItem(bc);
     }

extensions/arc/deployment/src/main/java/org/jboss/shamrock/arc/deployment/BeanDefiningAnnotationsBuildStep.java

@@ -4,19 +4,11 @@
 import org.jboss.shamrock.annotations.BuildProducer;
 import org.jboss.shamrock.annotations.BuildStep;
 import org.jboss.shamrock.deployment.Capabilities;
-import org.jboss.shamrock.undertow.UndertowBuildStep;
 
 public class BeanDefiningAnnotationsBuildStep {
 
     @BuildStep
     void beanDefiningAnnotations(Capabilities capabilities, BuildProducer<BeanDefiningAnnotationBuildItem> annotations) {
-        if (capabilities.isCapabilityPresent(Capabilities.UNDERTOW)) {
-            // Arc integration depends on undertow so we want to avoid cyclic dependencies
-            annotations.produce(new BeanDefiningAnnotationBuildItem(UndertowBuildStep.WEB_FILTER));
-            annotations.produce(new BeanDefiningAnnotationBuildItem(UndertowBuildStep.WEB_SERVLET));
-            annotations.produce(new BeanDefiningAnnotationBuildItem(UndertowBuildStep.WEB_LISTENER));
-        }
-
         // TODO: we should only add this when running the tests
         annotations.produce(new BeanDefiningAnnotationBuildItem(DotName.createSimple("org.junit.runner.RunWith")));
     }

extensions/arc/runtime/pom.xml

@@ -44,10 +44,6 @@
       <groupId>org.jboss.shamrock</groupId>
       <artifactId>shamrock-core-runtime</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.undertow</groupId>
-      <artifactId>undertow-servlet</artifactId>
-    </dependency>
   </dependencies>
 
   <build>

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

@@ -20,8 +20,6 @@
 import java.util.List;
 import java.util.function.Supplier;
 
-import javax.servlet.ServletContext;
-
 import org.jboss.protean.arc.Arc;
 import org.jboss.protean.arc.ArcContainer;
 import org.jboss.protean.arc.InstanceHandle;
@@ -31,11 +29,6 @@
 import org.jboss.shamrock.runtime.ShutdownContext;
 import org.jboss.shamrock.runtime.Template;
 
-import io.undertow.server.HttpServerExchange;
-import io.undertow.servlet.ServletExtension;
-import io.undertow.servlet.api.DeploymentInfo;
-import io.undertow.servlet.api.ThreadSetupHandler;
-
 /**
  * @author Martin Kouba
  */
@@ -69,36 +62,22 @@ public T get() {
                     }
                 };
             }
-        };
-        for(BeanContainerListener i : beanConfigurators) {
-            i.created(beanContainer);
-        }
-        return beanContainer;
-    }
 
-    public ServletExtension setupRequestScope(ArcContainer arcContainer) {
-        return new ServletExtension() {
             @Override
-            public void handleDeployment(DeploymentInfo deploymentInfo, ServletContext servletContext) {
-                deploymentInfo.addThreadSetupAction(new ThreadSetupHandler() {
-                    @Override
-                    public <T, C> Action<T, C> create(Action<T, C> action) {
-                        return new Action<T, C>() {
-                            @Override
-                            public T call(HttpServerExchange exchange, C context) throws Exception {
-                                ManagedContext requestContext = arcContainer.requestContext();
-                                requestContext.activate();
-                                try {
-                                    return action.call(exchange, context);
-                                } finally {
-                                    requestContext.terminate();
-                                }
-                            }
-                        };
-                    }
-                });
+            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();
+                }
             }
         };
+        for (BeanContainerListener i : beanConfigurators) {
+            i.created(beanContainer);
+        }
+        return beanContainer;
     }
 
     public InjectionFactory setupInjection(ArcContainer container) {

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

@@ -23,12 +23,28 @@ public interface BeanContainer {
     default <T> T instance(Class<T> type, Annotation... qualifiers) {
         return instanceFactory(type, qualifiers).get();
     }
+
     <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
+     */
+    <T, U, R> R withinRequestContext(RequestAction<T, U, R> action, T t, U u) throws Exception;
 
     interface Factory<T> {
 
         T get();
     }
 
+    interface RequestAction<T, U, R> {
+
+        R run(T t, U u) throws Exception;
+    }
+
 }

extensions/undertow/deployment/pom.xml

@@ -37,6 +37,10 @@
             <groupId>org.jboss.shamrock</groupId>
             <artifactId>shamrock-core-deployment</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.shamrock</groupId>
+            <artifactId>shamrock-arc-deployment</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.jboss.shamrock</groupId>
             <artifactId>shamrock-undertow-runtime</artifactId>

extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowArcIntegrationBuildStep.java

@@ -0,0 +1,41 @@
+/*
+ * Copyright 2019 Red Hat, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jboss.shamrock.undertow;
+
+import org.jboss.shamrock.annotations.BuildProducer;
+import org.jboss.shamrock.annotations.BuildStep;
+import org.jboss.shamrock.annotations.ExecutionTime;
+import org.jboss.shamrock.annotations.Record;
+import org.jboss.shamrock.arc.deployment.BeanContainerBuildItem;
+import org.jboss.shamrock.arc.deployment.BeanDefiningAnnotationBuildItem;
+import org.jboss.shamrock.undertow.runtime.UndertowDeploymentTemplate;
+
+public class UndertowArcIntegrationBuildStep {
+
+    @BuildStep
+    @Record(ExecutionTime.STATIC_INIT)
+    ServletExtensionBuildItem integrateRequestContext(BeanContainerBuildItem beanContainerBuildItem, UndertowDeploymentTemplate template) {
+        return new ServletExtensionBuildItem(template.setupRequestScope(beanContainerBuildItem.getValue()));
+    }
+
+    @BuildStep
+    void beanDefiningAnnotations(BuildProducer<BeanDefiningAnnotationBuildItem> annotations) {
+        annotations.produce(new BeanDefiningAnnotationBuildItem(UndertowBuildStep.WEB_FILTER));
+        annotations.produce(new BeanDefiningAnnotationBuildItem(UndertowBuildStep.WEB_SERVLET));
+        annotations.produce(new BeanDefiningAnnotationBuildItem(UndertowBuildStep.WEB_LISTENER));
+    }
+}

extensions/undertow/deployment/src/main/java/org/jboss/shamrock/undertow/UndertowBuildStep.java

@@ -155,14 +155,14 @@ SubstrateConfigBuildItem config() {
 
                 .build();
     }
-    
+
     @BuildStep
     HotDeploymentConfigFileBuildItem configFile() {
         return new HotDeploymentConfigFileBuildItem(WEB_XML);
     }
 
     @Record(STATIC_INIT)
-    @BuildStep(providesCapabilities = Capabilities.UNDERTOW)
+    @BuildStep
     public ServletDeploymentBuildItem build(ApplicationArchivesBuildItem applicationArchivesBuildItem,
                                             List<ServletBuildItem> servlets,
                                             List<FilterBuildItem> filters,