Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / java / org / onap / vid / aai / model / AaiGetPnfs / Pnf.java

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java
index 00a731a..d359474 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetPnfs/Pnf.java
@@ -1,31 +1,25 @@
 package org.onap.vid.aai.model.AaiGetPnfs;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import org.onap.vid.aai.model.AaiRelationResponse;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Pnf extends AaiRelationResponse {
 
-    @JsonProperty("pnf-name")
-    public String pnfName;
-    @JsonProperty("pnf-name2")
-    public String pnfName2;
-    @JsonProperty("pnf-name2-source")
-    public String pnfName2Source;
-    @JsonProperty("pnf-id")
-    public String pnfId;
-    @JsonProperty("equip-type")
-    public String equipType;
-    @JsonProperty("equip-vendor")
-    public String equipVendor;
-    @JsonProperty("equip-model")
-    public String equipModel;
+    private String pnfName;
+    private String pnfName2;
+    private String pnfName2Source;
+    private String pnfId;
+    private String equipType;
+    private String equipVendor;
+    private String equipModel;
 
     public String getPnfName() {
         return pnfName;
     }
 
+    @JsonAlias("pnf-name")
     public void setPnfName(String pnfName) {
         this.pnfName = pnfName;
     }
@@ -34,6 +28,7 @@ public class Pnf extends AaiRelationResponse {
         return equipType;
     }
 
+    @JsonAlias("equip-type")
     public void setEquipType(String equipType) {
         this.equipType = equipType;
     }
@@ -42,6 +37,7 @@ public class Pnf extends AaiRelationResponse {
         return equipVendor;
     }
 
+    @JsonAlias("equip-vendor")
     public void setEquipVendor(String equipVendor) {
         this.equipVendor = equipVendor;
     }
@@ -50,6 +46,7 @@ public class Pnf extends AaiRelationResponse {
         return pnfName2;
     }
 
+    @JsonAlias("pnf-name2")
     public void setPnfName2(String pnfName2) {
         this.pnfName2 = pnfName2;
     }
@@ -58,6 +55,7 @@ public class Pnf extends AaiRelationResponse {
         return pnfId;
     }
 
+    @JsonAlias("pnf-id")
     public void setPnfId(String pnfId) {
         this.pnfId = pnfId;
     }
@@ -66,12 +64,14 @@ public class Pnf extends AaiRelationResponse {
         return equipModel;
     }
 
+    @JsonAlias("equip-model")
     public void setEquipModel(String equipModel) {
         this.equipModel = equipModel;
     }
 
     public String getPnfName2Source() { return pnfName2Source; }
 
+    @JsonAlias("pnf-name2-source")
     public void setPnfName2Source(String pnfName2Source) { this.pnfName2Source = pnfName2Source; }
 }