Remove reduntant checks. #630

Refactor JSON schema type handling and add integer support

This commit simplifies the validation logic for the `type` property in the JSON schema by removing unnecessary conditional checks. It directly retrieves the string value from `typeProperty` and assigns it to `typeKeyword`. Additionally, it enhances the `s_lazyElicitAllowedProperties` dictionary to include support for the `integer` type, allowing it to be recognized as a valid type with its corresponding allowed properties.

Author: mehrandvd

src/ModelContextProtocol.Core/Server/McpServerExtensions.cs

@@ -386,22 +386,13 @@ private static bool TryValidateElicitationPrimitiveSchema(JsonElement schema, Ty
         }
 
         if (!schema.TryGetProperty("type", out JsonElement typeProperty)
-            || !(typeProperty.ValueKind is JsonValueKind.String or JsonValueKind.Array))
+            || typeProperty.ValueKind is not JsonValueKind.String)
         {
             error = $"Schema generated for type '{type.FullName}' is invalid: missing or invalid 'type' keyword.";
             return false;
         }
 
-        string? typeKeyword;
-        if (typeProperty.ValueKind == JsonValueKind.String)
-        {
-            typeKeyword = typeProperty.GetString();
-        }
-        else
-        {
-            error = $"Schema generated for type '{type.FullName}' is invalid: unsupported 'type' array.";
-            return false;
-        }
+        var typeKeyword = typeProperty.GetString();
 
         if (string.IsNullOrEmpty(typeKeyword))
         {
@@ -415,13 +406,11 @@ private static bool TryValidateElicitationPrimitiveSchema(JsonElement schema, Ty
             return false;
         }
 
-        if (typeKeyword == "integer")
-            typeKeyword = "number";
-
         s_lazyElicitAllowedProperties ??= new()
         {
             ["string"] = ["type", "title", "description", "minLength", "maxLength", "format", "enum", "enumNames"],
             ["number"] = ["type", "title", "description", "minimum", "maximum"],
+            ["integer"] = ["type", "title", "description", "minimum", "maximum"],
             ["boolean"] = ["type", "title", "description", "default"]
         };