1 files changed, 141 insertions, 116 deletions

diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelInfo.java b/common/src/main/java/org/onap/so/serviceinstancebeans/ModelInfo.java
index 6976fb6791..946deefee7 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelInfo.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/ModelInfo.java
@@ -29,7 +29,6 @@
 package org.onap.so.serviceinstancebeans;
 
 import java.io.Serializable;
-
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude.Include;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -39,131 +38,157 @@ import com.fasterxml.jackson.annotation.JsonRootName;
 @JsonInclude(Include.NON_DEFAULT)
 public class ModelInfo implements Serializable {
 
-	private static final long serialVersionUID = 5281763573935476852L;
-	@JsonProperty("modelCustomizationName")
+    private static final long serialVersionUID = 5281763573935476852L;
+    @JsonProperty("modelCustomizationName")
     protected String modelCustomizationName;
-	@JsonProperty("modelInvariantId")
+    @JsonProperty("modelInvariantId")
     protected String modelInvariantId;
-	@JsonProperty("modelType")
-	protected ModelType modelType;
-	@JsonProperty("modelId")
-	protected String modelId;
-	//v2
-	@JsonProperty("modelNameVersionId")
+    @JsonProperty("modelType")
+    protected ModelType modelType;
+    @JsonProperty("modelId")
+    protected String modelId;
+    // v2
+    @JsonProperty("modelNameVersionId")
     protected String modelNameVersionId;
-	@JsonProperty("modelName")
+    @JsonProperty("modelName")
     protected String modelName;
-	@JsonProperty("modelVersion")
+    @JsonProperty("modelVersion")
     protected String modelVersion;
-	@JsonProperty("modelCustomizationUuid")
+    @JsonProperty("modelCustomizationUuid")
     protected String modelCustomizationUuid;
-    //v3
-	@JsonProperty("modelVersionId")
+    // v3
+    @JsonProperty("modelVersionId")
     protected String modelVersionId;
-	@JsonProperty("modelCustomizationId")
+    @JsonProperty("modelCustomizationId")
     protected String modelCustomizationId;
-	
-    //Decomposition fields
-	@JsonProperty("modelUuid")
+
+    // Decomposition fields
+    @JsonProperty("modelUuid")
     protected String modelUuid;
-	@JsonProperty("modelInvariantUuid")
-	protected String modelInvariantUuid;
-	@JsonProperty("modelInstanceName")
+    @JsonProperty("modelInvariantUuid")
+    protected String modelInvariantUuid;
+    @JsonProperty("modelInstanceName")
     protected String modelInstanceName;
 
-	public String getModelCustomizationName() {
-		return modelCustomizationName;
-	}
-	public void setModelCustomizationName(String modelCustomizationName) {
-		modelInstanceName = modelCustomizationName;
-		this.modelCustomizationName = modelCustomizationName;
-	}
-	public String getModelNameVersionId() {
-		return modelNameVersionId;
-	}
-	public void setModelNameVersionId(String modelNameVersionId) {
-		this.modelNameVersionId = modelNameVersionId;
-	}
-	public String getModelName() {
-		return modelName;
-	}
-	public void setModelName(String modelName) {
-		this.modelName = modelName;
-	}
-	public String getModelVersion() {
-		return modelVersion;
-	}
-	public void setModelVersion(String modelVersion) {
-		this.modelVersion = modelVersion;
-	}
-	public ModelType getModelType() {
-		return modelType;
-	}
-	public void setModelType(ModelType modelType) {
-		this.modelType = modelType;
-	}
-	public String getModelInvariantId() {
-		return modelInvariantId;
-	}
-	public void setModelInvariantId(String modelInvariantId) {
-		this.modelInvariantUuid = modelInvariantId;
-		this.modelInvariantId = modelInvariantId;
-	}
-	public String getModelCustomizationUuid() {
-		return modelCustomizationUuid;
-	}
-	public void setModelCustomizationUuid(String modelCustomizationUuid) {
-		this.modelCustomizationUuid = modelCustomizationUuid;
-	}
-	public String getModelVersionId() {
-		return modelVersionId;
-	}
-	public void setModelVersionId(String modelVersionId) {
-		this.modelUuid=modelVersionId;
-		this.modelVersionId = modelVersionId;
-	}
-	public String getModelCustomizationId() {
-		return modelCustomizationId;
-	}
-	public void setModelCustomizationId(String modelCustomizationId) {
-		this.modelCustomizationUuid = modelCustomizationId;
-		this.modelCustomizationId = modelCustomizationId;
-	}
+    public String getModelCustomizationName() {
+        return modelCustomizationName;
+    }
+
+    public void setModelCustomizationName(String modelCustomizationName) {
+        modelInstanceName = modelCustomizationName;
+        this.modelCustomizationName = modelCustomizationName;
+    }
+
+    public String getModelNameVersionId() {
+        return modelNameVersionId;
+    }
+
+    public void setModelNameVersionId(String modelNameVersionId) {
+        this.modelNameVersionId = modelNameVersionId;
+    }
+
+    public String getModelName() {
+        return modelName;
+    }
+
+    public void setModelName(String modelName) {
+        this.modelName = modelName;
+    }
+
+    public String getModelVersion() {
+        return modelVersion;
+    }
+
+    public void setModelVersion(String modelVersion) {
+        this.modelVersion = modelVersion;
+    }
+
+    public ModelType getModelType() {
+        return modelType;
+    }
+
+    public void setModelType(ModelType modelType) {
+        this.modelType = modelType;
+    }
+
+    public String getModelInvariantId() {
+        return modelInvariantId;
+    }
+
+    public void setModelInvariantId(String modelInvariantId) {
+        this.modelInvariantUuid = modelInvariantId;
+        this.modelInvariantId = modelInvariantId;
+    }
+
+    public String getModelCustomizationUuid() {
+        return modelCustomizationUuid;
+    }
+
+    public void setModelCustomizationUuid(String modelCustomizationUuid) {
+        this.modelCustomizationUuid = modelCustomizationUuid;
+    }
+
+    public String getModelVersionId() {
+        return modelVersionId;
+    }
+
+    public void setModelVersionId(String modelVersionId) {
+        this.modelUuid = modelVersionId;
+        this.modelVersionId = modelVersionId;
+    }
+
+    public String getModelCustomizationId() {
+        return modelCustomizationId;
+    }
+
+    public void setModelCustomizationId(String modelCustomizationId) {
+        this.modelCustomizationUuid = modelCustomizationId;
+        this.modelCustomizationId = modelCustomizationId;
+    }
+
     public String getModelUuid() {
-		return modelUuid;
-	}
+        return modelUuid;
+    }
+
     public String getModelId() {
-    	return modelId;
-    }
-	public void setModelUuid(String modelUuid) {
-		this.modelId = modelUuid;
-		this.modelUuid = modelUuid;
-		
-	}
-	public void setModelId(String modelId) {
-		this.modelId = modelId;
-	}
-	public String getModelInvariantUuid() {
-		return modelInvariantUuid;
-	}
-	public void setModelInvariantUuid(String modelInvariantUuid) {
-		this.modelInvariantUuid = modelInvariantUuid;
-	}
-	public String getModelInstanceName() {
-		return modelInstanceName;
-	}
-	public void setModelInstanceName(String modelInstanceName) {
-		this.modelInstanceName = modelInstanceName;
-	}
-	@Override
-	public String toString() {
-		return "ModelInfo [modelCustomizationName=" + modelCustomizationName + ", modelInvariantId=" + modelInvariantId
-				+ ", modelType=" + modelType + ", modelNameVersionId=" + modelNameVersionId + ", modelName=" + modelName
-				+ ", modelVersion=" + modelVersion + ", modelCustomizationUuid=" + modelCustomizationUuid
-				+ ", modelVersionId=" + modelVersionId + ", modelCustomizationId=" + modelCustomizationId
-				+ ", modelUuid=" + modelUuid + ", modelInvariantUuid=" + modelInvariantUuid + ", modelInstanceName="
-				+ modelInstanceName + "]";
-	}
-
-
-}
\ No newline at end of file
+        return modelId;
+    }
+
+    public void setModelUuid(String modelUuid) {
+        this.modelId = modelUuid;
+        this.modelUuid = modelUuid;
+
+    }
+
+    public void setModelId(String modelId) {
+        this.modelId = modelId;
+    }
+
+    public String getModelInvariantUuid() {
+        return modelInvariantUuid;
+    }
+
+    public void setModelInvariantUuid(String modelInvariantUuid) {
+        this.modelInvariantUuid = modelInvariantUuid;
+    }
+
+    public String getModelInstanceName() {
+        return modelInstanceName;
+    }
+
+    public void setModelInstanceName(String modelInstanceName) {
+        this.modelInstanceName = modelInstanceName;
+    }
+
+    @Override
+    public String toString() {
+        return "ModelInfo [modelCustomizationName=" + modelCustomizationName + ", modelInvariantId=" + modelInvariantId
+                + ", modelType=" + modelType + ", modelNameVersionId=" + modelNameVersionId + ", modelName=" + modelName
+                + ", modelVersion=" + modelVersion + ", modelCustomizationUuid=" + modelCustomizationUuid
+                + ", modelVersionId=" + modelVersionId + ", modelCustomizationId=" + modelCustomizationId
+                + ", modelUuid=" + modelUuid + ", modelInvariantUuid=" + modelInvariantUuid + ", modelInstanceName="
+                + modelInstanceName + "]";
+    }
+
+
+}