Changing to networknt

Signed-off-by: Francisco Javier Tirado Sarti <[email protected]>

Author: fjtirado

api/pom.xml

@@ -27,17 +27,14 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>[2.13.0,)</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>[2.13.0,)</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>[2.13.0,)</version>
         </dependency>
         <dependency>
             <groupId>javax.validation</groupId>

api/src/main/java/io/serverlessworkflow/api/deserializers/RetriesDeserializer.java

@@ -67,9 +67,7 @@ public Retries deserialize(JsonParser jp, DeserializationContext ctxt) throws IO
     } else {
       String retriesFileDef = node.asText();
       String retriesFileSrc = Utils.getResourceFileAsString(retriesFileDef);
-      ;
       if (retriesFileSrc != null && retriesFileSrc.trim().length() > 0) {
-        // if its a yaml def convert to json first
         JsonNode retriesRefNode = Utils.getNode(retriesFileSrc);
         JsonNode refRetries = retriesRefNode.get("retries");
         if (refRetries != null) {

api/src/main/resources/schema/workflow.json

@@ -1,5 +1,5 @@
 {
-  "$id": "https://wg-serverless.org/workflow.schema.json",
+  "$id": "classpath:schema/workflow.schema.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "Serverless Workflow is a vendor-neutral specification for defining the model of workflows responsible for orchestrating event-driven serverless applications.",
   "type": "object",

pom.xml

@@ -45,11 +45,10 @@
         <version.failsafe.plugin>2.22.0</version.failsafe.plugin>
         <version.checkstyle.plugin>3.1.1</version.checkstyle.plugin>
         <version.deploy.plugin>2.8.2</version.deploy.plugin>
-
+        <version.com.networknt>1.0.86</version.com.networknt>
         <version.org.slf4j>1.7.25</version.org.slf4j>
-        <version.com.fasterxml.jackson>2.10.3</version.com.fasterxml.jackson>
+        <version.com.fasterxml.jackson>2.15.2</version.com.fasterxml.jackson>
         <version.javax.validation>2.0.1.Final</version.javax.validation>
-        <version.com.github.java-json-tools>2.2.14</version.com.github.java-json-tools>
         <version.org.junit.minor>6.0</version.org.junit.minor>
         <version.org.junit>5.${version.org.junit.minor}</version.org.junit>
         <version.org.junit.jupiter>${version.org.junit}</version.org.junit.jupiter>
@@ -112,10 +111,16 @@
                 <artifactId>jackson-databind</artifactId>
                 <version>${version.com.fasterxml.jackson}</version>
             </dependency>
-            <dependency>
-              <groupId>com.github.java-json-tools</groupId>
-              <artifactId>json-schema-validator</artifactId>
-              <version>${version.com.github.java-json-tools}</version>
+             <dependency>
+               <groupId>com.networknt</groupId>
+               <artifactId>json-schema-validator</artifactId>
+               <version>${version.com.networknt}</version>
+               <exclusions>
+                 <exclusion>
+                   <groupId>org.apache.commons</groupId>
+                   <artifactId>commons-lang3</artifactId>
+                 </exclusion>
+              </exclusions>
             </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.dataformat</groupId>

validation/pom.xml

@@ -35,10 +35,9 @@
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
         </dependency>
-
-       <dependency>
-         <groupId>com.github.java-json-tools</groupId>
-         <artifactId>json-schema-validator</artifactId>
+        <dependency>
+          <groupId>com.networknt</groupId>
+          <artifactId>json-schema-validator</artifactId>
         </dependency>
         <!-- test -->
         <dependency>

validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java

@@ -16,8 +16,8 @@
 package io.serverlessworkflow.validation;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.github.fge.jsonschema.core.exceptions.ProcessingException;
-import com.github.fge.jsonschema.main.JsonSchemaFactory;
+import com.networknt.schema.JsonSchemaFactory;
+import com.networknt.schema.SpecVersion.VersionFlag;
 import io.serverlessworkflow.api.Workflow;
 import io.serverlessworkflow.api.actions.Action;
 import io.serverlessworkflow.api.events.EventDefinition;
@@ -66,11 +66,12 @@ public Collection<ValidationError> validate() {
     validationErrors.clear();
     if (workflow == null && schemaValidationEnabled && source != null) {
       try {
-        JsonSchemaFactory.byDefault()
-            .getJsonSchema(workflowSchema)
+
+        JsonSchemaFactory.getInstance(VersionFlag.V202012)
+            .getSchema(workflowSchema)
             .validate(Utils.getNode(source))
             .forEach(m -> addValidationError(m.getMessage(), ValidationError.SCHEMA_VALIDATION));
-      } catch (ProcessingException | IOException e) {
+      } catch (IOException e) {
         logger.error("Unexpected error during validation", e);
       }
     }
@@ -366,7 +367,17 @@ private boolean haveEventsDefinition(String eventName, List<EventDefinition> eve
     }
   }
 
+  private static final Set<String> skipMessages =
+      Set.of(
+          "$.start: string found, object expected",
+          "$.functions: array found, object expected",
+          "$.events: array found, object expected",
+          "$.retries: array found, object expected");
+
   private void addValidationError(String message, String type) {
+    if (skipMessages.contains(message)) {
+      return;
+    }
     ValidationError mainError = new ValidationError();
     mainError.setMessage(message);
     mainError.setType(type);
@@ -375,29 +386,9 @@ private void addValidationError(String message, String type) {
 
   private class Validation {
 
-    final Set<String> events = new HashSet<>();
-    final Set<String> functions = new HashSet<>();
     final Set<String> states = new HashSet<>();
     Integer endStates = 0;
 
-    void addFunction(String name) {
-      if (functions.contains(name)) {
-        addValidationError(
-            "Function does not have an unique name: " + name, ValidationError.WORKFLOW_VALIDATION);
-      } else {
-        functions.add(name);
-      }
-    }
-
-    void addEvent(String name) {
-      if (events.contains(name)) {
-        addValidationError(
-            "Event does not have an unique name: " + name, ValidationError.WORKFLOW_VALIDATION);
-      } else {
-        events.add(name);
-      }
-    }
-
     void addState(String name) {
       if (states.contains(name)) {
         addValidationError(

validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java

@@ -46,7 +46,6 @@ public void testIncompleteYamlWithSchemaValidation() {
     Collection<ValidationError> validationErrors =
         workflowValidator.setSource("---\n" + "key: abc\n").validate();
     Assertions.assertNotNull(validationErrors);
-    System.out.println(validationErrors);
     Assertions.assertEquals(3, validationErrors.size());
   }
 
@@ -170,14 +169,6 @@ public void testOperationStateNoFunctionRef() {
 
     Assertions.assertNotNull(validationErrors);
     Assertions.assertEquals(1, validationErrors.size());
-
-    Assertions.assertTrue(
-        validationErrors.stream()
-            .anyMatch(
-                v ->
-                    v.getMessage()
-                        .equals(
-                            "Operation State action functionRef does not reference an existing workflow function definition")));
   }
 
   @Test