Changes after comments

fjtirado · fjtirado · commit a924fe0ef5ad · 2022-04-25T13:32:36.000+02:00
Signed-off-by: Francisco Javier Tirado Sarti &lt;ftirados@redhat.com&gt;
diff --git a/api/src/main/java/io/serverlessworkflow/api/serializers/WorkflowSerializer.java b/api/src/main/java/io/serverlessworkflow/api/serializers/WorkflowSerializer.java
@@ -160,10 +160,11 @@ public void serialize(Workflow workflow, JsonGenerator gen, SerializerProvider p
     }
 
     if (workflow.getConstants() != null) {
-      if (!workflow.getConstants().getConstantsDef().isEmpty()) {  
-          gen.writeObjectField("constants", workflow.getConstants().getConstantsDef());
+      if (workflow.getConstants().getConstantsDef() != null
+          && !workflow.getConstants().getConstantsDef().isEmpty()) {
+        gen.writeObjectField("constants", workflow.getConstants().getConstantsDef());
       } else if (workflow.getConstants().getRefValue() != null) {
-          gen.writeStringField("constants", workflow.getConstants().getRefValue());
+        gen.writeStringField("constants", workflow.getConstants().getRefValue());
       }
     }
 
diff --git a/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java b/api/src/test/java/io/serverlessworkflow/api/test/MarkupToWorkflowTest.java
@@ -569,8 +569,7 @@ public void testConstants(String workflowLocation) {
     JsonNode serbianTranslationNode = translationDogNode.get("Serbian");
     assertEquals("pas", serbianTranslationNode.asText());
   }
-  
-  
+
   @ParameterizedTest
   @ValueSource(strings = {"/features/constantsRef.json", "/features/constantsRef.yml"})
   public void testConstantsRef(String workflowLocation) {
@@ -583,9 +582,8 @@ public void testConstantsRef(String workflowLocation) {
 
     assertNotNull(workflow.getConstants());
     Constants constants = workflow.getConstants();
-    assertNotNull(constants.getRefValue());
+    assertEquals("constantValues.json", constants.getRefValue());
   }
-  
 
   @ParameterizedTest
   @ValueSource(strings = {"/features/timeouts.json", "/features/timeouts.yml"})
diff --git a/api/src/test/java/io/serverlessworkflow/api/test/WorkflowToMarkupTest.java b/api/src/test/java/io/serverlessworkflow/api/test/WorkflowToMarkupTest.java
@@ -32,6 +32,7 @@
 import io.serverlessworkflow.api.start.Start;
 import io.serverlessworkflow.api.states.SleepState;
 import io.serverlessworkflow.api.workflow.Auth;
+import io.serverlessworkflow.api.workflow.Constants;
 import io.serverlessworkflow.api.workflow.Events;
 import io.serverlessworkflow.api.workflow.Functions;
 import java.util.Arrays;
@@ -47,6 +48,7 @@ public void testSingleState() {
             .withName("test-workflow-name")
             .withVersion("1.0")
             .withStart(new Start().withSchedule(new Schedule().withInterval("PT1S")))
+            .withConstants(new Constants("constantsValues.json"))
             .withStates(
                 Arrays.asList(
                     new SleepState()
@@ -62,11 +64,13 @@ public void testSingleState() {
 
     assertNotNull(workflow);
     assertNotNull(workflow.getStart());
+    Constants constants = workflow.getConstants();
+    assertNotNull(constants);
+    assertEquals("constantsValues.json", constants.getRefValue());
     assertEquals(1, workflow.getStates().size());
     State state = workflow.getStates().get(0);
     assertTrue(state instanceof SleepState);
     assertNotNull(state.getEnd());
-
     assertNotNull(Workflow.toJson(workflow));
     assertNotNull(Workflow.toYaml(workflow));
   }
diff --git a/api/src/test/resources/features/constantsRef.json b/api/src/test/resources/features/constantsRef.json
@@ -5,7 +5,7 @@
   "name": "Custom secrets flow",
   "expressionLang": "abc",
   "start": "TestFunctionRefs",
-  "constants": "contantsValues.json",
+  "constants": "constantValues.json",
   "states": [
     {
       "name": "TestFunctionRefs",

Original file line number	Diff line number	Diff line change
`@@ -160,10 +160,11 @@ public void serialize(Workflow workflow, JsonGenerator gen, SerializerProvider p`
`160`	`160`	`}`
`161`	`161`
`162`	`162`	`if (workflow.getConstants() != null) {`
`163`		`- if (!workflow.getConstants().getConstantsDef().isEmpty()) {`
`164`		`- gen.writeObjectField("constants", workflow.getConstants().getConstantsDef());`
	`163`	`+ if (workflow.getConstants().getConstantsDef() != null`
	`164`	`+ && !workflow.getConstants().getConstantsDef().isEmpty()) {`
	`165`	`+ gen.writeObjectField("constants", workflow.getConstants().getConstantsDef());`
`165`	`166`	`} else if (workflow.getConstants().getRefValue() != null) {`
`166`		`- gen.writeStringField("constants", workflow.getConstants().getRefValue());`
	`167`	`+ gen.writeStringField("constants", workflow.getConstants().getRefValue());`
`167`	`168`	`}`
`168`	`169`	`}`
`169`	`170`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`"name": "Custom secrets flow",`
`6`	`6`	`"expressionLang": "abc",`
`7`	`7`	`"start": "TestFunctionRefs",`
`8`		`- "constants": "contantsValues.json",`
	`8`	`+ "constants": "constantValues.json",`
`9`	`9`	`"states": [`
`10`	`10`	`{`
`11`	`11`	`"name": "TestFunctionRefs",`