fix: adapt the new openApi structure

Author: jokemanfire

crates/rmcp/Cargo.toml

@@ -28,7 +28,7 @@ paste = { version = "1", optional = true }
 oauth2 = { version = "5.0", optional = true }
 
 # for auto generate schema
-schemars = { version = "0.9", optional = true }
+schemars = { version = "1.0", optional = true }
 
 # for image encoding
 base64 = { version = "0.22", optional = true }
@@ -133,7 +133,7 @@ schemars = ["dep:schemars"]
 
 [dev-dependencies]
 tokio = { version = "1", features = ["full"] }
-schemars = { version = "0.9", features = ["chrono04"] }
+schemars = { version = "1.0", features = ["chrono04"] }
 
 anyhow = "1.0"
 tracing-subscriber = { version = "0.3", features = [

crates/rmcp/src/handler/server/tool.rs

@@ -13,15 +13,13 @@ use crate::{
     model::{CallToolRequestParam, CallToolResult, IntoContents, JsonObject},
     service::RequestContext,
 };
-
+use crate::schemars::generate::SchemaSettings;
 /// A shortcut for generating a JSON schema for a type.
 pub fn schema_for_type<T: JsonSchema>() -> JsonObject {
     // explicitly to align json schema version to official specifications.
     // https://github.com/modelcontextprotocol/modelcontextprotocol/blob/main/schema/2025-03-26/schema.json
-    let mut settings = schemars::r#gen::SchemaSettings::draft07();
-    settings.option_nullable = true;
-    settings.option_add_null_type = false;
-    settings.visitors = Vec::default();
+    // TODO: update to 2020-12 waiting for the mcp spec update
+    let settings = SchemaSettings::draft07();
     let generator = settings.into_generator();
     let schema = generator.into_root_schema_for::<T>();
     let object = serde_json::to_value(schema).expect("failed to serialize schema");

crates/rmcp/tests/test_complex_schema.rs

@@ -47,7 +47,11 @@ fn test_complex_schema() {
     let attr = Demo::chat_tool_attr();
     let input_schema = attr.input_schema;
     let enum_number = input_schema
-        .get("definitions")
+        .get("components")
+        .unwrap()
+        .as_object()
+        .unwrap()
+        .get("schemas")
         .unwrap()
         .as_object()
         .unwrap()

crates/rmcp/tests/test_message_schema.rs

@@ -1,6 +1,6 @@
 mod tests {
     use rmcp::model::{ClientJsonRpcMessage, ServerJsonRpcMessage};
-    use schemars::schema_for;
+    use schemars::{generate::SchemaSettings, schema_for};
 
     fn compare_schemas(name: &str, actual: &str, expected_file: &str) {
         let expected = match std::fs::read_to_string(expected_file) {
@@ -48,7 +48,8 @@ mod tests {
 
     #[test]
     fn test_client_json_rpc_message_schema() {
-        let schema = schema_for!(ClientJsonRpcMessage);
+        let settings = SchemaSettings::draft07();
+        let schema = settings.into_generator().into_root_schema_for::<ClientJsonRpcMessage>();
         let schema_str = serde_json::to_string_pretty(&schema).expect("Failed to serialize schema");
 
         compare_schemas(
@@ -60,7 +61,8 @@ mod tests {
 
     #[test]
     fn test_server_json_rpc_message_schema() {
-        let schema = schema_for!(ServerJsonRpcMessage);
+        let settings = SchemaSettings::draft07();
+        let schema = settings.into_generator().into_root_schema_for::<ServerJsonRpcMessage>();
         let schema_str = serde_json::to_string_pretty(&schema).expect("Failed to serialize schema");
 
         compare_schemas(