From 4a62939436ddb538958c52c397befc9b1cb44435 Mon Sep 17 00:00:00 2001 From: Lvbo163 Date: Fri, 8 Dec 2017 16:32:18 +0800 Subject: [PATCH] support bpmn gateway elements Converter supports bpmn gateway elements(ParallelGateway, ExclusiveGateway). Issue-ID: SDC-742 Change-Id: Id7906e0744b299f82053945254e339efe8d27ccb Signed-off-by: Lvbo163 --- .../sdc/workflowdesigner/model/ExclusiveGateway.java | 16 ++++++++++++++++ .../onap/sdc/workflowdesigner/model/ParallelGateway.java | 16 ++++++++++++++++ .../workflowdesigner/parser/Bpmn4ToscaJsonParser.java | 8 ++++++++ .../bpmn_element_exclusiveGateway_template.xml | 2 ++ .../bpmn_element_parallelGateway_template.xml | 2 ++ 5 files changed, 44 insertions(+) create mode 100644 sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ExclusiveGateway.java create mode 100644 sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ParallelGateway.java create mode 100644 sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_exclusiveGateway_template.xml create mode 100644 sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_parallelGateway_template.xml 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 index 00000000..eb0f4bba --- /dev/null +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ExclusiveGateway.java @@ -0,0 +1,16 @@ +/** + * 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; + +public class ExclusiveGateway extends Element { + public static String type = "exclusiveGateway"; +} 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 index 00000000..93fae505 --- /dev/null +++ b/sdc-workflow-designer-server/src/main/java/org/onap/sdc/workflowdesigner/model/ParallelGateway.java @@ -0,0 +1,16 @@ +/** + * 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; + +public class ParallelGateway extends Element { + public static String type = "parallelGateway"; +} 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 26756571..519e77f1 100644 --- 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; import org.onap.sdc.workflowdesigner.model.Element; import org.onap.sdc.workflowdesigner.model.EndEvent; +import org.onap.sdc.workflowdesigner.model.ExclusiveGateway; import org.onap.sdc.workflowdesigner.model.IntermediateCatchEvent; +import org.onap.sdc.workflowdesigner.model.ParallelGateway; import org.onap.sdc.workflowdesigner.model.Parameter; import org.onap.sdc.workflowdesigner.model.Process; import org.onap.sdc.workflowdesigner.model.ScriptTask; @@ -138,6 +140,12 @@ public class Bpmn4ToscaJsonParser { case "scriptTask": element = MAPPER.readValue(jsonObject, ScriptTask.class); break; + case "exclusiveGateway": + element = MAPPER.readValue(jsonObject, ExclusiveGateway.class); + break; + case "parallelGateway": + element = MAPPER.readValue(jsonObject, ParallelGateway.class); + break; default: log.warn("Ignoring node: type '" + nodeType + "' is unkown"); return null; 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 index 00000000..d9ab4613 --- /dev/null +++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_exclusiveGateway_template.xml @@ -0,0 +1,2 @@ + + \ 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 index 00000000..2766601b --- /dev/null +++ b/sdc-workflow-designer-server/src/main/resources/bpmn-templates/bpmn_element_parallelGateway_template.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file -- 2.16.6