refactor(server): Improve parameter conversion logic in McpServerToolFactory and enhance tool invocation tests

Author: codeboyzhou

src/main/java/com/github/codeboyzhou/mcp/declarative/server/component/McpServerToolFactory.java

@@ -53,9 +53,8 @@ public McpServerFeatures.SyncToolSpecification create(Class<?> clazz, Method met
               boolean isError = false;
               try {
                 Object instance = InjectorProvider.getInstance().getInjector().getInstance(clazz);
-                Map<String, Object> args = request.arguments();
-                Map<String, Object> typedArgs = asTypedParameters(paramSchema, args);
-                result = method.invoke(instance, typedArgs.values().toArray());
+                List<Object> typedValues = asTypedParameterValues(method, request.arguments());
+                result = method.invoke(instance, typedValues.toArray());
               } catch (Exception e) {
                 log.error("Error invoking tool method", e);
                 result = e + ": " + e.getMessage();
@@ -147,23 +146,23 @@ private Map<String, Object> createJsonSchemaDefinition(Class<?> definitionClass)
     return definitionJsonSchema;
   }
 
-  @SuppressWarnings("unchecked")
-  private Map<String, Object> asTypedParameters(
-      McpSchema.JsonSchema schema, Map<String, Object> parameters) {
-    Map<String, Object> properties = schema.properties();
-    Map<String, Object> typedParameters = new LinkedHashMap<>(properties.size());
-
-    properties.forEach(
-        (parameterName, parameterProperties) -> {
-          Object parameterValue = parameters.get(parameterName);
-          // Fill in a default value when the parameter is not specified
-          // to ensure that the parameter type is correct when calling method.invoke()
-          Map<String, Object> map = (Map<String, Object>) parameterProperties;
-          final String jsonSchemaType = map.getOrDefault("type", Strings.EMPTY).toString();
-          Object typedParameterValue = Types.convert(parameterValue, jsonSchemaType);
-          typedParameters.put(parameterName, typedParameterValue);
-        });
-
-    return typedParameters;
+  private List<Object> asTypedParameterValues(Method method, Map<String, Object> parameters) {
+    Parameter[] methodParams = method.getParameters();
+    List<Object> typedValues = new ArrayList<>(methodParams.length);
+
+    for (Parameter param : methodParams) {
+      Object rawValue = null;
+      if (param.isAnnotationPresent(McpToolParam.class)) {
+        McpToolParam toolParam = param.getAnnotation(McpToolParam.class);
+        rawValue = parameters.get(toolParam.name());
+      }
+      // Fill in a default value when the parameter is not specified or unannotated
+      // to ensure that the parameter type is correct when calling method.invoke()
+      Class<?> targetType = param.getType();
+      Object typed = Types.convert(rawValue, targetType);
+      typedValues.add(typed);
+    }
+
+    return typedValues;
   }
 }

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

@@ -5,7 +5,6 @@
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertSame;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import com.github.codeboyzhou.mcp.declarative.configuration.McpServerConfiguration;
 import com.github.codeboyzhou.mcp.declarative.configuration.YAMLConfigurationLoader;
@@ -161,6 +160,7 @@ private void verify(McpSyncClient client) {
     verifyPromptsRegistered(client);
     verifyToolsRegistered(client);
     verifyPromptsCalled(client);
+    verifyToolsCalled(client);
   }
 
   private void verifyServerInfo(McpSyncClient client) {
@@ -217,6 +217,15 @@ private void verifyToolsRegistered(McpSyncClient client) {
     assertEquals("tool1_name", tool.name());
     assertEquals("tool1_title", tool.title());
     assertEquals("tool1_description", tool.description());
-    assertTrue(tool.inputSchema().properties().isEmpty());
+  }
+
+  private void verifyToolsCalled(McpSyncClient client) {
+    String name1 = "tool1_name";
+    Map<String, Object> args1 = Map.of("param1", "value1", "param2", "value2");
+    McpSchema.CallToolRequest request1 = new McpSchema.CallToolRequest(name1, args1);
+    McpSchema.CallToolResult result1 = client.callTool(request1);
+    McpSchema.TextContent content = (McpSchema.TextContent) result1.content().get(0);
+    assertEquals(ObjectMappers.toJson(args1), content.text());
+    assertFalse(result1.isError());
   }
 }

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

@@ -1,11 +1,16 @@
 package com.github.codeboyzhou.mcp.declarative.test;
 
 import com.github.codeboyzhou.mcp.declarative.annotation.McpTool;
+import com.github.codeboyzhou.mcp.declarative.annotation.McpToolParam;
+import com.github.codeboyzhou.mcp.declarative.util.ObjectMappers;
+import java.util.Map;
 
 public class TestMcpTools {
 
   @McpTool(name = "tool1_name", title = "tool1_title", description = "tool1_description")
-  public String tool1() {
-    return "tool1_content";
+  public String tool1(
+      @McpToolParam(name = "param1", description = "param1_description") String param1,
+      @McpToolParam(name = "param2", description = "param2_description") String param2) {
+    return ObjectMappers.toJson(Map.of("param1", param1, "param2", param2));
   }
 }