Merge from ECOMP's repository

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

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/RelationshipData.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/RelationshipData.java
index 4153665..55a0b77 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/RelationshipData.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/RelationshipData.java
@@ -1,29 +1,29 @@
 package org.onap.vid.aai.model;
 
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class RelationshipData {
-       @JsonProperty("relationship-key")
-       public String getRelationshipKey() {
-               return relationshipKey;
-       }
-       @JsonProperty("relationship-key")
-       public void setRelationshipKey(String relationshipKey) {
-               this.relationshipKey = relationshipKey;
-       }
-       @JsonProperty("relationship-value")
-       public String getRelationshipValue() {
-               return relationshipValue;
-       }
-       @JsonProperty("relationship-value")
-       public void setRelationshipValue(String relationshipValue) {
-               this.relationshipValue = relationshipValue;
-       }
+    public String relationshipKey;
+    public String relationshipValue;
 
-       public String relationshipKey;
-       
-       public String relationshipValue;
+    public String getRelationshipKey() {
+        return relationshipKey;
+    }
+
+    @JsonAlias("relationship-key")
+    public void setRelationshipKey(String relationshipKey) {
+        this.relationshipKey = relationshipKey;
+    }
+
+    public String getRelationshipValue() {
+        return relationshipValue;
+    }
+
+    @JsonAlias("relationship-value")
+    public void setRelationshipValue(String relationshipValue) {
+        this.relationshipValue = relationshipValue;
+    }
 
 }