Add support for script task

Add support for bpmn script task.

Issue-ID: SDC-741

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

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ScriptTask.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ScriptTask.java
new file mode 100644 (file)
index 0000000..01d224c
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ScriptTask.java
@@ -0,0 +1,33 @@
+/**\r
+ * Copyright (c) 2017 ZTE Corporation.\r
+ * All rights reserved. This program and the accompanying materials\r
+ * are made available under the Apache License, Version 2.0\r
+ * and the Eclipse Public License v1.0 which both accompany this distribution,\r
+ * and are available at http://www.eclipse.org/legal/epl-v10.html\r
+ * and http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Contributors:\r
+ *     ZTE - initial API and implementation and/or initial documentation\r
+ */\r
+package org.onap.sdc.workflowdesigner.model;\r
+\r
+public class ScriptTask extends Element {\r
+    private String scriptFormat;\r
+    private String script;\r
+\r
+    public String getScriptFormat() {\r
+        return scriptFormat;\r
+    }\r
+\r
+    public void setScriptFormat(String scriptFormat) {\r
+        this.scriptFormat = scriptFormat;\r
+    }\r
+\r
+    public String getScript() {\r
+        return script;\r
+    }\r
+\r
+    public void setScript(String script) {\r
+        this.script = script;\r
+    }\r
+}\r

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParser.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParser.java
index dafe83f..2675657 100644 (file)
--- a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParser.java
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/parser/Bpmn4ToscaJsonParser.java
@@ -24,6 +24,7 @@ import org.onap.sdc.workflowdesigner.model.EndEvent;
 import org.onap.sdc.workflowdesigner.model.IntermediateCatchEvent;\r
 import org.onap.sdc.workflowdesigner.model.Parameter;\r
 import org.onap.sdc.workflowdesigner.model.Process;\r
+import org.onap.sdc.workflowdesigner.model.ScriptTask;\r
 import org.onap.sdc.workflowdesigner.model.SequenceFlow;\r
 import org.onap.sdc.workflowdesigner.model.StartEvent;\r
 import org.slf4j.Logger;\r
@@ -134,6 +135,9 @@ public class Bpmn4ToscaJsonParser {
         case "intermediateCatchEvent":\r
             element = MAPPER.readValue(jsonObject, IntermediateCatchEvent.class);\r
             break;\r
+        case "scriptTask":\r
+            element = MAPPER.readValue(jsonObject, ScriptTask.class);\r
+            break;\r
         default:\r
             log.warn("Ignoring node: type '" + nodeType + "' is unkown");\r
             return null;\r

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_scriptTask_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_scriptTask_template.xml
new file mode 100644 (file)
index 0000000..d50e4c4
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_scriptTask_template.xml
@@ -0,0 +1,3 @@
+<scriptTask id="${element.id}" name="${element.name}" scriptFormat="${element.scriptFormat}" activiti:autoStoreVariables="false">\r
+      <script><![CDATA[${element.script}]]></script>\r
+</scriptTask>\r