ServerSchema旧逻辑删除

Author: relat-ivity

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/McpServer.java

@@ -6,7 +6,6 @@
 
 package modelengine.fel.tool.mcp.server;
 
-import modelengine.fel.tool.mcp.entity.ServerSchema;
 import modelengine.fel.tool.mcp.entity.Tool;
 
 import java.util.List;
@@ -18,13 +17,6 @@
  * @since 2025-05-15
  */
 public interface McpServer {
-    /**
-     * Gets MCP server schema.
-     *
-     * @return The MCP server schema as a {@link ServerSchema}.
-     */
-    ServerSchema getSchema();
-
     /**
      * Gets MCP server tools.
      *

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/support/DefaultMcpStreamableServer.java

@@ -9,7 +9,6 @@
 import io.modelcontextprotocol.server.McpServerFeatures;
 import io.modelcontextprotocol.server.McpSyncServer;
 import io.modelcontextprotocol.spec.McpSchema;
-import modelengine.fel.tool.mcp.entity.ServerSchema;
 import modelengine.fel.tool.mcp.entity.Tool;
 import modelengine.fel.tool.mcp.server.McpServer;
 import modelengine.fel.tool.service.ToolChangedObserver;
@@ -57,15 +56,6 @@ public DefaultMcpStreamableServer(ToolExecuteService toolExecuteService, McpSync
         this.mcpSyncServer = mcpSyncServer;
     }
 
-    @Override
-    public ServerSchema getSchema() {
-        ServerSchema.Info info = new ServerSchema.Info("FIT Store MCP Server", "3.6.0-SNAPSHOT");
-        ServerSchema.Capabilities.Logging logging = new ServerSchema.Capabilities.Logging();
-        ServerSchema.Capabilities.Tools tools = new ServerSchema.Capabilities.Tools(true);
-        ServerSchema.Capabilities capabilities = new ServerSchema.Capabilities(logging, tools);
-        return new ServerSchema("2025-06-18", capabilities, info);
-    }
-
     @Override
     public List<Tool> getTools() {
         return this.mcpSyncServer.listTools().stream()

framework/fel/java/plugins/tool-mcp-server/src/main/java/modelengine/fel/tool/mcp/server/transport/FitMcpStreamableServerTransportProvider.java

@@ -12,7 +12,6 @@
 import io.modelcontextprotocol.json.TypeRef;
 import io.modelcontextprotocol.server.McpTransportContextExtractor;
 import io.modelcontextprotocol.spec.*;
-import io.modelcontextprotocol.util.Assert;
 import io.modelcontextprotocol.util.KeepAliveScheduler;
 import modelengine.fel.tool.mcp.entity.Event;
 import modelengine.fit.http.annotation.DeleteMapping;
@@ -28,6 +27,7 @@
 import modelengine.fit.http.server.HttpClassicServerResponse;
 import modelengine.fitframework.flowable.Choir;
 import modelengine.fitframework.flowable.Emitter;
+import modelengine.fitframework.inspection.Validation;
 import modelengine.fitframework.log.Logger;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -59,24 +59,22 @@ public class FitMcpStreamableServerTransportProvider implements McpStreamableSer
      * Flag indicating whether DELETE requests are disallowed on the endpoint.
      */
     private final boolean disallowDelete;
-
     private final ObjectMapper objectMapper;
+    private final McpTransportContextExtractor<HttpClassicServerRequest> contextExtractor;
+    private KeepAliveScheduler keepAliveScheduler;
 
     private McpStreamableServerSession.Factory sessionFactory;
 
     /**
      * Map of active client sessions, keyed by mcp-session-id.
      */
-    private final ConcurrentHashMap<String, McpStreamableServerSession> sessions = new ConcurrentHashMap<>();
-
-    private final McpTransportContextExtractor<HttpClassicServerRequest> contextExtractor;
+    private final Map<String, McpStreamableServerSession> sessions = new ConcurrentHashMap<>();
 
     /**
      * Flag indicating if the transport is shutting down.
      */
     private volatile boolean isClosing = false;
 
-    private KeepAliveScheduler keepAliveScheduler;
 
     /**
      * Constructs a new FitMcpStreamableServerTransportProvider instance,
@@ -93,8 +91,8 @@ private FitMcpStreamableServerTransportProvider(ObjectMapper objectMapper,
                                                     boolean disallowDelete,
                                                     McpTransportContextExtractor<HttpClassicServerRequest> contextExtractor,
                                                     Duration keepAliveInterval) {
-        Assert.notNull(objectMapper, "ObjectMapper must not be null");
-        Assert.notNull(contextExtractor, "McpTransportContextExtractor must not be null");
+        Validation.notNull(objectMapper, "ObjectMapper must not be null");
+        Validation.notNull(contextExtractor, "McpTransportContextExtractor must not be null");
 
         this.objectMapper = objectMapper;
         this.disallowDelete = disallowDelete;
@@ -522,16 +520,13 @@ else if (map.containsKey("result") || map.containsKey("error")) {
      * send messages concurrently.
      */
     private class FitStreamableMcpSessionTransport implements McpStreamableServerTransport {
-
         private final String sessionId;
-
+        private final HttpClassicServerResponse response;
         private final Emitter<TextEvent> emitter;
 
         private final ReentrantLock lock = new ReentrantLock();
 
         private volatile boolean closed = false;
-        
-        private final HttpClassicServerResponse response;
 
         /**
          * Creates a new session transport with the specified ID and SSE builder.
@@ -676,14 +671,10 @@ public static Builder builder() {
      * Builder for creating instances of {@link FitMcpStreamableServerTransportProvider}.
      */
     public static class Builder {
-
         private ObjectMapper objectMapper;
-
         private boolean disallowDelete = false;
-
         private McpTransportContextExtractor<HttpClassicServerRequest> contextExtractor = (
                 HttpClassicServerRequest) -> McpTransportContext.EMPTY;
-
         private Duration keepAliveInterval;
 
         /**
@@ -694,7 +685,7 @@ public static class Builder {
          * @throws IllegalArgumentException if objectMapper is null
          */
         public Builder objectMapper(ObjectMapper objectMapper) {
-            Assert.notNull(objectMapper, "ObjectMapper must not be null");
+            Validation.notNull(objectMapper, "ObjectMapper must not be null");
             this.objectMapper = objectMapper;
             return this;
         }
@@ -722,7 +713,7 @@ public Builder disallowDelete(boolean disallowDelete) {
          * @throws IllegalArgumentException if contextExtractor is null
          */
         public Builder contextExtractor(McpTransportContextExtractor<HttpClassicServerRequest> contextExtractor) {
-            Assert.notNull(contextExtractor, "contextExtractor must not be null");
+            Validation.notNull(contextExtractor, "contextExtractor must not be null");
             this.contextExtractor = contextExtractor;
             return this;
         }
@@ -748,7 +739,7 @@ public Builder keepAliveInterval(Duration keepAliveInterval) {
          * @throws IllegalStateException if required parameters are not set
          */
         public FitMcpStreamableServerTransportProvider build() {
-            Assert.notNull(this.objectMapper, "ObjectMapper must be set");
+            Validation.notNull(this.objectMapper, "ObjectMapper must be set");
 
             return new FitMcpStreamableServerTransportProvider(this.objectMapper, this.disallowDelete,
                     this.contextExtractor, this.keepAliveInterval);

framework/fel/java/plugins/tool-mcp-server/src/test/java/modelengine/fel/tool/mcp/server/support/DefaultMcpStreamableServerTest.java

@@ -7,7 +7,6 @@
 package modelengine.fel.tool.mcp.server.support;
 
 import io.modelcontextprotocol.server.McpSyncServer;
-import modelengine.fel.tool.mcp.entity.ServerSchema;
 import modelengine.fel.tool.mcp.entity.Tool;
 import modelengine.fel.tool.mcp.server.McpServer;
 import modelengine.fel.tool.service.ToolExecuteService;
@@ -23,7 +22,9 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.catchThrowableOfType;
-import static org.mockito.Mockito.*;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
 
 /**
  * Unit test for {@link DefaultMcpStreamableServer}.
@@ -54,29 +55,6 @@ void throwIllegalArgumentExceptionWhenToolExecuteServiceIsNull() {
         }
     }
 
-    @Nested
-    @DisplayName("getInfo Method Tests")
-    class GivenGetInfo {
-        @Test
-        @DisplayName("Should return expected server information")
-        void returnExpectedServerInfo() {
-            McpServer server = new DefaultMcpStreamableServer(toolExecuteService, mcpSyncServer);
-            ServerSchema info = server.getSchema();
-
-            assertThat(info).returns("2025-06-18", ServerSchema::protocolVersion);
-
-            ServerSchema.Capabilities capabilities = info.capabilities();
-            assertThat(capabilities).isNotNull();
-
-            ServerSchema.Capabilities.Tools toolsCapability = capabilities.tools();
-            assertThat(toolsCapability).returns(true, ServerSchema.Capabilities.Tools::listChanged);
-
-            ServerSchema.Info serverInfo = info.serverInfo();
-            assertThat(serverInfo).returns("FIT Store MCP Server", ServerSchema.Info::name)
-                    .returns("3.6.0-SNAPSHOT", ServerSchema.Info::version);
-        }
-    }
-
     @Nested
     @DisplayName("registerToolsChangedObserver and Notification Tests")
     class GivenRegisterAndNotify {