feat(server): Enhance McpHttpServer with graceful shutdown and test mode support

Author: codeboyzhou

src/main/java/com/github/codeboyzhou/mcp/declarative/server/McpHttpServer.java

@@ -9,6 +9,8 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.time.Duration;
+
 public class McpHttpServer<T> {
 
     private static final Logger logger = LoggerFactory.getLogger(McpHttpServer.class);
@@ -58,6 +60,8 @@ public void start() {
 
         Server httpserver = new Server(serverInfo.port());
         httpserver.setHandler(handler);
+        httpserver.setStopAtShutdown(true);
+        httpserver.setStopTimeout(Duration.ofSeconds(5).getSeconds());
 
         try {
             httpserver.start();
@@ -69,6 +73,13 @@ public void start() {
             // Add a shutdown hook to stop the HTTP server and MCP server gracefully
             addShutdownHook(httpserver);
 
+            // Check if the server is running in test mode
+            final boolean testing = Boolean.parseBoolean(System.getProperty("mcp.declarative.java.sdk.testing"));
+            if (testing) {
+                logger.debug("Jetty-based HTTP server is running in test mode, not waiting for HTTP server to stop");
+                return;
+            }
+
             // Wait for the HTTP server to stop
             httpserver.join();
         } catch (Exception e) {

src/test/java/com/github/codeboyzhou/mcp/declarative/McpServersTest.java

@@ -59,14 +59,11 @@ void testStartSyncStdioServer() {
 
     @Test
     void testStartSyncSseServer() {
-        assertDoesNotThrow(() -> {
-            Thread thread = new Thread(() -> {
-                McpServers servers = McpServers.run(TestMcpComponentScanIsNull.class, EMPTY_ARGS);
-                servers.startSyncSseServer("test-mcp-sync-sse-server", "1.0.0");
-            });
-            thread.setDaemon(true);
-            thread.start();
-        });
+        System.setProperty("mcp.declarative.java.sdk.testing", "true");
+        McpServers servers = McpServers.run(TestMcpComponentScanIsNull.class, EMPTY_ARGS);
+        assertDoesNotThrow(() -> servers.startSyncSseServer("test-mcp-sync-sse-server", "1.0.0"));
+        assertDoesNotThrow(() -> servers.startSyncSseServer("test-mcp-sync-sse-server", "1.0.0", 9118));
+        assertDoesNotThrow(() -> servers.startSyncSseServer("test-mcp-sync-sse-server", "1.0.0", "/message", "/sse", 9119));
     }
 
     private Reflections getReflectionsField() throws NoSuchFieldException, IllegalAccessException {