1710 Rebase - Second Attempt

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

diff --git a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModuleResource.java b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ModuleResource.java
similarity index 81%
rename from bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModuleResource.java
rename to bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ModuleResource.java
index 1c91f4e..39cb839 100644 (file)
--- a/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/decomposition/ModuleResource.java
+++ b/bpmn/MSOCoreBPMN/src/main/java/org/openecomp/mso/bpmn/core/domain/ModuleResource.java
@@ -1,9 +1,9 @@
-package org.openecomp.mso.bpmn.core.decomposition;\r
+package org.openecomp.mso.bpmn.core.domain;\r
 \r
-import org.codehaus.jackson.map.annotate.JsonRootName;\r
+import com.fasterxml.jackson.annotation.JsonRootName;\r
 \r
 @JsonRootName("vfModule")\r
-public class ModuleResource  extends ResourceDecomposition {\r
+public class ModuleResource  extends Resource {\r
 \r
        private static final long serialVersionUID = 1L;\r
 \r
@@ -11,7 +11,7 @@ public class ModuleResource  extends ResourceDecomposition {
         * set resourceType for this object\r
         */\r
        public ModuleResource(){\r
-               resourceType = "module";\r
+               resourceType = ResourceType.MODULE;\r
        }\r
        \r
        /*\r
@@ -57,4 +57,4 @@ public class ModuleResource  extends ResourceDecomposition {
                this.hasVolumeGroup = hasVolumeGroup;\r
        }\r
        \r
-}\r
+}
\ No newline at end of file