This is an automated email from the ASF dual-hosted git repository.
egonzalez pushed a commit to branch main
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-runtimes.git
The following commit(s) were added to refs/heads/main by this push:
new 269632369b [incubator-kie-issues-2037] Remove deprecated inversion of
control (#3992)
269632369b is described below
commit 269632369b42f83c995e2db4ab9edd16593abc53
Author: Enrique <[email protected]>
AuthorDate: Wed Jul 23 14:23:49 2025 +0200
[incubator-kie-issues-2037] Remove deprecated inversion of control (#3992)
* [incubator-kie-issues-2037] Remove deprecated inversion of control
* fix formatting
---
.../workflow/instance/impl/NodeInstanceImpl.java | 4 --
.../instance/impl/WorkflowProcessInstanceImpl.java | 7 ----
.../instance/node/WorkItemNodeInstance.java | 46 +++++++---------------
3 files changed, 15 insertions(+), 42 deletions(-)
diff --git
a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/NodeInstanceImpl.java
b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/NodeInstanceImpl.java
index 61a59d6ac7..d2e8b2e8d9 100755
---
a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/NodeInstanceImpl.java
+++
b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/NodeInstanceImpl.java
@@ -180,10 +180,6 @@ public abstract class NodeInstanceImpl implements
org.jbpm.workflow.instance.Nod
}
}
- public boolean isInversionOfControl() {
- return false;
- }
-
@Override
public CancelType getCancelType() {
return cancelType;
diff --git
a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
index f533f71cbb..261d41326c 100755
---
a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
+++
b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/impl/WorkflowProcessInstanceImpl.java
@@ -213,10 +213,6 @@ public abstract class WorkflowProcessInstanceImpl extends
ProcessInstanceImpl im
@Override
public void removeNodeInstance(final NodeInstance nodeInstance) {
- if (((NodeInstanceImpl) nodeInstance).isInversionOfControl()) {
- getKnowledgeRuntime().delete(
- getKnowledgeRuntime().getFactHandle(nodeInstance));
- }
this.nodeInstances.remove(nodeInstance);
}
@@ -342,9 +338,6 @@ public abstract class WorkflowProcessInstanceImpl extends
ProcessInstanceImpl im
throw new IllegalArgumentException("Illegal node type: "
+ node.getClass());
}
- if (nodeInstance.isInversionOfControl()) {
- getKnowledgeRuntime().insert(nodeInstance);
- }
return nodeInstance;
}
diff --git
a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/WorkItemNodeInstance.java
b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/WorkItemNodeInstance.java
index 13e4854765..2e5ffb3c65 100755
---
a/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/WorkItemNodeInstance.java
+++
b/jbpm/jbpm-flow/src/main/java/org/jbpm/workflow/instance/node/WorkItemNodeInstance.java
@@ -54,7 +54,6 @@ import org.jbpm.workflow.core.node.WorkItemNode;
import org.jbpm.workflow.instance.WorkflowProcessInstance;
import org.jbpm.workflow.instance.WorkflowRuntimeException;
import org.kie.api.runtime.EnvironmentName;
-import org.kie.api.runtime.KieRuntime;
import org.kie.api.runtime.process.EventListener;
import org.kie.api.runtime.process.ProcessWorkItemHandlerException;
import org.kie.api.runtime.process.WorkItem;
@@ -127,12 +126,6 @@ public class WorkItemNodeInstance extends
StateBasedNodeInstance implements Even
this.workItem.setNodeInstance(this);
}
- @Override
- public boolean isInversionOfControl() {
- // TODO WorkItemNodeInstance.isInversionOfControl
- return false;
- }
-
public void internalRegisterWorkItem() {
((InternalKogitoWorkItemManager)
getProcessInstance().getKnowledgeRuntime().getWorkItemManager()).internalAddWorkItem(workItem);
}
@@ -174,25 +167,20 @@ public class WorkItemNodeInstance extends
StateBasedNodeInstance implements Even
}
private void processWorkItemHandler(Runnable handler) {
- if (isInversionOfControl()) {
- ((ProcessInstance) getProcessInstance()).getKnowledgeRuntime()
- .update(((ProcessInstance)
getProcessInstance()).getKnowledgeRuntime().getFactHandle(this), this);
- } else {
- try {
- handler.run();
- } catch (KogitoWorkItemHandlerNotFoundException wihnfe) {
- getProcessInstance().setState(STATE_ABORTED);
- throw wihnfe;
- } catch (ProcessWorkItemHandlerException handlerException) {
- if (triggerCount++ < handlerException.getRetries() + 1) {
- this.workItemId = workItem.getStringId();
- handleWorkItemHandlerException(handlerException, workItem);
- } else {
- throw handlerException;
- }
- } catch (Exception e) {
- handleException(e);
+ try {
+ handler.run();
+ } catch (KogitoWorkItemHandlerNotFoundException wihnfe) {
+ getProcessInstance().setState(STATE_ABORTED);
+ throw wihnfe;
+ } catch (ProcessWorkItemHandlerException handlerException) {
+ if (triggerCount++ < handlerException.getRetries() + 1) {
+ this.workItemId = workItem.getStringId();
+ handleWorkItemHandlerException(handlerException, workItem);
+ } else {
+ throw handlerException;
}
+ } catch (Exception e) {
+ handleException(e);
}
}
@@ -287,12 +275,8 @@ public class WorkItemNodeInstance extends
StateBasedNodeInstance implements Even
}
internalRemoveWorkItem();
- if (isInversionOfControl()) {
- KieRuntime kruntime = getProcessInstance().getKnowledgeRuntime();
- kruntime.update(kruntime.getFactHandle(this), this);
- } else {
- triggerCompleted();
- }
+ triggerCompleted();
+
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
