Methods with same name get mixed up

Methods with the same name and number of arguments but operating on different execution types get sometimes mixed up in Camunda.

Issue-ID: SO-3270
Signed-off-by: Kuleshov, Elena (ek1439) <evn@att.com>
Change-Id: I40319a185644c93c86a7883765a615129ee19f1e

diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java
index 55d7681..e5d8a92 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtils.java
@@ -92,7 +92,7 @@ public class AbstractCDSProcessingBBUtils {
      *
      * @param execution BuildingBlockExecution object
      */
-    public void constructExecutionServiceInputObject(BuildingBlockExecution execution) {
+    public void constructExecutionServiceInputObjectBB(BuildingBlockExecution execution) {
         logger.trace("Start AbstractCDSProcessingBBUtils.preProcessRequest for BuildingBlockExecution object.");
 
         try {
@@ -136,7 +136,7 @@ public class AbstractCDSProcessingBBUtils {
      *
      * @param execution BuildingBlockExecution object
      */
-    public void sendRequestToCDSClient(BuildingBlockExecution execution) {
+    public void sendRequestToCDSClientBB(BuildingBlockExecution execution) {
 
         logger.trace("Start AbstractCDSProcessingBBUtils.sendRequestToCDSClient for BuildingBlockExecution object.");
         try {

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtilsTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtilsTest.java
index 10844ec..40b0ed5 100644 (file)
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtilsTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/client/cds/AbstractCDSProcessingBBUtilsTest.java
@@ -97,7 +97,7 @@ public class AbstractCDSProcessingBBUtilsTest {
         BuildingBlockExecution execution = mock(BuildingBlockExecution.class);
         when(execution.getVariable("executionObject")).thenReturn(abstractCDSPropertiesBean);
 
-        abstractCDSProcessingBBUtils.constructExecutionServiceInputObject(execution);
+        abstractCDSProcessingBBUtils.constructExecutionServiceInputObjectBB(execution);
         verify(exceptionUtil, times(0)).buildAndThrowWorkflowException(any(BuildingBlockExecution.class), anyInt(),
                 any(Exception.class));
     }
@@ -107,7 +107,7 @@ public class AbstractCDSProcessingBBUtilsTest {
 
         BuildingBlockExecution execution = mock(BuildingBlockExecution.class);
         when(execution.getVariable("executionServiceInput")).thenReturn(abstractCDSPropertiesBean);
-        abstractCDSProcessingBBUtils.sendRequestToCDSClient(execution);
+        abstractCDSProcessingBBUtils.sendRequestToCDSClientBB(execution);
         verify(exceptionUtil, times(1)).buildAndThrowWorkflowException(any(BuildingBlockExecution.class), anyInt(),
                 any(Exception.class));
 

diff --git a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AbstractCDSProcessingBB.bpmn b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AbstractCDSProcessingBB.bpmn
index ccd6b0b..a69ee25 100644 (file)
--- a/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AbstractCDSProcessingBB.bpmn
+++ b/bpmn/so-bpmn-building-blocks/src/main/resources/subprocess/BuildingBlock/AbstractCDSProcessingBB.bpmn
@@ -10,11 +10,11 @@
     <bpmn:endEvent id="EndEvent_1h3epjc">
       <bpmn:incoming>SequenceFlow_161g9uz</bpmn:incoming>
     </bpmn:endEvent>
-    <bpmn:serviceTask id="Task_06n9c9v" name="Get Required data to call CDS Client" camunda:expression="${AbstractCDSProcessingBBUtils.constructExecutionServiceInputObject(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="Task_06n9c9v" name="Get Required data to call CDS Client" camunda:expression="${AbstractCDSProcessingBBUtils.constructExecutionServiceInputObjectBB(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>SequenceFlow_02v5z4h</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_0gksy4i</bpmn:outgoing>
     </bpmn:serviceTask>
-    <bpmn:serviceTask id="Task_0kjfr5o" name="CDS&#10;(Call SelfServiceAPI)&#10;" camunda:expression="${AbstractCDSProcessingBBUtils.sendRequestToCDSClient(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
+    <bpmn:serviceTask id="Task_0kjfr5o" name="CDS&#10;(Call SelfServiceAPI)&#10;" camunda:expression="${AbstractCDSProcessingBBUtils.sendRequestToCDSClientBB(InjectExecution.execute(execution, execution.getVariable(&#34;gBuildingBlockExecution&#34;)))}">
       <bpmn:incoming>SequenceFlow_0gksy4i</bpmn:incoming>
       <bpmn:outgoing>SequenceFlow_161g9uz</bpmn:outgoing>
     </bpmn:serviceTask>
@@ -47,4 +47,4 @@
       </bpmndi:BPMNShape>
     </bpmndi:BPMNPlane>
   </bpmndi:BPMNDiagram>
-</bpmn:definitions>
+</bpmn:definitions>
\ No newline at end of file

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericCDSProcessingBB.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericCDSProcessingBB.java
index d78b7c3..1fae5ce 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericCDSProcessingBB.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericCDSProcessingBB.java
@@ -84,7 +84,7 @@ public class GenericCDSProcessingBB implements ControllerRunnable<BuildingBlockE
     @Override
     public void run(ControllerContext<BuildingBlockExecution> context) {
         BuildingBlockExecution obj = context.getExecution();
-        cdsDispather.constructExecutionServiceInputObject(obj);
-        cdsDispather.sendRequestToCDSClient(obj);
+        cdsDispather.constructExecutionServiceInputObjectBB(obj);
+        cdsDispather.sendRequestToCDSClientBB(obj);
     }
 }

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericPnfCDSControllerRunnableBB.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericPnfCDSControllerRunnableBB.java
index 3b81d52..fe6d9de 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericPnfCDSControllerRunnableBB.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericPnfCDSControllerRunnableBB.java
@@ -94,8 +94,8 @@ public class GenericPnfCDSControllerRunnableBB implements ControllerRunnable<Bui
     @Override
     public void run(ControllerContext<BuildingBlockExecution> controllerContext) {
         BuildingBlockExecution buildingBlockExecution = controllerContext.getExecution();
-        abstractCDSProcessingBBUtils.constructExecutionServiceInputObject(buildingBlockExecution);
-        abstractCDSProcessingBBUtils.sendRequestToCDSClient(buildingBlockExecution);
+        abstractCDSProcessingBBUtils.constructExecutionServiceInputObjectBB(buildingBlockExecution);
+        abstractCDSProcessingBBUtils.sendRequestToCDSClientBB(buildingBlockExecution);
     }
 
     private AbstractCDSPropertiesBean prepareAndSetCdsPropertyBean(BuildingBlockExecution buildingBlockExecution) {

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericCDSProcessingBBTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericCDSProcessingBBTest.java
index 24bbc78..e360dc7 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericCDSProcessingBBTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericCDSProcessingBBTest.java
@@ -102,8 +102,8 @@ public class GenericCDSProcessingBBTest extends BaseTaskTest {
         AbstractCDSPropertiesBean cdsBean = prepareCDSBean();
 
         doReturn(cdsBean).when(generatePayloadForCds).buildCdsPropertiesBean(buildingBlockExecution);
-        doNothing().when(cdsDispather).constructExecutionServiceInputObject(buildingBlockExecution);
-        doNothing().when(cdsDispather).sendRequestToCDSClient(buildingBlockExecution);
+        doNothing().when(cdsDispather).constructExecutionServiceInputObjectBB(buildingBlockExecution);
+        doNothing().when(cdsDispather).sendRequestToCDSClientBB(buildingBlockExecution);
 
         // when
         Boolean isUnderstandable = controllerRunnable.understand(controllerContext);