Merge "[WIP] WorkflowAction refactoring"

5 files changed, 135 insertions, 64 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBFailureTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBFailureTest.java
index 7f44c97f59..23ffbac645 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBFailureTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBFailureTest.java
@@ -144,7 +144,8 @@ public class WorkflowActionBBFailureTest extends BaseTaskTest {
     @Test
     public void updateRequestStatusToFailedRollbackFabric() {
         BuildingBlock bb = new BuildingBlock().setBpmnFlowName("UnassignFabricConfigurationBB");
-        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock().setBuildingBlock(bb);
+        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock();
+        ebb.setBuildingBlock(bb);
         execution.setVariable("buildingBlock", ebb);
         execution.setVariable("mso-request-id", "123");
         execution.setVariable("isRollbackComplete", false);
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
index a736d85197..9b41d0fada 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
@@ -115,7 +115,9 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         ModelInfo mi = new ModelInfo();
         mi.setModelUuid(modelUuid);
         rd.setModelInfo(mi);
-        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock).setRequestDetails(rd);
+        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock();
+        ebb.setBuildingBlock(buildingBlock);
+        ebb.setRequestDetails(rd);
         flowsToExecute.add(ebb);
 
         List<VnfResourceCustomization> vnfResourceCustomizations = new ArrayList<>();
@@ -150,7 +152,9 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         ModelInfo mi = new ModelInfo();
         mi.setModelUuid(modelUuid);
         rd.setModelInfo(mi);
-        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock).setRequestDetails(rd);
+        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock();
+        ebb.setBuildingBlock(buildingBlock);
+        ebb.setRequestDetails(rd);
         ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
 
         flowsToExecute.add(ebb);
@@ -200,15 +204,18 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         execution.setVariable("resourceName", EMPTY_STRING);
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList<>();
         BuildingBlock buildingBlock1 = new BuildingBlock().setBpmnFlowName("AssignVfModuleBB");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(buildingBlock1);
         flowsToExecute.add(ebb1);
 
         BuildingBlock buildingBlock2 = new BuildingBlock().setBpmnFlowName("CreateVfModuleBB");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(buildingBlock2);
         flowsToExecute.add(ebb2);
 
         BuildingBlock buildingBlock3 = new BuildingBlock().setBpmnFlowName("ActivateVfModuleBB");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(buildingBlock3);
         flowsToExecute.add(ebb3);
 
         execution.setVariable("flowsToExecute", flowsToExecute);
@@ -231,15 +238,18 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         execution.setVariable("resourceName", EMPTY_STRING);
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList<>();
         BuildingBlock buildingBlock1 = new BuildingBlock().setBpmnFlowName("AssignVfModuleBB");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(buildingBlock1);
         flowsToExecute.add(ebb1);
 
         BuildingBlock buildingBlock2 = new BuildingBlock().setBpmnFlowName("CreateVfModuleBB");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(buildingBlock2);
         flowsToExecute.add(ebb2);
 
         BuildingBlock buildingBlock3 = new BuildingBlock().setBpmnFlowName("ActivateVfModuleBB");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(buildingBlock3);
         flowsToExecute.add(ebb3);
 
         execution.setVariable("flowsToExecute", flowsToExecute);
@@ -262,19 +272,23 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         execution.setVariable("resourceName", EMPTY_STRING);
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList<>();
         BuildingBlock buildingBlock1 = new BuildingBlock().setBpmnFlowName("AssignServiceInstanceBB");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(buildingBlock1);
         flowsToExecute.add(ebb1);
 
         BuildingBlock buildingBlock2 = new BuildingBlock().setBpmnFlowName("CreateNetworkCollectionBB");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(buildingBlock2);
         flowsToExecute.add(ebb2);
 
         BuildingBlock buildingBlock3 = new BuildingBlock().setBpmnFlowName("AssignNetworkBB");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(buildingBlock3);
         flowsToExecute.add(ebb3);
 
         BuildingBlock buildingBlock4 = new BuildingBlock().setBpmnFlowName("CreateNetworkBB");
-        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock4);
+        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock();
+        ebb4.setBuildingBlock(buildingBlock4);
         flowsToExecute.add(ebb4);
 
         execution.setVariable("flowsToExecute", flowsToExecute);
@@ -298,15 +312,18 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList<>();
 
         BuildingBlock buildingBlock1 = new BuildingBlock().setBpmnFlowName("AssignVfModuleBB");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(buildingBlock1);
         flowsToExecute.add(ebb1);
 
         BuildingBlock buildingBlock2 = new BuildingBlock().setBpmnFlowName("CreateVfModuleBB");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(buildingBlock2);
         flowsToExecute.add(ebb2);
 
         BuildingBlock buildingBlock3 = new BuildingBlock().setBpmnFlowName("ActivateVfModuleBB");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(buildingBlock3);
         flowsToExecute.add(ebb3);
 
         execution.setVariable("flowsToExecute", flowsToExecute);
@@ -327,24 +344,29 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         execution.setVariable("resourceName", "VfModule");
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList<>();
         BuildingBlock buildingBlock1 = new BuildingBlock().setBpmnFlowName("AssignVfModuleBB");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(buildingBlock1);
         flowsToExecute.add(ebb1);
 
         BuildingBlock buildingBlock2 = new BuildingBlock().setBpmnFlowName("CreateVfModuleBB");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(buildingBlock2);
         flowsToExecute.add(ebb2);
 
         BuildingBlock buildingBlock3 = new BuildingBlock().setBpmnFlowName("ActivateVfModuleBB");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(buildingBlock3);
         flowsToExecute.add(ebb3);
 
 
         BuildingBlock buildingBlock4 = new BuildingBlock().setBpmnFlowName("ChangeModelVnfBB");
-        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock4);
+        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock();
+        ebb4.setBuildingBlock(buildingBlock4);
         flowsToExecute.add(ebb4);
 
         BuildingBlock buildingBlock5 = new BuildingBlock().setBpmnFlowName("ChangeModelServiceInstanceBB");
-        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock5);
+        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock();
+        ebb5.setBuildingBlock(buildingBlock5);
         flowsToExecute.add(ebb5);
 
         execution.setVariable("flowsToExecute", flowsToExecute);
@@ -367,19 +389,23 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList<>();
 
         BuildingBlock buildingBlock1 = new BuildingBlock().setBpmnFlowName("AssignVfModuleBB");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(buildingBlock1);
         flowsToExecute.add(ebb1);
 
         BuildingBlock buildingBlock2 = new BuildingBlock().setBpmnFlowName("CreateVfModuleBB");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(buildingBlock2);
         flowsToExecute.add(ebb2);
 
         BuildingBlock buildingBlock3 = new BuildingBlock().setBpmnFlowName("ActivateVfModuleBB");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(buildingBlock3);
         flowsToExecute.add(ebb3);
 
         BuildingBlock buildingBlock4 = new BuildingBlock().setBpmnFlowName("AddFabricConfigurationBB");
-        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock4);
+        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock();
+        ebb4.setBuildingBlock(buildingBlock4);
         flowsToExecute.add(ebb4);
 
         execution.setVariable("flowsToExecute", flowsToExecute);
@@ -403,15 +429,18 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         execution.setVariable("resourceName", EMPTY_STRING);
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList<>();
         BuildingBlock buildingBlock1 = new BuildingBlock().setBpmnFlowName("AssignVfModuleBB");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(buildingBlock1);
         flowsToExecute.add(ebb1);
 
         BuildingBlock buildingBlock2 = new BuildingBlock().setBpmnFlowName("CreateVfModuleBB");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(buildingBlock2);
         flowsToExecute.add(ebb2);
 
         BuildingBlock buildingBlock3 = new BuildingBlock().setBpmnFlowName("ActivateVfModuleBB");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(buildingBlock3);
         flowsToExecute.add(ebb3);
 
         execution.setVariable("flowsToExecute", flowsToExecute);
@@ -432,43 +461,53 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         execution.setVariable("resourceName", EMPTY_STRING);
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList<>();
         BuildingBlock buildingBlock1 = new BuildingBlock().setBpmnFlowName("VNFCheckPserversLockedFlagActivity");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(buildingBlock1);
         flowsToExecute.add(ebb1);
 
         BuildingBlock buildingBlock2 = new BuildingBlock().setBpmnFlowName("VNFCheckInMaintFlagActivity");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(buildingBlock2);
         flowsToExecute.add(ebb2);
 
         BuildingBlock buildingBlock3 = new BuildingBlock().setBpmnFlowName("VNFSetInMaintFlagActivity");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(buildingBlock3);
         flowsToExecute.add(ebb3);
 
         BuildingBlock buildingBlock4 = new BuildingBlock().setBpmnFlowName("VNFCheckClosedLoopDisabledFlagActivity");
-        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock4);
+        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock();
+        ebb4.setBuildingBlock(buildingBlock4);
         flowsToExecute.add(ebb4);
 
         BuildingBlock buildingBlock5 = new BuildingBlock().setBpmnFlowName("VNFSetClosedLoopDisabledFlagActivity");
-        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock5);
+        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock();
+        ebb5.setBuildingBlock(buildingBlock5);
         flowsToExecute.add(ebb5);
 
         BuildingBlock buildingBlock6 = new BuildingBlock().setBpmnFlowName("VNFLockActivity");
-        ExecuteBuildingBlock ebb6 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock6);
+        ExecuteBuildingBlock ebb6 = new ExecuteBuildingBlock();
+        ebb6.setBuildingBlock(buildingBlock6);
         flowsToExecute.add(ebb6);
 
         BuildingBlock buildingBlock7 = new BuildingBlock().setBpmnFlowName("VNFUpgradePreCheckActivity");
-        ExecuteBuildingBlock ebb7 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock7);
+        ExecuteBuildingBlock ebb7 = new ExecuteBuildingBlock();
+        ebb7.setBuildingBlock(buildingBlock7);
         flowsToExecute.add(ebb7);
 
         BuildingBlock buildingBlock8 = new BuildingBlock().setBpmnFlowName("VNFQuiesceTrafficActivity");
-        ExecuteBuildingBlock ebb8 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock8);
+        ExecuteBuildingBlock ebb8 = new ExecuteBuildingBlock();
+        ebb8.setBuildingBlock(buildingBlock8);
         flowsToExecute.add(ebb8);
 
         BuildingBlock buildingBlock9 = new BuildingBlock().setBpmnFlowName("VNFStopActivity");
-        ExecuteBuildingBlock ebb9 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock9);
+        ExecuteBuildingBlock ebb9 = new ExecuteBuildingBlock();
+        ebb9.setBuildingBlock(buildingBlock9);
         flowsToExecute.add(ebb9);
 
         BuildingBlock buildingBlock10 = new BuildingBlock().setBpmnFlowName("VNFSnapShotActivity");
-        ExecuteBuildingBlock ebb10 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock10);
+        ExecuteBuildingBlock ebb10 = new ExecuteBuildingBlock();
+        ebb10.setBuildingBlock(buildingBlock10);
         flowsToExecute.add(ebb10);
 
         execution.setVariable("flowsToExecute", flowsToExecute);
@@ -493,27 +532,33 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         execution.setVariable("resourceName", EMPTY_STRING);
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList<>();
         BuildingBlock buildingBlock1 = new BuildingBlock().setBpmnFlowName("VNFCheckPserversLockedFlagActivity");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(buildingBlock1);
         flowsToExecute.add(ebb1);
 
         BuildingBlock buildingBlock2 = new BuildingBlock().setBpmnFlowName("VNFCheckInMaintFlagActivity");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(buildingBlock2);
         flowsToExecute.add(ebb2);
 
         BuildingBlock buildingBlock3 = new BuildingBlock().setBpmnFlowName("VNFSetInMaintFlagActivity");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(buildingBlock3);
         flowsToExecute.add(ebb3);
 
         BuildingBlock buildingBlock4 = new BuildingBlock().setBpmnFlowName("VNFCheckClosedLoopDisabledFlagActivity");
-        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock4);
+        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock();
+        ebb4.setBuildingBlock(buildingBlock4);
         flowsToExecute.add(ebb4);
 
         BuildingBlock buildingBlock5 = new BuildingBlock().setBpmnFlowName("VNFSetClosedLoopDisabledFlagActivity");
-        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock5);
+        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock();
+        ebb5.setBuildingBlock(buildingBlock5);
         flowsToExecute.add(ebb5);
 
         BuildingBlock buildingBlock6 = new BuildingBlock().setBpmnFlowName("VNFHealthCheckActivity");
-        ExecuteBuildingBlock ebb6 = new ExecuteBuildingBlock().setBuildingBlock(buildingBlock6);
+        ExecuteBuildingBlock ebb6 = new ExecuteBuildingBlock();
+        ebb6.setBuildingBlock(buildingBlock6);
         flowsToExecute.add(ebb6);
 
         execution.setVariable("flowsToExecute", flowsToExecute);
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksUpdateReqDbTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksUpdateReqDbTest.java
index 73aace7592..e064fb0b64 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksUpdateReqDbTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksUpdateReqDbTest.java
@@ -68,10 +68,12 @@ public class WorkflowActionBBTasksUpdateReqDbTest extends BaseTaskTest {
     public void getUpdatedRequestTest() throws Exception {
         List<ExecuteBuildingBlock> flowsToExecute = new ArrayList();
         BuildingBlock bb1 = new BuildingBlock().setBpmnFlowName("CreateNetworkBB");
-        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock().setBuildingBlock(bb1);
+        ExecuteBuildingBlock ebb1 = new ExecuteBuildingBlock();
+        ebb1.setBuildingBlock(bb1);
         flowsToExecute.add(ebb1);
         BuildingBlock bb2 = new BuildingBlock().setBpmnFlowName("ActivateNetworkBB");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(bb2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(bb2);
         flowsToExecute.add(ebb2);
         String requestId = "requestId";
         execution.setVariable("mso-request-id", requestId);
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 e24eaf0581..c762c16d92 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
@@ -1647,10 +1647,19 @@ public class WorkflowActionTest extends BaseTaskTest {
         List<OrchestrationFlow> orchFlows = createFlowList("DeactivateVfModuleBB", "DeleteVfModuleBB",
                 "UnassignVfModuleBB", "DeactivateFabricConfigurationBB", "UnassignFabricConfigurationBB");
 
-        ConfigBuildingBlocksDataObject dataObj = new ConfigBuildingBlocksDataObject().setsIRequest(sIRequest)
-                .setOrchFlows(orchFlows).setRequestId(requestId).setResourceKey(resourceKey).setApiVersion(apiVersion)
-                .setResourceId(resourceId).setRequestAction(requestAction).setaLaCarte(aLaCarte).setVnfType(vnfType)
-                .setWorkflowResourceIds(workflowResourceIds).setRequestDetails(requestDetails).setExecution(execution);
+        ConfigBuildingBlocksDataObject dataObj = new ConfigBuildingBlocksDataObject();
+        dataObj.setsIRequest(sIRequest);
+        dataObj.setOrchFlows(orchFlows);
+        dataObj.setRequestId(requestId);
+        dataObj.setResourceKey(resourceKey);
+        dataObj.setApiVersion(apiVersion);
+        dataObj.setResourceId(resourceId);
+        dataObj.setRequestAction(requestAction);
+        dataObj.setaLaCarte(aLaCarte);
+        dataObj.setVnfType(vnfType);
+        dataObj.setWorkflowResourceIds(workflowResourceIds);
+        dataObj.setRequestDetails(requestDetails);
+        dataObj.setExecution(execution);
 
         org.onap.aai.domain.yang.GenericVnf vnf = new org.onap.aai.domain.yang.GenericVnf();
         vnf.setVnfId("vnf0");
@@ -1807,27 +1816,33 @@ public class WorkflowActionTest extends BaseTaskTest {
         List<ExecuteBuildingBlock> executeFlows = new ArrayList<>();
 
         BuildingBlock bb = new BuildingBlock().setBpmnFlowName("AssignNetworkBB").setKey("0");
-        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock().setBuildingBlock(bb);
+        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock();
+        ebb.setBuildingBlock(bb);
         executeFlows.add(ebb);
 
         BuildingBlock bb2 = new BuildingBlock().setBpmnFlowName("AssignNetworkBB").setKey("1");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(bb2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(bb2);
         executeFlows.add(ebb2);
 
         BuildingBlock bb3 = new BuildingBlock().setBpmnFlowName("CreateNetworkBB").setKey("0");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(bb3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(bb3);
         executeFlows.add(ebb3);
 
         BuildingBlock bb4 = new BuildingBlock().setBpmnFlowName("CreateNetworkBB").setKey("1");
-        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock().setBuildingBlock(bb4);
+        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock();
+        ebb4.setBuildingBlock(bb4);
         executeFlows.add(ebb4);
 
         BuildingBlock bb5 = new BuildingBlock().setBpmnFlowName("ActivateNetworkBB").setKey("0");
-        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock().setBuildingBlock(bb5);
+        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock();
+        ebb5.setBuildingBlock(bb5);
         executeFlows.add(ebb5);
 
         BuildingBlock bb6 = new BuildingBlock().setBpmnFlowName("ActivateNetworkBB").setKey("1");
-        ExecuteBuildingBlock ebb6 = new ExecuteBuildingBlock().setBuildingBlock(bb6);
+        ExecuteBuildingBlock ebb6 = new ExecuteBuildingBlock();
+        ebb6.setBuildingBlock(bb6);
         executeFlows.add(ebb6);
 
         List<ExecuteBuildingBlock> sorted =
@@ -1841,27 +1856,33 @@ public class WorkflowActionTest extends BaseTaskTest {
         List<ExecuteBuildingBlock> executeFlows = new ArrayList<>();
 
         BuildingBlock bb = new BuildingBlock().setBpmnFlowName("DeactivateNetworkBB").setKey("0");
-        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock().setBuildingBlock(bb);
+        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock();
+        ebb.setBuildingBlock(bb);
         executeFlows.add(ebb);
 
         BuildingBlock bb2 = new BuildingBlock().setBpmnFlowName("DeactivateNetworkBB").setKey("1");
-        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock().setBuildingBlock(bb2);
+        ExecuteBuildingBlock ebb2 = new ExecuteBuildingBlock();
+        ebb2.setBuildingBlock(bb2);
         executeFlows.add(ebb2);
 
         BuildingBlock bb3 = new BuildingBlock().setBpmnFlowName("DeleteNetworkBB").setKey("0");
-        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock().setBuildingBlock(bb3);
+        ExecuteBuildingBlock ebb3 = new ExecuteBuildingBlock();
+        ebb3.setBuildingBlock(bb3);
         executeFlows.add(ebb3);
 
         BuildingBlock bb4 = new BuildingBlock().setBpmnFlowName("DeleteNetworkBB").setKey("1");
-        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock().setBuildingBlock(bb4);
+        ExecuteBuildingBlock ebb4 = new ExecuteBuildingBlock();
+        ebb4.setBuildingBlock(bb4);
         executeFlows.add(ebb4);
 
         BuildingBlock bb5 = new BuildingBlock().setBpmnFlowName("UnassignNetworkBB").setKey("0");
-        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock().setBuildingBlock(bb5);
+        ExecuteBuildingBlock ebb5 = new ExecuteBuildingBlock();
+        ebb5.setBuildingBlock(bb5);
         executeFlows.add(ebb5);
 
         BuildingBlock bb6 = new BuildingBlock().setBpmnFlowName("UnassignNetworkBB").setKey("1");
-        ExecuteBuildingBlock ebb6 = new ExecuteBuildingBlock().setBuildingBlock(bb6);
+        ExecuteBuildingBlock ebb6 = new ExecuteBuildingBlock();
+        ebb6.setBuildingBlock(bb6);
         executeFlows.add(ebb6);
 
         List<ExecuteBuildingBlock> sorted =
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/MultiStageSkipListenerTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/MultiStageSkipListenerTest.java
index 9d208f41e8..1b4ddf71c2 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/MultiStageSkipListenerTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/listeners/MultiStageSkipListenerTest.java
@@ -91,8 +91,10 @@ public class MultiStageSkipListenerTest {
         workflowResourceIds.setServiceInstanceId("serviceInstanceId");
         workflowResourceIds.setVnfId(vnfId);
         BuildingBlock bb = new BuildingBlock().setBpmnFlowName("AssignVfModuleBB");
-        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock().setResourceId(vfModuleId).setBuildingBlock(bb)
-                .setWorkflowResourceIds(workflowResourceIds);
+        ExecuteBuildingBlock ebb = new ExecuteBuildingBlock();
+        ebb.setResourceId(vfModuleId);
+        ebb.setBuildingBlock(bb);
+        ebb.setWorkflowResourceIds(workflowResourceIds);
         flowsToExecute.add(ebb);
         flowsToExecute.add(new ExecuteBuildingBlock());
         flowsToExecute.add(new ExecuteBuildingBlock());