diff options
| author |   Steve Smokowski <ss835w@att.com> | 2019-06-09 19:45:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-06-09 19:45:11 +0000 |
| commit | fabcae6be329ed3c2d9aa0bb763dfe6cbe66b62b (patch) | |
| tree | 0c795467fe21cbcf62a8b4db5f8c0d04f935c678 /adapters/mso-adapter-utils | |
| parent | 6370f8f99b9cea4e1b3e2010c380f6e9c22aa18f (diff) | |
| parent | 6ce8eb0b4cf2b5e082f1506067bb40173c0f4180 (diff) | |
Merge "Switched name and id, and updated tests"
Diffstat (limited to 'adapters/mso-adapter-utils')
2 files changed, 5 insertions, 5 deletions
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 df173c002d..625b584257 100644 --- 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 54e2bbf06d..0d5cd6a118 100644 --- 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"); |