Skip to content

Bump json-schema-validator from 1.5.7 to 2.0.0 #660

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 12, 2025
Merged

Bump json-schema-validator from 1.5.7 to 2.0.0 #660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 18 additions & 18 deletions ...src/main/java/io/modelcontextprotocol/json/schema/jackson/DefaultJsonSchemaValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
*/
package io.modelcontextprotocol.json.schema.jackson;

import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.networknt.schema.JsonSchema;
import com.networknt.schema.JsonSchemaFactory;
import com.networknt.schema.SpecVersion;
import com.networknt.schema.ValidationMessage;
import com.networknt.schema.Schema;
import com.networknt.schema.SchemaRegistry;
import com.networknt.schema.Error;
import com.networknt.schema.dialect.Dialects;
import io.modelcontextprotocol.json.schema.JsonSchemaValidator;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -31,18 +31,18 @@ public class DefaultJsonSchemaValidator implements JsonSchemaValidator {

private final ObjectMapper objectMapper;

private final JsonSchemaFactory schemaFactory;
private final SchemaRegistry schemaFactory;

// TODO: Implement a strategy to purge the cache (TTL, size limit, etc.)
private final ConcurrentHashMap<String, JsonSchema> schemaCache;
private final ConcurrentHashMap<String, Schema> schemaCache;

public DefaultJsonSchemaValidator() {
this(new ObjectMapper());
}

public DefaultJsonSchemaValidator(ObjectMapper objectMapper) {
this.objectMapper = objectMapper;
this.schemaFactory = JsonSchemaFactory.getInstance(SpecVersion.VersionFlag.V202012);
this.schemaFactory = SchemaRegistry.withDialect(Dialects.getDraft202012());
this.schemaCache = new ConcurrentHashMap<>();
}

Expand All @@ -62,7 +62,7 @@ public ValidationResponse validate(Map<String, Object> schema, Object structured
? this.objectMapper.readTree((String) structuredContent)
: this.objectMapper.valueToTree(structuredContent);

Set<ValidationMessage> validationResult = this.getOrCreateJsonSchema(schema).validate(jsonStructuredOutput);
List<Error> validationResult = this.getOrCreateJsonSchema(schema).validate(jsonStructuredOutput);

// Check if validation passed
if (!validationResult.isEmpty()) {
Expand All @@ -85,36 +85,36 @@ public ValidationResponse validate(Map<String, Object> schema, Object structured
}

/**
* Gets a cached JsonSchema or creates and caches a new one.
* Gets a cached Schema or creates and caches a new one.
* @param schema the schema map to convert
* @return the compiled JsonSchema
* @return the compiled Schema
* @throws JsonProcessingException if schema processing fails
*/
private JsonSchema getOrCreateJsonSchema(Map<String, Object> schema) throws JsonProcessingException {
private Schema getOrCreateJsonSchema(Map<String, Object> schema) throws JsonProcessingException {
// Generate cache key based on schema content
String cacheKey = this.generateCacheKey(schema);

// Try to get from cache first
JsonSchema cachedSchema = this.schemaCache.get(cacheKey);
Schema cachedSchema = this.schemaCache.get(cacheKey);
if (cachedSchema != null) {
return cachedSchema;
}

// Create new schema if not in cache
JsonSchema newSchema = this.createJsonSchema(schema);
Schema newSchema = this.createJsonSchema(schema);

// Cache the schema
JsonSchema existingSchema = this.schemaCache.putIfAbsent(cacheKey, newSchema);
Schema existingSchema = this.schemaCache.putIfAbsent(cacheKey, newSchema);
return existingSchema != null ? existingSchema : newSchema;
}

/**
* Creates a new JsonSchema from the given schema map.
* Creates a new Schema from the given schema map.
* @param schema the schema map
* @return the compiled JsonSchema
* @return the compiled Schema
* @throws JsonProcessingException if schema processing fails
*/
private JsonSchema createJsonSchema(Map<String, Object> schema) throws JsonProcessingException {
private Schema createJsonSchema(Map<String, Object> schema) throws JsonProcessingException {
// Convert schema map directly to JsonNode (more efficient than string
// serialization)
JsonNode schemaNode = this.objectMapper.valueToTree(schema);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
<awaitility.version>4.2.0</awaitility.version>
<bnd-maven-plugin.version>7.1.0</bnd-maven-plugin.version>
<json-unit-assertj.version>4.1.0</json-unit-assertj.version>
<json-schema-validator.version>1.5.7</json-schema-validator.version>
<json-schema-validator.version>2.0.0</json-schema-validator.version>

</properties>

Expand Down