Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sync main branch with Apache main branch #51

Merged
merged 3 commits into from
Jul 17, 2024
Merged

Sync main branch with Apache main branch #51

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e26da8
[incubator-kie-issues-1131] test migration from V7 to code generation…
Abhitocode Jul 15, 2024
8cdac01
Increase timeout in flaky test (#3580)
fjtirado Jul 16, 2024
6927a44
[Fix #3571] Adding onErrors support for starting event state (#3578)
fjtirado Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
157 changes: 87 additions & 70 deletions jbpm/jbpm-tests/src/test/java/org/jbpm/bpmn2/ActivityTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@
import org.jbpm.bpmn2.flow.MinimalWithDIGraphicalProcess;
import org.jbpm.bpmn2.flow.MinimalWithGraphicalModel;
import org.jbpm.bpmn2.flow.MinimalWithGraphicalProcess;
import org.jbpm.bpmn2.flow.ProcessCustomDescriptionMetaDataModel;
import org.jbpm.bpmn2.flow.ProcessCustomDescriptionMetaDataProcess;
import org.jbpm.bpmn2.flow.ProcessVariableCustomDescriptionMetaDataModel;
import org.jbpm.bpmn2.flow.ProcessVariableCustomDescriptionMetaDataProcess;
import org.jbpm.bpmn2.flow.ProcessWithVariableNameModel;
import org.jbpm.bpmn2.flow.ProcessWithVariableNameProcess;
import org.jbpm.bpmn2.flow.UserTaskModel;
Expand Down Expand Up @@ -86,8 +90,16 @@
import org.jbpm.bpmn2.subprocess.CallActivityMIProcess;
import org.jbpm.bpmn2.subprocess.CallActivityModel;
import org.jbpm.bpmn2.subprocess.CallActivityProcess;
import org.jbpm.bpmn2.subprocess.CallActivityProcessBoundaryErrorModel;
import org.jbpm.bpmn2.subprocess.CallActivityProcessBoundaryErrorProcess;
import org.jbpm.bpmn2.subprocess.CallActivitySubProcessBoundaryErrorModel;
import org.jbpm.bpmn2.subprocess.CallActivitySubProcessBoundaryErrorProcess;
import org.jbpm.bpmn2.subprocess.CallActivitySubProcessModel;
import org.jbpm.bpmn2.subprocess.CallActivitySubProcessProcess;
import org.jbpm.bpmn2.subprocess.CallActivitySubProcessWithBoundaryEventModel;
import org.jbpm.bpmn2.subprocess.CallActivitySubProcessWithBoundaryEventProcess;
import org.jbpm.bpmn2.subprocess.CallActivityWithBoundaryEventModel;
import org.jbpm.bpmn2.subprocess.CallActivityWithBoundaryEventProcess;
import org.jbpm.bpmn2.subprocess.CallActivityWithIOexpressionModel;
import org.jbpm.bpmn2.subprocess.CallActivityWithIOexpressionProcess;
import org.jbpm.bpmn2.subprocess.InputMappingUsingValueModel;
Expand Down Expand Up @@ -969,31 +981,26 @@ public void testScriptTaskWithVariableByName() throws Exception {
}

@Test
public void testCallActivityWithBoundaryEvent() throws Exception {
ProcessCompletedCountDownProcessEventListener countDownListener = new ProcessCompletedCountDownProcessEventListener();
kruntime = createKogitoProcessRuntime(
"org/jbpm/bpmn2/subprocess/BPMN2-CallActivityWithBoundaryEvent.bpmn2",
"org/jbpm/bpmn2/subprocess/BPMN2-CallActivitySubProcessWithBoundaryEvent.bpmn2");
kruntime.getProcessEventManager().addEventListener(countDownListener);

public void testCallActivityWithBoundaryEvent() {
Application app = ProcessTestHelper.newApplication();
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
kruntime.getKogitoWorkItemManager().registerWorkItemHandler("Human Task",
workItemHandler);
Map<String, Object> params = new HashMap<>();
params.put("x", "oldValue");
KogitoProcessInstance processInstance = kruntime.startProcess("CallActivityWithBoundaryEvent", params);

countDownListener.waitTillCompleted();

assertProcessInstanceFinished(processInstance, kruntime);
// assertEquals("new timer value",
// ((WorkflowProcessInstance) processInstance).getVariable("y"));
// first check the parent process executed nodes
assertNodeTriggered(processInstance.getStringId(), "StartProcess",
"CallActivity", "Boundary event", "Script Task", "end");
// then check child process executed nodes - is there better way to get child process id than simply increment?
assertNodeTriggered(processInstance.getStringId() + 1, "StartProcess2",
"User Task");
ProcessTestHelper.registerHandler(app, "Human Task", workItemHandler);
ProcessCompletedCountDownProcessEventListener listener = new ProcessCompletedCountDownProcessEventListener();
ProcessTestHelper.registerProcessEventListener(app, listener);
org.kie.kogito.process.Process<CallActivitySubProcessWithBoundaryEventModel> callActivitySubProcessWithBoundaryEventProcess = CallActivitySubProcessWithBoundaryEventProcess.newProcess(app);
org.kie.kogito.process.Process<CallActivityWithBoundaryEventModel> process = CallActivityWithBoundaryEventProcess.newProcess(app);
CallActivityWithBoundaryEventModel model = process.createModel();
model.setX("oldValue");
ProcessInstance<CallActivityWithBoundaryEventModel> processInstance = process.createInstance(model);
processInstance.start();
listener.waitTillCompleted(15000);
assertThat(processInstance).extracting(ProcessInstance::status).isEqualTo(ProcessInstance.STATE_COMPLETED);
Collection<String> processNodes = process.findNodes(Objects::nonNull).stream().map(Node::getName).collect(Collectors.toSet());
Collection<String> subProcessNodes = callActivitySubProcessWithBoundaryEventProcess.findNodes(Objects::nonNull).stream().map(Node::getName).collect(Collectors.toSet());
assertThat(processNodes.containsAll(List.of("StartProcess",
"CallActivity", "Boundary event", "Script Task", "end"))).isTrue();
assertThat(subProcessNodes.containsAll(List.of("StartProcess2",
"User Task"))).isTrue();
}

@Test
Expand Down Expand Up @@ -1059,45 +1066,56 @@ public void testUserTaskWithSimData() {
}

@Test
public void testCallActivityWithBoundaryErrorEvent() throws Exception {
kruntime = createKogitoProcessRuntime(
"org/jbpm/bpmn2/subprocess/BPMN2-CallActivityProcessBoundaryError.bpmn2",
"org/jbpm/bpmn2/subprocess/BPMN2-CallActivitySubProcessBoundaryError.bpmn2");

kruntime.getKogitoWorkItemManager().registerWorkItemHandler("task1",
new SystemOutWorkItemHandler());
KogitoProcessInstance processInstance = kruntime.startProcess("CallActivityProcessBoundaryError");
public void testCallActivityWithBoundaryErrorEvent() {
Application app = ProcessTestHelper.newApplication();
SystemOutWorkItemHandler workItemHandler = new SystemOutWorkItemHandler();
ProcessTestHelper.registerHandler(app, "task1", workItemHandler);
ProcessCompletedCountDownProcessEventListener listener = new ProcessCompletedCountDownProcessEventListener();
ProcessTestHelper.registerProcessEventListener(app, listener);
org.kie.kogito.process.Process<CallActivitySubProcessBoundaryErrorModel> callActivitySubProcessBoundaryErrorProcess = CallActivitySubProcessBoundaryErrorProcess.newProcess(app);
org.kie.kogito.process.Process<CallActivityProcessBoundaryErrorModel> process = CallActivityProcessBoundaryErrorProcess.newProcess(app);
CallActivityProcessBoundaryErrorModel model = process.createModel();
ProcessInstance<CallActivityProcessBoundaryErrorModel> processInstance = process.createInstance(model);
processInstance.start();
assertThat(processInstance).extracting(ProcessInstance::status).isEqualTo(ProcessInstance.STATE_COMPLETED);

assertProcessInstanceFinished(processInstance, kruntime);
assertNodeTriggered(processInstance.getStringId(), "StartProcess",
"Call Activity 1", "Boundary event", "Task Parent", "End2");
// then check child process executed nodes - is there better way to get child process id than simply increment?
assertNodeTriggered(processInstance.getStringId() + 1, "StartProcess", "Task 1", "End");
Collection<String> processNodes = process.findNodes(Objects::nonNull).stream().map(Node::getName).collect(Collectors.toSet());
Collection<String> subProcessNodes = callActivitySubProcessBoundaryErrorProcess.findNodes(Objects::nonNull).stream()
.map(Node::getName).collect(Collectors.toSet());
assertThat(processNodes.containsAll(List.of("StartProcess",
"Call Activity 1", "Boundary event", "Task Parent", "End2"))).isTrue();
assertThat(subProcessNodes.containsAll(List.of("StartProcess", "Task 1", "End"))).isTrue();
}

@Test
public void testCallActivityWithBoundaryErrorEventWithWaitState() throws Exception {
kruntime = createKogitoProcessRuntime(
"org/jbpm/bpmn2/subprocess/BPMN2-CallActivityProcessBoundaryError.bpmn2",
"org/jbpm/bpmn2/subprocess/BPMN2-CallActivitySubProcessBoundaryError.bpmn2");

public void testCallActivityWithBoundaryErrorEventWithWaitState() {
Application app = ProcessTestHelper.newApplication();
TestWorkItemHandler workItemHandler = new TestWorkItemHandler();
kruntime.getKogitoWorkItemManager().registerWorkItemHandler("task1", workItemHandler);
KogitoProcessInstance processInstance = kruntime.startProcess("CallActivityProcessBoundaryError");
ProcessTestHelper.registerHandler(app, "task1", workItemHandler);

org.kie.kogito.process.Process<CallActivitySubProcessBoundaryErrorModel> callActivitySubProcessBoundaryErrorProcess = CallActivitySubProcessBoundaryErrorProcess.newProcess(app);
ProcessInstance<CallActivitySubProcessBoundaryErrorModel> subProcessInstance = callActivitySubProcessBoundaryErrorProcess
.createInstance(callActivitySubProcessBoundaryErrorProcess.createModel());
org.kie.kogito.process.Process<CallActivityProcessBoundaryErrorModel> process = CallActivityProcessBoundaryErrorProcess.newProcess(app);
CallActivityProcessBoundaryErrorModel model = process.createModel();
ProcessInstance<CallActivityProcessBoundaryErrorModel> processInstance = process.createInstance(model);
processInstance.start();

org.kie.kogito.internal.process.runtime.KogitoWorkItem workItem = workItemHandler.getWorkItem();
assertThat(workItem).isNotNull();
kruntime.getKogitoWorkItemManager().completeWorkItem(workItem.getStringId(), null);

subProcessInstance.completeWorkItem(workItem.getStringId(), Collections.emptyMap());

workItem = workItemHandler.getWorkItem();
assertThat(workItem).isNotNull();
kruntime.getKogitoWorkItemManager().completeWorkItem(workItem.getStringId(), null);

assertProcessInstanceFinished(processInstance, kruntime);
assertNodeTriggered(processInstance.getStringId(), "StartProcess",
"Call Activity 1", "Boundary event", "Task Parent", "End2");
// then check child process executed nodes - is there better way to get child process id than simply increment?
assertNodeTriggered(processInstance.getStringId() + 1, "StartProcess", "Task 1", "End");
processInstance.completeWorkItem(workItem.getStringId(), Collections.emptyMap());
assertThat(processInstance).extracting(ProcessInstance::status).isEqualTo(ProcessInstance.STATE_COMPLETED);
Collection<String> processNodes = process.findNodes(Objects::nonNull).stream().map(Node::getName).collect(Collectors.toSet());
Collection<String> subProcessNodes = callActivitySubProcessBoundaryErrorProcess.findNodes(Objects::nonNull).stream()
.map(Node::getName).collect(Collectors.toSet());
assertThat(processNodes.containsAll(List.of("StartProcess",
"Call Activity 1", "Boundary event", "Task Parent", "End2"))).isTrue();
assertThat(subProcessNodes.containsAll(List.of("StartProcess", "Task 1", "End"))).isTrue();
}

@Test
Expand Down Expand Up @@ -1246,28 +1264,27 @@ public void testErrorBetweenProcessesProcess() throws Exception {
}

@Test
public void testProcessCustomDescriptionMetaData() throws Exception {
kruntime = createKogitoProcessRuntime("org/jbpm/bpmn2/flow/BPMN2-ProcessCustomDescriptionMetaData.bpmn2");

Map<String, Object> params = new HashMap<>();

KogitoProcessInstance processInstance = kruntime.startProcess("ProcessCustomDescriptionMetaData", params);
assertProcessInstanceCompleted(processInstance);

String description = processInstance.getDescription();
public void testProcessCustomDescriptionMetaData() {
Application app = ProcessTestHelper.newApplication();
org.kie.kogito.process.Process<ProcessCustomDescriptionMetaDataModel> process = ProcessCustomDescriptionMetaDataProcess.newProcess(app);
ProcessCustomDescriptionMetaDataModel model = process.createModel();
ProcessInstance<ProcessCustomDescriptionMetaDataModel> processInstance = process.createInstance(model);
processInstance.start();
assertThat(processInstance.status()).isEqualTo(ProcessInstance.STATE_COMPLETED);
String description = processInstance.description();
assertThat(description).isNotNull().isEqualTo("my process with description");
}

@Test
public void testProcessVariableCustomDescriptionMetaData() throws Exception {
kruntime = createKogitoProcessRuntime("org/jbpm/bpmn2/flow/BPMN2-ProcessVariableCustomDescriptionMetaData.bpmn2");

Map<String, Object> params = new HashMap<>();
params.put("x", "variable name for process");
KogitoProcessInstance processInstance = kruntime.startProcess("ProcessVariableCustomDescriptionMetaData", params);
assertProcessInstanceCompleted(processInstance);

String description = processInstance.getDescription();
public void testProcessVariableCustomDescriptionMetaData() {
Application app = ProcessTestHelper.newApplication();
org.kie.kogito.process.Process<ProcessVariableCustomDescriptionMetaDataModel> process = ProcessVariableCustomDescriptionMetaDataProcess.newProcess(app);
ProcessVariableCustomDescriptionMetaDataModel model = process.createModel();
model.setX("variable name for process");
ProcessInstance<ProcessVariableCustomDescriptionMetaDataModel> processInstance = process.createInstance(model);
processInstance.start();
assertThat(processInstance.status()).isEqualTo(ProcessInstance.STATE_COMPLETED);
String description = processInstance.description();
assertThat(description).isNotNull().isEqualTo("variable name for process");
}

Expand Down
4 changes: 3 additions & 1 deletion ...uilder/src/main/java/org/kie/kogito/serverless/workflow/parser/handlers/EventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,16 @@ public MakeNodeResult makeNode(RuleFlowNodeContainerFactory<?, ?> factory) {
handleErrors(factory, embeddedContainer);
return new MakeNodeResult(embeddedContainer);
}

}

private MakeNodeResult processOnEvent(RuleFlowNodeContainerFactory<?, ?> factory, OnEvents onEvent) {
MakeNodeResult result = joinNodes(factory,
onEvent.getEventRefs(), (fact, onEventRef) -> filterAndMergeNode(fact, onEvent.getEventDataFilter(), getVarName(),
(f, inputVar, outputVar) -> buildEventNode(f, onEventRef, inputVar, outputVar)));
CompositeContextNodeFactory<?> embeddedSubProcess = handleActions(makeCompositeNode(factory), onEvent.getActions());
if (isStartState) {
handleErrors(factory, embeddedSubProcess);
}
connect(result.getOutgoingNode(), embeddedSubProcess);
return new MakeNodeResult(result.getIncomingNode(), embeddedSubProcess);
}
Expand Down
4 changes: 4 additions & 0 deletions ...to-quarkus-serverless-workflow-integration-test/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ quarkus.rest-client.enum-parameter_yaml.url=${enum-echo-service-mock.url}
# Error handling properties
kogito.sw.functions.publishPerfectSquare.host=localhost


mp.messaging.incoming.start.connector=quarkus-http
mp.messaging.incoming.start.path=/startWithError

mp.messaging.incoming.move.connector=quarkus-http
mp.messaging.incoming.move.path=/move

Expand Down
76 changes: 76 additions & 0 deletions ...arkus-serverless-workflow-integration-test/src/main/resources/eventStartWithError.sw.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"id": "startEventError",
"version": "1.0",
"name": "Workflow event test",
"description": "An test of a starting event with error on action",
"start": "waitForEvent",
"events": [
{
"name": "startEvent",
"source": "",
"type": "start"
}
],
"errors": [
{
"name": "odd number",
"code": "Odd situation"
}
],
"functions": [
{
"name": "publishEvenError",
"type": "asyncapi",
"operation": "specs/callbackResults.yaml#sendEvenError"
},
{
"name": "isEven",
"type": "custom",
"operation": "service:java:org.kie.kogito.workflows.services.EvenService::isEven"
}
]
,
"states": [
{
"name": "waitForEvent",
"type": "event",
"onEvents": [
{
"eventRefs": [
"startEvent"
],
"actions": [
{
"name": "actionWithError",
"functionRef": {
"refName": "isEven",
"arguments": {
"number": ".number"
}
}
}
]

}
],
"onErrors": [
{
"errorRef": "odd number",
"transition": "PublishError"
}
],
"end":true
},
{
"name": "PublishError",
"type": "operation",
"actions": [
{
"name": "publishEvenError",
"functionRef": "publishEvenError"
}
],
"end": "true"
}
]
}
7 changes: 7 additions & 0 deletions ...uarkus-serverless-workflow-integration-test/src/main/resources/specs/callbackResults.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,13 @@ channels:
summary: Timeout Expired
message:
$ref: '#/components/messages/message'
sendEvenError:
description: A message channel for publishing errors
publish:
operationId: sendEvenError
summary: Reporting error
message:
$ref: '#/components/messages/message'
error:
description: A message channel for failed executions
publish:
Expand Down
6 changes: 3 additions & 3 deletions ...workflow-integration-test/src/test/java/org/kie/kogito/quarkus/workflows/EventFlowIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ static void init() {
}

@Test
void testStartingEventWithToStateFilter() {
void testStartingEventWithToStateFilter() throws IOException {
given()
.contentType(ContentType.JSON)
.when()
.body(CloudEventBuilder.v1()
.body(defaultMarshaller.marshall(CloudEventBuilder.v1()
.withId(UUID.randomUUID().toString())
.withSource(URI.create("customer-arrival-event-source"))
.withType("customer-arrival-type")
.withTime(OffsetDateTime.now())
.withData(defaultMarshaller.cloudEventDataFactory().apply(Collections.singletonMap("customer", Map.of("name", "pepe")))).build())
.withData(defaultMarshaller.cloudEventDataFactory().apply(Collections.singletonMap("customer", Map.of("name", "pepe")))).build()))
.post("/eventWithToStateFilter")
.then()
.statusCode(202);
Expand Down
Loading
Loading