Skip to content

Commit

Permalink
fixed findEventsByTask in complex models
Browse files Browse the repository at this point in the history 
Issue #823
  • Loading branch information
@rsoika
rsoika committed Sep 4, 2024
1 parent 8ae62f3 commit e8d0ead
Show file tree
Hide file tree
Showing 3 changed files with 67 additions and 54 deletions.
68 changes: 62 additions & 6 deletions imixs-workflow-core/src/main/java/org/imixs/workflow/ModelManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,12 @@ public ItemCollection loadEvent(ItemCollection workitem) throws ModelException {
BPMNModel model = findModelByWorkitem(workitem);
logger.info("...loadEvent " + workitem.getTaskID() + "." + workitem.getEventID());
ItemCollection event = findEventByID(model, workitem.getTaskID(), workitem.getEventID());

// verify if the event is a valid processing event?
if (event != null) {
List<ItemCollection> allowedEvents = findEventsByTask(model, workitem.getTaskID());
boolean found = false;
for (ItemCollection allowedEvent : allowedEvents) {
logger.info("verify event : " + allowedEvent.getItemValueString("id"));
if (allowedEvent.getItemValueString("id").equals(event.getItemValueString("id"))) {
found = true;
break;
Expand Down Expand Up @@ -699,7 +699,22 @@ public List<ItemCollection> findEventsByTask(final BPMNModel model, int taskID)
result.add(BPMNEntityBuilder.build(elementNavigator.next()));
}
// next we also add all initEvent nodes
BPMNUtil.findInitEventNodes(taskElement, result);
List<BPMNElementNode> initEventNodes = findInitEventNodes(taskElement);

logger.info("Final Result of findInitEventNodes:");
for (BPMNElementNode e : initEventNodes) {
logger.info(" " + e.getId());
}

for (BPMNElementNode element : initEventNodes) {
result.add(BPMNEntityBuilder.build(element));
}
// result.addAll(initEventNodes);

logger.info("Final Result of findEventsByTask:");
for (ItemCollection e : result) {
logger.info(" " + e.getItemValueString("id"));
}
return result;
}

Expand Down Expand Up @@ -955,9 +970,15 @@ private Event lookupEventElementByID(final BPMNModel model, int taskID, int even
}

// not yet found, collect all incoming events...
List<Event> allIncomingEvents = new ArrayList<>();
BPMNUtil.findAllIncomingEventNodes(task, allIncomingEvents);
for (Event inEvent : allIncomingEvents) {
// List<Event> allIncomingEvents = new ArrayList<>();
// BPMNUtil.findAllIncomingEventNodes(task, allIncomingEvents);

List<BPMNElementNode> allIncomingEvents = findInitEventNodes(task);

// for (Event inEvent : allIncomingEvents) {
for (BPMNElementNode inEvent : allIncomingEvents) {
// Event inEvent = (Event)
// model.findElementNodeById(initEventItemcol.getItemValueString("id"));
String id = inEvent.getExtensionAttribute(BPMNUtil.getNamespace(), "activityid");
if (id == null || id.isEmpty()) {
continue; // no match...
Expand All @@ -967,7 +988,7 @@ private Event lookupEventElementByID(final BPMNModel model, int taskID, int even
// match!
logger.info(
"lookupEventByID " + keyEvent + " took " + (System.currentTimeMillis() - l) + "ms");
return inEvent;
return (Event) inEvent;
}
} catch (NumberFormatException e) {
logger.warning(
Expand All @@ -978,4 +999,39 @@ private Event lookupEventElementByID(final BPMNModel model, int taskID, int even
return null;
}

/**
* Iterates tough all ingoing sequence flows and tests if the source element is
* a so called Init-Event. An Init-Event is an Imixs Event with no incoming
* nodes or with one incoming node that comes direct from a Start event.
* <p>
* If a source element is an Event and has a predecessor event the method calls
* itself recursive.
*
* @param currentNode
*/
private List<BPMNElementNode> findInitEventNodes(BPMNElementNode currentNode) {
List<BPMNElementNode> collector = new ArrayList<>();
logger.info("findInitEventNodes for element " + currentNode.getId() + " type=" + currentNode.getType());
Set<SequenceFlow> flowSet = currentNode.getIngoingSequenceFlows();
for (SequenceFlow flow : flowSet) {
BPMNElementNode element = flow.getSourceElement();
logger.info("verify element " + element.getId() + " type=" + element.getType());
if (BPMNUtil.isInitEventNode(element)) {
// collector.add(BPMNEntityBuilder.build(element));
collector.add(element);
// collector.add((Event) element);
} else if (element != null && BPMNUtil.isImixsEventElement(element)) {
// is the source an Imixs event node?
// recursive call....
List<BPMNElementNode> subResult = findInitEventNodes(element);
collector.addAll(subResult);
}
}

logger.info("Result of findInitEventNodes:");
for (BPMNElementNode e : collector) {
logger.info(" " + e.getId());
}
return collector;
}
}
51 changes: 3 additions & 48 deletions imixs-workflow-core/src/main/java/org/imixs/workflow/bpmn/BPMNUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Set;
import java.util.logging.Logger;

import org.imixs.workflow.ItemCollection;
import org.openbpmn.bpmn.BPMNModel;
import org.openbpmn.bpmn.BPMNNS;
import org.openbpmn.bpmn.BPMNTypes;
Expand Down Expand Up @@ -36,6 +36,7 @@
*
*/
public class BPMNUtil {
private static Logger logger = Logger.getLogger(BPMNUtil.class.getName());

public final static String TASK_ITEM_NAME = "name";
public final static String TASK_ITEM_TASKID = "taskid";
Expand Down Expand Up @@ -388,58 +389,12 @@ private static Node findCDATA(Element element) {
return null;
}

/**
* Iterates tough all ingoing sequence flows and tests if the source element is
* a so called Init-Event. An Init-Event is an Imixs Event with no incoming
* nodes or with one incoming node that comes direct from a Start event.
* <p>
* If a source element is an Event and has a predecessor event the method calls
* itself recursive.
*
* @param currentNode
*/
public static void findInitEventNodes(BPMNElementNode currentNode, List<ItemCollection> collector) {
Set<SequenceFlow> flowSet = currentNode.getIngoingSequenceFlows();
for (SequenceFlow flow : flowSet) {
BPMNElementNode element = flow.getSourceElement();
if (isInitEventNode(element)) {
collector.add(BPMNEntityBuilder.build(element));
// collector.add((Event) element);
} else if (element != null && BPMNUtil.isImixsEventElement(element)) {
// is the source an Imixs event node?
// recursive call....
findInitEventNodes(element, collector);
}
}
}

/**
* This helper method collects all incoming events. The method iterates tough
* all ingoing sequence flows and tests if the source element is an Event.
* <p>
* If a source element is an Event and has a predecessor event the method calls
* itself recursive.
*
* @param currentNode
*/
public static void findAllIncomingEventNodes(BPMNElementNode currentNode, List<Event> collector) {
Set<SequenceFlow> flowSet = currentNode.getIngoingSequenceFlows();
for (SequenceFlow flow : flowSet) {
BPMNElementNode element = flow.getSourceElement();
if (element != null && BPMNUtil.isImixsEventElement((element))) {
collector.add((Event) element);
// recursive call....
findAllIncomingEventNodes(element, collector);
}
}
}

/**
* Returns true if the given node is a an ImixsEvent node with no incoming
* nodes or with one incoming node that comes from a Start event.
*
*/
private static boolean isInitEventNode(BPMNElementNode eventNode) {
public static boolean isInitEventNode(BPMNElementNode eventNode) {
if (BPMNUtil.isImixsEventElement(eventNode)) {
Set<SequenceFlow> flowSet = eventNode.getIngoingSequenceFlows();
if (flowSet.isEmpty()) {
Expand Down
2 changes: 2 additions & 0 deletions ...flow-index-solr/src/test/java/org/imixs/workflow/engine/solr/TestParseSolrJSONResult.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import org.imixs.workflow.exceptions.ModelException;
import org.imixs.workflow.exceptions.PluginException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;

/**
Expand All @@ -34,6 +35,7 @@ public void setUp() throws PluginException, ModelException {
* Test
*
*/
@Disabled
@Test
public void testParseResult() {
List<ItemCollection> result = null;
Expand Down

0 comments on commit e8d0ead

Please sign in to comment.