From 66289acb399027823d50a693d63a01182eb5d23d Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Thu, 7 Mar 2024 10:44:49 +0100 Subject: [PATCH 1/2] [Fix apache/incubator-kie-issues#987] New onError event (#3428) * [Fix apache/incubator-kie-issues#987] New onError event * [Fix apache/incubator-kie-issues#987] Adding unit test * [Fix apache/incubator-kie-issues#987] Refactor ProcessNodeEvent children Although not strictly needed by the PR, for future additions, a new class in the hierarchy that holds the NodeInstance reference has been included. fields has been made final to remark that event objects are inmutable --- .../event/KogitoProcessEventSupport.java | 5 +- .../UnitOfWorkProcessEventListener.java | 9 +- .../event/impl/ProcessInstanceEventBatch.java | 127 +++++++----------- .../impl/ProcessInstanceEventBatchTest.java | 56 ++++++++ .../event/AbstractProcessNodeEvent.java | 45 +++++++ .../instance/event/ErrorEventImpl.java | 46 +++++++ .../event/KogitoProcessEventSupportImpl.java | 6 + .../event/KogitoProcessNodeLeftEventImpl.java | 13 +- .../KogitoProcessNodeTriggeredEventImpl.java | 12 +- .../instance/event/MessageEventImpl.java | 17 +-- .../instance/event/SignalEventImpl.java | 17 +-- .../impl/WorkflowProcessInstanceImpl.java | 1 + 12 files changed, 230 insertions(+), 124 deletions(-) create mode 100644 jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/AbstractProcessNodeEvent.java create mode 100644 jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/ErrorEventImpl.java diff --git a/api/kogito-api/src/main/java/org/kie/kogito/internal/process/event/KogitoProcessEventSupport.java b/api/kogito-api/src/main/java/org/kie/kogito/internal/process/event/KogitoProcessEventSupport.java index d0a2bc155c2..01fffac0f4b 100644 --- a/api/kogito-api/src/main/java/org/kie/kogito/internal/process/event/KogitoProcessEventSupport.java +++ b/api/kogito-api/src/main/java/org/kie/kogito/internal/process/event/KogitoProcessEventSupport.java @@ -158,12 +158,11 @@ void fireOnUserTaskCommentAdded( KieRuntime kruntime, Comment addedComment); - // - void reset(); void addEventListener(KogitoProcessEventListener listener); void removeEventListener(KogitoProcessEventListener listener); -} \ No newline at end of file + void fireOnError(KogitoProcessInstance instance, KogitoNodeInstance nodeInstance, KieRuntime kruntime, Exception exception); +} diff --git a/api/kogito-api/src/main/java/org/kie/kogito/uow/events/UnitOfWorkProcessEventListener.java b/api/kogito-api/src/main/java/org/kie/kogito/uow/events/UnitOfWorkProcessEventListener.java index e2998dfc5ab..0696688a8d3 100644 --- a/api/kogito-api/src/main/java/org/kie/kogito/uow/events/UnitOfWorkProcessEventListener.java +++ b/api/kogito-api/src/main/java/org/kie/kogito/uow/events/UnitOfWorkProcessEventListener.java @@ -18,6 +18,7 @@ */ package org.kie.kogito.uow.events; +import org.kie.api.event.process.ErrorEvent; import org.kie.api.event.process.MessageEvent; import org.kie.api.event.process.ProcessCompletedEvent; import org.kie.api.event.process.ProcessEvent; @@ -59,12 +60,11 @@ private void intercept(UserTaskEvent event) { @Override public void beforeProcessStarted(ProcessStartedEvent event) { - + intercept(event); } @Override public void afterProcessStarted(ProcessStartedEvent event) { - intercept(event); } @Override @@ -193,4 +193,9 @@ public void onUserTaskOutputVariable(UserTaskVariableEvent event) { intercept(event); } + @Override + public void onError(ErrorEvent event) { + intercept(event); + } + } diff --git a/api/kogito-events-core/src/main/java/org/kie/kogito/event/impl/ProcessInstanceEventBatch.java b/api/kogito-events-core/src/main/java/org/kie/kogito/event/impl/ProcessInstanceEventBatch.java index 0802570959a..9d55dff1b9a 100644 --- a/api/kogito-events-core/src/main/java/org/kie/kogito/event/impl/ProcessInstanceEventBatch.java +++ b/api/kogito-events-core/src/main/java/org/kie/kogito/event/impl/ProcessInstanceEventBatch.java @@ -19,13 +19,15 @@ package org.kie.kogito.event.impl; import java.time.Instant; -import java.util.ArrayList; import java.util.Collection; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.Map; import java.util.Objects; +import java.util.TreeSet; +import org.kie.api.event.process.ErrorEvent; import org.kie.api.event.process.ProcessCompletedEvent; import org.kie.api.event.process.ProcessEvent; import org.kie.api.event.process.ProcessNodeEvent; @@ -38,7 +40,6 @@ import org.kie.api.event.usertask.UserTaskAttachmentEvent; import org.kie.api.event.usertask.UserTaskCommentEvent; import org.kie.api.event.usertask.UserTaskDeadlineEvent; -import org.kie.api.event.usertask.UserTaskEvent; import org.kie.api.event.usertask.UserTaskStateEvent; import org.kie.api.event.usertask.UserTaskVariableEvent; import org.kie.kogito.Addons; @@ -70,7 +71,6 @@ import org.kie.kogito.event.usertask.UserTaskInstanceVariableEventBody; import org.kie.kogito.internal.process.event.KogitoProcessVariableChangedEvent; import org.kie.kogito.internal.process.runtime.KogitoNodeInstance; -import org.kie.kogito.internal.process.runtime.KogitoProcessInstance; import org.kie.kogito.internal.process.runtime.KogitoWorkItem; import org.kie.kogito.internal.process.runtime.KogitoWorkItemNodeInstance; import org.kie.kogito.internal.process.runtime.KogitoWorkflowProcessInstance; @@ -86,25 +86,19 @@ public class ProcessInstanceEventBatch implements EventBatch { public ProcessInstanceEventBatch(String service, Addons addons) { this.service = service; this.addons = addons != null ? addons : Addons.EMTPY; - this.processedEvents = new ArrayList<>(); - } - - @Override - public void append(Object rawEvent) { - if (rawEvent instanceof ProcessEvent) { - addDataEvent((ProcessEvent) rawEvent); - } else if (rawEvent instanceof UserTaskEvent) { - addDataEvent((UserTaskEvent) rawEvent); - } + this.processedEvents = new TreeSet<>(new Comparator>() { + @Override + public int compare(DataEvent event1, DataEvent event2) { + return event2 instanceof ProcessInstanceStateDataEvent && + ((ProcessInstanceStateDataEvent) event2).getData().getEventType() == ProcessInstanceStateEventBody.EVENT_TYPE_ENDED + || event1 instanceof ProcessInstanceStateDataEvent && + ((ProcessInstanceStateDataEvent) event1).getData().getEventType() == ProcessInstanceStateEventBody.EVENT_TYPE_STARTED ? -1 : 1; + } + }); } @Override - public Collection> events() { - return processedEvents; - } - - private void addDataEvent(ProcessEvent event) { - // process events + public void append(Object event) { if (event instanceof ProcessStartedEvent) { handleProcessStateEvent((ProcessStartedEvent) event); } else if (event instanceof ProcessCompletedEvent) { @@ -117,9 +111,28 @@ private void addDataEvent(ProcessEvent event) { handleProcesssNodeEvent((SLAViolatedEvent) event); } else if (event instanceof ProcessVariableChangedEvent) { handleProcessVariableEvent((ProcessVariableChangedEvent) event); + } else if (event instanceof ErrorEvent) { + handleErrorEvent((ErrorEvent) event); + } else if (event instanceof UserTaskStateEvent) { + handleUserTaskStateEvent((UserTaskStateEvent) event); + } else if (event instanceof UserTaskDeadlineEvent) { + handleUserTaskDeadlineEvent((UserTaskDeadlineEvent) event); + } else if (event instanceof UserTaskAssignmentEvent) { + handleUserTaskAssignmentEvent((UserTaskAssignmentEvent) event); + } else if (event instanceof UserTaskVariableEvent) { + handleUserTaskVariableEvent((UserTaskVariableEvent) event); + } else if (event instanceof UserTaskAttachmentEvent) { + handleUserTaskAttachmentEvent((UserTaskAttachmentEvent) event); + } else if (event instanceof UserTaskCommentEvent) { + handleUserTaskCommentEvent((UserTaskCommentEvent) event); } } + @Override + public Collection> events() { + return processedEvents; + } + private void handleProcessVariableEvent(ProcessVariableChangedEvent event) { if (event.getTags().contains(KogitoTags.INTERNAL_TAG)) { return; @@ -245,52 +258,31 @@ private ProcessInstanceNodeDataEvent toProcessInstanceNodeEvent(ProcessNodeEvent return piEvent; } - private void handleProcessStateEvent(ProcessCompletedEvent event) { + private void handleErrorEvent(ErrorEvent event) { + KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); + ProcessInstanceErrorEventBody errorBody = ProcessInstanceErrorEventBody.create() + .eventDate(new Date()) + .eventUser(event.getEventIdentity()) + .processInstanceId(pi.getId()) + .processId(pi.getProcessId()) + .processVersion(pi.getProcessVersion()) + .nodeDefinitionId(pi.getNodeIdInError()) + .nodeInstanceId(pi.getNodeInstanceIdInError()) + .errorMessage(pi.getErrorMessage()) + .build(); + Map metadata = buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance()); + ProcessInstanceErrorDataEvent piEvent = + new ProcessInstanceErrorDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, errorBody); + piEvent.setKogitoBusinessKey(pi.getBusinessKey()); + processedEvents.add(piEvent); + } + private void handleProcessStateEvent(ProcessCompletedEvent event) { processedEvents.add(toProcessInstanceStateEvent(event, ProcessInstanceStateEventBody.EVENT_TYPE_ENDED)); - - KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); - if (pi.getState() == KogitoProcessInstance.STATE_ERROR) { - ProcessInstanceErrorEventBody errorBody = ProcessInstanceErrorEventBody.create() - .eventDate(new Date()) - .eventUser(event.getEventIdentity()) - .processInstanceId(pi.getId()) - .processId(pi.getProcessId()) - .processVersion(pi.getProcessVersion()) - .nodeDefinitionId(pi.getNodeIdInError()) - .nodeInstanceId(pi.getNodeInstanceIdInError()) - .errorMessage(pi.getErrorMessage()) - .build(); - Map metadata = buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance()); - ProcessInstanceErrorDataEvent piEvent = - new ProcessInstanceErrorDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, errorBody); - piEvent.setKogitoBusinessKey(pi.getBusinessKey()); - processedEvents.add(piEvent); - } } private void handleProcessStateEvent(ProcessStartedEvent event) { processedEvents.add(toProcessInstanceStateEvent(event, ProcessInstanceStateEventBody.EVENT_TYPE_STARTED)); - - KogitoWorkflowProcessInstance pi = (KogitoWorkflowProcessInstance) event.getProcessInstance(); - if (pi.getState() == KogitoProcessInstance.STATE_ERROR) { - ProcessInstanceErrorEventBody errorBody = ProcessInstanceErrorEventBody.create() - .eventDate(new Date()) - .eventUser(event.getEventIdentity()) - .processInstanceId(pi.getId()) - .processId(pi.getProcessId()) - .processVersion(pi.getProcessVersion()) - .nodeDefinitionId(pi.getNodeIdInError()) - .nodeInstanceId(pi.getNodeInstanceIdInError()) - .errorMessage(pi.getErrorMessage()) - .build(); - Map metadata = buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance()); - ProcessInstanceErrorDataEvent piEvent = - new ProcessInstanceErrorDataEvent(buildSource(event.getProcessInstance().getProcessId()), addons.toString(), event.getEventIdentity(), metadata, errorBody); - piEvent.setKogitoBusinessKey(pi.getBusinessKey()); - processedEvents.add(piEvent); - } - } private ProcessInstanceStateDataEvent toProcessInstanceStateEvent(ProcessEvent event, int eventType) { @@ -339,23 +331,6 @@ private Map buildProcessMetadata(KogitoWorkflowProcessInstance p return metadata; } - private void addDataEvent(UserTaskEvent event) { - // this should go in another event types - if (event instanceof UserTaskStateEvent) { - handleUserTaskStateEvent((UserTaskStateEvent) event); - } else if (event instanceof UserTaskDeadlineEvent) { - handleUserTaskDeadlineEvent((UserTaskDeadlineEvent) event); - } else if (event instanceof UserTaskAssignmentEvent) { - handleUserTaskAssignmentEvent((UserTaskAssignmentEvent) event); - } else if (event instanceof UserTaskVariableEvent) { - handleUserTaskVariableEvent((UserTaskVariableEvent) event); - } else if (event instanceof UserTaskAttachmentEvent) { - handleUserTaskAttachmentEvent((UserTaskAttachmentEvent) event); - } else if (event instanceof UserTaskCommentEvent) { - handleUserTaskCommentEvent((UserTaskCommentEvent) event); - } - } - private void handleUserTaskCommentEvent(UserTaskCommentEvent event) { Map metadata = buildUserTaskMetadata((HumanTaskWorkItem) event.getWorkItem()); metadata.putAll(buildProcessMetadata((KogitoWorkflowProcessInstance) event.getProcessInstance())); diff --git a/api/kogito-events-core/src/test/java/org/kie/kogito/event/impl/ProcessInstanceEventBatchTest.java b/api/kogito-events-core/src/test/java/org/kie/kogito/event/impl/ProcessInstanceEventBatchTest.java index 4b117d04a5e..b4326cc2283 100644 --- a/api/kogito-events-core/src/test/java/org/kie/kogito/event/impl/ProcessInstanceEventBatchTest.java +++ b/api/kogito-events-core/src/test/java/org/kie/kogito/event/impl/ProcessInstanceEventBatchTest.java @@ -19,6 +19,25 @@ package org.kie.kogito.event.impl; import org.junit.jupiter.api.Test; +import org.kie.api.event.process.ErrorEvent; +import org.kie.api.event.process.ProcessCompletedEvent; +import org.kie.api.event.process.ProcessEvent; +import org.kie.api.event.process.ProcessNodeEvent; +import org.kie.api.event.process.ProcessNodeLeftEvent; +import org.kie.api.event.process.ProcessNodeTriggeredEvent; +import org.kie.api.event.process.ProcessStartedEvent; +import org.kie.api.event.process.ProcessVariableChangedEvent; +import org.kie.api.runtime.process.NodeInstance; +import org.kie.api.runtime.process.ProcessInstance; +import org.kie.kogito.event.process.ProcessInstanceErrorDataEvent; +import org.kie.kogito.event.process.ProcessInstanceNodeDataEvent; +import org.kie.kogito.event.process.ProcessInstanceStateDataEvent; +import org.kie.kogito.event.process.ProcessInstanceVariableDataEvent; +import org.kie.kogito.internal.process.runtime.KogitoNode; +import org.kie.kogito.internal.process.runtime.KogitoNodeInstance; +import org.kie.kogito.internal.process.runtime.KogitoWorkflowProcess; +import org.kie.kogito.internal.process.runtime.KogitoWorkflowProcessInstance; +import org.mockito.Mockito; import static java.util.Collections.emptyMap; import static java.util.Collections.singletonMap; @@ -49,4 +68,41 @@ public void testServiceDefined() { assertThat(batch.extractRuntimeSource(singletonMap(PROCESS_ID_META_DATA, "demo.orders"))).isEqualTo("http://localhost:8080/orders"); } + @Test + public void testEventSorting() { + ProcessInstanceEventBatch batch = new ProcessInstanceEventBatch("", null); + KogitoWorkflowProcess process = Mockito.mock(KogitoWorkflowProcess.class); + KogitoWorkflowProcessInstance processInstance = Mockito.mock(KogitoWorkflowProcessInstance.class); + KogitoNodeInstance nodeInstance = Mockito.mock(KogitoNodeInstance.class); + KogitoNode node = Mockito.mock(KogitoNode.class); + Mockito.when(processInstance.getProcess()).thenReturn(process); + Mockito.when(nodeInstance.getNode()).thenReturn(node); + batch.append(mockEvent(ProcessVariableChangedEvent.class, processInstance)); + batch.append(mockEvent(ProcessNodeTriggeredEvent.class, processInstance, nodeInstance)); + batch.append(mockEvent(ProcessNodeLeftEvent.class, processInstance, nodeInstance)); + batch.append(mockEvent(ProcessStartedEvent.class, processInstance)); + batch.append(mockEvent(ProcessNodeTriggeredEvent.class, processInstance, nodeInstance)); + batch.append(mockEvent(ProcessNodeLeftEvent.class, processInstance, nodeInstance)); + batch.append(mockEvent(ErrorEvent.class, processInstance, nodeInstance)); + batch.append(mockEvent(ProcessCompletedEvent.class, processInstance)); + batch.append(mockEvent(ProcessNodeTriggeredEvent.class, processInstance, nodeInstance)); + batch.append(mockEvent(ProcessNodeLeftEvent.class, processInstance, nodeInstance)); + assertThat(batch.processedEvents).hasExactlyElementsOfTypes(ProcessInstanceStateDataEvent.class, ProcessInstanceVariableDataEvent.class, ProcessInstanceNodeDataEvent.class, + ProcessInstanceNodeDataEvent.class, + ProcessInstanceNodeDataEvent.class, ProcessInstanceNodeDataEvent.class, ProcessInstanceErrorDataEvent.class, ProcessInstanceNodeDataEvent.class, ProcessInstanceNodeDataEvent.class, + ProcessInstanceStateDataEvent.class); + } + + private T mockEvent(Class clazz, ProcessInstance processInstance) { + T event = Mockito.mock(clazz); + Mockito.when(event.getProcessInstance()).thenReturn(processInstance); + return event; + } + + private T mockEvent(Class clazz, ProcessInstance processInstance, NodeInstance nodeInstance) { + T event = Mockito.mock(clazz); + Mockito.when(event.getProcessInstance()).thenReturn(processInstance); + Mockito.when(event.getNodeInstance()).thenReturn(nodeInstance); + return event; + } } diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/AbstractProcessNodeEvent.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/AbstractProcessNodeEvent.java new file mode 100644 index 00000000000..9ad5cc225ef --- /dev/null +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/AbstractProcessNodeEvent.java @@ -0,0 +1,45 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.jbpm.process.instance.event; + +import org.kie.api.event.process.ProcessNodeEvent; +import org.kie.api.runtime.KieRuntime; +import org.kie.api.runtime.process.NodeInstance; +import org.kie.api.runtime.process.ProcessInstance; + +public abstract class AbstractProcessNodeEvent extends ProcessEvent implements ProcessNodeEvent { + + private final NodeInstance nodeInstance; + + protected AbstractProcessNodeEvent(NodeInstance nodeInstance, ProcessInstance instance, KieRuntime kruntime) { + super(instance, kruntime); + this.nodeInstance = nodeInstance; + } + + protected AbstractProcessNodeEvent(NodeInstance nodeInstance, ProcessInstance instance, KieRuntime kruntime, String identity) { + super(instance, kruntime, identity); + this.nodeInstance = nodeInstance; + } + + @Override + public NodeInstance getNodeInstance() { + return nodeInstance; + } + +} diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/ErrorEventImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/ErrorEventImpl.java new file mode 100644 index 00000000000..b6e3488c5eb --- /dev/null +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/ErrorEventImpl.java @@ -0,0 +1,46 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.jbpm.process.instance.event; + +import org.kie.api.event.process.ErrorEvent; +import org.kie.api.runtime.KieRuntime; +import org.kie.api.runtime.process.NodeInstance; +import org.kie.api.runtime.process.ProcessInstance; + +public class ErrorEventImpl extends AbstractProcessNodeEvent implements ErrorEvent { + + private static final long serialVersionUID = 1L; + private final Exception exception; + + public ErrorEventImpl(ProcessInstance instance, KieRuntime kruntime, NodeInstance nodeInstance, + Exception exception) { + super(nodeInstance, instance, kruntime); + this.exception = exception; + } + + @Override + public Exception getException() { + return exception; + } + + @Override + public String toString() { + return "ErrorEventImpl [nodeInstance=" + getNodeInstance() + ", exception=" + exception + "]"; + } +} diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessEventSupportImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessEventSupportImpl.java index 2a87fcd4c95..4bbd2314858 100644 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessEventSupportImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessEventSupportImpl.java @@ -367,4 +367,10 @@ public void reset() { this.clear(); } + @Override + public void fireOnError(KogitoProcessInstance instance, KogitoNodeInstance nodeInstance, KieRuntime kruntime, Exception exception) { + ErrorEventImpl event = new ErrorEventImpl(instance, kruntime, nodeInstance, exception); + notifyAllListeners(l -> l.onError(event)); + } + } diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessNodeLeftEventImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessNodeLeftEventImpl.java index 9fa10db97ee..be9a0262f56 100644 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessNodeLeftEventImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessNodeLeftEventImpl.java @@ -23,24 +23,17 @@ import org.kie.api.runtime.process.NodeInstance; import org.kie.kogito.internal.process.runtime.KogitoNodeInstance; -public class KogitoProcessNodeLeftEventImpl extends ProcessEvent implements ProcessNodeLeftEvent { +public class KogitoProcessNodeLeftEventImpl extends AbstractProcessNodeEvent implements ProcessNodeLeftEvent { private static final long serialVersionUID = 510l; - private NodeInstance nodeInstance; - public KogitoProcessNodeLeftEventImpl(NodeInstance nodeInstance, KieRuntime kruntime, String identity) { - super(nodeInstance.getProcessInstance(), kruntime, identity); - this.nodeInstance = nodeInstance; - } - - public NodeInstance getNodeInstance() { - return nodeInstance; + super(nodeInstance, nodeInstance.getProcessInstance(), kruntime, identity); } @Override public String toString() { - return "==>[ProcessNodeLeft(nodeId=" + nodeInstance.getNodeId() + "; id=" + ((KogitoNodeInstance) nodeInstance).getStringId() + return "==>[ProcessNodeLeft(nodeId=" + getNodeInstance().getNodeId() + "; id=" + ((KogitoNodeInstance) getNodeInstance()).getStringId() + "; nodeName=" + getNodeInstance().getNodeName() + "; processName=" + getProcessInstance().getProcessName() + "; processId=" + getProcessInstance().getProcessId() + ")]"; } } diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessNodeTriggeredEventImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessNodeTriggeredEventImpl.java index 9882ac6f02e..f47ae407658 100644 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessNodeTriggeredEventImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/KogitoProcessNodeTriggeredEventImpl.java @@ -23,24 +23,18 @@ import org.kie.api.runtime.process.NodeInstance; import org.kie.kogito.internal.process.runtime.KogitoNodeInstance; -public class KogitoProcessNodeTriggeredEventImpl extends ProcessEvent implements ProcessNodeTriggeredEvent { +public class KogitoProcessNodeTriggeredEventImpl extends AbstractProcessNodeEvent implements ProcessNodeTriggeredEvent { private static final long serialVersionUID = 510l; - private NodeInstance nodeInstance; - public KogitoProcessNodeTriggeredEventImpl(NodeInstance nodeInstance, KieRuntime kruntime, String identity) { - super(nodeInstance.getProcessInstance(), kruntime, identity); - this.nodeInstance = nodeInstance; - } + super(nodeInstance, nodeInstance.getProcessInstance(), kruntime, identity); - public NodeInstance getNodeInstance() { - return nodeInstance; } @Override public String toString() { - return "==>[ProcessNodeTriggered(nodeId=" + nodeInstance.getNodeId() + "; id=" + ((KogitoNodeInstance) nodeInstance).getStringId() + return "==>[ProcessNodeTriggered(nodeId=" + getNodeInstance().getNodeId() + "; id=" + ((KogitoNodeInstance) getNodeInstance()).getStringId() + "; nodeName=" + getNodeInstance().getNodeName() + "; processName=" + getProcessInstance().getProcessName() + "; processId=" + getProcessInstance().getProcessId() + ")]"; } } diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/MessageEventImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/MessageEventImpl.java index 25882a36025..b74e1d6508d 100644 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/MessageEventImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/MessageEventImpl.java @@ -23,26 +23,19 @@ import org.kie.api.runtime.process.NodeInstance; import org.kie.api.runtime.process.ProcessInstance; -public class MessageEventImpl extends ProcessEvent implements MessageEvent { +public class MessageEventImpl extends AbstractProcessNodeEvent implements MessageEvent { private static final long serialVersionUID = 1L; - private NodeInstance nodeInstance; - private String messageName; - private Object messageObject; + private final String messageName; + private final Object messageObject; public MessageEventImpl(ProcessInstance instance, KieRuntime kruntime, NodeInstance nodeInstance, String messageName, Object messageObject, String identity) { - super(instance, kruntime, identity); - this.nodeInstance = nodeInstance; + super(nodeInstance, instance, kruntime, identity); this.messageName = messageName; this.messageObject = messageObject; } - @Override - public NodeInstance getNodeInstance() { - return nodeInstance; - } - @Override public String getMessageName() { return messageName; @@ -55,7 +48,7 @@ public Object getMessage() { @Override public String toString() { - return "MessageEventImpl [nodeInstance=" + nodeInstance + ", messageName=" + messageName + ", messageObject=" + + return "MessageEventImpl [nodeInstance=" + getNodeInstance() + ", messageName=" + messageName + ", messageObject=" + messageObject + "]"; } } diff --git a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/SignalEventImpl.java b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/SignalEventImpl.java index ec2b01cae23..55fb834c3d9 100644 --- a/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/SignalEventImpl.java +++ b/jbpm/jbpm-flow/src/main/java/org/jbpm/process/instance/event/SignalEventImpl.java @@ -23,26 +23,19 @@ import org.kie.api.runtime.process.NodeInstance; import org.kie.api.runtime.process.ProcessInstance; -public class SignalEventImpl extends ProcessEvent implements SignalEvent { +public class SignalEventImpl extends AbstractProcessNodeEvent implements SignalEvent { private static final long serialVersionUID = 1L; - private NodeInstance nodeInstance; - private String signalName; - private Object signalObject; + private final String signalName; + private final Object signalObject; public SignalEventImpl(ProcessInstance instance, KieRuntime kruntime, NodeInstance nodeInstance, String signalName, Object signalObject, String identity) { - super(instance, kruntime, identity); - this.nodeInstance = nodeInstance; + super(nodeInstance, instance, kruntime, identity); this.signalName = signalName; this.signalObject = signalObject; } - @Override - public NodeInstance getNodeInstance() { - return nodeInstance; - } - @Override public String getSignalName() { return signalName; @@ -55,7 +48,7 @@ public Object getSignal() { @Override public String toString() { - return "SignalEventImpl [nodeInstance=" + nodeInstance + ", signalName=" + signalName + ", signalObject=" + + return "SignalEventImpl [nodeInstance=" + getNodeInstance() + ", signalName=" + signalName + ", signalObject=" + signalObject + "]"; } } 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 e13e3d50248..437b054eecf 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 @@ -1149,6 +1149,7 @@ public void setErrorState(NodeInstance nodeInstanceInError, Exception e) { this.errorMessage = rootException.getClass().getCanonicalName() + " - " + rootException.getMessage(); setState(STATE_ERROR); logger.error("Unexpected error while executing node {} in process instance {}", nodeInstanceInError.getNode().getName(), this.getStringId(), e); + ((InternalProcessRuntime) getKnowledgeRuntime().getProcessRuntime()).getProcessEventSupport().fireOnError(this, nodeInstanceInError, getKnowledgeRuntime(), e); // remove node instance that caused an error ((org.jbpm.workflow.instance.NodeInstanceContainer) nodeInstanceInError.getNodeInstanceContainer()).removeNodeInstance(nodeInstanceInError); } From 6e80fd47c2fdb2ae494e3ada80016df091ca0404 Mon Sep 17 00:00:00 2001 From: Francisco Javier Tirado Sarti <65240126+fjtirado@users.noreply.github.com> Date: Fri, 8 Mar 2024 18:36:30 +0100 Subject: [PATCH 2/2] [Fix apache/incubator-kie-issues#987] Fix nightly (#3431) * [Fix apache/incubator-kie-issues#987] Fix nightly * Import not sorted preventing green --- .../kie/kogito/uow/events/UnitOfWorkProcessEventListener.java | 2 +- .../test/java/org/kie/kogito/codegen/tests/PublishEventIT.java | 2 +- .../java/org/kie/kogito/quarkus/workflows/WorkflowEventIT.java | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/kogito-api/src/main/java/org/kie/kogito/uow/events/UnitOfWorkProcessEventListener.java b/api/kogito-api/src/main/java/org/kie/kogito/uow/events/UnitOfWorkProcessEventListener.java index 0696688a8d3..3428ebfbb93 100644 --- a/api/kogito-api/src/main/java/org/kie/kogito/uow/events/UnitOfWorkProcessEventListener.java +++ b/api/kogito-api/src/main/java/org/kie/kogito/uow/events/UnitOfWorkProcessEventListener.java @@ -60,11 +60,11 @@ private void intercept(UserTaskEvent event) { @Override public void beforeProcessStarted(ProcessStartedEvent event) { - intercept(event); } @Override public void afterProcessStarted(ProcessStartedEvent event) { + intercept(event); } @Override diff --git a/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java b/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java index 60f4d83164a..d95c2e9e684 100644 --- a/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java +++ b/kogito-codegen-modules/kogito-codegen-processes-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java @@ -147,7 +147,7 @@ private Optional findUserTaskInstanceEvent(List< } private Optional> findProcessInstanceEvent(List> events, int state) { - return events.stream().filter(ProcessInstanceStateDataEvent.class::isInstance).filter(e -> ((ProcessInstanceStateEventBody) e.getData()).getState() == state).findAny(); + return events.stream().filter(ProcessInstanceStateDataEvent.class::isInstance).filter(e -> ((ProcessInstanceStateEventBody) e.getData()).getEventType() == state).findAny(); } private List findNodeInstanceEvents(List> events, int eventType) { diff --git a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/WorkflowEventIT.java b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/WorkflowEventIT.java index c11109b5d8a..db120c19bdd 100644 --- a/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/WorkflowEventIT.java +++ b/quarkus/extensions/kogito-quarkus-serverless-workflow-extension/kogito-quarkus-serverless-workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/WorkflowEventIT.java @@ -93,7 +93,6 @@ void testWorkflowEvents() throws Exception { Map data = (Map) event.getData(); if ("secure".equals(data.get("processId"))) { if (event.getType().equals("ProcessInstanceStateDataEvent")) { - assertEquals("ProcessInstanceStateEvent", event.getType()); assertEquals("/secure", event.getSource().toString()); assertEquals("secure", event.getKogitoProcessId()); assertEquals("1.0", event.getKogitoProcessInstanceVersion());