1710 Rebase - Second Attempt

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

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ResourceDecomposition.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ResourceDecomposition.java
similarity index 75%
rename from bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ResourceDecomposition.java
rename to bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ResourceDecomposition.java
index ba01c8f..67e1906 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ResourceDecomposition.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ResourceDecomposition.java
@@ -1,16 +1,12 @@
-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.annotate.JsonIgnore;\r
-import org.codehaus.jackson.annotate.JsonIgnoreProperties;\r
-import org.codehaus.jackson.map.annotate.JsonRootName;\r
+import com.fasterxml.jackson.annotation.JsonIgnore;\r
 \r
 /**\r
  * Abstract superclass for all individual decomposition resources\r
  * \r
- * @author\r
- *\r
  */\r
 //@JsonIgnoreProperties\r
 public abstract class ResourceDecomposition extends JsonWrapper  implements Serializable {\r
@@ -21,7 +17,7 @@ public abstract class ResourceDecomposition extends JsonWrapper  implements Seri
        private ModelInfo modelInfo;\r
 \r
        //private List modules;\r
-       private InstanceData instanceData = new InstanceData();\r
+       private ResourceInstance instanceData = new ResourceInstance();\r
        \r
        // GET and SET\r
        public ModelInfo getModelInfo() {\r
@@ -31,10 +27,10 @@ public abstract class ResourceDecomposition extends JsonWrapper  implements Seri
                this.modelInfo = modelInfo;\r
        }\r
 \r
-       public InstanceData getInstanceData() {\r
+       public ResourceInstance getInstanceData() {\r
                return instanceData;\r
        }\r
-       public void setInstanceData(InstanceData instanceData) {\r
+       public void setInstanceData(ResourceInstance instanceData) {\r
                this.instanceData = instanceData;\r
        }\r
        public void setResourceType(String resourceType) {\r