converter supports error element

Converter support bpmn error elements(error start/end event)

Issue-ID: SDC-746

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

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
new file mode 100644 (file)
index 0000000..4ab9fd3
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorEndEvent.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2017 ZTE Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the Apache License, Version 2.0
+ * and the Eclipse Public License v1.0 which both accompany this distribution,
+ * and are available at http://www.eclipse.org/legal/epl-v10.html
+ * and http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Contributors:
+ *     ZTE - initial API and implementation and/or initial documentation
+ */
+package org.onap.sdc.workflowdesigner.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ErrorEndEvent extends Element {
+       @JsonProperty("parameter")
+       private Parameter parameter;
+
+       public Parameter getParameter() {
+               return 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
new file mode 100644 (file)
index 0000000..8e4fcd4
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ErrorStartEvent.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (c) 2017 ZTE Corporation.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the Apache License, Version 2.0
+ * and the Eclipse Public License v1.0 which both accompany this distribution,
+ * and are available at http://www.eclipse.org/legal/epl-v10.html
+ * and http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Contributors:
+ *     ZTE - initial API and implementation and/or initial documentation
+ */
+package org.onap.sdc.workflowdesigner.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ErrorStartEvent extends Element {
+       @JsonProperty("parameter")
+       private Parameter parameter;
+
+       public Parameter getParameter() {
+               return parameter;
+       }
+
+       public void setParameter(Parameter parameter) {
+               this.parameter = parameter;
+       }
+
+}

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 4041a9a..1b3a877 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
@@ -23,6 +23,8 @@ import java.util.Map;
 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.ErrorEndEvent;\r
+import org.onap.sdc.workflowdesigner.model.ErrorStartEvent;\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
@@ -163,6 +165,12 @@ public class Bpmn4ToscaJsonParser {
         case "endEvent":\r
             element = MAPPER.readValue(jsonObject, EndEvent.class);\r
             break;\r
+        case "errorStartEvent":\r
+            element = MAPPER.readValue(jsonObject, ErrorStartEvent.class);\r
+            break;\r
+        case "errorEndEvent":\r
+            element = MAPPER.readValue(jsonObject, ErrorEndEvent.class);\r
+            break;\r
         case "intermediateCatchEvent":\r
             element = MAPPER.readValue(jsonObject, IntermediateCatchEvent.class);\r
             break;\r

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_errorEndEvent_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_errorEndEvent_template.xml
new file mode 100644 (file)
index 0000000..aef14d9
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_errorEndEvent_template.xml
@@ -0,0 +1,4 @@
+
+<endEvent id="${element.id}" name="${element.name}">
+       <errorEventDefinition errorRef="${element.parameter.value}" />
+</endEvent>

diff --git a/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_errorStartEvent_template.xml b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_errorStartEvent_template.xml
new file mode 100644 (file)
index 0000000..56b0847
--- /dev/null
+++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_errorStartEvent_template.xml
@@ -0,0 +1,4 @@
+
+<startEvent id="${element.id}" name="${element.name}">
+       <errorEventDefinition errorRef="${element.parameter.value}" />
+</startEvent>