support bpmn gateway elements

Converter supports bpmn gateway elements(ParallelGateway, ExclusiveGateway).

Issue-ID: SDC-742

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

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ExclusiveGateway.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ExclusiveGateway.java
new file mode 100644 (file)
index 0000000..eb0f4bb
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ExclusiveGateway.java
@@ -0,0 +1,16 @@
+/**\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 ExclusiveGateway extends Element {\r
+    public static String type = "exclusiveGateway";\r
+}\r

diff --git a/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ParallelGateway.java b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ParallelGateway.java
new file mode 100644 (file)
index 0000000..93fae50
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ParallelGateway.java
@@ -0,0 +1,16 @@
+/**\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 ParallelGateway extends Element {\r
+    public static String type = "parallelGateway";\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 2675657..519e77f 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
@@ -21,7 +21,9 @@ import java.util.List;
 import org.onap.sdc.workflowdesigner.model.DataObject;\r
 import org.onap.sdc.workflowdesigner.model.Element;\r
 import org.onap.sdc.workflowdesigner.model.EndEvent;\r
+import org.onap.sdc.workflowdesigner.model.ExclusiveGateway;\r
 import org.onap.sdc.workflowdesigner.model.IntermediateCatchEvent;\r
+import org.onap.sdc.workflowdesigner.model.ParallelGateway;\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
@@ -138,6 +140,12 @@ public class Bpmn4ToscaJsonParser {
         case "scriptTask":\r
             element = MAPPER.readValue(jsonObject, ScriptTask.class);\r
             break;\r
+        case "exclusiveGateway":\r
+            element = MAPPER.readValue(jsonObject, ExclusiveGateway.class);\r
+            break;\r
+        case "parallelGateway":\r
+            element = MAPPER.readValue(jsonObject, ParallelGateway.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_exclusiveGateway_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_exclusiveGateway_template.xml
new file mode 100644 (file)
index 0000000..d9ab461
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_exclusiveGateway_template.xml
@@ -0,0 +1,2 @@
+\r
+<exclusiveGateway id="${element.id}" name="${element.name}"></exclusiveGateway>
\ No newline at end of file

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_parallelGateway_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_parallelGateway_template.xml
new file mode 100644 (file)
index 0000000..2766601
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_parallelGateway_template.xml
@@ -0,0 +1,2 @@
+\r
+<parallelGateway id="${element.id}" name="${element.name}"></parallelGateway>
\ No newline at end of file