Skip to content

Commit

Permalink
fix light work item manager
Browse files Browse the repository at this point in the history
  • Loading branch information
@elguardian
elguardian committed Sep 30, 2024
1 parent e993e18 commit 7801939
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 35 deletions.
63 changes: 33 additions & 30 deletions jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/LightWorkItemManager.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public void internalAddWorkItem(InternalKogitoWorkItem workItem) {
public InternalKogitoWorkItem getWorkItem(String workItemId) {
InternalKogitoWorkItem workItem = workItems.get(workItemId);
if (workItem == null) {
throw new WorkItemNotFoundException(workItemId);
throw new WorkItemNotFoundException("Work Item (" + workItemId + ") does not exist", workItemId);
}
return workItem;
}
Expand All @@ -92,7 +92,8 @@ public void internalExecuteWorkItem(InternalKogitoWorkItem workItem) {
internalAddWorkItem(workItem);
KogitoWorkItemHandler handler = getWorkItemHandler(workItem);
WorkItemTransition transition = handler.startingTransition(Collections.emptyMap());
transitionWorkItem(workItem, transition, true);
WorkItemTransition lastTransition = transitionWorkItem(workItem, transition);
cleanUp(workItem.getProcessInstance(), workItem, lastTransition);
}

public KogitoWorkItemHandler getWorkItemHandler(String workItemId) throws KogitoWorkItemHandlerNotFoundException {
Expand All @@ -115,7 +116,7 @@ public KogitoWorkItemHandler getWorkItemHandler(InternalKogitoWorkItem workItem)
public void internalAbortWorkItem(String workItemId) {
InternalKogitoWorkItem workItem = getWorkItem(workItemId);
KogitoWorkItemHandler handler = getWorkItemHandler(workItem);
transitionWorkItem(workItem, handler.abortTransition(workItem.getPhaseStatus()), false);
transitionWorkItem(workItem, handler.abortTransition(workItem.getPhaseStatus()));
}

@Override
Expand All @@ -134,19 +135,19 @@ public void retryWorkItem(String workItemId, Map<String, Object> params) {
}
KogitoWorkItemHandler handler = getWorkItemHandler(workItem);
WorkItemTransition transition = handler.startingTransition(Collections.emptyMap());
transitionWorkItem(workItem, transition, true);

WorkItemTransition lastTransition = transitionWorkItem(workItem, transition);
cleanUp(workItem.getProcessInstance(), workItem, lastTransition);
}

@Override
public void completeWorkItem(String workItemId, Map<String, Object> data, Policy... policies) {
InternalKogitoWorkItem workItem = getWorkItem(workItemId);
workItem.setState(KogitoWorkItem.COMPLETED);
KogitoWorkItemHandler handler = getWorkItemHandler(workItem);
transitionWorkItem(workItem, handler.completeTransition(workItem.getPhaseStatus(), data, policies), false);
WorkItemTransition lastTransition = transitionWorkItem(workItem, handler.completeTransition(workItem.getPhaseStatus(), data, policies));
// process instance may have finished already
KogitoProcessInstance processInstance = processInstanceManager.getProcessInstance(workItem.getProcessInstanceStringId());
processInstance.signalEvent("workItemCompleted", workItem);
cleanUp(processInstance, workItem, lastTransition);

}

Expand All @@ -155,11 +156,10 @@ public void abortWorkItem(String workItemId, Policy... policies) {
InternalKogitoWorkItem workItem = getWorkItem(workItemId);
workItem.setState(KogitoWorkItem.ABORTED);
KogitoWorkItemHandler handler = getWorkItemHandler(workItemId);
transitionWorkItem(workItem, handler.abortTransition(workItem.getPhaseStatus(), policies), false);
WorkItemTransition lastTransition = transitionWorkItem(workItem, handler.abortTransition(workItem.getPhaseStatus(), policies));
// process instance may have finished already
KogitoProcessInstance processInstance = processInstanceManager.getProcessInstance(workItem.getProcessInstanceStringId());
processInstance.signalEvent("workItemAborted", workItem);

cleanUp(processInstance, workItem, lastTransition);
}

@Override
Expand All @@ -182,19 +182,17 @@ public void internalCompleteWorkItem(InternalKogitoWorkItem workItem) {

@Override
public void transitionWorkItem(String workItemId, WorkItemTransition transition) {
InternalKogitoWorkItem workItem = workItems.get(workItemId);
if (workItem == null) {
throw new WorkItemNotFoundException("Work Item (" + workItemId + ") does not exist", workItemId);
}
transitionWorkItem(workItem, transition, true);
InternalKogitoWorkItem workItem = getWorkItem(workItemId);
WorkItemTransition lastTransition = transitionWorkItem(workItem, transition);
cleanUp(workItem.getProcessInstance(), workItem, lastTransition);
}

@Override
public Collection<String> getHandlerIds() {
return this.workItemHandlers.keySet();
}

private void transitionWorkItem(InternalKogitoWorkItem workItem, WorkItemTransition transition, boolean signal) {
private WorkItemTransition transitionWorkItem(InternalKogitoWorkItem workItem, WorkItemTransition transition) {
// work item may have been aborted
KogitoWorkItemHandler handler = this.workItemHandlers.get(workItem.getName());
if (handler == null) {
Expand All @@ -212,21 +210,26 @@ private void transitionWorkItem(InternalKogitoWorkItem workItem, WorkItemTransit
this.eventSupport.fireAfterWorkItemTransition(workItem.getProcessInstance(), workItem, lastTransition, null);
}

if (lastTransition.termination().isPresent()) {
internalRemoveWorkItem(workItem.getStringId());
if (signal) {
switch (lastTransition.termination().get()) {
case COMPLETE:
workItem.setState(KogitoWorkItem.COMPLETED);
processInstance.signalEvent("workItemCompleted", workItem);
break;
case ABORT:
workItem.setState(KogitoWorkItem.ABORTED);
processInstance.signalEvent("workItemAborted", workItem);
break;
}
}
return lastTransition;
}

private void cleanUp(KogitoProcessInstance processInstance, InternalKogitoWorkItem workItem, WorkItemTransition lastTransition) {
if (lastTransition.termination().isEmpty()) {
return;
}

switch (lastTransition.termination().get()) {
case COMPLETE:
workItem.setState(KogitoWorkItem.COMPLETED);
processInstance.signalEvent("workItemCompleted", workItem);
break;
case ABORT:
workItem.setState(KogitoWorkItem.ABORTED);
processInstance.signalEvent("workItemAborted", workItem);
break;
}

internalRemoveWorkItem(workItem.getStringId());
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions jbpm/jbpm-flow/src/main/java/org/kie/kogito/process/impl/AbstractProcessInstance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ protected void reconnect() {
processInstance.setMetaData(KOGITO_PROCESS_INSTANCE, this);
addCompletionEventListener();

for (org.kie.api.runtime.process.NodeInstance nodeInstance : processInstance.getNodeInstances()) {
for (org.kie.api.runtime.process.NodeInstance nodeInstance : processInstance.getNodeInstances(true)) {
if (nodeInstance instanceof WorkItemNodeInstance) {
((WorkItemNodeInstance) nodeInstance).internalRegisterWorkItem();
}
Expand Down Expand Up @@ -197,7 +197,7 @@ protected void disconnect() {
return;
}

for (org.kie.api.runtime.process.NodeInstance nodeInstance : processInstance.getNodeInstances()) {
for (org.kie.api.runtime.process.NodeInstance nodeInstance : processInstance.getNodeInstances(true)) {
if (nodeInstance instanceof WorkItemNodeInstance) {
((WorkItemNodeInstance) nodeInstance).internalRemoveWorkItem();
}
Expand Down
9 changes: 6 additions & 3 deletions ...va/org/kie/kogito/jbpm/usertask/handler/UserTaskKogitoWorkItemHandlerProcessListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

import org.kie.kogito.Model;
import org.kie.kogito.process.ProcessInstance;
import org.kie.kogito.process.ProcessInstanceReadMode;
import org.kie.kogito.process.Processes;
import org.kie.kogito.process.workitems.InternalKogitoWorkItem;
import org.kie.kogito.usertask.UserTaskEventListener;
Expand All @@ -45,16 +46,18 @@ public void onUserTaskState(UserTaskStateEvent event) {

String processId = (String) event.getUserTaskInstance().getMetadata().get("ProcessId");
String processInstanceId = (String) event.getUserTaskInstance().getMetadata().get("ProcessInstanceId");
ProcessInstance<? extends Model> processInstance = processes.processById(processId).instances().findById(processInstanceId).orElse(null);
ProcessInstance<? extends Model> processInstance = processes.processById(processId).instances().findById(processInstanceId, ProcessInstanceReadMode.MUTABLE).orElse(null);
processInstance.updateWorkItem(event.getUserTaskInstance().getExternalReferenceId(), workItem -> {
((InternalKogitoWorkItem) workItem).setActualOwner(event.getUserTaskInstance().getActualOwner());
return workItem;
});
// we check first that the work item is not fished to convey the signal
Boolean notify = (Boolean) event.getUserTaskInstance().getMetadata().get(DefaultUserTaskLifeCycle.PARAMETER_NOTIFY);
if (notify == null || notify) {
processInstance.completeWorkItem(event.getUserTaskInstance().getExternalReferenceId(), event.getUserTaskInstance().getOutputs());
if (notify != null && !notify) {
return;
}

processInstance.completeWorkItem(event.getUserTaskInstance().getExternalReferenceId(), event.getUserTaskInstance().getOutputs());

}
}

0 comments on commit 7801939

Please sign in to comment.