fix(#8): Mcp tools params type is double or Double will error

Author: codeboyzhou

src/main/java/com/github/codeboyzhou/mcp/declarative/enums/JavaTypeToJsonSchemaMapper.java

@@ -0,0 +1,93 @@
+package com.github.codeboyzhou.mcp.declarative.enums;
+
+/**
+ * This enum is used to map Java types to JSON schema data types.
+ *
+ * @author codeboyzhou
+ */
+public enum JavaTypeToJsonSchemaMapper {
+
+  /** Java {@code String} is mapped to JSON schema data type {@code string}. */
+  STRING(String.class, "string"),
+
+  /** Java {@code Number} is mapped to JSON schema data type {@code number}. */
+  NUMBER(Number.class, "number"),
+
+  /** Java {@code long} is mapped to JSON schema data type {@code number}. */
+  LONG(long.class, "number"),
+
+  /** Java {@code Long} is mapped to JSON schema data type {@code number}. */
+  LONG_CLASS(Long.class, "number"),
+
+  /** Java {@code float} is mapped to JSON schema data type {@code number}. */
+  FLOAT(float.class, "number"),
+
+  /** Java {@code Float} is mapped to JSON schema data type {@code number}. */
+  FLOAT_CLASS(Float.class, "number"),
+
+  /** Java {@code double} is mapped to JSON schema data type {@code number}. */
+  DOUBLE(double.class, "number"),
+
+  /** Java {@code Double} is mapped to JSON schema data type {@code number}. */
+  DOUBLE_CLASS(Double.class, "number"),
+
+  /** Java {@code int} is mapped to JSON schema data type {@code integer}. */
+  INT(int.class, "integer"),
+
+  /** Java {@code Integer} is mapped to JSON schema data type {@code integer}. */
+  INTEGER(Integer.class, "integer"),
+
+  /** Java {@code boolean} is mapped to JSON schema data type {@code boolean}. */
+  BOOLEAN(boolean.class, "boolean"),
+
+  /** Java {@code Boolean} is mapped to JSON schema data type {@code boolean}. */
+  BOOLEAN_CLASS(Boolean.class, "boolean"),
+
+  /** Java {@code Object} is mapped to JSON schema data type {@code object}. */
+  OBJECT(Object.class, "object"),
+  ;
+
+  /** The Java class that is mapped to the JSON schema data type. */
+  private final Class<?> javaType;
+
+  /** The JSON schema data type. */
+  private final String jsonSchemaType;
+
+  /**
+   * Creates a new instance of {@code JsonSchemaDataType} with the specified Java class and JSON
+   * schema data type.
+   *
+   * @param javaType the Java class that is mapped to the JSON schema data type
+   * @param jsonSchemaType the JSON schema data type
+   */
+  JavaTypeToJsonSchemaMapper(Class<?> javaType, String jsonSchemaType) {
+    this.javaType = javaType;
+    this.jsonSchemaType = jsonSchemaType;
+  }
+
+  /**
+   * Returns the JSON schema data type.
+   *
+   * @return the JSON schema data type
+   */
+  public String getJsonSchemaType() {
+    return jsonSchemaType;
+  }
+
+  /**
+   * Returns the JSON schema data type for the specified Java class. If the Java class is not
+   * supported or mapped to a JSON schema data type, {@code "string"} will be returned.
+   *
+   * @param javaType the Java class
+   * @return the JSON schema data type
+   */
+  public static String getJsonSchemaType(Class<?> javaType) {
+    JavaTypeToJsonSchemaMapper[] values = values();
+    for (JavaTypeToJsonSchemaMapper mapper : values) {
+      if (mapper.javaType.equals(javaType)) {
+        return mapper.jsonSchemaType;
+      }
+    }
+    return STRING.jsonSchemaType;
+  }
+}

src/main/java/com/github/codeboyzhou/mcp/declarative/enums/JsonSchemaDataType.java

@@ -4,7 +4,7 @@
 import com.github.codeboyzhou.mcp.declarative.annotation.McpJsonSchemaDefinitionProperty;
 import com.github.codeboyzhou.mcp.declarative.annotation.McpTool;
 import com.github.codeboyzhou.mcp.declarative.annotation.McpToolParam;
-import com.github.codeboyzhou.mcp.declarative.enums.JsonSchemaDataType;
+import com.github.codeboyzhou.mcp.declarative.enums.JavaTypeToJsonSchemaMapper;
 import com.github.codeboyzhou.mcp.declarative.reflect.InvocationResult;
 import com.github.codeboyzhou.mcp.declarative.reflect.MethodCache;
 import com.github.codeboyzhou.mcp.declarative.server.converter.McpToolParameterConverter;
@@ -116,7 +116,7 @@ private McpSchema.JsonSchema createJsonSchema(Parameter[] methodParams) {
           Map<String, Object> definition = createJsonSchemaDefinition(definitionClass);
           definitions.put(definitionClassName, definition);
         } else {
-          property.put("type", definitionClass.getSimpleName().toLowerCase());
+          property.put("type", JavaTypeToJsonSchemaMapper.getJsonSchemaType(definitionClass));
           property.put("description", resolveComponentAttributeValue(toolParam.description()));
         }
         properties.put(parameterName, property);
@@ -129,7 +129,7 @@ private McpSchema.JsonSchema createJsonSchema(Parameter[] methodParams) {
 
     final boolean hasAdditionalProperties = false;
     return new McpSchema.JsonSchema(
-        JsonSchemaDataType.OBJECT.getType(),
+        JavaTypeToJsonSchemaMapper.OBJECT.getJsonSchemaType(),
         properties,
         required,
         hasAdditionalProperties,
@@ -145,7 +145,7 @@ private McpSchema.JsonSchema createJsonSchema(Parameter[] methodParams) {
    */
   private Map<String, Object> createJsonSchemaDefinition(Class<?> definitionClass) {
     Map<String, Object> definitionJsonSchema = new HashMap<>();
-    definitionJsonSchema.put("type", JsonSchemaDataType.OBJECT.getType());
+    definitionJsonSchema.put("type", JavaTypeToJsonSchemaMapper.OBJECT.getJsonSchemaType());
 
     Map<String, Object> properties = new LinkedHashMap<>();
     List<String> required = new ArrayList<>();
@@ -164,7 +164,7 @@ private Map<String, Object> createJsonSchemaDefinition(Class<?> definitionClass)
       }
 
       Map<String, Object> fieldProperties = new HashMap<>();
-      fieldProperties.put("type", JsonSchemaDataType.fromJavaType(field.getType()).getType());
+      fieldProperties.put("type", JavaTypeToJsonSchemaMapper.getJsonSchemaType(field.getType()));
       fieldProperties.put("description", resolveComponentAttributeValue(property.description()));
 
       final String fieldName = StringHelper.defaultIfBlank(property.name(), field.getName());