Removed JsonIgnore for resourceInput

Removed JsonIgnore for resourceinput, it was earlier made @jsonIgnore
to fix mapping (SO-1358).

Change-Id: I7eb7160be220d445bec396d4c5eb3fd913e66f9e
Issue-ID: SO-1816
Signed-off-by: subhash kumar singh <subhash.kumar.singh@huawei.com>

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfResource.java b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfResource.java
index f66ad36..a69a49b 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfResource.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/onap/so/bpmn/core/domain/VnfResource.java
@@ -32,6 +32,7 @@ import com.fasterxml.jackson.annotation.JsonRootName;
  * Encapsulates VNF resource data set
  *
  */
+@JsonIgnoreProperties(ignoreUnknown = true)
 @JsonRootName("vnfResource")
 public class VnfResource extends Resource {
 
@@ -59,7 +60,7 @@ public class VnfResource extends Resource {
     private String multiStageDesign;
     private String orchestrationStatus;
 
-    @JsonIgnore
+    @JsonProperty("resourceInput")
     private String resourceInput;
 
     /*

diff --git a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/VnfResourceTest.java b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/VnfResourceTest.java
index 09bcfe8..b23633b 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/VnfResourceTest.java
+++ b/bpmn/MSOCoreBPMN/src/test/java/org/onap/so/bpmn/core/domain/VnfResourceTest.java
@@ -58,6 +58,19 @@ public class VnfResourceTest {
         VnfResource vnfResource = objectMapper.readValue(jsonStr, VnfResource.class);
 
         assertTrue(vnfResource != null);
+        assertEquals("sample", vnfResource.getResourceInput());
+        assertEquals("home", vnfResource.getVnfHostname());
+    }
+
+    @Test
+    public void vnfResourceMapperTestNoResourceInput() throws IOException {
+        String jsonStr = "{\"vnfHostname\": \"home\"}";
+        ObjectMapper objectMapper = new ObjectMapper();
+        VnfResource vnfResource = objectMapper.readValue(jsonStr, VnfResource.class);
+
+        assertTrue(vnfResource != null);
+        assertEquals(null, vnfResource.getResourceInput());
+        assertEquals("home", vnfResource.getVnfHostname());
     }
 
     @Test