Switched name and id, and updated tests

Switched name and id, and updated tests

Change-Id: Ica8251be71d2fd9362e4f209755d80bc36ccbf66
Issue-ID: SO-2000
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/StackStatusHandler.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/StackStatusHandler.java
index df173c0..625b584 100644 (file)
--- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/StackStatusHandler.java
+++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/StackStatusHandler.java
@@ -28,8 +28,8 @@ public class StackStatusHandler {
             String requestId = MDC.get(ONAPLogConstants.MDCs.REQUEST_ID);
             String stackStatus = mapper.writeValueAsString(stack);
             RequestProcessingData requestProcessingData =
-                    requestDBClient.getRequestProcessingDataBySoRequestIdAndNameAndGrouping(requestId, stack.getId(),
-                            stack.getStackName());
+                    requestDBClient.getRequestProcessingDataBySoRequestIdAndNameAndGrouping(requestId,
+                            stack.getStackName(), stack.getId());
             if (requestProcessingData == null) {
                 requestProcessingData = new RequestProcessingData();
                 requestProcessingData.setGroupingId(stack.getId());

diff --git a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/StackStatusHandlerTest.java b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/StackStatusHandlerTest.java
index 54e2bbf..0d5cd6a 100644 (file)
--- a/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/StackStatusHandlerTest.java
+++ b/adapters/mso-adapter-utils/src/test/java/org/onap/so/openstack/utils/StackStatusHandlerTest.java
@@ -33,7 +33,7 @@ public class StackStatusHandlerTest {
         requestProcessingData.setValue("testMe");
 
         doReturn(requestProcessingData).when(requestDBClient)
-                .getRequestProcessingDataBySoRequestIdAndNameAndGrouping(null, "id", "stackName");
+                .getRequestProcessingDataBySoRequestIdAndNameAndGrouping(null, "stackName", "id");
         Stack latestStack = new Stack();
         latestStack.setId("id");
         latestStack.setStackName("stackName");
@@ -48,8 +48,8 @@ public class StackStatusHandlerTest {
     @Test
     public final void record_Not_Exists_Test() throws MsoException, IOException {
         ArgumentCaptor<RequestProcessingData> requestCaptor = ArgumentCaptor.forClass(RequestProcessingData.class);
-        doReturn(null).when(requestDBClient).getRequestProcessingDataBySoRequestIdAndNameAndGrouping(null, "id",
-                "stackName");
+        doReturn(null).when(requestDBClient).getRequestProcessingDataBySoRequestIdAndNameAndGrouping(null, "stackName",
+                "id");
         Stack latestStack = new Stack();
         latestStack.setId("id");
         latestStack.setStackName("stackName");