update switch state required and remove writing empty arrays to json/yaml (#201)

Signed-off-by: Tihomir Surdilovic <[email protected]>

Author: tsurdilo

api/src/main/java/io/serverlessworkflow/api/mapper/BaseObjectMapper.java

@@ -15,10 +15,12 @@
  */
 package io.serverlessworkflow.api.mapper;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import io.serverlessworkflow.api.interfaces.WorkflowPropertySource;
+import java.util.Map;
 
 public class BaseObjectMapper extends ObjectMapper {
 
@@ -31,6 +33,11 @@ public BaseObjectMapper(JsonFactory factory, WorkflowPropertySource workflowProp
 
     configure(SerializationFeature.INDENT_OUTPUT, true);
     registerModule(workflowModule);
+    configure(SerializationFeature.WRITE_EMPTY_JSON_ARRAYS, false);
+    configOverride(Map.class)
+        .setInclude(
+            JsonInclude.Value.construct(
+                JsonInclude.Include.NON_NULL, JsonInclude.Include.NON_NULL));
   }
 
   public WorkflowModule getWorkflowModule() {

api/src/main/resources/schema/switchconditions/datacondition.json

@@ -23,8 +23,18 @@
       "description": "Workflow end definition"
     }
   },
-  "required": [
-    "condition",
-    "transition"
+  "oneOf": [
+    {
+      "required": [
+        "condition",
+        "transition"
+      ]
+    },
+    {
+      "required": [
+        "condition",
+        "end"
+      ]
+    }
   ]
 }

api/src/test/java/io/serverlessworkflow/api/test/WorkflowToMarkupTest.java

@@ -23,6 +23,7 @@
 import io.serverlessworkflow.api.Workflow;
 import io.serverlessworkflow.api.auth.AuthDefinition;
 import io.serverlessworkflow.api.auth.BasicAuthDefinition;
+import io.serverlessworkflow.api.defaultdef.DefaultConditionDefinition;
 import io.serverlessworkflow.api.end.End;
 import io.serverlessworkflow.api.events.EventDefinition;
 import io.serverlessworkflow.api.functions.FunctionDefinition;
@@ -31,6 +32,10 @@
 import io.serverlessworkflow.api.schedule.Schedule;
 import io.serverlessworkflow.api.start.Start;
 import io.serverlessworkflow.api.states.SleepState;
+import io.serverlessworkflow.api.states.SwitchState;
+import io.serverlessworkflow.api.switchconditions.DataCondition;
+import io.serverlessworkflow.api.switchconditions.EventCondition;
+import io.serverlessworkflow.api.transitions.Transition;
 import io.serverlessworkflow.api.workflow.Auth;
 import io.serverlessworkflow.api.workflow.Constants;
 import io.serverlessworkflow.api.workflow.Events;
@@ -189,4 +194,46 @@ public void testAuth() {
     assertEquals(
         "testPassword", workflow.getAuth().getAuthDefs().get(0).getBasicauth().getPassword());
   }
+
+  @Test
+  public void testSwitchConditionWithTransition() {
+    Workflow workflow =
+        new Workflow()
+            .withId("test-workflow")
+            .withName("test-workflow-name")
+            .withVersion("1.0")
+            .withSpecVersion("0.8")
+            .withStates(
+                Arrays.asList(
+                    new SwitchState()
+                        .withDataConditions(
+                            Arrays.asList(
+                                new DataCondition()
+                                    .withCondition("test-condition")
+                                    .withTransition(
+                                        new Transition().withNextState("test-next-state"))))
+                        .withDefaultCondition(
+                            new DefaultConditionDefinition()
+                                .withTransition(new Transition("test-next-state-default")))));
+    assertNotNull(Workflow.toJson(workflow));
+    assertNotNull(Workflow.toYaml(workflow));
+  }
+
+  @Test
+  public void testSwitchConditionWithEnd() {
+    Workflow workflow =
+        new Workflow()
+            .withId("test-workflow")
+            .withName("test-workflow-name")
+            .withVersion("1.0")
+            .withSpecVersion("0.8")
+            .withStates(
+                Arrays.asList(
+                    new SwitchState()
+                        .withEventConditions(Arrays.asList(new EventCondition().withEnd(new End())))
+                        .withDefaultCondition(
+                            new DefaultConditionDefinition().withEnd(new End()))));
+    assertNotNull(Workflow.toJson(workflow));
+    assertNotNull(Workflow.toYaml(workflow));
+  }
 }