From: Steve Smokowski <ss835w@att.com>
Date: Tue, 7 Jul 2020 15:57:21 +0000 (+0000)
Subject: Merge "Do not edit calling argument"
X-Git-Tag: 1.7.1~77
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=05d5b97f40d72c494ad95152a31ec8b931db94eb;p=so.git

Merge "Do not edit calling argument"
---

05d5b97f40d72c494ad95152a31ec8b931db94eb
diff --cc bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasks.java
index 6cb522e403,be2abb21a2..343b25eb97
--- a/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 b538718bd0,0948436345..1aa7640492
--- 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
@@@ -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;