diff options
| author |   Mnushkin, Dmitry <dmitry.mnushkin@att.com> | 2020-11-03 14:38:18 -0500 |
|---|---|---|
| committer |   Benjamin, Max (mb388a) <mb388a@att.com> | 2020-11-03 14:38:19 -0500 |
| commit | 4cd764e9b6d6131ab735ce1148f7378d7f41e129 (patch) | |
| tree | c2f3011888b41cf5c54dcf069ffafef9fbc75b74 /bpmn/so-bpmn-tasks | |
| parent | 331650299b48d34c3c6bf11139319d64a489a1ad (diff) | |
ensure default flags are set on execution
ensure default flags are set on execution
Issue-ID: SO-3362
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I6b579cb8d26ab6a8e12c44372101bfb37480e12f
Diffstat (limited to 'bpmn/so-bpmn-tasks')
2 files changed, 10 insertions, 2 deletions
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java index 7c4f735577..8f150b301c 100644 --- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java +++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowAction.java @@ -178,6 +178,7 @@ public class WorkflowAction { public void selectExecutionList(DelegateExecution execution) throws Exception { try { + fillExecutionDefault(execution); final String bpmnRequest = (String) execution.getVariable(BBConstants.G_BPMN_REQUEST); ServiceInstancesRequest sIRequest = new ObjectMapper().readValue(bpmnRequest, ServiceInstancesRequest.class); @@ -1871,12 +1872,15 @@ public class WorkflowAction { return generatedResourceId; } - private void fillExecution(DelegateExecution execution, boolean suppressRollback, String resourceId, - WorkflowType resourceType) { + private void fillExecutionDefault(DelegateExecution execution) { execution.setVariable("sentSyncResponse", false); execution.setVariable(HOMING, false); execution.setVariable("calledHoming", false); execution.setVariable(BBConstants.G_ISTOPLEVELFLOW, true); + } + + private void fillExecution(DelegateExecution execution, boolean suppressRollback, String resourceId, + WorkflowType resourceType) { execution.setVariable("suppressRollback", suppressRollback); execution.setVariable("resourceId", resourceId); execution.setVariable("resourceType", resourceType); diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java index 50ff074866..7f22c5138e 100644 --- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java +++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java @@ -243,6 +243,10 @@ public class WorkflowActionTest extends BaseTaskTest { SPY_workflowAction.selectExecutionList(execution); assertEquals(execution.getVariable("WorkflowActionErrorMessage"), "Exception while setting execution list. serviceInstance with name (instanceName) and different version id (3c40d244-808e-42ca-b09a-256d83d19d0a) already exists. The name must be unique."); + + // verify default values are present in failure case + assertEquals(true, execution.getVariable("isTopLevelFlow")); + assertEquals(false, execution.getVariable("sentSyncResponse")); } /** |