Review comments

Signed-off-by: Francisco Javier Tirado Sarti <ftirados@redhat.com>
Signed-off-by: Ricardo Zanini <zanini@redhat.com>

Author: fjtirado

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

@@ -64,13 +64,14 @@ public WorkflowValidator setSource(String source) {
   @Override
   public Collection<ValidationError> validate() {
     validationErrors.clear();
-    if (workflow == null && schemaValidationEnabled && source != null) {
+    if (workflow == null) {
       try {
-
-        JsonSchemaFactory.getInstance(VersionFlag.V202012)
-            .getSchema(workflowSchema)
-            .validate(Utils.getNode(source))
-            .forEach(m -> addValidationError(m.getMessage(), ValidationError.SCHEMA_VALIDATION));
+        if (schemaValidationEnabled && source != null) {
+          JsonSchemaFactory.getInstance(VersionFlag.V7)
+              .getSchema(workflowSchema)
+              .validate(Utils.getNode(source))
+              .forEach(m -> addValidationError(m.getMessage(), ValidationError.SCHEMA_VALIDATION));
+        }
       } catch (IOException e) {
         logger.error("Unexpected error during validation", e);
       }
@@ -163,17 +164,6 @@ public Collection<ValidationError> validate() {
                     }
 
                     if (action.getEventRef() != null) {
-                      if (action.getEventRef().getTriggerEventRef().isEmpty()) {
-                        addValidationError(
-                            "Operation State action trigger eventRef does not reference an existing workflow event definition",
-                            ValidationError.WORKFLOW_VALIDATION);
-                      }
-
-                      if (action.getEventRef().getResultEventRef().isEmpty()) {
-                        addValidationError(
-                            "Operation State action results eventRef does not reference an existing workflow event definition",
-                            ValidationError.WORKFLOW_VALIDATION);
-                      }
 
                       if (!haveEventsDefinition(
                           action.getEventRef().getTriggerEventRef(), events)) {
@@ -357,22 +347,19 @@ private boolean haveFunctionDefinition(String functionName, List<FunctionDefinit
   }
 
   private boolean haveEventsDefinition(String eventName, List<EventDefinition> events) {
+    if (eventName == null) {
+      return true;
+    }
     if (events != null) {
       EventDefinition eve =
           events.stream().filter(e -> e.getName().equals(eventName)).findFirst().orElse(null);
-
       return eve == null ? false : true;
     } else {
       return false;
     }
   }
 
-  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 static final Set<String> skipMessages = Set.of("$.start: string found, object expected");
 
   private void addValidationError(String message, String type) {
     if (skipMessages.contains(message)) {
@@ -385,7 +372,6 @@ private void addValidationError(String message, String type) {
   }
 
   private class Validation {
-
     final Set<String> states = new HashSet<>();
     Integer endStates = 0;
 

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

@@ -15,14 +15,26 @@
  */
 package io.serverlessworkflow.validation.test;
 
+import static io.serverlessworkflow.api.states.DefaultState.Type.OPERATION;
 import static io.serverlessworkflow.api.states.DefaultState.Type.SLEEP;
 
 import io.serverlessworkflow.api.Workflow;
+import io.serverlessworkflow.api.actions.Action;
 import io.serverlessworkflow.api.end.End;
+import io.serverlessworkflow.api.events.EventDefinition;
+import io.serverlessworkflow.api.events.EventRef;
+import io.serverlessworkflow.api.functions.FunctionDefinition;
+import io.serverlessworkflow.api.functions.FunctionDefinition.Type;
+import io.serverlessworkflow.api.functions.FunctionRef;
 import io.serverlessworkflow.api.interfaces.WorkflowValidator;
+import io.serverlessworkflow.api.retry.RetryDefinition;
 import io.serverlessworkflow.api.start.Start;
+import io.serverlessworkflow.api.states.OperationState;
 import io.serverlessworkflow.api.states.SleepState;
 import io.serverlessworkflow.api.validation.ValidationError;
+import io.serverlessworkflow.api.workflow.Events;
+import io.serverlessworkflow.api.workflow.Functions;
+import io.serverlessworkflow.api.workflow.Retries;
 import io.serverlessworkflow.validation.WorkflowValidatorImpl;
 import java.util.Arrays;
 import java.util.Collection;
@@ -123,6 +135,50 @@ public void testWorkflowMissingStatesIdAndKey() {
         2);
   }
 
+  @Test
+  void testFunctionCall() {
+    Workflow workflow =
+        new Workflow()
+            .withId("test-workflow")
+            .withVersion("1.0")
+            .withStart(new Start().withStateName("start"))
+            .withFunctions(
+                new Functions(
+                    Arrays.asList(new FunctionDefinition("expression").withType(Type.EXPRESSION))))
+            .withStates(
+                Arrays.asList(
+                    new OperationState()
+                        .withName("start")
+                        .withType(OPERATION)
+                        .withActions(
+                            Arrays.asList(
+                                new Action().withFunctionRef(new FunctionRef("expression"))))
+                        .withEnd(new End())));
+    Assertions.assertTrue(new WorkflowValidatorImpl().setWorkflow(workflow).validate().isEmpty());
+  }
+
+  @Test
+  void testEventCall() {
+    Workflow workflow =
+        new Workflow()
+            .withId("test-workflow")
+            .withVersion("1.0")
+            .withStart(new Start().withStateName("start"))
+            .withEvents(new Events(Arrays.asList(new EventDefinition().withName("event"))))
+            .withRetries(new Retries(Arrays.asList(new RetryDefinition("start", "PT1S"))))
+            .withStates(
+                Arrays.asList(
+                    new OperationState()
+                        .withName("start")
+                        .withType(OPERATION)
+                        .withActions(
+                            Arrays.asList(
+                                new Action()
+                                    .withEventRef(new EventRef().withTriggerEventRef("event"))))
+                        .withEnd(new End())));
+    Assertions.assertTrue(new WorkflowValidatorImpl().setWorkflow(workflow).validate().isEmpty());
+  }
+
   @Test
   public void testOperationStateNoFunctionRef() {
     WorkflowValidator workflowValidator = new WorkflowValidatorImpl();