Fix #232 - Add Errors validation to skipMessages

ricardozanini · ricardozanini · commit c1ef0fb4c39e · 2024-05-28T13:20:42.000-03:00
Signed-off-by: Ricardo Zanini &lt;zanini@redhat.com&gt;
diff --git a/validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java b/validation/src/main/java/io/serverlessworkflow/validation/WorkflowValidatorImpl.java
@@ -43,8 +43,8 @@ public class WorkflowValidatorImpl implements WorkflowValidator {
 
   private static final Logger logger = LoggerFactory.getLogger(WorkflowValidatorImpl.class);
   private boolean schemaValidationEnabled = true;
-  private List<ValidationError> validationErrors = new ArrayList<>();
-  private JsonNode workflowSchema = WorkflowSchemaLoader.getWorkflowSchema();
+  private final List<ValidationError> validationErrors = new ArrayList<>();
+  private final JsonNode workflowSchema = WorkflowSchemaLoader.getWorkflowSchema();
   private String source;
   private Workflow workflow;
 
@@ -371,7 +371,10 @@ 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");
+      Set.of(
+          "$.start: string found, object expected",
+          "$.functions: array found, object expected",
+          "$.errors: array found, object expected");
 
   private void addValidationError(String message, String type) {
     if (skipMessages.contains(message)) {
diff --git a/validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java b/validation/src/test/java/io/serverlessworkflow/validation/test/WorkflowValidationTest.java
@@ -18,9 +18,11 @@
 import static io.serverlessworkflow.api.states.DefaultState.Type.OPERATION;
 import static io.serverlessworkflow.api.states.DefaultState.Type.SLEEP;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.serverlessworkflow.api.Workflow;
 import io.serverlessworkflow.api.actions.Action;
 import io.serverlessworkflow.api.end.End;
+import io.serverlessworkflow.api.error.ErrorDefinition;
 import io.serverlessworkflow.api.events.EventDefinition;
 import io.serverlessworkflow.api.events.EventRef;
 import io.serverlessworkflow.api.functions.FunctionDefinition;
@@ -30,9 +32,11 @@
 import io.serverlessworkflow.api.retry.RetryDefinition;
 import io.serverlessworkflow.api.start.Start;
 import io.serverlessworkflow.api.states.ForEachState;
+import io.serverlessworkflow.api.states.InjectState;
 import io.serverlessworkflow.api.states.OperationState;
 import io.serverlessworkflow.api.states.SleepState;
 import io.serverlessworkflow.api.validation.ValidationError;
+import io.serverlessworkflow.api.workflow.Errors;
 import io.serverlessworkflow.api.workflow.Events;
 import io.serverlessworkflow.api.workflow.Functions;
 import io.serverlessworkflow.api.workflow.Retries;
@@ -367,4 +371,27 @@ void testActionDefForEach() {
         "State action 'callFn' functionRef does not reference an existing workflow function definition",
         validationErrors.get(0).getMessage());
   }
+
+  /**
+   * @see <a href="https://github.com/serverlessworkflow/sdk-java/issues/232">WorkflowValidator
+   *     validate Wrokflow.tojson(workflow) failed</a>
+   */
+  @Test
+  void testErrorsArrayParsing() {
+    final Workflow workflow =
+        new Workflow()
+            .withId("test-workflow")
+            .withName("test-workflow")
+            .withVersion("1.0")
+            .withStart(new Start().withStateName("testingErrors"))
+            .withErrors(new Errors(Arrays.asList(new ErrorDefinition())))
+            .withStates(
+                Arrays.asList(
+                    new InjectState()
+                        .withName("testingErrors")
+                        .withData(new ObjectMapper().createObjectNode().put("name", "Skywalker"))
+                        .withEnd(new End())));
+    Assertions.assertTrue(
+        new WorkflowValidatorImpl().setSource(Workflow.toJson(workflow)).isValid());
+  }
 }
