Policy 1707 Second commit

Change-Id: I18f5b142238733d17280cf17c3d1dd28204d34e9
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

2 files changed, 9 insertions, 9 deletions

diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSAttributeObject.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSAttributeObject.java
index c912374ef..a04f77e7e 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSAttributeObject.java
+++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSAttributeObject.java
@@ -28,7 +28,7 @@ public class MSAttributeObject {
 	private String className;
 	private HashMap<String, String> attribute = new HashMap<String, String>();
 	private HashMap<String, String> refAttribute = new HashMap<String, String>();
-	private HashMap<String, String> subClass = new HashMap<String, String>();
+	private HashMap<String, Object> subClass = new HashMap<String, Object>();
 	private String dependency;
 	private HashMap<String, String> enumType = new HashMap<String, String>();
 	private HashMap<String, String> matchingSet = new HashMap<String, String>();
@@ -70,13 +70,13 @@ public class MSAttributeObject {
 	public void addAllRefAttribute(Map<String, String> map){
 		this.refAttribute.putAll(map);
 	}
-	public HashMap<String, String> getSubClass() {
+	public HashMap<String, Object> getSubClass() {
 		return subClass;
 	}
-	public void setSubClass(HashMap<String, String> subClass) {
+	public void setSubClass(HashMap<String, Object> subClass) {
 		this.subClass = subClass;
 	}
-	public void addAllSubClass(HashMap<String, String> subClass){
+	public void addAllSubClass(HashMap<String, Object> subClass){
 		this.subClass.putAll(subClass);
 	}
 	public String getDependency() {
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java
index 7276a19f8..057d8544e 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java
+++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java
@@ -217,7 +217,7 @@ public class MSModelUtils {
 		String extendClass = getSubTypes(root, className);
 		HashMap<String, String> returnRefList = getRefAttributeList(root, className, extendClass);
 		HashMap<String, String> returnAttributeList = getAttributeList(root, className, extendClass);
-		HashMap<String, String> returnSubList = getSubAttributeList(root, className, extendClass);
+		HashMap<String, Object> returnSubList = getSubAttributeList(root, className, extendClass);
 		HashMap<String, String> returnAnnotation = getAnnotation(root, className, extendClass);
 		msAttributeObject.setAttribute(returnAttributeList);
 		msAttributeObject.setRefAttribute(returnRefList);
@@ -285,10 +285,10 @@ public class MSModelUtils {
 		return annotationSet;
 	}
 
-	private HashMap<String, String> getSubAttributeList(EPackage root, String className , String superClass) {
+	private HashMap<String, Object> getSubAttributeList(EPackage root, String className , String superClass) {
 		TreeIterator<EObject> treeItr = root.eAllContents();
 		boolean requiredAttribute = false; 
-		HashMap<String, String> subAttribute = new HashMap<String, String>();
+		HashMap<String, Object> subAttribute = new HashMap<String, Object>();
 		int rollingCount = 0;
 		int processClass = 0;
 		boolean annotation = false;
@@ -622,7 +622,7 @@ public class MSModelUtils {
 
 	}
 
-	public String createJson(HashMap<String, String> subClassAttributes, HashMap<String, MSAttributeObject> classMap, String className) { 
+	public String createJson(HashMap<String, Object> subClassAttributes, HashMap<String, MSAttributeObject> classMap, String className) { 
 		boolean enumType;
 		Map<String, HashMap<String, String>> myObject = new HashMap<String, HashMap<String, String>>();
 		for ( Entry<String, String> map : classMap.get(className).getRefAttribute().entrySet()){
@@ -660,7 +660,7 @@ public class MSModelUtils {
 
 	public String createSubAttributes(ArrayList<String> dependency, HashMap<String, MSAttributeObject> classMap, String modelName) {
 
-		HashMap <String,  String>  workingMap = new HashMap<String,String>();
+		HashMap <String,  Object>  workingMap = new HashMap<String,Object>();
 		MSAttributeObject tempObject = new MSAttributeObject();
 		if (dependency!=null){
 			if (dependency.size()==0){