refactor(server): Some minor improvements

codeboyzhou · codeboyzhou · commit 6fd89201061c · 2025-08-21T21:33:52.000+08:00
diff --git a/src/main/java/com/github/codeboyzhou/mcp/declarative/server/EmbeddedJettyServer.java b/src/main/java/com/github/codeboyzhou/mcp/declarative/server/EmbeddedJettyServer.java
@@ -11,9 +11,9 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-public class McpHttpServer {
+public class EmbeddedJettyServer {
 
-  private static final Logger log = LoggerFactory.getLogger(McpHttpServer.class);
+  private static final Logger log = LoggerFactory.getLogger(EmbeddedJettyServer.class);
 
   private static final String DEFAULT_SERVLET_CONTEXT_PATH = "/";
 
@@ -25,16 +25,16 @@ public class McpHttpServer {
 
   private int port;
 
-  public McpHttpServer() {
+  public EmbeddedJettyServer() {
     this.threadPool = Executors.newSingleThreadExecutor(new NamedThreadFactory("mcp-http-server"));
   }
 
-  public McpHttpServer use(HttpServlet servlet) {
+  public EmbeddedJettyServer use(HttpServlet servlet) {
     this.servlet = servlet;
     return this;
   }
 
-  public McpHttpServer bind(int port) {
+  public EmbeddedJettyServer bind(int port) {
     this.port = port;
     return this;
   }
@@ -54,9 +54,9 @@ public void start() {
     try {
       httpserver.start();
       addShutdownHook(httpserver);
-      log.info("Jetty-based HTTP server started on http://127.0.0.1:{}", port);
+      log.info("Embedded Jetty server started on http://127.0.0.1:{}", port);
     } catch (Exception e) {
-      log.error("Error starting HTTP server on http://127.0.0.1:{}", port, e);
+      log.error("Error starting embedded Jetty server on http://127.0.0.1:{}", port, e);
     }
 
     threadPool.submit(() -> await(httpserver));
@@ -66,7 +66,7 @@ private void await(Server httpserver) {
     try {
       httpserver.join();
     } catch (InterruptedException e) {
-      log.error("Error joining HTTP server", e);
+      log.error("Error joining embedded Jetty server", e);
     }
   }
 
@@ -78,11 +78,12 @@ private void addShutdownHook(Server httpserver) {
 
   private void shutdown(Server httpserver) {
     try {
-      log.info("Shutting down HTTP server and MCP server");
+      log.info("Shutting down embedded Jetty server");
       httpserver.stop();
+      servlet.destroy();
       threadPool.shutdown();
     } catch (Exception e) {
-      log.error("Error stopping HTTP server and MCP server", e);
+      log.error("Error stopping Jetty server", e);
     }
   }
 }
diff --git a/src/main/java/com/github/codeboyzhou/mcp/declarative/server/component/AbstractMcpServerComponentFactory.java b/src/main/java/com/github/codeboyzhou/mcp/declarative/server/component/AbstractMcpServerComponentFactory.java
@@ -22,13 +22,15 @@ public abstract class AbstractMcpServerComponentFactory<T> implements McpServerC
 
   private final ResourceBundle bundle;
 
+  private final boolean i18nEnabled;
+
   protected AbstractMcpServerComponentFactory() {
     this.bundle = loadResourceBundle();
+    Key<Boolean> key = Key.get(Boolean.class, Names.named(INJECTED_VARIABLE_NAME_I18N_ENABLED));
+    this.i18nEnabled = InjectorProvider.getInstance().getInjector().getInstance(key);
   }
 
   protected String resolveComponentAttributeValue(String attributeLiteralValue) {
-    Key<Boolean> key = Key.get(Boolean.class, Names.named(INJECTED_VARIABLE_NAME_I18N_ENABLED));
-    final Boolean i18nEnabled = InjectorProvider.getInstance().getInjector().getInstance(key);
     if (i18nEnabled && bundle != null && bundle.containsKey(attributeLiteralValue)) {
       return bundle.getString(attributeLiteralValue);
     }
diff --git a/src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/McpSseServerFactory.java b/src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/McpSseServerFactory.java
@@ -1,6 +1,6 @@
 package com.github.codeboyzhou.mcp.declarative.server.factory;
 
-import com.github.codeboyzhou.mcp.declarative.server.McpHttpServer;
+import com.github.codeboyzhou.mcp.declarative.server.EmbeddedJettyServer;
 import io.modelcontextprotocol.server.McpServer;
 import io.modelcontextprotocol.server.transport.HttpServletSseServerTransportProvider;
 import org.slf4j.Logger;
@@ -19,7 +19,7 @@ public McpServer.SyncSpecification<?> sync(McpSseServerInfo info) {
             .sseEndpoint(info.sseEndpoint())
             .messageEndpoint(info.messageEndpoint())
             .build();
-    McpHttpServer httpserver = new McpHttpServer();
+    EmbeddedJettyServer httpserver = new EmbeddedJettyServer();
     httpserver.use(transportProvider).bind(info.port()).start();
     return McpServer.sync(transportProvider);
   }
diff --git a/src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/McpStreamableServerFactory.java b/src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/McpStreamableServerFactory.java
@@ -1,6 +1,6 @@
 package com.github.codeboyzhou.mcp.declarative.server.factory;
 
-import com.github.codeboyzhou.mcp.declarative.server.McpHttpServer;
+import com.github.codeboyzhou.mcp.declarative.server.EmbeddedJettyServer;
 import com.github.codeboyzhou.mcp.declarative.util.ObjectMappers;
 import io.modelcontextprotocol.server.McpServer;
 import io.modelcontextprotocol.server.transport.HttpServletStreamableServerTransportProvider;
@@ -16,7 +16,7 @@ public McpServer.SyncSpecification<?> sync(McpStreamableServerInfo info) {
             .contextExtractor(info.contextExtractor())
             .keepAliveInterval(info.keepAliveInterval())
             .build();
-    McpHttpServer httpserver = new McpHttpServer();
+    EmbeddedJettyServer httpserver = new EmbeddedJettyServer();
     httpserver.use(transportProvider).bind(info.port()).start();
     return McpServer.sync(transportProvider);
   }
diff --git a/src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/configurable/ConfigurableMcpSseServerFactory.java b/src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/configurable/ConfigurableMcpSseServerFactory.java
@@ -2,7 +2,7 @@
 
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerConfiguration;
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerSSE;
-import com.github.codeboyzhou.mcp.declarative.server.McpHttpServer;
+import com.github.codeboyzhou.mcp.declarative.server.EmbeddedJettyServer;
 import io.modelcontextprotocol.server.McpServer;
 import io.modelcontextprotocol.server.transport.HttpServletSseServerTransportProvider;
 import org.slf4j.Logger;
@@ -26,7 +26,7 @@ public McpServer.SyncSpecification<?> sync() {
             .sseEndpoint(sse.endpoint())
             .messageEndpoint(sse.messageEndpoint())
             .build();
-    McpHttpServer httpserver = new McpHttpServer();
+    EmbeddedJettyServer httpserver = new EmbeddedJettyServer();
     httpserver.use(transportProvider).bind(sse.port()).start();
     return McpServer.sync(transportProvider);
   }
diff --git a/src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/configurable/ConfigurableMcpStreamableServerFactory.java b/src/main/java/com/github/codeboyzhou/mcp/declarative/server/factory/configurable/ConfigurableMcpStreamableServerFactory.java
@@ -2,7 +2,7 @@
 
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerConfiguration;
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerStreamable;
-import com.github.codeboyzhou.mcp.declarative.server.McpHttpServer;
+import com.github.codeboyzhou.mcp.declarative.server.EmbeddedJettyServer;
 import com.github.codeboyzhou.mcp.declarative.util.ObjectMappers;
 import io.modelcontextprotocol.server.McpServer;
 import io.modelcontextprotocol.server.transport.HttpServletStreamableServerTransportProvider;
@@ -24,7 +24,7 @@ public McpServer.SyncSpecification<?> sync() {
             .disallowDelete(streamable.disallowDelete())
             .keepAliveInterval(Duration.ofMillis(streamable.keepAliveInterval()))
             .build();
-    McpHttpServer httpserver = new McpHttpServer();
+    EmbeddedJettyServer httpserver = new EmbeddedJettyServer();
     httpserver.use(transportProvider).bind(streamable.port()).start();
     return McpServer.sync(transportProvider);
   }
diff --git a/src/main/java/com/github/codeboyzhou/mcp/declarative/util/Strings.java b/src/main/java/com/github/codeboyzhou/mcp/declarative/util/Strings.java
@@ -14,6 +14,6 @@ public final class Strings {
   }
 
   public static String defaultIfBlank(String str, String defaultValue) {
-    return str == null || str.trim().isBlank() ? defaultValue : str;
+    return str == null || str.isBlank() ? defaultValue : str;
   }
 }
diff --git a/src/main/java/com/github/codeboyzhou/mcp/declarative/util/Types.java b/src/main/java/com/github/codeboyzhou/mcp/declarative/util/Types.java
@@ -85,16 +85,16 @@ private static Object getDefaultValue(Class<?> type) {
   }
 
   private static Object getDefaultValue(String jsonSchemaType) {
-    if (String.class.getSimpleName().equalsIgnoreCase(jsonSchemaType)) {
+    if (JsonSchemaDataType.STRING.getType().equalsIgnoreCase(jsonSchemaType)) {
       return Strings.EMPTY;
     }
-    if (Integer.class.getSimpleName().equalsIgnoreCase(jsonSchemaType)) {
+    if (JsonSchemaDataType.INTEGER.getType().equalsIgnoreCase(jsonSchemaType)) {
       return 0;
     }
-    if (Number.class.getSimpleName().equalsIgnoreCase(jsonSchemaType)) {
+    if (JsonSchemaDataType.NUMBER.getType().equalsIgnoreCase(jsonSchemaType)) {
       return 0.0;
     }
-    if (Boolean.class.getSimpleName().equalsIgnoreCase(jsonSchemaType)) {
+    if (JsonSchemaDataType.BOOLEAN.getType().equalsIgnoreCase(jsonSchemaType)) {
       return false;
     }
     return null;

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ public final class Strings {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`public static String defaultIfBlank(String str, String defaultValue) {`
`17`		`- return str == null \|\| str.trim().isBlank() ? defaultValue : str;`
	`17`	`+ return str == null \|\| str.isBlank() ? defaultValue : str;`
`18`	`18`	`}`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,16 +85,16 @@ private static Object getDefaultValue(Class<?> type) {`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`private static Object getDefaultValue(String jsonSchemaType) {`
`88`		`- if (String.class.getSimpleName().equalsIgnoreCase(jsonSchemaType)) {`
	`88`	`+ if (JsonSchemaDataType.STRING.getType().equalsIgnoreCase(jsonSchemaType)) {`
`89`	`89`	`return Strings.EMPTY;`
`90`	`90`	`}`
`91`		`- if (Integer.class.getSimpleName().equalsIgnoreCase(jsonSchemaType)) {`
	`91`	`+ if (JsonSchemaDataType.INTEGER.getType().equalsIgnoreCase(jsonSchemaType)) {`
`92`	`92`	`return 0;`
`93`	`93`	`}`
`94`		`- if (Number.class.getSimpleName().equalsIgnoreCase(jsonSchemaType)) {`
	`94`	`+ if (JsonSchemaDataType.NUMBER.getType().equalsIgnoreCase(jsonSchemaType)) {`
`95`	`95`	`return 0.0;`
`96`	`96`	`}`
`97`		`- if (Boolean.class.getSimpleName().equalsIgnoreCase(jsonSchemaType)) {`
	`97`	`+ if (JsonSchemaDataType.BOOLEAN.getType().equalsIgnoreCase(jsonSchemaType)) {`
`98`	`98`	`return false;`
`99`	`99`	`}`
`100`	`100`	`return null;`