Integrate json object convert and template convert

Issue-ID: SDC-405

Change-Id: Idf03ac5064805c2ac9b1df5b4e51bd6b59161f9b
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 e7d48ac..ab1c5fa 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
@@ -15,8 +15,12 @@ import java.io.IOException;
 import java.net.URI;\r
 import java.nio.file.Files;\r
 import java.nio.file.Path;\r
+import java.nio.file.Paths;\r
 import java.nio.file.StandardOpenOption;\r
 \r
+import org.onap.sdc.workflowdesigner.model.Process;\r
+import org.onap.sdc.workflowdesigner.parser.Bpmn4ToscaJsonParser;\r
+import org.onap.sdc.workflowdesigner.writer.BpmnPlanArtefactWriter;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
@@ -31,15 +35,21 @@ public class Bpmn4Tosca2Bpmn {
      *\r
      * @param srcBpmn4ToscaJsonFile\r
      * @param targetBpmnArchive\r
+     * @throws Exception \r
      */\r
-    public void transform(URI srcBpmn4ToscaJsonFile, URI targetBpmnArchive) {\r
+    public void transform(String processId, URI srcBpmn4ToscaJsonFile, URI targetBpmnArchive) throws Exception {\r
         log.info("transform start");\r
 \r
         // parse json object\r
+        Bpmn4ToscaJsonParser parser = new Bpmn4ToscaJsonParser();\r
+        Process process = parser.parse(processId, srcBpmn4ToscaJsonFile);\r
 \r
         // transform bpmn template\r
+        BpmnPlanArtefactWriter writer = new BpmnPlanArtefactWriter(process);\r
+        String workflowString = writer.completePlanTemplate();\r
 \r
         // write bpmn to file\r
+        writeStringToFile(workflowString, Paths.get(targetBpmnArchive));\r
         log.info("transform end");\r
     }\r
 \r