Skip to content

Commit

Permalink
fixed
Browse files Browse the repository at this point in the history 
issue #211
  • Loading branch information
@rsoika
rsoika committed Sep 29, 2016
1 parent 725702b commit 7a2a156
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 44 deletions.
96 changes: 54 additions & 42 deletions imixs-workflow-core/src/main/java/org/imixs/workflow/bpmn/BPMNModelHandler.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,6 @@ public BPMNModelHandler() {

@Override
public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException {

logger.finest("Start Element :" + qName);

// bpmn2:definitions
Expand All @@ -106,15 +105,13 @@ public void startElement(String uri, String localName, String qName, Attributes

}



// bpmn2:process - parse workflowGroup
// bpmn2:process - parse workflowGroup
if (qName.equalsIgnoreCase("bpmn2:process")) {
if (bDefinitions && currentEntity != null) {
definition = currentEntity;
bDefinitions = false;

}
}
currentWorkflowGroup = attributes.getValue("name");
if (currentWorkflowGroup == null || currentWorkflowGroup.isEmpty()) {
logger.warning("No process name defined!");
Expand All @@ -135,9 +132,8 @@ public void startElement(String uri, String localName, String qName, Attributes
int currentID = Integer.parseInt(value);
currentEntity = new ItemCollection();
bpmnID = attributes.getValue("id");
String currentItemName = attributes.getValue("name");
currentEntity.replaceItemValue("type", "ProcessEntity");
currentEntity.replaceItemValue("txtname", currentItemName);
currentEntity.replaceItemValue("txtname", attributes.getValue("name"));
currentEntity.replaceItemValue("txtworkflowgroup", currentWorkflowGroup);
currentEntity.replaceItemValue("numprocessid", currentID);
}
Expand Down Expand Up @@ -182,9 +178,8 @@ public void startElement(String uri, String localName, String qName, Attributes
int currentID = Integer.parseInt(value);
currentEntity = new ItemCollection();
bpmnID = attributes.getValue("id");
String currentItemName = attributes.getValue("name");
currentEntity.replaceItemValue("type", "ActivityEntity");
currentEntity.replaceItemValue("txtname", currentItemName);
currentEntity.replaceItemValue("txtname", attributes.getValue("name"));
currentEntity.replaceItemValue("numactivityid", currentID);
}

Expand All @@ -198,13 +193,12 @@ public void startElement(String uri, String localName, String qName, Attributes

// bpmn2:messageFlow - cache all messageFlow...
/*
if (qName.equalsIgnoreCase("bpmn2:messageFlow")) {
bpmnID = attributes.getValue("id");
String source = attributes.getValue("sourceRef");
String target = attributes.getValue("targetRef");
sequenceCache.put(bpmnID, new SequenceFlow(source, target));
}
*/
* if (qName.equalsIgnoreCase("bpmn2:messageFlow")) { bpmnID =
* attributes.getValue("id"); String source =
* attributes.getValue("sourceRef"); String target =
* attributes.getValue("targetRef"); sequenceCache.put(bpmnID, new
* SequenceFlow(source, target)); }
*/

/*
* parse a imixs:item
Expand Down Expand Up @@ -311,14 +305,14 @@ public void endElement(String uri, String localName, String qName) throws SAXExc
}

// end of bpmn2:intermediateThrowEvent -
if (bLinkThrowEvent && (qName.equalsIgnoreCase("bpmn2:linkEventDefinition"))) {
if (bLinkThrowEvent && !bLinkCatchEvent && (qName.equalsIgnoreCase("bpmn2:linkEventDefinition"))) {
bLinkThrowEvent = false;
// we need to cache the link name
linkThrowEventCache.put(bpmnID, currentLinkName);
}

// end of bpmn2:intermediateCatchEvent -
if (bLinkCatchEvent && (qName.equalsIgnoreCase("bpmn2:linkEventDefinition"))) {
if (bLinkCatchEvent && !bLinkThrowEvent && (qName.equalsIgnoreCase("bpmn2:linkEventDefinition"))) {
bLinkCatchEvent = false;
// we need to cache the link name
linkCatchEventCache.put(currentLinkName, bpmnID);
Expand Down Expand Up @@ -473,14 +467,19 @@ private List<ItemCollection> findSourceTasks(String eventID) throws ModelExcepti
}

// test target element....
SequenceFlow outgoingFlow = outFlows.get(0);
ItemCollection targetTask = new ElementResolver().findImixsTargetTask(outgoingFlow);
if (targetTask != null) {
result.add(targetTask);
} else {
logger.warning("Imixs BPMN Event '" + eventID + "' has no target task!");
// issue #211 - verify all outFlows!
// SequenceFlow outgoingFlow = outFlows.get(0);

for (SequenceFlow outgoingFlow : outFlows) {
ItemCollection targetTask = new ElementResolver().findImixsTargetTask(outgoingFlow);
if (targetTask != null) {
result.add(targetTask);
}
}
}
if (result.size() == 0) {
logger.warning("Imixs BPMN Event '" + eventID + "' has no target task!");
}

return result;

Expand All @@ -505,7 +504,6 @@ private void addImixsEvent(String eventID, ItemCollection sourceTask) throws Mod
String eventName = event.getItemValueString("txtname");

logger.finest("adding event '" + eventName + "'");

List<SequenceFlow> outFlows = findOutgoingFlows(eventID);
if (outFlows == null || outFlows.size() == 0) {
// invalid model!!
Expand Down Expand Up @@ -540,12 +538,17 @@ private void addImixsEvent(String eventID, ItemCollection sourceTask) throws Mod
// target element now

// test target element....
SequenceFlow outgoingFlow = outFlows.get(0);
// is this Event connected to a followUp Activity?
String followUpEventID = new ElementResolver().findImixsTargetEventID(outgoingFlow);
// SequenceFlow outgoingFlow = outFlows.get(0);
String followUpEventID = null;
for (SequenceFlow outgoingFlow : outFlows) {
// is this Event connected to a followUp Activity?
followUpEventID = new ElementResolver().findImixsTargetEventID(outgoingFlow);
if (followUpEventID != null) {
break;
}
}

if (followUpEventID != null) {

// recursive call!
addImixsEvent(followUpEventID, sourceTask);

Expand All @@ -556,14 +559,21 @@ private void addImixsEvent(String eventID, ItemCollection sourceTask) throws Mod

} else {
// test if we found a target task.
ItemCollection targetTask = new ElementResolver().findImixsTargetTask(outgoingFlow);
if (targetTask != null) {
event.removeItem("keyFollowUp");
event.replaceItemValue("numNextProcessID", targetTask.getItemValue("numProcessID"));

} else {

// invalid model!!
ItemCollection targetTask = null;
for (SequenceFlow outgoingFlow : outFlows) {
// invalid model if more than one target tasks!!
if (targetTask != null)
throw new ModelException(ModelException.INVALID_MODEL,
"Imixs BPMN Event '" + eventName + "' has more than one target task element!");
targetTask = new ElementResolver().findImixsTargetTask(outgoingFlow);
if (targetTask != null) {
event.removeItem("keyFollowUp");
event.replaceItemValue("numNextProcessID", targetTask.getItemValue("numProcessID"));
break;
}
}
if (targetTask == null) {
// invalid model!! - no target task
throw new ModelException(ModelException.INVALID_MODEL,
"Imixs BPMN Event '" + eventName + "' has no target task element!");

Expand Down Expand Up @@ -646,15 +656,13 @@ private List<SequenceFlow> findIncomingFlows(String elementID) {
* @return
*/
private List<SequenceFlow> findOutgoingFlows(String elementID) {

List<SequenceFlow> result = new ArrayList<BPMNModelHandler.SequenceFlow>();
for (String aFlowID : sequenceCache.keySet()) {
SequenceFlow aFlow = sequenceCache.get(aFlowID);
if (aFlow.source.equals(elementID)) {
result.add(aFlow);
}
}

return result;
}

Expand Down Expand Up @@ -831,7 +839,6 @@ public ItemCollection findImixsSourceEvent(SequenceFlow flow) {
* @return the Imixs Task element or null if no Task Element was found.
*/
public ItemCollection findImixsTargetTask(SequenceFlow flow) {

if (flow.source == null) {
return null;
}
Expand All @@ -856,10 +863,15 @@ public ItemCollection findImixsTargetTask(SequenceFlow flow) {
}

// no Imixs task or event found so we are trying to look for the
// next incoming flow elements.
// next outgoing flow elements. (issue #211)
List<SequenceFlow> refList = findOutgoingFlows(flow.target);
for (SequenceFlow aflow : refList) {
return (findImixsTargetTask(aflow));
// recursive call....
ItemCollection aResult = findImixsTargetTask(aflow);
if (aResult!=null) {
// we got the task!
return aResult;
}
}
return null;
}
Expand Down
4 changes: 2 additions & 2 deletions imixs-workflow-core/src/test/java/org/imixs/workflow/bpmn/TestBPMNParserCollaboration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import java.util.Collection;
import java.util.List;


import javax.xml.parsers.ParserConfigurationException;

import org.imixs.workflow.ItemCollection;
Expand All @@ -30,7 +31,6 @@ public class TestBPMNParserCollaboration {

@Before
public void setup() {

}

@After
Expand All @@ -47,7 +47,7 @@ public void testSimple() throws ParseException, ParserConfigurationException, SA
InputStream inputStream = getClass().getResourceAsStream("/bpmn/collaboration.bpmn");

Model model = null;
try {
try {
model = BPMNParser.parseModel(inputStream, "UTF-8");
} catch (UnsupportedEncodingException e) {
e.printStackTrace();
Expand Down

0 comments on commit 7a2a156

Please sign in to comment.