Merge "Do not edit calling argument"

diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
index 6cb522e,be2abb2..343b25e
--- 1/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
--- 2/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
@@@ -474,12 -491,14 +474,12 @@@ public class WorkflowActionBBTasks 
          BuildingBlock buildingBlock =
                  new BuildingBlock().setBpmnFlowName(bbName).setMsoId(UUID.randomUUID().toString());
  
-         WorkflowResourceIds workflowResourceIds = ebb.getWorkflowResourceIds();
+         WorkflowResourceIds workflowResourceIds = new WorkflowResourceIds(ebb.getWorkflowResourceIds());
          workflowResourceIds.setConfigurationId(configurationId);
 -        ExecuteBuildingBlock configBB = new ExecuteBuildingBlock().setaLaCarte(ebb.isaLaCarte())
 -                .setApiVersion(ebb.getApiVersion()).setRequestAction(ebb.getRequestAction())
 -                .setVnfType(ebb.getVnfType()).setRequestId(ebb.getRequestId())
 +        return new ExecuteBuildingBlock().setaLaCarte(ebb.isaLaCarte()).setApiVersion(ebb.getApiVersion())
 +                .setRequestAction(ebb.getRequestAction()).setVnfType(ebb.getVnfType()).setRequestId(ebb.getRequestId())
                  .setRequestDetails(ebb.getRequestDetails()).setBuildingBlock(buildingBlock)
                  .setWorkflowResourceIds(workflowResourceIds).setConfigurationResourceKeys(configurationResourceKeys);
 -        return configBB;
      }
  
      protected void setInstanceName(String resourceId, WorkflowType resourceType, InfraActiveRequests request) {

diff --cc bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
index b538718,0948436..1aa7640
--- 1/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
--- 2/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
@@@ -53,8 -55,8 +55,9 @@@ import org.springframework.core.env.Env
  import java.util.ArrayList;
  import java.util.List;
  import java.util.Optional;
+ import static org.assertj.core.api.Assertions.assertThat;
  import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
  import static org.junit.Assert.assertTrue;
  import static org.mockito.ArgumentMatchers.anyObject;
  import static org.mockito.ArgumentMatchers.anyString;