Merge from ECOMP's repository

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

diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/OwningEntity.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/OwningEntity.java
index edf5242..366a108 100644 (file)
--- a/vid-app-common/src/main/java/org/onap/vid/aai/model/OwningEntity.java
+++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/OwningEntity.java
@@ -1,33 +1,29 @@
 package org.onap.vid.aai.model;
 
 
-import org.codehaus.jackson.annotate.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonAlias;
 
 /**
  * Created by moriya1 on 08/10/2017.
  */
 public class OwningEntity extends AaiRelationResponse {
-    @JsonProperty("owning-entity-id")
     private String owningEntityId;
-    @JsonProperty("owning-entity-name")
     private String owningEntityName;
 
-    @JsonProperty("owning-entity-id")
     public String getOwningEntityId() {
         return owningEntityId;
     }
 
-    @JsonProperty("owning-entity-id")
+    @JsonAlias("owning-entity-id")
     public void setOwningEntityId(String owningEntityId) {
         this.owningEntityId = owningEntityId;
     }
 
-    @JsonProperty("owning-entity-name")
     public String getOwningEntityName() {
         return owningEntityName;
     }
 
-    @JsonProperty("owning-entity-name")
+    @JsonAlias("owning-entity-name")
     public void setOwningEntityName(String owningEntityName) {
         this.owningEntityName = owningEntityName;
     }