diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/AssociationXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/AssociationXMLConverter.java index 33466db877d8f76e22b17a0c9443b6d153042ed9..1579b26b080a2be255699425b5f7da0580f6e043 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/AssociationXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/AssociationXMLConverter.java @@ -18,7 +18,6 @@ import javax.xml.stream.XMLStreamWriter; import org.activiti.bpmn.converter.util.BpmnXMLUtil; import org.activiti.bpmn.model.Association; import org.activiti.bpmn.model.BaseElement; -import org.apache.commons.lang3.StringUtils; /** * @author Tijs Rademakers @@ -57,10 +56,6 @@ public class AssociationXMLConverter extends BaseBpmnXMLConverter { writeDefaultAttribute(ATTRIBUTE_FLOW_SOURCE_REF, association.getSourceRef(), xtw); writeDefaultAttribute(ATTRIBUTE_FLOW_TARGET_REF, association.getTargetRef(), xtw); } - - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BaseBpmnXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BaseBpmnXMLConverter.java index e5eaed74b8bb20582b11eac4c2d36dcaafc6be95..5b47949dcde1b6b38924d529f71542278052dd4c 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BaseBpmnXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BaseBpmnXMLConverter.java @@ -65,8 +65,6 @@ public abstract class BaseBpmnXMLConverter implements BpmnXMLConstants { protected Process activeProcess; protected Map childElementParsers = new HashMap(); - protected boolean didWriteExtensionStartElement = false; - protected static final List defaultElementAttributes = Arrays.asList( new ExtensionAttribute(ATTRIBUTE_ID), new ExtensionAttribute(ATTRIBUTE_NAME) @@ -151,7 +149,7 @@ public abstract class BaseBpmnXMLConverter implements BpmnXMLConstants { this.model = model; xtw.writeStartElement(getXMLElementName()); - didWriteExtensionStartElement = false; + boolean didWriteExtensionStartElement = false; writeDefaultAttribute(ATTRIBUTE_ID, baseElement.getId(), xtw); if (baseElement instanceof FlowElement) { writeDefaultAttribute(ATTRIBUTE_NAME, ((FlowElement) baseElement).getName(), xtw); @@ -195,8 +193,8 @@ public abstract class BaseBpmnXMLConverter implements BpmnXMLConstants { } } - writeExtensionChildElements(baseElement, xtw); - didWriteExtensionStartElement = writeListeners(baseElement, xtw); + didWriteExtensionStartElement = writeExtensionChildElements(baseElement, didWriteExtensionStartElement, xtw); + didWriteExtensionStartElement = writeListeners(baseElement, didWriteExtensionStartElement, xtw); didWriteExtensionStartElement = BpmnXMLUtil.writeExtensionElements(baseElement, didWriteExtensionStartElement, xtw); if (didWriteExtensionStartElement) { @@ -219,7 +217,9 @@ public abstract class BaseBpmnXMLConverter implements BpmnXMLConstants { protected abstract void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception; - protected abstract void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception; + protected boolean writeExtensionChildElements(BaseElement element, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { + return didWriteExtensionStartElement; + } protected abstract void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception; @@ -308,7 +308,7 @@ public abstract class BaseBpmnXMLConverter implements BpmnXMLConstants { return BpmnXMLUtil.convertToDelimitedString(stringList); } - protected void writeFormProperties(FlowElement flowElement, XMLStreamWriter xtw) throws Exception { + protected boolean writeFormProperties(FlowElement flowElement, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { List propertyList = null; if (flowElement instanceof UserTask) { @@ -360,9 +360,11 @@ public abstract class BaseBpmnXMLConverter implements BpmnXMLConstants { } } } + + return didWriteExtensionStartElement; } - protected boolean writeListeners(BaseElement element, XMLStreamWriter xtw) throws Exception { + protected boolean writeListeners(BaseElement element, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { return ActivitiListenerExport.writeListeners(element, didWriteExtensionStartElement, xtw); } diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BoundaryEventXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BoundaryEventXMLConverter.java index 1ae68cc47b138d4d666319c3a7ac19e963089d7c..85fad5a44b1bd7d312ccba5090f8f5552921c43d 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BoundaryEventXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BoundaryEventXMLConverter.java @@ -81,10 +81,6 @@ public class BoundaryEventXMLConverter extends BaseBpmnXMLConverter { } } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { BoundaryEvent boundaryEvent = (BoundaryEvent) element; diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BusinessRuleTaskXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BusinessRuleTaskXMLConverter.java index bc88634d31a93667b171ca167ce2c1615902b433..a2e78ffa210658cd7ef53990c8f6bfb89d835402 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BusinessRuleTaskXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/BusinessRuleTaskXMLConverter.java @@ -76,10 +76,6 @@ public class BusinessRuleTaskXMLConverter extends BaseBpmnXMLConverter { } } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { } diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/CallActivityXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/CallActivityXMLConverter.java index 6c3c063c738b66d181377824c5c11fd8be7ca733..b5d6808aa4d244d3b98e791607db9de4abc9fdde 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/CallActivityXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/CallActivityXMLConverter.java @@ -68,18 +68,19 @@ public class CallActivityXMLConverter extends BaseBpmnXMLConverter { } @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { + protected boolean writeExtensionChildElements(BaseElement element, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { CallActivity callActivity = (CallActivity) element; - writeIOParameters(ELEMENT_CALL_ACTIVITY_IN_PARAMETERS, callActivity.getInParameters(), xtw); - writeIOParameters(ELEMENT_CALL_ACTIVITY_OUT_PARAMETERS, callActivity.getOutParameters(), xtw); + didWriteExtensionStartElement = writeIOParameters(ELEMENT_CALL_ACTIVITY_IN_PARAMETERS, callActivity.getInParameters(), didWriteExtensionStartElement, xtw); + didWriteExtensionStartElement = writeIOParameters(ELEMENT_CALL_ACTIVITY_OUT_PARAMETERS, callActivity.getOutParameters(), didWriteExtensionStartElement, xtw); + return didWriteExtensionStartElement; } @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { } - private void writeIOParameters(String elementName, List parameterList, XMLStreamWriter xtw) throws Exception { - if (parameterList.size() == 0) return; + private boolean writeIOParameters(String elementName, List parameterList, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { + if (parameterList.size() == 0) return didWriteExtensionStartElement; for (IOParameter ioParameter : parameterList) { if (didWriteExtensionStartElement == false) { @@ -100,6 +101,8 @@ public class CallActivityXMLConverter extends BaseBpmnXMLConverter { xtw.writeEndElement(); } + + return didWriteExtensionStartElement; } public class InParameterParser extends BaseChildElementParser { diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/CatchEventXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/CatchEventXMLConverter.java index c128b5ce798769b9c4a68c983a89815742b1d9e7..964b300460d9a540cb1216e5c73b0d11edef750e 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/CatchEventXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/CatchEventXMLConverter.java @@ -50,10 +50,6 @@ public class CatchEventXMLConverter extends BaseBpmnXMLConverter { } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { IntermediateCatchEvent catchEvent = (IntermediateCatchEvent) element; diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/DataObjectXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/DataObjectXMLConverter.java deleted file mode 100644 index 397e78a25b079ca6b9fd75df2702ae2fac7e69a0..0000000000000000000000000000000000000000 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/DataObjectXMLConverter.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.activiti.bpmn.converter; - -import javax.xml.stream.XMLStreamReader; -import javax.xml.stream.XMLStreamWriter; - -import org.activiti.bpmn.converter.util.BpmnXMLUtil; -import org.activiti.bpmn.model.BaseElement; -import org.activiti.bpmn.model.BpmnModel; -import org.activiti.bpmn.model.DataObject; -import org.activiti.bpmn.model.ItemDefinition; - -/** - * @author Lori Small - */ -public class DataObjectXMLConverter extends BaseBpmnXMLConverter { - - protected boolean didWriteExtensionStartElement = false; - - public static String getXMLType() { - return ELEMENT_DATA_OBJECT; - } - - public static Class getBpmnElementType() { - return DataObject.class; - } - - @Override - protected String getXMLElementName() { - return ELEMENT_DATA_OBJECT; - } - - @Override - protected BaseElement convertXMLToElement(XMLStreamReader xtr) throws Exception { - DataObject dataObject = new DataObject(); - ItemDefinition itemSubjectRef = new ItemDefinition(); - - BpmnXMLUtil.addXMLLocation(dataObject, xtr); - - dataObject.setId(xtr.getAttributeValue(null, ATTRIBUTE_DATA_ID)); - dataObject.setName(xtr.getAttributeValue(null, ATTRIBUTE_DATA_NAME)); - - itemSubjectRef.setStructureRef(xtr.getAttributeValue(null, ATTRIBUTE_DATA_ITEM_REF)); - dataObject.setItemSubjectRef(itemSubjectRef); - - parseChildElements(xtr, dataObject); - - return dataObject; - } - - @Override - public void convertToXML(XMLStreamWriter xtw, BaseElement baseElement, BpmnModel model) throws Exception { - xtw.writeStartElement(getXMLElementName()); - didWriteExtensionStartElement = false; - writeDefaultAttribute(ATTRIBUTE_DATA_ID, baseElement.getId(), xtw); - writeDefaultAttribute(ATTRIBUTE_DATA_NAME, ((DataObject) baseElement).getName(), xtw); - writeDefaultAttribute(ATTRIBUTE_DATA_ITEM_REF, ((DataObject) baseElement).getItemSubjectRef().getStructureRef(), xtw); - - writeExtensionChildElements(baseElement, xtw); - - xtw.writeEndElement(); - } - - @Override - protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - - @Override - protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - - private void parseChildElements(XMLStreamReader xtr, BaseElement parentElement) throws Exception { - } -} diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/EndEventXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/EndEventXMLConverter.java index bbb30de5fedb636ebfc77924f4b58ae92f200bdc..404d357109aa349f948097792668cdbfbffac8da 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/EndEventXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/EndEventXMLConverter.java @@ -48,10 +48,6 @@ public class EndEventXMLConverter extends BaseBpmnXMLConverter { @Override protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { } - - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/EventGatewayXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/EventGatewayXMLConverter.java index 5ac61b22f3cf02d8ca067a23e126bbcfc9abdcf9..ca0c33b4e68408f695df1b827fa87e674713f89f 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/EventGatewayXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/EventGatewayXMLConverter.java @@ -49,10 +49,6 @@ public class EventGatewayXMLConverter extends BaseBpmnXMLConverter { protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ExclusiveGatewayXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ExclusiveGatewayXMLConverter.java index b83b6352c9dd2d21fd9bd3e59479a90ccf1d5d0c..fc9fc9451b2c94f7a8fa78c44c8c8199c69ebc1a 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ExclusiveGatewayXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ExclusiveGatewayXMLConverter.java @@ -49,10 +49,6 @@ public class ExclusiveGatewayXMLConverter extends BaseBpmnXMLConverter { protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/InclusiveGatewayXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/InclusiveGatewayXMLConverter.java index 47e6f4df63cbf5443563d10bbf539ab86b9e24ae..3117b7e1776b43095f4f403d0b8873a92db246ca 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/InclusiveGatewayXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/InclusiveGatewayXMLConverter.java @@ -49,10 +49,6 @@ public class InclusiveGatewayXMLConverter extends BaseBpmnXMLConverter { protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ManualTaskXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ManualTaskXMLConverter.java index be98fab731f434c0aba3dedce09b1f50fe0d08be..1af013baa57882b7a83b8aa895d58c63207fafaf 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ManualTaskXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ManualTaskXMLConverter.java @@ -49,10 +49,6 @@ public class ManualTaskXMLConverter extends BaseBpmnXMLConverter { protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ParallelGatewayXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ParallelGatewayXMLConverter.java index 6048e0730ae62bd65da9372d764106f0fd58253d..6ea35a6a0e79d03d1208b85d02a5e574e9a95e0f 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ParallelGatewayXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ParallelGatewayXMLConverter.java @@ -49,10 +49,6 @@ public class ParallelGatewayXMLConverter extends BaseBpmnXMLConverter { protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ReceiveTaskXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ReceiveTaskXMLConverter.java index 5999a58af97cab7b2dbcef0d105045c8d8110eb0..c7a1e9d1f943e1a4481260fc9c5f6fc4be77c39f 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ReceiveTaskXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ReceiveTaskXMLConverter.java @@ -49,10 +49,6 @@ public class ReceiveTaskXMLConverter extends BaseBpmnXMLConverter { protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { } diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ScriptTaskXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ScriptTaskXMLConverter.java index 66057ff409678a9af1a03fea20fb828beec9adfd..dcc6c84a9613730ac5d882e22a7c1c0c455102f7 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ScriptTaskXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ScriptTaskXMLConverter.java @@ -69,10 +69,6 @@ public class ScriptTaskXMLConverter extends BaseBpmnXMLConverter { writeQualifiedAttribute(ATTRIBUTE_TASK_SCRIPT_AUTO_STORE_VARIABLE, String.valueOf(scriptTask.isAutoStoreVariables()), xtw); } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { ScriptTask scriptTask = (ScriptTask) element; diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/SendTaskXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/SendTaskXMLConverter.java index 29a6321ceb0bcdade4c17141e10ba7a3419ef7a3..cc51a5d35a5ea3bc29ed30dba9fe296857d0ff7e 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/SendTaskXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/SendTaskXMLConverter.java @@ -68,9 +68,10 @@ public class SendTaskXMLConverter extends BaseBpmnXMLConverter { } @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { + protected boolean writeExtensionChildElements(BaseElement element, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { SendTask sendTask = (SendTask) element; didWriteExtensionStartElement = FieldExtensionExport.writeFieldExtensions(sendTask.getFieldExtensions(), didWriteExtensionStartElement, xtw); + return didWriteExtensionStartElement; } @Override diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/SequenceFlowXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/SequenceFlowXMLConverter.java index fb69d14d16ff3a71ca0e556e3c4e74e62d7828a0..e08e47deb413523f805a977fbbaead2801a61a37 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/SequenceFlowXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/SequenceFlowXMLConverter.java @@ -58,10 +58,6 @@ public class SequenceFlowXMLConverter extends BaseBpmnXMLConverter { writeDefaultAttribute(ATTRIBUTE_FLOW_TARGET_REF, sequenceFlow.getTargetRef(), xtw); } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { SequenceFlow sequenceFlow = (SequenceFlow) element; diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ServiceTaskXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ServiceTaskXMLConverter.java index 3e83f4d365cf1e24658d46cf3fb5012d5f2f0d89..40c4e43049e4ad8bf5fdd3d70a91c3f0c3f0d6b4 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ServiceTaskXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ServiceTaskXMLConverter.java @@ -101,7 +101,7 @@ public class ServiceTaskXMLConverter extends BaseBpmnXMLConverter { } @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { + protected boolean writeExtensionChildElements(BaseElement element, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { ServiceTask serviceTask = (ServiceTask) element; if (serviceTask.getCustomProperties().size() > 0) { @@ -131,6 +131,8 @@ public class ServiceTaskXMLConverter extends BaseBpmnXMLConverter { } else { didWriteExtensionStartElement = FieldExtensionExport.writeFieldExtensions(serviceTask.getFieldExtensions(), didWriteExtensionStartElement, xtw); } + + return didWriteExtensionStartElement; } @Override diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/StartEventXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/StartEventXMLConverter.java index 3676523295141425637337780828fdb840a868c2..3344edba07bf54e273277b8df58ccccb1690d439 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/StartEventXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/StartEventXMLConverter.java @@ -73,9 +73,10 @@ public class StartEventXMLConverter extends BaseBpmnXMLConverter { } @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { + protected boolean writeExtensionChildElements(BaseElement element, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { StartEvent startEvent = (StartEvent) element; - writeFormProperties(startEvent, xtw); + didWriteExtensionStartElement = writeFormProperties(startEvent, didWriteExtensionStartElement, xtw); + return didWriteExtensionStartElement; } @Override diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/TaskXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/TaskXMLConverter.java index c053d804c5fad4b53c1fe546c289de264a24de8c..d431db88f75c7029364f884129200e253aa67075 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/TaskXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/TaskXMLConverter.java @@ -50,10 +50,6 @@ public class TaskXMLConverter extends BaseBpmnXMLConverter { protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/TextAnnotationXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/TextAnnotationXMLConverter.java index 92b791b30152781e1a89a8d30a8867bf0672b7c0..e18a35e2b7b6511653a1cc11abc8945953e4209d 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/TextAnnotationXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/TextAnnotationXMLConverter.java @@ -59,10 +59,6 @@ public class TextAnnotationXMLConverter extends BaseBpmnXMLConverter { writeDefaultAttribute(ATTRIBUTE_TEXTFORMAT, textAnnotation.getTextFormat(), xtw); } - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { TextAnnotation textAnnotation = (TextAnnotation) element; diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ThrowEventXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ThrowEventXMLConverter.java index 95b3b6c1a19cf37a1ecc3416ce5274a203401e8d..c3838a02945dafc1fce8dbb60928ce450a45cfc5 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ThrowEventXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ThrowEventXMLConverter.java @@ -48,11 +48,7 @@ public class ThrowEventXMLConverter extends BaseBpmnXMLConverter { @Override protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { } - - @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - } - + @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { ThrowEvent throwEvent = (ThrowEvent) element; diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/UserTaskXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/UserTaskXMLConverter.java index 188563e89f4b78c9be98dfaab8b47e5a061289e8..2b34b0ae41f6482bb03234ebffbf4245d860a4f1 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/UserTaskXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/UserTaskXMLConverter.java @@ -125,9 +125,10 @@ public class UserTaskXMLConverter extends BaseBpmnXMLConverter { } @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { + protected boolean writeExtensionChildElements(BaseElement element, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { UserTask userTask = (UserTask) element; - writeFormProperties(userTask, xtw); + didWriteExtensionStartElement = writeFormProperties(userTask, didWriteExtensionStartElement, xtw); + return didWriteExtensionStartElement; } @Override diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ValuedDataObjectXMLConverter.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ValuedDataObjectXMLConverter.java index 045ff742cbb3818a1c463bc7d5eae05adf45e8df..a73264839bc409f01bde3ea36cbeb6cf41d7ba70 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ValuedDataObjectXMLConverter.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/ValuedDataObjectXMLConverter.java @@ -1,6 +1,7 @@ package org.activiti.bpmn.converter; import java.util.Date; +import java.util.List; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; @@ -8,9 +9,9 @@ import javax.xml.stream.XMLStreamWriter; import org.activiti.bpmn.converter.util.BpmnXMLUtil; import org.activiti.bpmn.model.BaseElement; import org.activiti.bpmn.model.BooleanDataObject; -import org.activiti.bpmn.model.BpmnModel; import org.activiti.bpmn.model.DateDataObject; import org.activiti.bpmn.model.DoubleDataObject; +import org.activiti.bpmn.model.ExtensionElement; import org.activiti.bpmn.model.IntegerDataObject; import org.activiti.bpmn.model.ItemDefinition; import org.activiti.bpmn.model.LongDataObject; @@ -22,6 +23,7 @@ import org.joda.time.format.ISODateTimeFormat; /** * @author Lori Small + * @author Tijs Rademakers */ public class ValuedDataObjectXMLConverter extends BaseBpmnXMLConverter { @@ -46,22 +48,29 @@ public class ValuedDataObjectXMLConverter extends BaseBpmnXMLConverter { ItemDefinition itemSubjectRef = new ItemDefinition(); String structureRef = xtr.getAttributeValue(null, ATTRIBUTE_DATA_ITEM_REF); - String dataType = structureRef.substring(structureRef.indexOf(':') + 1); + if (StringUtils.isNotEmpty(structureRef) && structureRef.contains(":")) { + String dataType = structureRef.substring(structureRef.indexOf(':') + 1); + + if (dataType.equals("string")) { + dataObject = new StringDataObject(); + } else if (dataType.equals("int")) { + dataObject = new IntegerDataObject(); + } else if (dataType.equals("long")) { + dataObject = new LongDataObject(); + } else if (dataType.equals("double")) { + dataObject = new DoubleDataObject(); + } else if (dataType.equals("boolean")) { + dataObject = new BooleanDataObject(); + } else if (dataType.equals("datetime")) { + dataObject = new DateDataObject(); + } else { + // TODO should throw exception here for unsupported data type + } - if (dataType.equals("string")) { - dataObject = new StringDataObject(); - } else if (dataType.equals("int")) { - dataObject = new IntegerDataObject(); - } else if (dataType.equals("long")) { - dataObject = new LongDataObject(); - } else if (dataType.equals("double")) { - dataObject = new DoubleDataObject(); - } else if (dataType.equals("boolean")) { - dataObject = new BooleanDataObject(); - } else if (dataType.equals("datetime")) { - dataObject = new DateDataObject(); } else { - // TODO should throw exception here for unsupported data type + // use String as default type + dataObject = new StringDataObject(); + structureRef = "xsd:string"; } if (dataObject != null) { @@ -73,34 +82,40 @@ public class ValuedDataObjectXMLConverter extends BaseBpmnXMLConverter { itemSubjectRef.setStructureRef(structureRef); dataObject.setItemSubjectRef(itemSubjectRef); - parseChildElements(xtr, dataObject); + parseChildElements(getXMLElementName(), dataObject, xtr); + + List valuesElement = dataObject.getExtensionElements().get("value"); + if (valuesElement != null && valuesElement.size() > 0) { + ExtensionElement valueElement = valuesElement.get(0); + if (StringUtils.isNotEmpty(valueElement.getElementText())) { + if (dataObject instanceof DateDataObject) { + dataObject.setValue(DateTime.parse(valueElement.getElementText(), ISODateTimeFormat.dateOptionalTimeParser()).toDate()); + } else { + dataObject.setValue(valueElement.getElementText()); + } + } + + // remove value element + dataObject.getExtensionElements().remove("value"); + } } return dataObject; } - @Override - public void convertToXML(XMLStreamWriter xtw, BaseElement baseElement, BpmnModel model) throws Exception { - xtw.writeStartElement(getXMLElementName()); - didWriteExtensionStartElement = false; - writeDefaultAttribute(ATTRIBUTE_DATA_ID, baseElement.getId(), xtw); - writeDefaultAttribute(ATTRIBUTE_DATA_NAME, ((ValuedDataObject) baseElement).getName(), xtw); - writeDefaultAttribute(ATTRIBUTE_DATA_ITEM_REF, ((ValuedDataObject) baseElement).getItemSubjectRef().getStructureRef(), xtw); - - writeExtensionChildElements(baseElement, xtw); - - xtw.writeEndElement(); - } - @Override protected void writeAdditionalAttributes(BaseElement element, XMLStreamWriter xtw) throws Exception { + ValuedDataObject dataObject = (ValuedDataObject) element; + if (dataObject.getItemSubjectRef() != null && StringUtils.isNotEmpty(dataObject.getItemSubjectRef().getStructureRef())) { + writeDefaultAttribute(ATTRIBUTE_DATA_ITEM_REF, dataObject.getItemSubjectRef().getStructureRef(), xtw); + } } @Override - protected void writeExtensionChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { - ValuedDataObject dObj = (ValuedDataObject)element; + protected boolean writeExtensionChildElements(BaseElement element, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { + ValuedDataObject dataObject = (ValuedDataObject) element; - if (StringUtils.isNotEmpty(dObj.getId())) { + if (StringUtils.isNotEmpty(dataObject.getId()) && dataObject.getValue() != null) { if (didWriteExtensionStartElement == false) { xtw.writeStartElement(ELEMENT_EXTENSIONS); @@ -108,48 +123,23 @@ public class ValuedDataObjectXMLConverter extends BaseBpmnXMLConverter { } xtw.writeStartElement(ACTIVITI_EXTENSIONS_PREFIX, ELEMENT_DATA_VALUE, ACTIVITI_EXTENSIONS_NAMESPACE); - if (dObj.getValue() != null) { + if (dataObject.getValue() != null) { String value = null; - if (dObj instanceof DateDataObject) { - DateTime dateTime = new DateTime((Date) dObj.getValue()); + if (dataObject instanceof DateDataObject) { + DateTime dateTime = new DateTime((Date) dataObject.getValue()); value = ISODateTimeFormat.dateTimeNoMillis().print(dateTime); } else { - value = dObj.getValue().toString(); + value = dataObject.getValue().toString(); } xtw.writeCharacters(value); } xtw.writeEndElement(); - - xtw.writeEndElement(); } + + return didWriteExtensionStartElement; } @Override protected void writeAdditionalChildElements(BaseElement element, XMLStreamWriter xtw) throws Exception { } - - private void parseChildElements(XMLStreamReader xtr, ValuedDataObject dataObject) throws Exception { - - boolean readyWithDataObject = false; - try { - while (readyWithDataObject == false && xtr.hasNext()) { - xtr.next(); - if (xtr.isStartElement() && ELEMENT_DATA_VALUE.equalsIgnoreCase(xtr.getLocalName())) { - String value = xtr.getElementText(); - if (StringUtils.isNotEmpty(value)) { - if (dataObject instanceof DateDataObject) { - dataObject.setValue(DateTime.parse(value, ISODateTimeFormat.dateOptionalTimeParser()).toDate()); - } else { - dataObject.setValue(value); - } - } - - } else if (xtr.isEndElement() && ELEMENT_DATA_OBJECT.equalsIgnoreCase(xtr.getLocalName())) { - readyWithDataObject = true; - } - } - } catch (Exception e) { - LOGGER.warn("Error parsing data object child elements", e); - } - } } diff --git a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/export/ActivitiListenerExport.java b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/export/ActivitiListenerExport.java index cfc044932150734d613b0ed1ef6cf60a5852ac5f..92b56e3c8d0d76637840156a529337cac7ff4dc3 100644 --- a/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/export/ActivitiListenerExport.java +++ b/modules/activiti-bpmn-converter/src/main/java/org/activiti/bpmn/converter/export/ActivitiListenerExport.java @@ -30,16 +30,16 @@ import org.apache.commons.lang3.StringUtils; public class ActivitiListenerExport implements BpmnXMLConstants { public static boolean writeListeners(BaseElement element, boolean didWriteExtensionStartElement, XMLStreamWriter xtw) throws Exception { - if(element instanceof HasExecutionListeners) { + if (element instanceof HasExecutionListeners) { didWriteExtensionStartElement = writeListeners(ELEMENT_EXECUTION_LISTENER, ((HasExecutionListeners) element).getExecutionListeners(), didWriteExtensionStartElement, xtw); } // In case of a usertaks, also add task-listeners - if(element instanceof UserTask) { + if (element instanceof UserTask) { didWriteExtensionStartElement = writeListeners(ELEMENT_TASK_LISTENER, ((UserTask) element).getTaskListeners(), didWriteExtensionStartElement, xtw); } // In case of a process-element, write the event-listeners - if(element instanceof Process) { + if (element instanceof Process) { didWriteExtensionStartElement = writeEventListeners(((Process) element).getEventListeners(), didWriteExtensionStartElement, xtw); } diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/DataObjectConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/DataObjectConverterTest.java index 142a68a23587a3c806326cf01cf8261b174fcb82..56d727fa37127c60074e1fa500d56a20b430fa80 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/DataObjectConverterTest.java +++ b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/DataObjectConverterTest.java @@ -46,32 +46,43 @@ public class DataObjectConverterTest extends AbstractConverterTest { assertEquals("start1", flowElement.getId()); // verify the main process data objects - List dataObjects = model.getProcess(null).getDataObjects(); - assertEquals(6, dataObjects.size()); + List dataObjects = model.getMainProcess().getDataObjects(); + assertEquals(7, dataObjects.size()); - for (ValuedDataObject dataObj : dataObjects) { - if (dataObj.getId().equals("dObj1")) { - assertEquals("StringTest", dataObj.getName()); - assertEquals("xsd:string", dataObj.getItemSubjectRef().getStructureRef()); - } else if (dataObj.getId().equals("dObj2")) { - assertEquals("BooleanTest", dataObj.getName()); - assertEquals("xsd:boolean", dataObj.getItemSubjectRef().getStructureRef()); - } else if (dataObj.getId().equals("dObj3")) { - assertEquals("DateTest", dataObj.getName()); - assertEquals("xsd:datetime", dataObj.getItemSubjectRef().getStructureRef()); - } else if (dataObj.getId().equals("dObj4")) { - assertEquals("DoubleTest", dataObj.getName()); - assertEquals("xsd:double", dataObj.getItemSubjectRef().getStructureRef()); - } else if (dataObj.getId().equals("dObj5")) { - assertEquals("IntegerTest", dataObj.getName()); - assertEquals("xsd:int", dataObj.getItemSubjectRef().getStructureRef()); - } else { - assertEquals("dObj6", dataObj.getId()); - assertEquals("LongTest", dataObj.getName()); - assertEquals("xsd:long", dataObj.getItemSubjectRef().getStructureRef()); - } + Map objectMap = new HashMap(); + for (ValuedDataObject valueObj : dataObjects) { + objectMap.put(valueObj.getId(), valueObj); } + ValuedDataObject dataObj = objectMap.get("dObj1"); + assertEquals("dObj1", dataObj.getId()); + assertEquals("StringTest", dataObj.getName()); + assertEquals("xsd:string", dataObj.getItemSubjectRef().getStructureRef()); + + dataObj = objectMap.get("dObj2"); + assertEquals("BooleanTest", dataObj.getName()); + assertEquals("xsd:boolean", dataObj.getItemSubjectRef().getStructureRef()); + + dataObj = objectMap.get("dObj3"); + assertEquals("DateTest", dataObj.getName()); + assertEquals("xsd:datetime", dataObj.getItemSubjectRef().getStructureRef()); + + dataObj = objectMap.get("dObj4"); + assertEquals("DoubleTest", dataObj.getName()); + assertEquals("xsd:double", dataObj.getItemSubjectRef().getStructureRef()); + + dataObj = objectMap.get("dObj5"); + assertEquals("IntegerTest", dataObj.getName()); + assertEquals("xsd:int", dataObj.getItemSubjectRef().getStructureRef()); + + dataObj = objectMap.get("dObj6"); + assertEquals("LongTest", dataObj.getName()); + assertEquals("xsd:long", dataObj.getItemSubjectRef().getStructureRef()); + + dataObj = objectMap.get("dObjWithoutType"); + assertEquals("UnknownTypeTest", dataObj.getName()); + assertEquals("xsd:string", dataObj.getItemSubjectRef().getStructureRef()); + flowElement = model.getMainProcess().getFlowElement("userTask1"); assertNotNull(flowElement); assertTrue(flowElement instanceof UserTask); @@ -90,12 +101,12 @@ public class DataObjectConverterTest extends AbstractConverterTest { dataObjects = subProcess.getDataObjects(); assertEquals(6, dataObjects.size()); - Map objectMap = new HashMap(); + objectMap = new HashMap(); for (ValuedDataObject valueObj : dataObjects) { objectMap.put(valueObj.getId(), valueObj); } - ValuedDataObject dataObj = objectMap.get("dObj7"); + dataObj = objectMap.get("dObj7"); assertEquals("dObj7", dataObj.getId()); assertEquals("StringSubTest", dataObj.getName()); assertEquals("xsd:string", dataObj.getItemSubjectRef().getStructureRef()); diff --git a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ValuedDataObjectConverterTest.java b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ValuedDataObjectConverterTest.java index bfffbb1c76d617e777e768072fe47028b9c73611..3f731726f51d428c73afc07b101d74ad4e10c98d 100644 --- a/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ValuedDataObjectConverterTest.java +++ b/modules/activiti-bpmn-converter/src/test/java/org/activiti/editor/language/xml/ValuedDataObjectConverterTest.java @@ -12,6 +12,7 @@ import java.util.List; import java.util.Map; import org.activiti.bpmn.model.BpmnModel; +import org.activiti.bpmn.model.ExtensionElement; import org.activiti.bpmn.model.FlowElement; import org.activiti.bpmn.model.StartEvent; import org.activiti.bpmn.model.SubProcess; @@ -104,6 +105,12 @@ public class ValuedDataObjectConverterTest extends AbstractConverterTest { assertEquals("xsd:long", dataObj.getItemSubjectRef().getStructureRef()); assertTrue(dataObj.getValue() instanceof Long); assertEquals(new Long(-123456), dataObj.getValue()); + assertEquals(1, dataObj.getExtensionElements().size()); + List testValues = dataObj.getExtensionElements().get("testvalue"); + assertNotNull(testValues); + assertEquals(1, testValues.size()); + assertEquals("testvalue", testValues.get(0).getName()); + assertEquals("test", testValues.get(0).getElementText()); flowElement = model.getMainProcess().getFlowElement("userTask1"); assertNotNull(flowElement); diff --git a/modules/activiti-bpmn-converter/src/test/resources/dataobjectmodel.bpmn b/modules/activiti-bpmn-converter/src/test/resources/dataobjectmodel.bpmn index 039765be26b3ac19c29da178a731d53c043049fb..1106c021ebba2e3b2ba55d379b10a6618f6484c0 100644 --- a/modules/activiti-bpmn-converter/src/test/resources/dataobjectmodel.bpmn +++ b/modules/activiti-bpmn-converter/src/test/resources/dataobjectmodel.bpmn @@ -7,6 +7,7 @@ + diff --git a/modules/activiti-bpmn-converter/src/test/resources/valueddataobjectmodel.bpmn b/modules/activiti-bpmn-converter/src/test/resources/valueddataobjectmodel.bpmn index 3049672babe74d4dc89b5e55bf310ce80586353a..3da962716d241008fe5944ca4600bb8a27a584a2 100644 --- a/modules/activiti-bpmn-converter/src/test/resources/valueddataobjectmodel.bpmn +++ b/modules/activiti-bpmn-converter/src/test/resources/valueddataobjectmodel.bpmn @@ -29,6 +29,7 @@ -123456 + test