1710 Rebase - Second Attempt

[so.git] / bpmn / MSOCoreBPMN / src / main / java / org / openecomp / mso / bpmn / core / domain / ModelInfo.java

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModelInfo.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ModelInfo.java
similarity index 51%
rename from bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModelInfo.java
rename to bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ModelInfo.java
index ecbb076..03dd69e 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModelInfo.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ModelInfo.java
@@ -1,29 +1,28 @@
-package org.openecomp.mso.bpmn.core.decomposition;\r
+package org.openecomp.mso.bpmn.core.domain;\r
 \r
 import java.io.Serializable;\r
 \r
-import org.codehaus.jackson.map.annotate.JsonRootName;\r
+import com.fasterxml.jackson.annotation.JsonRootName;\r
 \r
 @JsonRootName("modelInfo")\r
 public class ModelInfo  extends JsonWrapper implements Serializable {\r
 \r
        /**\r
-        * \r
+        * This is domain object defining structure for MODEL INFO\r
+        * It will be valid for each Resource type object\r
         */\r
        private static final long serialVersionUID = 1L;\r
        \r
        private String modelName = "";\r
        private String modelUuid = "";\r
-       private String modelInvariantId = "";\r
+       private String modelInvariantUuid = "";\r
        private String modelVersion = "";\r
        //additionally on resource level\r
        private String modelCustomizationUuid = "";\r
        private String modelInstanceName = "";\r
-       \r
-       //TODO - those were present in original "modelInfo" object structure. Confirm.\r
-       private String modelCustomizationName = "";\r
-       private String modelVersionId = "";\r
        private String modelType = "";\r
+\r
+       //GET and SET methods\r
        \r
        public String getModelName() {\r
                return modelName;\r
@@ -37,11 +36,11 @@ public class ModelInfo  extends JsonWrapper implements Serializable {
        public void setModelUuid(String modelUuid) {\r
                this.modelUuid = modelUuid;\r
        }\r
-       public String getModelInvariantId() {\r
-               return modelInvariantId;\r
+       public String getModelInvariantUuid() {\r
+               return modelInvariantUuid;\r
        }\r
-       public void setModelInvariantId(String modelInvariantId) {\r
-               this.modelInvariantId = modelInvariantId;\r
+       public void setModelInvariantUuid(String modelInvariantUuid) {\r
+               this.modelInvariantUuid = modelInvariantUuid;\r
        }\r
        public String getModelVersion() {\r
                return modelVersion;\r
@@ -61,41 +60,11 @@ public class ModelInfo  extends JsonWrapper implements Serializable {
        public void setModelInstanceName(String modelInstanceName) {\r
                this.modelInstanceName = modelInstanceName;\r
        }\r
-       public String getModelCustomizationName() {\r
-               return modelCustomizationName;\r
-       }\r
-       public void setModelCustomizationName(String modelCustomizationName) {\r
-               this.modelCustomizationName = modelCustomizationName;\r
-       }\r
-       public String getModelVersionId() {\r
-               return modelVersionId;\r
-       }\r
-       public void setModelVersionId(String modelVersionId) {\r
-               this.modelVersionId = modelVersionId;\r
-       }\r
        public String getModelType() {\r
                return modelType;\r
        }\r
        public void setModelType(String modelType) {\r
                this.modelType = modelType;\r
        }\r
-       \r
-       //TODO add convenience methods\r
-       \r
-       \r
-       //TODO - complete this manual\r
-       public String toString(){\r
-\r
-               String jsonString = "";\r
-               \r
-               //can try building manually\r
-               jsonString = "{" +\r
-                               "\"modelName\":\"" + getModelName() + "\"," +\r
-                               "\"modelUuid\":\"" + getModelUuid() + "\"" +\r
-                               "\"modelInvariantId\":\"" + getModelInvariantId() + "\"" +\r
-                               "}";\r
                \r
-\r
-               return jsonString;\r
-       }       \r
-}\r
+}
\ No newline at end of file