Skip to content
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

Jump to bottom

DGS-18989 Allow empty fragment (#) in $schema prop for JSON Schema #3379

Merged
merged 1 commit into from
Oct 24, 2024
Merged

DGS-18989 Allow empty fragment (#) in $schema prop for JSON Schema #3379

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
3 changes: 3 additions & 0 deletions ...a-provider/src/main/java/io/confluent/kafka/schemaregistry/json/SpecificationVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,9 @@ public static SpecificationVersion get(String name) {
}

public static SpecificationVersion getFromUrl(String url) {
if (url != null && url.endsWith("#")) {
url = url.substring(0, url.length() - 1);
}
return urlLookup.get(url);
}

Expand Down
18 changes: 17 additions & 1 deletion ...-schema-provider/src/test/java/io/confluent/kafka/schemaregistry/json/JsonSchemaTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,23 @@ public void testParseSchema() {
Optional<ParsedSchema> parsedSchemaOptional = jsonSchemaProvider.parseSchema(recordSchemaString,
new ArrayList<>(), false, false);

assertNotNull(parsedSchema);
assertNotNull(parsedSchema.rawSchema());
assertTrue(parsedSchemaOptional.isPresent());
}

@Test
public void testParseSchemaDraft4() {
String schemaString = "{\"$schema\":\"http://json-schema.org/draft-04/schema#\","
+ "\"title\":\"Test Obj\",\"type\":\"object\",\"additionalProperties\":false,"
+ "\"properties\":{\"prop\":{\"oneOf\":[{\"type\":\"null\",\"title\":\"Not included\"},"
+ "{\"type\":\"string\"}]}}}";
SchemaProvider jsonSchemaProvider = new JsonSchemaProvider();
ParsedSchema parsedSchema = jsonSchemaProvider.parseSchemaOrElseThrow(
new Schema(null, null, null, JsonSchema.TYPE, new ArrayList<>(), schemaString), false, false);
Optional<ParsedSchema> parsedSchemaOptional = jsonSchemaProvider.parseSchema(schemaString,
new ArrayList<>(), false, false);

assertNotNull(parsedSchema.rawSchema());
assertTrue(parsedSchemaOptional.isPresent());
}

Expand Down