code format

code format for workflow converter

Issue-ID: SDC-753

Change-Id: If1a128265c263761d0fa5030c0a96a74912a3a6a
Signed-off-by: Lvbo163 <lv.bo163@zte.com.cn>

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/converter/Bpmn4Tosca2Bpmn.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/converter/Bpmn4Tosca2Bpmn.java
index efa36c3..0b4f2ed 100644 (file)
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/converter/Bpmn4Tosca2Bpmn.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/converter/Bpmn4Tosca2Bpmn.java
@@ -11,7 +11,6 @@
  */\r
 package org.onap.sdc.workflowdesigner.converter;\r
 \r
-import java.io.IOException;\r
 import java.net.URI;\r
 import java.nio.file.Files;\r
 import java.nio.file.Path;\r
@@ -49,12 +48,9 @@ public class Bpmn4Tosca2Bpmn {
         String workflowString = writer.completePlanTemplate();\r
 \r
         // write bpmn to file\r
-        writeStringToFile(workflowString, Paths.get(targetBpmnArchive));\r
+        Path targetPath = Paths.get(targetBpmnArchive);\r
+        Files.write(targetPath, workflowString.getBytes(), StandardOpenOption.CREATE);\r
         log.info("transform end");\r
     }\r
 \r
-    public static Path writeStringToFile(String content, Path targetPath) throws IOException {\r
-        return Files.write(targetPath, content.getBytes(), StandardOpenOption.CREATE);\r
-    }\r
-\r
 }\r

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/Element.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/Element.java
index ea22dfb..6420a16 100644 (file)
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/Element.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/Element.java
@@ -14,9 +14,13 @@ package org.onap.sdc.workflowdesigner.model;
 import java.util.List;\r
 \r
 public class Element {\r
+    public enum TYPE {\r
+        startEvent, endEvent, errorStartEvent, errorEndEvent, serviceTask, scriptTask, exclusiveGateway, parallelGateway, restTask, intermediateCatchEvent\r
+    };\r
+\r
     private String id;\r
     private String name;\r
-    private String type;\r
+    private TYPE type;\r
     private String documentation;\r
     private Position position;\r
     private List<String> connections;\r
@@ -61,11 +65,11 @@ public class Element {
         this.documentation = documentation;\r
     }\r
 \r
-    public String getType() {\r
+    public TYPE getType() {\r
         return type;\r
     }\r
 \r
-    public void setType(String type) {\r
+    public void setType(TYPE type) {\r
         this.type = type;\r
     }\r
 \r

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/EndEvent.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/EndEvent.java
index 82e48d2..52818e7 100644 (file)
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/EndEvent.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/EndEvent.java
@@ -12,4 +12,5 @@
 package org.onap.sdc.workflowdesigner.model;\r
 \r
 public class EndEvent extends Element {\r
+    public static String type = "endEvent";\r
 }\r

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorEndEvent.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorEndEvent.java
index 4ab9fd3..0fda8c2 100644 (file)
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorEndEvent.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorEndEvent.java
@@ -14,15 +14,15 @@ package org.onap.sdc.workflowdesigner.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ErrorEndEvent extends Element {
-       @JsonProperty("parameter")
-       private Parameter parameter;
+    @JsonProperty("parameter")
+    private Parameter parameter;
 
-       public Parameter getParameter() {
-               return parameter;
-       }
+    public Parameter getParameter() {
+        return parameter;
+    }
 
-       public void setParameter(Parameter parameter) {
-               this.parameter = parameter;
-       }
+    public void setParameter(Parameter parameter) {
+        this.parameter = parameter;
+    }
 
 }

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorStartEvent.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorStartEvent.java
index 8e4fcd4..b4cf96c 100644 (file)
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorStartEvent.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorStartEvent.java
@@ -14,15 +14,15 @@ package org.onap.sdc.workflowdesigner.model;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class ErrorStartEvent extends Element {
-       @JsonProperty("parameter")
-       private Parameter parameter;
+    @JsonProperty("parameter")
+    private Parameter parameter;
 
-       public Parameter getParameter() {
-               return parameter;
-       }
+    public Parameter getParameter() {
+        return parameter;
+    }
 
-       public void setParameter(Parameter parameter) {
-               this.parameter = parameter;
-       }
+    public void setParameter(Parameter parameter) {
+        this.parameter = parameter;
+    }
 
 }

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/JsonKeys.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/JsonKeys.java
index 8c7c62f..2237d8d 100644 (file)
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/JsonKeys.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/JsonKeys.java
@@ -11,7 +11,7 @@
  */\r
 package org.onap.sdc.workflowdesigner.parser;\r
 \r
-public class JsonKeys {\r
+public interface JsonKeys {\r
     // workflow keys\r
     public static final String NODES = "nodes";\r
     public static final String CONFIGS = "configs";\r

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_endEvent_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_endEvent_template.xml
index 3735709..223542c 100644 (file)
--- a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_endEvent_template.xml
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_endEvent_template.xml
@@ -1,2 +1,3 @@
+\r
 <endEvent id="${element.id}" name="${element.name}">\r
 </endEvent>\r

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_intermediateCatchEvent_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_intermediateCatchEvent_template.xml
index ee2365e..cb95209 100644 (file)
--- a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_intermediateCatchEvent_template.xml
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_intermediateCatchEvent_template.xml
@@ -1,6 +1,14 @@
 \r
 <intermediateCatchEvent id="${element.id}" name="${element.name}">\r
        <timerEventDefinition>\r
-        <timeDuration><![CDATA[${element.timerEventDefinition.timeDuration}]]></timeDuration>\r
-      </timerEventDefinition>\r
+               #if (${element.timerEventDefinition.timeDuration})\r
+               <timeDuration><![CDATA[${element.timerEventDefinition.timeDuration}]]></timeDuration>\r
+               #end\r
+               #if (${element.timerEventDefinition.timeDate})\r
+               <timeDate><![CDATA[${element.timerEventDefinition.timeDate}]]></timeDate>\r
+               #end\r
+               #if (${element.timerEventDefinition.timeCycle})\r
+               <timeCycle><![CDATA[${element.timerEventDefinition.timeCycle}]]></timeCycle>\r
+               #end\r
+       </timerEventDefinition>\r
 </intermediateCatchEvent>\r

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_startEvent_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_startEvent_template.xml
index 38489b0..1805315 100644 (file)
--- a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_startEvent_template.xml
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_startEvent_template.xml
@@ -1,3 +1,4 @@
+\r
 <startEvent id="${element.id}" name="${element.name}">\r
     <extensionElements>\r
         #foreach( $param in ${element.parameters} )\r

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_template.xml
index 3cb1125..66a5f1a 100644 (file)
--- a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_template.xml
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_template.xml
@@ -20,6 +20,12 @@
         )\r
         #end\r
 \r
+               <!-- Perform bpmn sequence flow -->\r
+               #foreach( $sequenceFlow in $process.sequenceFlowList)\r
+               #parse(\r
+               "${templatePath}bpmn_sequenceFlow_template.xml"\r
+               )\r
+               #end\r
     </process>\r
 </definitions>\r
 \r