fix NPE SO Response

-change requestReference to requestReferences
-change mocks

Change-Id: Ia8173b6286d04ab78bd6c5766ad1e9c2c61ab153
Issue-ID: EXTAPI-68
Signed-off-by: romaingimbert <romain.gimbert@orange.com>

diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CreateServiceInstanceResponse.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CreateServiceInstanceResponse.java
index bfda46e..590bace 100644 (file)
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CreateServiceInstanceResponse.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/CreateServiceInstanceResponse.java
@@ -17,13 +17,13 @@ package org.onap.nbi.apis.serviceorder.model.consumer;
 
 public class CreateServiceInstanceResponse {
 
-    public RequestReference getRequestReference() {
-        return requestReference;
+    public RequestReferences getRequestReferences() {
+        return requestReferences;
     }
 
-    public void setRequestReference(RequestReference requestReference) {
-        this.requestReference = requestReference;
+    public void setRequestReferences(RequestReferences requestReferences) {
+        this.requestReferences = requestReferences;
     }
 
-    private RequestReference requestReference;
+    private RequestReferences requestReferences;
 }

diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReference.java b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReferences.java
similarity index 88%
rename from src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReference.java
rename to src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReferences.java
index 2d0b7c9..2f74f73 100644 (file)
--- a/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReference.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/model/consumer/RequestReferences.java
@@ -15,7 +15,7 @@
  */
 package org.onap.nbi.apis.serviceorder.model.consumer;
 
-public class RequestReference {
+public class RequestReferences {
 
     private String instanceId;
 
@@ -39,6 +39,6 @@ public class RequestReference {
 
     @Override
     public String toString() {
-        return "RequestReference{" + "instanceId='" + instanceId + '\'' + ", requestId='" + requestId + '\'' + '}';
+        return "RequestReferences{" + "instanceId='" + instanceId + '\'' + ", requestId='" + requestId + '\'' + '}';
     }
 }

diff --git a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
index 84a198c..f39ad1f 100644 (file)
--- a/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
+++ b/src/main/java/org/onap/nbi/apis/serviceorder/workflow/SOTaskProcessor.java
@@ -115,7 +115,7 @@ public class SOTaskProcessor {
                 updateServiceOrderItem(response.getBody(), serviceOrderItem);
 
                 if (response.getStatusCode() != HttpStatus.CREATED || response.getBody() == null
-                        || response.getBody().getRequestReference() == null) {
+                        || response.getBody().getRequestReferences() == null) {
                     serviceOrderItem.setState(StateType.FAILED);
                 } else {
                     serviceOrderItem.setState(StateType.INPROGRESS);
@@ -311,8 +311,8 @@ public class SOTaskProcessor {
             ServiceOrderItem orderItem) {
 
         if (createServiceInstanceResponse != null && !orderItem.getState().equals(StateType.FAILED)) {
-            orderItem.getService().setId(createServiceInstanceResponse.getRequestReference().getInstanceId());
-            orderItem.setRequestId(createServiceInstanceResponse.getRequestReference().getRequestId());
+            orderItem.getService().setId(createServiceInstanceResponse.getRequestReferences().getInstanceId());
+            orderItem.setRequestId(createServiceInstanceResponse.getRequestReferences().getRequestId());
         }
     }
 

diff --git a/src/test/resources/mappings/so_delete_service_instance.json b/src/test/resources/mappings/so_delete_service_instance.json
index fae7b9e..d89c184 100644 (file)
--- a/src/test/resources/mappings/so_delete_service_instance.json
+++ b/src/test/resources/mappings/so_delete_service_instance.json
@@ -9,7 +9,7 @@
             "Content-Type": "application/json"
         },
         "jsonBody": {
-            "requestReference": {
+            "requestReferences": {
                 "instanceId": "instanceId",
                 "requestId": "requestId"
             }

diff --git a/src/test/resources/mappings/so_post_create_service_instance.json b/src/test/resources/mappings/so_post_create_service_instance.json
index 239aecb..f5aaa90 100644 (file)
--- a/src/test/resources/mappings/so_post_create_service_instance.json
+++ b/src/test/resources/mappings/so_post_create_service_instance.json
@@ -9,7 +9,7 @@
             "Content-Type": "application/json"
         },
         "jsonBody": {
-            "requestReference": {
+            "requestReferences": {
                 "instanceId": "instanceId",
                 "requestId": "requestId"
             }