Skip to content

Upgrade to schema.nt 2.0 #924

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
Oct 29, 2025
+20 −22
Merged

Upgrade to schema.nt 2.0 #924

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
23 changes: 10 additions & 13 deletions api/src/main/java/io/serverlessworkflow/api/ValidationReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,31 +16,30 @@
package io.serverlessworkflow.api;

import com.fasterxml.jackson.databind.JsonNode;
import com.networknt.schema.Error;
import com.networknt.schema.InputFormat;
import com.networknt.schema.JsonSchema;
import com.networknt.schema.JsonSchemaFactory;
import com.networknt.schema.SchemaValidatorsConfig;
import com.networknt.schema.SpecVersion.VersionFlag;
import com.networknt.schema.ValidationMessage;
import com.networknt.schema.Schema;
import com.networknt.schema.SchemaRegistry;
import com.networknt.schema.SpecificationVersion;
import io.serverlessworkflow.api.types.Workflow;
import java.io.IOException;
import java.io.InputStream;
import java.io.Reader;
import java.io.UncheckedIOException;
import java.util.Set;
import java.util.Collection;
import java.util.stream.Collectors;

class ValidationReader implements WorkflowReaderOperations {
private final JsonSchema schemaObject;
private final Schema schemaObject;

ValidationReader() {
try (InputStream input =
Thread.currentThread()
.getContextClassLoader()
.getResourceAsStream("schema/workflow.yaml")) {
this.schemaObject =
JsonSchemaFactory.getInstance(VersionFlag.V7)
.getSchema(input, InputFormat.YAML, SchemaValidatorsConfig.builder().build());
SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_7)
.getSchema(input, InputFormat.YAML);
} catch (IOException e) {
throw new UncheckedIOException(e);
}
Expand All @@ -67,12 +66,10 @@ public Workflow read(String input, WorkflowFormat format) throws IOException {
}

private Workflow validate(JsonNode value, WorkflowFormat format) {
Set<ValidationMessage> validationErrors = schemaObject.validate(value);
Collection<Error> validationErrors = schemaObject.validate(value);
if (!validationErrors.isEmpty()) {
throw new IllegalArgumentException(
validationErrors.stream()
.map(ValidationMessage::toString)
.collect(Collectors.joining("\n")));
validationErrors.stream().map(Error::toString).collect(Collectors.joining("\n")));
}
return format.mapper().convertValue(value, Workflow.class);
}
Expand Down
17 changes: 9 additions & 8 deletions ...lidation/src/main/java/io/serverlessworkflow/impl/jackson/schema/JsonSchemaValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,26 @@
package io.serverlessworkflow.impl.jackson.schema;

import com.fasterxml.jackson.databind.JsonNode;
import com.networknt.schema.JsonSchema;
import com.networknt.schema.JsonSchemaFactory;
import com.networknt.schema.SpecVersion.VersionFlag;
import com.networknt.schema.ValidationMessage;
import com.networknt.schema.Error;
import com.networknt.schema.Schema;
import com.networknt.schema.SchemaRegistry;
import com.networknt.schema.SpecificationVersion;
import io.serverlessworkflow.impl.WorkflowModel;
import io.serverlessworkflow.impl.schema.SchemaValidator;
import java.util.Set;
import java.util.Collection;

public class JsonSchemaValidator implements SchemaValidator {

private final JsonSchema schemaObject;
private final Schema schemaObject;

public JsonSchemaValidator(JsonNode jsonNode) {
this.schemaObject = JsonSchemaFactory.getInstance(VersionFlag.V7).getSchema(jsonNode);
this.schemaObject =
SchemaRegistry.withDefaultDialect(SpecificationVersion.DRAFT_7).getSchema(jsonNode);
}

@Override
public void validate(WorkflowModel node) {
Set<ValidationMessage> report =
Collection<Error> report =
schemaObject.validate(
node.as(JsonNode.class)
.orElseThrow(
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 @@ -82,7 +82,7 @@
<version.ch.qos.logback>1.5.20</version.ch.qos.logback>
<version.com.fasterxml.jackson>2.20.0</version.com.fasterxml.jackson>
<version.com.fasterxml.jackson.annotations>2.20</version.com.fasterxml.jackson.annotations>
<version.com.networknt>1.5.9</version.com.networknt>
<version.com.networknt>2.0.0</version.com.networknt>
<version.com.squareup.okhttp3.mockwebserver>5.2.1</version.com.squareup.okhttp3.mockwebserver>
<version.io.cloudevents>4.0.1</version.io.cloudevents>
<version.jakarta.validation>3.1.1</version.jakarta.validation>
Expand Down