fix...

Author: Aliaksie

mcp-schema-jackson/src/main/java/io/modelcontextprotocol/schema/McpJacksonSchema.java

@@ -410,6 +410,8 @@ public interface JsonSchemaMixin {
 		@JsonProperty("properties") Map<String, Object> properties();
 		@JsonProperty("required") List<String> required();
 		@JsonProperty("additionalProperties") Boolean additionalProperties();
+		@JsonProperty("$defs")  Map<String, Object> defs();
+		@JsonProperty("definitions") Map<String, Object> definitions();
 	} // @formatter:on
 
 	@JsonInclude(JsonInclude.Include.NON_ABSENT)

mcp-schema-jackson/src/test/java/io/modelcontextprotocol/schema/McpSchemaTests.java

@@ -487,16 +487,16 @@ void testJsonSchema() throws Exception {
 				""";
 
 		// Deserialize the original string to a JsonSchema object
-		McpSchema.JsonSchema schema = mapper.readValue(schemaJson, McpSchema.JsonSchema.class);
+		McpSchema.JsonSchema schema = mcpJacksonCodec.getMapper().readValue(schemaJson, McpSchema.JsonSchema.class);
 
 		// Serialize the object back to a string
-		String serialized = mapper.writeValueAsString(schema);
+		String serialized = mcpJacksonCodec.getMapper().writeValueAsString(schema);
 
 		// Deserialize again
-		McpSchema.JsonSchema deserialized = mapper.readValue(serialized, McpSchema.JsonSchema.class);
+		McpSchema.JsonSchema deserialized = mcpJacksonCodec.getMapper().readValue(serialized, McpSchema.JsonSchema.class);
 
 		// Serialize one more time and compare with the first serialization
-		String serializedAgain = mapper.writeValueAsString(deserialized);
+		String serializedAgain = mcpJacksonCodec.getMapper().writeValueAsString(deserialized);
 
 		// The two serialized strings should be the same
 		assertThatJson(serializedAgain).when(Option.IGNORING_ARRAY_ORDER).isEqualTo(json(serialized));
@@ -530,16 +530,16 @@ void testJsonSchemaWithDefinitions() throws Exception {
 				""";
 
 		// Deserialize the original string to a JsonSchema object
-		McpSchema.JsonSchema schema = mapper.readValue(schemaJson, McpSchema.JsonSchema.class);
+		McpSchema.JsonSchema schema = mcpJacksonCodec.getMapper().readValue(schemaJson, McpSchema.JsonSchema.class);
 
 		// Serialize the object back to a string
-		String serialized = mapper.writeValueAsString(schema);
+		String serialized = mcpJacksonCodec.getMapper().writeValueAsString(schema);
 
 		// Deserialize again
-		McpSchema.JsonSchema deserialized = mapper.readValue(serialized, McpSchema.JsonSchema.class);
+		McpSchema.JsonSchema deserialized = mcpJacksonCodec.getMapper().readValue(serialized, McpSchema.JsonSchema.class);
 
 		// Serialize one more time and compare with the first serialization
-		String serializedAgain = mapper.writeValueAsString(deserialized);
+		String serializedAgain = mcpJacksonCodec.getMapper().writeValueAsString(deserialized);
 
 		// The two serialized strings should be the same
 		assertThatJson(serializedAgain).when(Option.IGNORING_ARRAY_ORDER).isEqualTo(json(serialized));
@@ -596,16 +596,17 @@ void testToolWithComplexSchema() throws Exception {
 				}
 				""";
 
-		McpSchema.Tool tool = new McpSchema.Tool("addressTool", "Handles addresses", complexSchemaJson);
+		McpSchema.JsonSchema schema = mcpJacksonCodec.getMapper().readValue(complexSchemaJson, McpSchema.JsonSchema.class);
+		McpSchema.Tool tool = new McpSchema.Tool("addressTool", "Handles addresses", schema);
 
 		// Serialize the tool to a string
-		String serialized = mapper.writeValueAsString(tool);
+		String serialized = mcpJacksonCodec.getMapper().writeValueAsString(tool);
 
 		// Deserialize back to a Tool object
-		McpSchema.Tool deserializedTool = mapper.readValue(serialized, McpSchema.Tool.class);
+		McpSchema.Tool deserializedTool = mcpJacksonCodec.getMapper().readValue(serialized, McpSchema.Tool.class);
 
 		// Serialize again and compare with first serialization
-		String serializedAgain = mapper.writeValueAsString(deserializedTool);
+		String serializedAgain = mcpJacksonCodec.getMapper().writeValueAsString(deserializedTool);
 
 		// The two serialized strings should be the same
 		assertThatJson(serializedAgain).when(Option.IGNORING_ARRAY_ORDER).isEqualTo(json(serialized));

mcp-spi/src/main/java/io/modelcontextprotocol/schema/McpSchema.java

@@ -539,11 +539,8 @@ public record GetPromptResult(String description, List<PromptMessage> messages)
 	public record ListToolsResult(List<Tool> tools, String nextCursor) {
 	}
 
-	public record JsonSchema(String type, Map<String, Object> properties,
-                            List<String> required,
-			Boolean additionalProperties,
-		Map<String, Object> defs,
-      Map<String, Object> definitions) {
+	public record JsonSchema(String type, Map<String, Object> properties, List<String> required,
+			Boolean additionalProperties, Map<String, Object> defs, Map<String, Object> definitions) {
 	}
 
 	/**