module-check

Author: SentryMan

…je/http/inject/HttpValidatorHandler.java …ttp/inject/HttpValidatorErrorPlugin.javahttp-inject-plugin/src/main/java/io/avaje/http/inject/HttpValidatorHandler.java renamed to http-inject-plugin/src/main/java/io/avaje/http/inject/HttpValidatorErrorPlugin.java http-inject-plugin/src/main/java/io/avaje/http/inject/HttpValidatorHandler.java renamed to http-inject-plugin/src/main/java/io/avaje/http/inject/HttpValidatorErrorPlugin.java

@@ -14,21 +14,40 @@
       "io.avaje.http.api.AvajeJavalinPlugin",
       "io.avaje.jex.Routing.HttpService",
     })
-public final class HttpValidatorHandler implements InjectPlugin {
+public final class HttpValidatorErrorPlugin implements InjectPlugin {
 
   @Override
   public void apply(BeanScopeBuilder builder) {
-    try {
+
+    ModuleLayer bootLayer = ModuleLayer.boot();
+
+    if (bootLayer.findModule("io.avaje.jex").isPresent()) {
+      builder.provideDefault(HttpService.class, JexHandler::new);
+      return;
+    } else if (bootLayer.findModule("io.helidon.webserver").isPresent()) {
       builder.provideDefault(HttpFeature.class, HelidonHandler::new);
+      return;
+    } else if (bootLayer.findModule("io.javalin").isPresent()) {
+      builder.provideDefault(AvajeJavalinPlugin.class, JavalinHandler::new);
+      return;
+    }
+
+    try {
+      builder.provideDefault(HttpService.class, JexHandler::new);
+      return;
     } catch (NoClassDefFoundError e) {
+      // not present
     }
     try {
-      builder.provideDefault(AvajeJavalinPlugin.class, JavalinHandler::new);
+      builder.provideDefault(HttpFeature.class, HelidonHandler::new);
+      return;
     } catch (NoClassDefFoundError e) {
+      // not present
     }
     try {
-      builder.provideDefault(HttpService.class, JexHandler::new);
+      builder.provideDefault(AvajeJavalinPlugin.class, JavalinHandler::new);
     } catch (NoClassDefFoundError e) {
+      // not present
     }
   }
 }

http-inject-plugin/src/main/java/module-info.java

@@ -1,5 +1,5 @@
 import io.avaje.http.inject.DefaultResolverProvider;
-import io.avaje.http.inject.HttpValidatorHandler;
+import io.avaje.http.inject.HttpValidatorErrorPlugin;
 
 module io.avaje.http.plugin {
 
@@ -8,5 +8,5 @@
   requires static io.avaje.jex;
   requires static io.javalin;
   requires static io.helidon.webserver;
-  provides io.avaje.inject.spi.InjectExtension with DefaultResolverProvider, HttpValidatorHandler;
+  provides io.avaje.inject.spi.InjectExtension with DefaultResolverProvider, HttpValidatorErrorPlugin;
 }