添加测试，修改log格式

Author: “â黄可欣

framework/fel/java/plugins/tool-mcp-client/src/main/java/modelengine/fel/tool/mcp/client/support/DefaultMcpClientFactory.java

@@ -41,13 +41,18 @@ public McpClient create(String baseUri, String sseEndpoint) {
     }
 
     @Override
-    public McpClient create(String baseUri, String sseEndpoint, Consumer<McpSchema.LoggingMessageNotification> loggingConsumer) {
+    public McpClient create(String baseUri, String sseEndpoint,
+            Consumer<McpSchema.LoggingMessageNotification> loggingConsumer) {
         return create(baseUri, sseEndpoint, loggingConsumer, null);
     }
 
     @Override
-    public McpClient create(String baseUri, String sseEndpoint, Function<McpSchema.ElicitRequest, McpSchema.ElicitResult> elicitationHandler) {
-        return create(baseUri, sseEndpoint, DefaultMcpClientMessageHandler::defaultLoggingMessageHandler, elicitationHandler);
+    public McpClient create(String baseUri, String sseEndpoint,
+            Function<McpSchema.ElicitRequest, McpSchema.ElicitResult> elicitationHandler) {
+        return create(baseUri,
+                sseEndpoint,
+                DefaultMcpClientMessageHandler::defaultLoggingMessageHandler,
+                elicitationHandler);
     }
 
     @Override

framework/fel/java/plugins/tool-mcp-client/src/main/java/modelengine/fel/tool/mcp/client/support/DefaultMcpClientMessageHandler.java

@@ -31,6 +31,8 @@ public class DefaultMcpClientMessageHandler {
      * @param notification The {@link McpSchema.LoggingMessageNotification} containing the log level and data.
      */
     public static void defaultLoggingMessageHandler(McpSchema.LoggingMessageNotification notification) {
-        log.info("[Client] log: {}-{}", notification.level(), notification.data());
+        log.info("Received logging message from MCP server. [level={}, data={}]",
+                notification.level(),
+                notification.data());
     }
 }

framework/fel/java/plugins/tool-mcp-client/src/main/java/modelengine/fel/tool/mcp/client/support/DefaultMcpStreamableClient.java

@@ -58,7 +58,7 @@ public DefaultMcpStreamableClient(String baseUri, String sseEndpoint, int reques
         this.clientId = UUID.randomUUID().toString();
         notBlank(baseUri, "The MCP server base URI cannot be blank.");
         notBlank(sseEndpoint, "The MCP server SSE endpoint cannot be blank.");
-        log.info("Creating MCP client [{}] for server: {}", clientId, baseUri);
+        log.info("Creating MCP client. [clientId={}, baseUri={}]", clientId, baseUri);
         ObjectMapper mapper = new ObjectMapper();
         HttpClientStreamableHttpTransport transport = HttpClientStreamableHttpTransport.builder(baseUri)
                 .jsonMapper(new JacksonMcpJsonMapper(mapper))
@@ -99,7 +99,7 @@ public void initialize() {
         ensureNotClosed();
         mcpSyncClient.initialize();
         this.initialized = true;
-        log.info("MCP client [{}] initialized successfully.", clientId);
+        log.info("MCP client initialized successfully. [clientId={}]", clientId);
     }
 
     /**
@@ -112,22 +112,23 @@ public void initialize() {
     @Override
     public List<Tool> getTools() {
         ensureReady();
-
         try {
             McpSchema.ListToolsResult result = this.mcpSyncClient.listTools();
             if (result == null || result.tools() == null) {
-                log.warn("MCP client [{}] failed to get tools: result is null.", clientId);
+                log.warn("Failed to get tools: result is null. [clientId={}]", clientId);
                 throw new IllegalStateException("Failed to get tools from MCP server: result is null.");
             }
 
             List<Tool> tools = result.tools().stream().map(this::convertToFelTool).collect(Collectors.toList());
 
-            log.info("MCP client [{}] successfully retrieved {} tools.", clientId, tools.size());
-            tools.forEach(tool -> log.debug("Tool - Name: {}, Description: {}", tool.getName(), tool.getDescription()));
+            log.info("Successfully retrieved tools. [clientId={}, count={}]", clientId, tools.size());
+            tools.forEach(tool -> log.debug("Tool information. [name={}, description={}]",
+                    tool.getName(),
+                    tool.getDescription()));
             return tools;
         } catch (Exception e) {
-            log.error("MCP client [{}] failed to get tools: {}", clientId, e);
-            throw new IllegalStateException("Failed to get tools from MCP server: " + e.getMessage(), e);
+            log.error("Failed to get tools. [clientId={}, error={}]", clientId, e.getMessage());
+            throw new IllegalStateException("Failed to get tools from MCP server. [error=" + e.getMessage() + "]", e);
         }
     }
 
@@ -146,39 +147,20 @@ public List<Tool> getTools() {
     public Object callTool(String name, Map<String, Object> arguments) {
         ensureReady();
         try {
-            log.info("MCP client [{}] calling tool: {} with arguments: {}", clientId, name, arguments);
+            log.info("Calling tool. [clientId={}, name={}, arguments={}]", clientId, name, arguments);
             McpSchema.CallToolResult result =
                     this.mcpSyncClient.callTool(new McpSchema.CallToolRequest(name, arguments));
 
             if (result == null) {
-                log.error("MCP client [{}] failed to call tool '{}': result is null.", clientId, name);
-                throw new IllegalStateException("Failed to call tool '" + name + "': result is null.");
+                log.error("Failed to call tool: result is null. [clientId={}, name={}]", clientId, name);
+                throw new IllegalStateException("Failed to call tool: result is null. [name=" + name + "]");
             }
             return processToolResult(result, name);
         } catch (Exception e) {
-            log.error("MCP client [{}] failed to call tool '{}': {}", clientId, name, e);
-            throw new IllegalStateException("Failed to call tool '" + name + "': " + e.getMessage(), e);
-        }
-    }
-
-    /**
-     * Builds an error message from tool result content.
-     *
-     * @param name The name of the tool that was called.
-     * @param content The content list from the tool result.
-     * @return The formatted error message.
-     */
-    private String buildToolErrorMessage(String name, List<McpSchema.Content> content) {
-        String errorMsg = "Tool '" + name + "' returned an error";
-        if (content != null && !content.isEmpty()) {
-            McpSchema.Content errorContent = content.get(0);
-            if (errorContent instanceof McpSchema.TextContent textContent) {
-                errorMsg += ": " + textContent.text();
-            } else {
-                errorMsg += ": " + errorContent;
-            }
+            log.error("Failed to call tool. [clientId={}, name={}, error={}]", clientId, name, e.getMessage());
+            throw new IllegalStateException("Failed to call tool. [name=" + name + ", error=" + e.getMessage() + "]",
+                    e);
         }
-        return errorMsg;
     }
 
     /**
@@ -194,25 +176,29 @@ private String buildToolErrorMessage(String name, List<McpSchema.Content> conten
      */
     private Object processToolResult(McpSchema.CallToolResult result, String name) {
         if (result.isError() != null && result.isError()) {
-            String errorMsg = buildToolErrorMessage(name, result.content());
-            log.error("MCP client [{}]: {}", clientId, errorMsg);
-            throw new IllegalStateException(errorMsg);
+            String errorDetails = extractErrorDetails(result.content());
+            log.error("Tool returned an error. [clientId={}, name={}, details={}]", clientId, name, errorDetails);
+            throw new IllegalStateException(
+                    "Tool returned an error. [name=" + name + ", details=" + errorDetails + "]");
         }
 
         if (result.content() == null || result.content().isEmpty()) {
-            log.warn("MCP client [{}] tool '{}' returned empty content.", clientId, name);
+            log.warn("Tool returned empty content. [clientId={}, name={}]", clientId, name);
             return null;
         }
 
         Object content = result.content().get(0);
         if (content instanceof McpSchema.TextContent textContent) {
-            log.info("MCP client [{}] successfully called tool '{}', result: {}", clientId, name, textContent.text());
+            log.info("Successfully called tool. [clientId={}, name={}, result={}]", clientId, name, textContent.text());
             return textContent.text();
         } else if (content instanceof McpSchema.ImageContent imageContent) {
-            log.info("MCP client [{}] successfully called tool '{}', returned image content.", clientId, name);
+            log.info("Successfully called tool: image content. [clientId={}, name={}]", clientId, name);
             return imageContent;
         } else {
-            log.info("MCP client [{}] successfully called tool '{}', content type: {}", clientId, name, content.getClass().getSimpleName());
+            log.info("Successfully called tool. [clientId={}, name={}, contentType={}]",
+                    clientId,
+                    name,
+                    content.getClass().getSimpleName());
             return content;
         }
     }
@@ -227,7 +213,7 @@ public void close() throws IOException {
         ensureNotClosed();
         this.closed = true;
         this.mcpSyncClient.closeGracefully();
-        log.info("MCP client [{}] closed.", clientId);
+        log.info("MCP client closed. [clientId={}]", clientId);
     }
 
     /**
@@ -265,7 +251,7 @@ private Tool convertToFelTool(McpSchema.Tool mcpTool) {
      */
     private void ensureNotClosed() {
         if (this.closed) {
-            throw new IllegalStateException("The MCP client is closed.");
+            throw new IllegalStateException("The MCP client is closed. [clientId=" + clientId + "]");
         }
     }
 
@@ -277,7 +263,26 @@ private void ensureNotClosed() {
     private void ensureReady() {
         ensureNotClosed();
         if (!this.initialized) {
-            throw new IllegalStateException("MCP client is not initialized. Please wait a moment.");
+            throw new IllegalStateException(
+                    "MCP client is not initialized. Please wait a moment. [clientId=" + clientId + "]");
+        }
+    }
+
+    /**
+     * Extracts error details from tool result content.
+     *
+     * @param content The content list from the tool result.
+     * @return The error details as a string.
+     */
+    private String extractErrorDetails(List<McpSchema.Content> content) {
+        if (content != null && !content.isEmpty()) {
+            McpSchema.Content errorContent = content.get(0);
+            if (errorContent instanceof McpSchema.TextContent textContent) {
+                return textContent.text();
+            } else {
+                return errorContent.toString();
+            }
         }
+        return "";
     }
 }

framework/fel/java/plugins/tool-mcp-test/src/main/java/modelengine/fel/tool/mcp/test/TestController.java

@@ -6,6 +6,7 @@
 
 package modelengine.fel.tool.mcp.test;
 
+import io.modelcontextprotocol.spec.McpSchema;
 import modelengine.fel.tool.mcp.client.McpClient;
 import modelengine.fel.tool.mcp.client.McpClientFactory;
 import modelengine.fel.tool.mcp.entity.Tool;
@@ -15,8 +16,10 @@
 import modelengine.fit.http.annotation.RequestMapping;
 import modelengine.fit.http.annotation.RequestQuery;
 import modelengine.fitframework.annotation.Component;
+import modelengine.fitframework.log.Logger;
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -30,6 +33,8 @@
 @Component
 @RequestMapping(path = "/mcp-test")
 public class TestController {
+    private static final Logger log = Logger.get(TestController.class);
+
     private final McpClientFactory mcpClientFactory;
     private McpClient client;
 
@@ -43,10 +48,12 @@ public TestController(McpClientFactory mcpClientFactory) {
     }
 
     /**
-     * Initializes the MCP client by creating an instance using the provided factory and initializing it.
-     * This method sets up the connection to the MCP server and prepares it for further interactions.
+     * Initializes the MCP client with default settings (default logging, no elicitation).
+     * This method creates an instance using the provided factory and initializes it.
      *
-     * @return A string indicating that the initialization was successful.
+     * @param baseUri The base URI of the MCP server.
+     * @param sseEndpoint The SSE endpoint of the MCP server.
+     * @return A map with clientId and status message.
      */
     @PostMapping(path = "/initialize")
     public String initialize(@RequestQuery(name = "baseUri") String baseUri,
@@ -56,6 +63,55 @@ public String initialize(@RequestQuery(name = "baseUri") String baseUri,
         return "Initialized";
     }
 
+    /**
+     * Initializes the MCP client with custom logging consumer but without elicitation.
+     * This demonstrates using a custom logging handler.
+     *
+     * @param baseUri The base URI of the MCP server.
+     * @param sseEndpoint The SSE endpoint of the MCP server.
+     * @return A string indicating that the initialization was successful.
+     */
+    @PostMapping(path = "/initialize-with-log")
+    public String initializeWithCustomLogging(@RequestQuery(name = "baseUri") String baseUri,
+            @RequestQuery(name = "sseEndpoint") String sseEndpoint) {
+        this.client = this.mcpClientFactory.create(baseUri, sseEndpoint, this::loggingConsumer);
+        this.client.initialize();
+        return "Initialized with custom logging";
+    }
+
+    /**
+     * Initializes the MCP client with elicitation capability.
+     * This demonstrates enabling elicitation with default logging.
+     *
+     * @param baseUri The base URI of the MCP server.
+     * @param sseEndpoint The SSE endpoint of the MCP server.
+     * @return A string indicating that the initialization was successful.
+     */
+    @PostMapping(path = "/initialize-with-elicitation")
+    public String initializeWithElicitation(@RequestQuery(name = "baseUri") String baseUri,
+            @RequestQuery(name = "sseEndpoint") String sseEndpoint) {
+        this.client = this.mcpClientFactory.create(baseUri, sseEndpoint, this::elicitationHandler);
+        this.client.initialize();
+        return "Initialized with elicitation";
+    }
+
+    /**
+     * Initializes the MCP client with both custom logging and elicitation.
+     * This demonstrates full customization of the client.
+     *
+     * @param baseUri The base URI of the MCP server.
+     * @param sseEndpoint The SSE endpoint of the MCP server.
+     * @return A string indicating that the initialization was successful.
+     */
+    @PostMapping(path = "/initialize-full")
+    public String initializeFullCustom(@RequestQuery(name = "baseUri") String baseUri,
+            @RequestQuery(name = "sseEndpoint") String sseEndpoint) {
+        this.client =
+                this.mcpClientFactory.create(baseUri, sseEndpoint, this::loggingConsumer, this::elicitationHandler);
+        this.client.initialize();
+        return "Initialized with full customization";
+    }
+
     /**
      * Closes the MCP client and releases any resources associated with it.
      * This method ensures that the MCP client is properly closed and resources are released.
@@ -95,4 +151,28 @@ public List<Tool> toolsList() {
     public Object toolsCall(@RequestQuery(name = "name") String name, @RequestBody Map<String, Object> jsonArgs) {
         return this.client.callTool(name, jsonArgs);
     }
+
+    /**
+     * Custom logging consumer for MCP client.
+     *
+     * @param notification The logging message notification from MCP server.
+     */
+    private void loggingConsumer(McpSchema.LoggingMessageNotification notification) {
+        log.info("Custom logging handler received message. [level={}, data={}]",
+                notification.level(),
+                notification.data());
+    }
+
+    /**
+     * Elicitation handler for MCP client.
+     *
+     * @param request The elicitation request from MCP server.
+     * @return The elicitation result with action and user data.
+     */
+    private McpSchema.ElicitResult elicitationHandler(McpSchema.ElicitRequest request) {
+        log.info("Elicitation request received. [message={}, schema={}]", request.message(), request.requestedSchema());
+        Map<String, Object> userData = new HashMap<>();
+        userData.put("response", "Auto-accepted by test controller");
+        return new McpSchema.ElicitResult(McpSchema.ElicitResult.Action.ACCEPT, userData);
+    }
 }

framework/fel/java/services/tool-mcp-client-service/src/main/java/modelengine/fel/tool/mcp/client/McpClientFactory.java

@@ -37,7 +37,8 @@ public interface McpClientFactory {
      * @param loggingConsumer The consumer to handle logging messages from the MCP server.
      * @return The connected {@link McpClient} instance with custom logging consumer but without elicitation ability.
      */
-    McpClient create(String baseUri, String sseEndpoint, Consumer<McpSchema.LoggingMessageNotification> loggingConsumer);
+    McpClient create(String baseUri, String sseEndpoint,
+            Consumer<McpSchema.LoggingMessageNotification> loggingConsumer);
 
     /**
      * Creates a {@link McpClient} instance with default logging consumer and elicitation ability.
@@ -47,7 +48,8 @@ public interface McpClientFactory {
      * @param elicitationHandler The function to handle elicitation requests from the MCP server.
      * @return The connected {@link McpClient} instance with default logging consumer and elicitation ability.
      */
-    McpClient create(String baseUri, String sseEndpoint, Function<McpSchema.ElicitRequest, McpSchema.ElicitResult> elicitationHandler);
+    McpClient create(String baseUri, String sseEndpoint,
+            Function<McpSchema.ElicitRequest, McpSchema.ElicitResult> elicitationHandler);
 
     /**
      * Creates a {@link McpClient} instance with custom message handlers and elicitation ability.