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

dev.harrel: toggle format assertions #91

Merged
merged 2 commits into from
Jan 10, 2024
Merged

dev.harrel: toggle format assertions #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5829d21
toggle format assertions
harrel56 Dec 28, 2023
6ec389d
Merge branch 'main' into feature/dev-harrel-format-validation-toggle
big-andy-coates Jan 10, 2024
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
37 changes: 20 additions & 17 deletions src/main/java/org/creekservice/kafka/test/perf/implementations/DevHarrelImplementation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import dev.harrel.jsonschema.SchemaResolver;
import dev.harrel.jsonschema.SpecificationVersion;
import dev.harrel.jsonschema.Validator;
import dev.harrel.jsonschema.ValidatorFactory;
import dev.harrel.jsonschema.providers.JacksonNode;
import java.awt.Color;
import java.io.IOException;
Expand Down Expand Up @@ -68,12 +69,7 @@ public JsonValidator prepare(
final AdditionalSchemas additionalSchemas,
final boolean enableFormatAssertions) {

/*
Implementation does not seem to currently provide a way to programmatically turn on format assertions.
Instead, they seem to be on-by-default, which is not inline with the draft 2020-12 spec.
*/

final Validator validator = validator(spec, additionalSchemas);
final Validator validator = validator(spec, additionalSchemas, enableFormatAssertions);
final URI schemaUri = validator.registerSchema(schema);

return new JsonValidator() {
Expand Down Expand Up @@ -118,7 +114,10 @@ public TestModel deserialize(final byte[] data) {
};
}

private Validator validator(final SchemaSpec spec, final AdditionalSchemas additionalSchemas) {
private Validator validator(
final SchemaSpec spec,
final AdditionalSchemas additionalSchemas,
final boolean enableFormatAssertions) {
final JacksonNode.Factory nodeFactory = new JacksonNode.Factory();
final Map<String, JsonNode> remotes =
additionalSchemas.remotes().entrySet().stream()
Expand All @@ -136,26 +135,30 @@ private Validator validator(final SchemaSpec spec, final AdditionalSchemas addit
};
switch (spec) {
case DRAFT_2020_12:
final Validator validator2020 =
new dev.harrel.jsonschema.ValidatorFactory()
final ValidatorFactory validatorFactory2020 =
new ValidatorFactory()
.withDisabledSchemaValidation(true)
.withDialect(new Dialects.Draft2020Dialect())
.withEvaluatorFactory(new FormatEvaluatorFactory())
.withJsonNodeFactory(nodeFactory)
.withSchemaResolver(resolver)
.createValidator();
.withSchemaResolver(resolver);
if (enableFormatAssertions) {
validatorFactory2020.withEvaluatorFactory(new FormatEvaluatorFactory());
}
final Validator validator2020 = validatorFactory2020.createValidator();
/* Validate against meta-schema in order to parse it eagerly */
validator2020.validate(URI.create(SpecificationVersion.DRAFT2020_12.getId()), "{}");
return validator2020;
case DRAFT_2019_09:
final Validator validator2019 =
new dev.harrel.jsonschema.ValidatorFactory()
final ValidatorFactory validatorFactory2019 =
new ValidatorFactory()
.withDisabledSchemaValidation(true)
.withDialect(new Dialects.Draft2019Dialect())
.withEvaluatorFactory(new FormatEvaluatorFactory())
.withJsonNodeFactory(nodeFactory)
.withSchemaResolver(resolver)
.createValidator();
.withSchemaResolver(resolver);
if (enableFormatAssertions) {
validatorFactory2019.withEvaluatorFactory(new FormatEvaluatorFactory());
}
final Validator validator2019 = validatorFactory2019.createValidator();
/* Validate against meta-schema in order to parse it eagerly */
validator2019.validate(URI.create(SpecificationVersion.DRAFT2019_09.getId()), "{}");
return validator2019;
Expand Down