Merge pull request #72 from tsurdilo/statenamesfix

Fixing issue with diagram generation with state names with spaces

Author: Tihomir Surdilovic

diagram/src/main/java/io/serverlessworkflow/diagram/WorkflowDiagramImpl.java

@@ -55,9 +55,10 @@ public String getSvgDiagram() throws Exception {
         if(workflow == null) {
             throw new IllegalAccessException("Unable to get diagram - no workflow set.");
         }
-        SourceStringReader reader = new SourceStringReader(WorkflowToPlantuml.convert(workflow, showLegend));
+        String diagramSource = WorkflowToPlantuml.convert(workflow, showLegend);
+        SourceStringReader reader = new SourceStringReader(diagramSource);
         final ByteArrayOutputStream os = new ByteArrayOutputStream();
-        String desc = reader.generateImage(os, new FileFormatOption(FileFormat.SVG));
+        reader.generateImage(os, new FileFormatOption(FileFormat.SVG));
         os.close();
         return new String(os.toByteArray(), Charset.forName("UTF-8"));
     }

diagram/src/main/java/io/serverlessworkflow/diagram/model/ModelConnection.java

@@ -24,8 +24,8 @@ public class ModelConnection {
     private String desc;
 
     public ModelConnection(String left, String right, String desc) {
-        this.left = left;
-        this.right = right;
+        this.left = left.replaceAll("\\s", "");
+        this.right = right.replaceAll("\\s", "");
         this.desc = desc;
     }
 

diagram/src/main/java/io/serverlessworkflow/diagram/model/ModelState.java

@@ -23,10 +23,12 @@
 
 public class ModelState {
     private String name;
+    private String noSpaceName;
     private List<String> stateInfo = new ArrayList<>();
 
     public ModelState(String name) {
         this.name = name;
+        this.noSpaceName = name.replaceAll("\\s", "");
     }
 
     public void addInfo(String info) {
@@ -38,7 +40,7 @@ public String toString() {
         StringBuffer retBuff = new StringBuffer();
         retBuff.append(System.lineSeparator());
         for(String info : stateInfo) {
-            retBuff.append(name).append(WorkflowDiagramUtils.description)
+            retBuff.append(noSpaceName).append(WorkflowDiagramUtils.description)
                     .append(info).append(System.lineSeparator());
         }
         retBuff.append(System.lineSeparator());

diagram/src/main/java/io/serverlessworkflow/diagram/model/ModelStateDef.java

@@ -21,17 +21,21 @@
 public class ModelStateDef {
     private String name;
     private String type;
+    private String noSpaceName;
 
     public ModelStateDef(String name, String type) {
         this.name = name;
         this.type = type;
+        this.noSpaceName = name.replaceAll("\\s", "");
     }
 
     @Override
     public String toString() {
         StringBuffer retBuff = new StringBuffer();
         retBuff.append(WorkflowDiagramUtils.stateDef)
-                .append(name)
+                .append(noSpaceName)
+                .append(WorkflowDiagramUtils.stateAsName)
+                .append("\"" + name + "\"")
                 .append(WorkflowDiagramUtils.typeDefStart)
                 .append(type)
                 .append(WorkflowDiagramUtils.typeDefEnd);

diagram/src/main/java/io/serverlessworkflow/diagram/utils/WorkflowDiagramUtils.java

@@ -35,6 +35,7 @@ public class WorkflowDiagramUtils {
     public static final String legendStart = new StringBuffer().append("legend top center").append(System.lineSeparator()).toString();
     public static final String legendEnd = new StringBuffer().append(System.lineSeparator()).append("endlegend").toString();
     public static final String stateDef = "state ";
+    public static final String stateAsName = " as ";
     public static final String typeDefStart = " << ";
     public static final String typeDefEnd = " >> ";
 

diagram/src/test/java/io/serverlessworkflow/diagram/test/WorkflowDiagramTest.java

@@ -63,6 +63,7 @@ public void testSpecExamplesParsing(String workflowLocation) throws Exception {
         workflowDiagram.setWorkflow(workflow);
 
         String diagramSVG = workflowDiagram.getSvgDiagram();
+
         Assertions.assertNotNull(diagramSVG);
 
     }