Adds an afterStart pseudo-event to LoomServer observable by Router im…

…plementations Signed-off-by: Laird Nelson <[email protected]>
helidon-io · Jan 16, 2025 · 25b0684 · 25b0684
1 parent 867a60e
commit 25b0684
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 4 deletions.
diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java b/webserver/webserver/src/main/java/io/helidon/webserver/LoomServer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -53,6 +53,7 @@ class LoomServer implements WebServer {
     private static final AtomicInteger WEBSERVER_COUNTER = new AtomicInteger(1);
 
     private final Map<String, ServerListener> listeners;
+    private final Runnable afterStartNotifier;
     private final AtomicBoolean running = new AtomicBoolean();
     private final Lock lifecycleLock = new ReentrantLock();
     private final ExecutorService executorService;
@@ -101,6 +102,7 @@ class LoomServer implements WebServer {
         });
 
         listeners = Map.copyOf(listenerMap);
+        afterStartNotifier = () -> listeners.values().forEach(l -> l.router().afterStart(this));
     }
 
     @Override
@@ -225,6 +227,8 @@ private void startIt() {
                 + uptime + " milliseconds since JVM startup. "
                 + "Java " + Runtime.version());
 
+        afterStartNotifier.run();
+
         if ("!".equals(System.getProperty(EXIT_ON_STARTED_KEY))) {
             LOGGER.log(System.Logger.Level.INFO, String.format("Exiting, -D%s set.", EXIT_ON_STARTED_KEY));
             // we need to run the system exit on a different thread, to correctly finish whatever was happening on main

diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/Router.java b/webserver/webserver/src/main/java/io/helidon/webserver/Router.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -61,6 +61,14 @@ static Router empty() {
      */
     void beforeStart();
 
+    /**
+     * This is called after the server's listeners have successfully started.
+     *
+     * @param webServer the {@link WebServer} that has successfully started
+     */
+    default void afterStart(WebServer webServer) {
+    }
+
     /**
      * List of all conifgured routings.
      *

diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/RouterImpl.java b/webserver/webserver/src/main/java/io/helidon/webserver/RouterImpl.java
@@ -62,6 +62,13 @@ public void beforeStart() {
         }
     }
 
+    @Override
+    public void afterStart(WebServer webServer) {
+        for (Routing value : routings.values()) {
+            value.afterStart(webServer);
+        }
+    }
+
     @Override
     public List<? extends Routing> routings() {
         return List.copyOf(routings.values());

diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ServerLifecycle.java b/webserver/webserver/src/main/java/io/helidon/webserver/ServerLifecycle.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2023 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,6 +26,14 @@ public interface ServerLifecycle {
     default void beforeStart() {
     }
 
+    /**
+     * After server start.
+     *
+     * @param webServer the {@link WebServer} that was started
+     */
+    default void afterStart(WebServer webServer) {
+    }
+
     /**
      * After server stop.
      */

diff --git a/webserver/webserver/src/main/java/io/helidon/webserver/ServerListener.java b/webserver/webserver/src/main/java/io/helidon/webserver/ServerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+ * Copyright (c) 2022, 2025 Oracle and/or its affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -212,6 +212,10 @@ int port() {
         return connectedPort;
     }
 
+    Router router() {
+        return router;
+    }
+
     InetSocketAddress configuredAddress() {
         return configuredAddress;
     }