From bb3126b06f81d9251e0d684590a3301b06c2802d Mon Sep 17 00:00:00 2001
From: Elena Kuleshov <EK1439@att.com>
Date: Sat, 17 Oct 2020 01:58:35 -0400
Subject: 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
---
 .../infrastructure/flowspecific/tasks/GenericCDSProcessingBB.java     | 4 ++--
 .../flowspecific/tasks/GenericPnfCDSControllerRunnableBB.java         | 4 ++--
 .../infrastructure/flowspecific/tasks/GenericCDSProcessingBBTest.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'bpmn/so-bpmn-tasks')

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 d78b7c3af0..1fae5ce06c 100644
--- 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 3b81d52703..fe6d9de199 100644
--- 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 24bbc78afb..e360dc7c42 100644
--- 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);
-- 
cgit 1.2.3-korg