Simplify maven module dependencies.

Signed-off-by: Hiram Chirino <hiram@hiramchirino.com>

Author: chirino

pom.xml

@@ -44,6 +44,7 @@
     <compiler-plugin.version>${maven.compiler.version}</compiler-plugin.version>
     <surefire-plugin.version>3.5.2</surefire-plugin.version>
     <failsafe-plugin.version>${surefire-plugin.version}</failsafe-plugin.version>
+    <jandex.version>3.2.7</jandex.version>
 
     <!-- test time versions -->
     <junit.version>5.12.0</junit.version>
@@ -231,8 +232,8 @@
         <jdk>[17,)</jdk>
       </activation>
       <modules>
-        <module>quarkus-proxy-wasm</module>
         <module>proxy-wasm-quarkus-example</module>
+        <module>quarkus-proxy-wasm</module>
       </modules>
     </profile>
   </profiles>

proxy-wasm-jaxrs/pom.xml

@@ -26,50 +26,16 @@
   </dependencyManagement>
 
   <dependencies>
-    <dependency>
-      <groupId>com.dylibso.chicory</groupId>
-      <artifactId>aot-experimental</artifactId>
-      <version>${chicory.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.dylibso.chicory</groupId>
-      <artifactId>host-module-annotations-experimental</artifactId>
-      <version>${chicory.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.dylibso.chicory</groupId>
-      <artifactId>runtime</artifactId>
-      <version>${chicory.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>com.dylibso.chicory</groupId>
-      <artifactId>wasi</artifactId>
-      <version>${chicory.version}</version>
-    </dependency>
-
-    <dependency>
-      <groupId>io.quarkus</groupId>
-      <artifactId>quarkus-arc</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>io.roastedroot</groupId>
       <artifactId>proxy-wasm-java-host</artifactId>
       <version>${project.version}</version>
     </dependency>
-
-    <dependency>
-      <groupId>io.vertx</groupId>
-      <artifactId>vertx-core</artifactId>
-      <optional>true</optional>
-    </dependency>
     <dependency>
       <groupId>jakarta.servlet</groupId>
       <artifactId>jakarta.servlet-api</artifactId>
       <optional>true</optional>
     </dependency>
-
-    <!-- Depend on a minimal set of jakarta/jaxrs apis -->
     <dependency>
       <groupId>jakarta.enterprise</groupId>
       <artifactId>jakarta.enterprise.cdi-api</artifactId>
@@ -80,6 +46,8 @@
       <artifactId>jakarta.inject-api</artifactId>
       <scope>provided</scope>
     </dependency>
+
+    <!-- Depend on a minimal set of jakarta/jaxrs apis -->
     <dependency>
       <groupId>jakarta.ws.rs</groupId>
       <artifactId>jakarta.ws.rs-api</artifactId>
@@ -93,7 +61,7 @@
       <plugin>
         <groupId>io.smallrye</groupId>
         <artifactId>jandex-maven-plugin</artifactId>
-        <version>3.2.7</version>
+        <version>${jandex.version}</version>
         <executions>
           <execution>
             <id>make-index</id>

proxy-wasm-jaxrs/src/main/java/io/roastedroot/proxywasm/jaxrs/ServerAdaptor.java

@@ -5,9 +5,6 @@
 import io.roastedroot.proxywasm.plugin.HttpCallResponse;
 import io.roastedroot.proxywasm.plugin.HttpCallResponseHandler;
 import io.roastedroot.proxywasm.plugin.HttpRequestAdaptor;
-import jakarta.annotation.Priority;
-import jakarta.enterprise.context.ApplicationScoped;
-import jakarta.enterprise.inject.Alternative;
 import jakarta.ws.rs.core.UriBuilder;
 import java.net.URI;
 import java.net.http.HttpClient;
@@ -19,9 +16,6 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-@Alternative
-@Priority(100)
-@ApplicationScoped
 public class ServerAdaptor implements io.roastedroot.proxywasm.plugin.ServerAdaptor {
 
     ScheduledExecutorService tickExecutorService = Executors.newScheduledThreadPool(1);

proxy-wasm-jaxrs/src/main/java/io/roastedroot/proxywasm/jaxrs/cdi/ServerAdaptor.java

@@ -0,0 +1,10 @@
+package io.roastedroot.proxywasm.jaxrs.cdi;
+
+import jakarta.annotation.Priority;
+import jakarta.enterprise.context.ApplicationScoped;
+import jakarta.enterprise.inject.Alternative;
+
+@Alternative
+@Priority(100)
+@ApplicationScoped
+public class ServerAdaptor extends io.roastedroot.proxywasm.jaxrs.ServerAdaptor {}

proxy-wasm-jaxrs/src/main/java/io/roastedroot/proxywasm/jaxrs/cdi/WasmPluginFeature.java

@@ -17,12 +17,12 @@ public class WasmPluginFeature extends io.roastedroot.proxywasm.jaxrs.AbstractWa
 
     @Inject Instance<PluginFactory> factories;
 
-    @Inject @Any ServerAdaptor httpServer;
+    @Inject @Any ServerAdaptor serverAdaptor;
 
     @Inject
     @PostConstruct
     public void init() throws StartException {
-        init(factories, httpServer);
+        init(factories, serverAdaptor);
     }
 
     @PreDestroy

quarkus-proxy-wasm/deployment/src/main/java/io/quarkiverse/proxywasm/deployment/ProxyWasmProcessor.java

@@ -1,5 +1,7 @@
 package io.quarkiverse.proxywasm.deployment;
 
+import io.quarkiverse.proxywasm.runtime.VertxHttpRequestAdaptor;
+import io.quarkiverse.proxywasm.runtime.VertxServerAdaptor;
 import io.quarkus.arc.deployment.AdditionalBeanBuildItem;
 import io.quarkus.deployment.annotations.BuildStep;
 import io.quarkus.deployment.builditem.FeatureBuildItem;
@@ -20,7 +22,8 @@ FeatureBuildItem feature() {
 
     @BuildStep
     AdditionalBeanBuildItem resources() {
-        return new AdditionalBeanBuildItem(WasmPluginFeature.class);
+        return new AdditionalBeanBuildItem(
+                WasmPluginFeature.class, VertxServerAdaptor.class, VertxHttpRequestAdaptor.class);
     }
 
     @BuildStep

…jaxrs/vertx/VertxHttpRequestAdaptor.java …asm/runtime/VertxHttpRequestAdaptor.javaproxy-wasm-jaxrs/src/main/java/io/roastedroot/proxywasm/jaxrs/vertx/VertxHttpRequestAdaptor.java renamed to quarkus-proxy-wasm/runtime/src/main/java/io/quarkiverse/proxywasm/runtime/VertxHttpRequestAdaptor.java proxy-wasm-jaxrs/src/main/java/io/roastedroot/proxywasm/jaxrs/vertx/VertxHttpRequestAdaptor.java renamed to quarkus-proxy-wasm/runtime/src/main/java/io/quarkiverse/proxywasm/runtime/VertxHttpRequestAdaptor.java

@@ -1,4 +1,4 @@
-package io.roastedroot.proxywasm.jaxrs.vertx;
+package io.quarkiverse.proxywasm.runtime;
 
 import io.roastedroot.proxywasm.jaxrs.JaxrsHttpRequestAdaptor;
 import jakarta.annotation.Priority;

…wasm/jaxrs/vertx/VertxServerAdaptor.java …roxywasm/runtime/VertxServerAdaptor.javaproxy-wasm-jaxrs/src/main/java/io/roastedroot/proxywasm/jaxrs/vertx/VertxServerAdaptor.java renamed to quarkus-proxy-wasm/runtime/src/main/java/io/quarkiverse/proxywasm/runtime/VertxServerAdaptor.java proxy-wasm-jaxrs/src/main/java/io/roastedroot/proxywasm/jaxrs/vertx/VertxServerAdaptor.java renamed to quarkus-proxy-wasm/runtime/src/main/java/io/quarkiverse/proxywasm/runtime/VertxServerAdaptor.java

@@ -1,4 +1,4 @@
-package io.roastedroot.proxywasm.jaxrs.vertx;
+package io.quarkiverse.proxywasm.runtime;
 
 import io.roastedroot.proxywasm.ProxyMap;
 import io.roastedroot.proxywasm.plugin.HttpCallResponse;