Merge branch 'master' into FilterOutputStream

Author: SentryMan

avaje-jex/src/main/java/io/avaje/jex/Routing.java

@@ -14,6 +14,7 @@
 import io.avaje.jex.http.HttpFilter;
 import io.avaje.jex.http.sse.SseClient;
 import io.avaje.jex.security.Role;
+import io.avaje.jex.spi.JexExtension;
 
 /** Routing abstraction. */
 public interface Routing {
@@ -171,7 +172,7 @@ default Routing sse(String path, Consumer<SseClient> handler, Role... roles) {
 
   /** Adds to the Routing. */
   @FunctionalInterface
-  interface HttpService {
+  non-sealed interface HttpService extends JexExtension {
 
     /**
      * Add to the routing.

avaje-jex/src/main/java/io/avaje/jex/core/BootstrapServer.java

@@ -16,7 +16,6 @@
 import io.avaje.jex.Jex;
 import io.avaje.jex.JexConfig;
 import io.avaje.jex.routes.RoutesBuilder;
-import io.avaje.jex.routes.SpiRoutes;
 
 public final class BootstrapServer {
 
@@ -32,14 +31,11 @@ public static Jex.Server start(Jex jex) {
 
     CoreServiceLoader.plugins().forEach(p -> p.apply(jex));
 
-    final SpiRoutes routes = new RoutesBuilder(jex.routing(), config).build();
+    var routing = jex.routing();
+    routing.addAll(CoreServiceLoader.spiRoutes());
+    final var routes = new RoutesBuilder(routing, config).build();
 
-    return start(jex, routes);
-  }
-
-  static Jex.Server start(Jex jex, SpiRoutes routes) {
     try {
-      final var config = jex.config();
       final var socketAddress = createSocketAddress(config);
       final var https = config.httpsConfig();
       final var provider = config.serverProvider();
@@ -54,9 +50,8 @@ static Jex.Server start(Jex jex, SpiRoutes routes) {
 
       final var scheme = config.scheme();
       final var contextPath = config.contextPath();
-      ServiceManager serviceManager = ServiceManager.create(jex);
+      var serviceManager = ServiceManager.create(jex);
       final var handler = new RoutingHandler(routes, serviceManager);
-
       final var serverClass = server.getClass();
 
       // jetty's server does not support setExecutor with virtual threads (VT)

avaje-jex/src/main/java/io/avaje/jex/core/CoreServiceLoader.java

@@ -5,6 +5,7 @@
 import java.util.Optional;
 import java.util.ServiceLoader;
 
+import io.avaje.jex.Routing.HttpService;
 import io.avaje.jex.spi.JexExtension;
 import io.avaje.jex.spi.JexPlugin;
 import io.avaje.jex.spi.JsonService;
@@ -18,6 +19,7 @@ final class CoreServiceLoader {
   private final JsonService jsonService;
   private final List<TemplateRender> renders = new ArrayList<>();
   private final List<JexPlugin> plugins = new ArrayList<>();
+  private final List<HttpService> spiRoutes = new ArrayList<>();
 
   CoreServiceLoader() {
     JsonService spiJsonService = null;
@@ -26,6 +28,7 @@ final class CoreServiceLoader {
         case JsonService s -> spiJsonService = s;
         case TemplateRender r -> renders.add(r);
         case JexPlugin p -> plugins.add(p);
+        case HttpService p -> spiRoutes.add(p);
       }
     }
     jsonService = spiJsonService;
@@ -42,4 +45,8 @@ static List<TemplateRender> getRenders() {
   static List<JexPlugin> plugins() {
     return INSTANCE.plugins;
   }
+
+  static List<HttpService> spiRoutes() {
+    return INSTANCE.spiRoutes;
+  }
 }

avaje-jex/src/main/java/io/avaje/jex/spi/JexExtension.java

@@ -1,5 +1,6 @@
 package io.avaje.jex.spi;
 
+import io.avaje.jex.Routing.HttpService;
 import io.avaje.spi.Service;
 
 /**
@@ -9,4 +10,4 @@
  * META-INF/services/io.avaje.jex.spi.JexExtension } for it to be auto loaded
  */
 @Service
-public sealed interface JexExtension permits JsonService, TemplateRender, JexPlugin {}
+public sealed interface JexExtension permits HttpService, JexPlugin, JsonService, TemplateRender {}

avaje-jex/src/test/java/io/avaje/jex/SpiRouteTest.java

@@ -0,0 +1,30 @@
+package io.avaje.jex;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.http.HttpResponse;
+
+import org.junit.jupiter.api.Test;
+
+import io.avaje.jex.Routing.HttpService;
+import io.avaje.jex.core.TestPair;
+import io.avaje.spi.ServiceProvider;
+
+@ServiceProvider
+public class SpiRouteTest implements HttpService {
+
+  @Override
+  public void add(Routing routing) {
+
+    routing.get("/spi", ctx -> ctx.write("hello from spi"));
+  }
+
+  @Test
+  void get() {
+    var pair = TestPair.create(Jex.create());
+    HttpResponse<String> res = pair.request().path("spi").GET().asString();
+
+    assertThat(res.body()).isEqualTo("hello from spi");
+    pair.shutdown();
+  }
+}