AT&T 1712 and 1802 release code

[so.git] / common / src / main / java / org / openecomp / mso / serviceinstancebeans / RelatedInstance.java

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstance.java b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RelatedInstance.java
similarity index 63%
rename from mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstance.java
rename to common/src/main/java/org/openecomp/mso/serviceinstancebeans/RelatedInstance.java
index 5a7699b..8e4dbd0 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/serviceinstancebeans/RelatedInstance.java
+++ b/common/src/main/java/org/openecomp/mso/serviceinstancebeans/RelatedInstance.java
@@ -18,16 +18,29 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.openecomp.mso.apihandlerinfra.serviceinstancebeans;
+package org.openecomp.mso.serviceinstancebeans;
 
-import org.codehaus.jackson.map.annotate.JsonSerialize;
+import java.io.Serializable;
 
-@JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)
-public class RelatedInstance {
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.annotation.JsonInclude.Include;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+@JsonRootName(value = "relatedInstance")
+@JsonInclude(Include.NON_DEFAULT)
+public class RelatedInstance implements Serializable {
        
+       private static final long serialVersionUID = 137250604008221644L;
+       @JsonProperty("instanceName")
        protected String instanceName;
+       @JsonProperty("instanceId")
        protected String instanceId;
+       @JsonProperty("modelInfo")
        protected ModelInfo modelInfo;
+       //Configuration field
+       @JsonProperty("instanceDirection")
+       protected InstanceDirection instanceDirection;
        
        
        public String getInstanceName() {
@@ -48,7 +61,10 @@ public class RelatedInstance {
        public void setModelInfo(ModelInfo modelInfo) {
                this.modelInfo = modelInfo;
        }
-       
-       
-
+       public InstanceDirection getInstanceDirection() {
+               return instanceDirection;
+       }
+       public void setInstanceDirection(InstanceDirection instanceDirection) {
+               this.instanceDirection = instanceDirection;
+       }
 }