Policy 1707 commit to LF

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

5 files changed, 732 insertions, 620 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 45b5aefb8..c912374ef 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
@@ -21,7 +21,6 @@
 package org.openecomp.policy.rest.util;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class MSAttributeObject {
@@ -31,8 +30,9 @@ public class MSAttributeObject {
 	private HashMap<String, String> refAttribute = new HashMap<String, String>();
 	private HashMap<String, String> subClass = new HashMap<String, String>();
 	private String dependency;
-	private List<String> enumType;
-
+	private HashMap<String, String> enumType = new HashMap<String, String>();
+	private HashMap<String, String> matchingSet = new HashMap<String, String>();
+	private boolean policyTempalate; 
 	
 	public Map<String, String> getRefAttribute() {
 		return refAttribute;
@@ -52,10 +52,10 @@ public class MSAttributeObject {
 	public void setAttribute(HashMap<String, String> attribute) {
 		this.attribute = attribute;
 	}
-	public List<String> getEnumType() {
+	public HashMap<String, String> getEnumType() {
 		return enumType;
 	}
-	public void setEnumType(List<String> enumType) {
+	public void setEnumType(HashMap<String, String> enumType) {
 		this.enumType = enumType;
 	}
 	public void addAttribute(String key, String value){
@@ -85,4 +85,25 @@ public class MSAttributeObject {
 	public void setDependency(String dependency) {
 		this.dependency = dependency;
 	}
-}
+	public void addSingleEnum(String key, String value){
+		this.enumType.put(key, value);
+	}
+	public HashMap<String, String> getMatchingSet() {
+		return matchingSet;
+	}
+	public void setMatchingSet(HashMap<String, String> matchingSet) {
+		this.matchingSet = matchingSet;
+	}
+	public void addMatchingSet(String key, String value){
+		this.matchingSet.put(key, value);
+	}
+	public void addMatchingSet(HashMap<String, String> matchingSet){
+		this.matchingSet.putAll(matchingSet);
+	}
+	public boolean isPolicyTempalate() {
+		return policyTempalate;
+	}
+	public void setPolicyTempalate(boolean policyTempalate) {
+		this.policyTempalate = policyTempalate;
+	}
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..7276a19f8
--- /dev/null
+++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtils.java
@@ -0,0 +1,701 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ECOMP-REST
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.openecomp.policy.rest.util;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.common.util.EMap;
+import org.eclipse.emf.common.util.Enumerator;
+import org.eclipse.emf.common.util.TreeIterator;
+import org.eclipse.emf.common.util.URI;
+import org.eclipse.emf.ecore.EAnnotation;
+import org.eclipse.emf.ecore.EClass;
+import org.eclipse.emf.ecore.EClassifier;
+import org.eclipse.emf.ecore.EEnum;
+import org.eclipse.emf.ecore.EEnumLiteral;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.EPackage;
+import org.eclipse.emf.ecore.EReference;
+import org.eclipse.emf.ecore.EStructuralFeature;
+import org.eclipse.emf.ecore.impl.EAttributeImpl;
+import org.eclipse.emf.ecore.impl.EEnumImpl;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
+import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
+import org.json.JSONObject;
+import org.openecomp.policy.rest.XACMLRestProperties;
+
+import com.att.research.xacml.util.XACMLProperties;
+import com.google.gson.Gson;
+
+
+public class MSModelUtils {
+
+	private static final Log logger	= LogFactory.getLog(MSModelUtils.class);
+
+	private HashMap<String,MSAttributeObject > classMap = new HashMap<String,MSAttributeObject>();
+	private HashMap<String, String> enumMap = new HashMap<String, String>();
+	private HashMap<String, String> matchingClass = new HashMap<String, String>();
+	private String configuration = "configuration";
+	private String dictionary = "dictionary";
+	private String ecomp = "";
+	private String policy = "";
+	private String eProxyURI = "eProxyURI:";
+	
+	public MSModelUtils(String ecomp, String policy){
+		this.ecomp = ecomp;
+		this.policy = policy;
+	}
+
+	private enum ANNOTATION_TYPE{
+		MATCHING, VALIDATION, DICTIONARY
+	};
+
+	public enum MODEL_TYPE {
+		XMI
+	};
+
+
+	public HashMap<String, MSAttributeObject> processEpackage(String file, MODEL_TYPE model){
+		if (model == MODEL_TYPE.XMI ){
+			processXMIEpackage(file);
+		}
+		return classMap;
+
+	} 
+
+	private void processXMIEpackage(String xmiFile){
+		EPackage root = getEpackage(xmiFile);
+		TreeIterator<EObject> treeItr = root.eAllContents();
+		String className = null;
+		String returnValue = null;
+
+		//    Pulling out dependency from file
+		while (treeItr.hasNext()) {	    
+			EObject obj = (EObject) treeItr.next();
+			if (obj instanceof EClassifier) {
+				EClassifier eClassifier = (EClassifier) obj;
+				className = eClassifier.getName();
+
+				if (obj instanceof EEnum) {
+					enumMap.putAll(getEEnum(obj));
+				}else if (obj instanceof EClass) {
+					String temp = getDependencyList(eClassifier, className).toString();
+					returnValue = StringUtils.replaceEach(temp, new String[]{"[", "]"}, new String[]{"", ""});
+					getAttributes(className, returnValue, root);
+				}        		   		
+			}
+		}
+
+		if (!enumMap.isEmpty()){
+			addEnumClassMap();
+		}
+		if (!matchingClass.isEmpty()){
+			CheckForMatchingClass();
+		}
+	}
+
+	private void CheckForMatchingClass() {
+		HashMap<String, String> tempAttribute = new HashMap<String, String>();
+
+		for (Entry<String, String> set : matchingClass.entrySet()){
+			String key = set.getKey();
+			if (classMap.containsKey(key)){
+				Map<String, String> listAttributes = classMap.get(key).getAttribute();
+				Map<String, String> listRef = classMap.get(key).getRefAttribute();
+				for (  Entry<String, String> eSet : listAttributes.entrySet()){
+					String key2 = eSet.getKey();
+					tempAttribute.put(key2, "matching-true");
+				}
+				for (  Entry<String, String> eSet : listRef.entrySet()){
+					String key3 = eSet.getKey();
+					tempAttribute.put(key3, "matching-true");
+				}
+
+			}
+			UpdateMatching(tempAttribute, key);
+		}
+
+	}
+
+
+
+	private void UpdateMatching(HashMap<String, String> tempAttribute, String key) {
+		Map<String, MSAttributeObject> newClass = null;
+
+		newClass = classMap;
+
+		for (Entry<String, MSAttributeObject> updateClass :  newClass.entrySet()){
+			HashMap<String, String> valueMap = updateClass.getValue().getMatchingSet();
+			String keymap = updateClass.getKey();
+			if (valueMap.containsKey(key)){
+				HashMap<String, String> modifyMap = classMap.get(keymap).getMatchingSet();
+				modifyMap.remove(key);
+				modifyMap.putAll(tempAttribute);
+				classMap.get(keymap).setMatchingSet(modifyMap);
+			}
+
+		}
+	}
+
+	private void addEnumClassMap() {
+		for (Entry<String, MSAttributeObject> value :classMap.entrySet()){
+			value.getValue().setEnumType(enumMap);
+		}
+	}
+
+	private EPackage getEpackage(String xmiFile) {
+		ResourceSet resSet = new ResourceSetImpl();
+		Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
+		Map<String, Object> m = reg.getExtensionToFactoryMap();
+		m.put("xmi", new XMIResourceFactoryImpl());
+		Resource resource = resSet.getResource(URI.createFileURI(xmiFile), true);
+		try {
+			resource.load(Collections.EMPTY_MAP);
+		} catch (IOException e) {
+			logger.error("Error loading Encore Resource for new Model");
+		}
+
+		EPackage root = (EPackage) resource.getContents().get(0);
+
+		return root;
+	}
+
+	private HashMap<String, String> getEEnum(EObject obj) {
+		List<String> valueList = new ArrayList<>();
+		HashMap<String, String> returnMap = new HashMap<String, String>();
+		EEnum eenum = (EEnum)obj;
+
+		String name = eenum.getName();
+		for (EEnumLiteral eEnumLiteral : eenum.getELiterals())
+		{
+			Enumerator instance = eEnumLiteral.getInstance();
+			String value = instance.getLiteral();
+			valueList.add(value);
+		}
+		returnMap.put(name, valueList.toString());
+		return returnMap;
+	}
+
+	public void getAttributes(String className, String dependency, EPackage root) {
+		List<String> dpendList = null;
+		if (dependency!=null){
+			dpendList = new ArrayList<String>(Arrays.asList(dependency.split(",")));
+		}
+		MSAttributeObject msAttributeObject = new MSAttributeObject();
+		msAttributeObject.setClassName(className);
+		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, String> returnAnnotation = getAnnotation(root, className, extendClass);
+		msAttributeObject.setAttribute(returnAttributeList);
+		msAttributeObject.setRefAttribute(returnRefList);
+		msAttributeObject.setSubClass(returnSubList);
+		msAttributeObject.setDependency(dpendList.toString());
+		msAttributeObject.addMatchingSet(returnAnnotation);
+		msAttributeObject.setPolicyTempalate(isPolicyTemplate(root, className));
+
+		this.classMap.put(className, msAttributeObject);	
+	}
+
+	private HashMap<String, String> getAnnotation(EPackage root, String className, String extendClass) {
+		TreeIterator<EObject> treeItr = root.eAllContents();
+		boolean requiredAttribute = false; 
+		boolean requiredMatchAttribute = false;
+		HashMap<String, String> annotationSet = new HashMap<String, String>();
+		String  matching  = null;
+		String range   = null;
+		String dictionary = null;
+
+		//    Pulling out dependency from file
+		while (treeItr.hasNext()) {	    
+			EObject obj = treeItr.next();
+			if (obj instanceof EClassifier) {
+				requiredAttribute = isRequiredAttribute(obj,  className );
+				requiredMatchAttribute = isRequiredAttribute(obj,  extendClass );
+			}
+
+			if (requiredAttribute){
+				if (obj instanceof EStructuralFeature) {
+					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
+					if (eStrucClassifier.getEAnnotations().size() != 0) {
+						matching  = annotationValue(eStrucClassifier, ANNOTATION_TYPE.MATCHING, policy);
+						if (matching!=null){
+							annotationSet.put(eStrucClassifier.getName(), matching);
+						}
+						range  = annotationValue(eStrucClassifier, ANNOTATION_TYPE.VALIDATION, policy);
+						if (range!=null){
+							annotationSet.put(eStrucClassifier.getName(), range);
+						}
+						dictionary = annotationValue(eStrucClassifier, ANNOTATION_TYPE.DICTIONARY, policy);
+						if (dictionary!=null){
+							annotationSet.put(eStrucClassifier.getName(), dictionary);
+						}
+					}
+				}
+			} else if (requiredMatchAttribute){
+				if (obj instanceof EStructuralFeature) {
+					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
+					if (eStrucClassifier.getEAnnotations().size() != 0) {
+						matching  = annotationValue(eStrucClassifier, ANNOTATION_TYPE.MATCHING, policy);
+						if (matching!=null){
+							if (obj instanceof EReference){
+								EClass refType = ((EReference) obj).getEReferenceType();
+								annotationSet.put(refType.getName(), matching);
+								matchingClass.put(refType.getName(), matching);
+							}else{
+								annotationSet.put(eStrucClassifier.getName(), matching);
+							}
+						}
+					}
+				}
+			}
+		}
+		return annotationSet;
+	}
+
+	private HashMap<String, String> getSubAttributeList(EPackage root, String className , String superClass) {
+		TreeIterator<EObject> treeItr = root.eAllContents();
+		boolean requiredAttribute = false; 
+		HashMap<String, String> subAttribute = new HashMap<String, String>();
+		int rollingCount = 0;
+		int processClass = 0;
+		boolean annotation = false;
+
+		//    Pulling out dependency from file
+		while (treeItr.hasNext() && rollingCount < 2) {	 
+
+			EObject obj = treeItr.next();
+			if (obj instanceof EClassifier) {
+				if (isRequiredAttribute(obj,  className ) || isRequiredAttribute(obj,  superClass )){
+					requiredAttribute = true;
+				}else {
+					requiredAttribute = false;
+				}
+				if (requiredAttribute){
+					processClass++;
+				}
+				rollingCount = rollingCount+processClass;
+			}
+
+			if (requiredAttribute)   {
+				if (obj instanceof EStructuralFeature) {
+					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
+					if (eStrucClassifier.getEAnnotations().size() != 0) {
+						annotation = annotationTest(eStrucClassifier, configuration, ecomp);
+						if (annotation &&  obj instanceof EReference) {
+							EClass refType = ((EReference) obj).getEReferenceType();
+							if(!refType.toString().contains(eProxyURI)){
+								subAttribute.put(eStrucClassifier.getName(), refType.getName());						
+							}
+						}	
+					}
+				}
+			}
+		}
+		return subAttribute;
+	}
+
+	public String checkDefultValue(String defultValue) {
+		if (defultValue!=null){
+			return ":defaultValue-"+ defultValue;
+		}
+		return ":defaultValue-NA";
+
+	}
+
+	public String checkRequiredPattern(int upper, int lower) {	
+
+		String pattern = XACMLProperties.getProperty(XACMLRestProperties.PROP_XCORE_REQUIRED_PATTERN);
+
+		if (pattern!=null){
+			if (upper == Integer.parseInt(pattern.split(",")[1]) && lower==Integer.parseInt(pattern.split(",")[0])){
+				return ":required-true";
+			}
+		}
+
+		return ":required-false";
+	}
+
+	public JSONObject buildJavaObject(HashMap<String, String> map, String attributeType){
+
+		JSONObject returnValue = new JSONObject(map);
+
+		return returnValue;
+
+	}
+
+	public HashMap<String, String> getRefAttributeList(EPackage root, String className, String superClass){
+
+		TreeIterator<EObject> treeItr = root.eAllContents();
+		boolean requiredAttribute = false; 
+		HashMap<String, String> refAttribute = new HashMap<String, String>();
+		int rollingCount = 0;
+		int processClass = 0;
+		boolean annotation = false;
+		//    Pulling out dependency from file
+		while (treeItr.hasNext()) {	    
+			EObject obj = treeItr.next();
+			if (obj instanceof EClassifier) {
+				if (isRequiredAttribute(obj,  className ) || isRequiredAttribute(obj,  superClass )){
+					requiredAttribute = true;
+				}else {
+					requiredAttribute = false;
+				}	
+				if (requiredAttribute){
+					processClass++;
+				}
+				rollingCount = rollingCount+processClass;
+			}
+
+			if (requiredAttribute)   {
+				if (obj instanceof EStructuralFeature) {
+					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
+					if (eStrucClassifier.getEAnnotations().size() != 0) {
+						annotation = annotationTest(eStrucClassifier, configuration, ecomp);
+						if ( annotation &&  obj instanceof EReference) {
+							EClass refType = ((EReference) obj).getEReferenceType();
+							if(refType.toString().contains(eProxyURI)){
+								String one = refType.toString().split(eProxyURI)[1];
+								String refValue = StringUtils.replaceEach(one.split("#")[1], new String[]{"//", ")"}, new String[]{"", ""});							
+								refAttribute.put(eStrucClassifier.getName(), refValue);							
+							} else {
+								String array = arrayCheck(((EStructuralFeature) obj).getUpperBound());
+								refAttribute.put(eStrucClassifier.getName(), refType.getName() + array);
+							}
+						} else if (annotation &&  obj instanceof EAttributeImpl){
+							EClassifier refType = ((EAttributeImpl) obj).getEType();
+							if (refType instanceof EEnumImpl){
+								String array = arrayCheck(((EStructuralFeature) obj).getUpperBound());
+								refAttribute.put(eStrucClassifier.getName(), refType.getName() + array);							}
+						}	
+					}
+				}
+			}
+		}
+		return refAttribute;
+	}
+
+	private boolean annotationTest(EStructuralFeature eStrucClassifier, String annotation, String type) {
+		String annotationType = null;
+		EAnnotation eAnnotation = null;
+		String ecompType = null;
+		String ecompValue = null;
+
+		EList<EAnnotation> value = eStrucClassifier.getEAnnotations();
+
+		for (int i = 0; i < value.size(); i++){
+			annotationType = value.get(i).getSource();
+			eAnnotation = eStrucClassifier.getEAnnotations().get(i);
+			ecompType = eAnnotation.getDetails().get(0).getValue();
+			ecompValue = eAnnotation.getDetails().get(0).getKey();
+			if (annotationType.contains(type) && ecompType.contains(annotation)){
+				return true;
+			} else if (annotationType.contains(type) && ecompValue.contains(annotation)){
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+
+	private String annotationValue(EStructuralFeature eStrucClassifier, ANNOTATION_TYPE annotation, String type) {
+		String annotationType = null;
+		EAnnotation eAnnotation = null;
+		String ecompType = null;
+		String ecompValue = null;
+
+		EList<EAnnotation> value = eStrucClassifier.getEAnnotations();
+
+		for (int i = 0; i < value.size(); i++){
+			annotationType = value.get(i).getSource();
+			eAnnotation = eStrucClassifier.getEAnnotations().get(i);
+			ecompType = eAnnotation.getDetails().get(0).getKey();
+			if (annotationType.contains(type) && ecompType.compareToIgnoreCase(annotation.toString())==0){
+				ecompValue = eAnnotation.getDetails().get(0).getValue();
+				if (annotation == ANNOTATION_TYPE.VALIDATION){
+					return ecompValue;
+				} else {
+					return ecompType + "-" + ecompValue;
+				}
+			}
+		}
+
+		return ecompValue;
+	}
+	public boolean isRequiredAttribute(EObject obj, String className){
+		EClassifier eClassifier = (EClassifier) obj;
+		String workingClass = eClassifier.getName();
+		workingClass.trim();
+		if (workingClass.equalsIgnoreCase(className)){
+			return  true;
+		}
+
+		return false;
+	} 
+
+	private boolean isPolicyTemplate(EPackage root, String className){
+
+		for (EClassifier classifier : root.getEClassifiers()){ 
+			if (classifier instanceof EClass) { 
+				EClass eClass = (EClass)classifier; 
+				if (eClass.getName().contentEquals(className)){
+					EList<EAnnotation> value = eClass.getEAnnotations();
+					for (EAnnotation workingValue : value){
+						EMap<String, String> keyMap = workingValue.getDetails();	
+						if (keyMap.containsKey("policyTemplate")){
+							return true;
+						}
+					}	
+				}
+			}
+		}
+		return false;
+	}
+	private String getSubTypes(EPackage root, String className) {
+		String returnSubTypes = null;
+		for (EClassifier classifier : root.getEClassifiers()){ 
+			if (classifier instanceof EClass) { 
+				EClass eClass = (EClass)classifier; 
+
+				for (EClass eSuperType : eClass.getEAllSuperTypes()) 
+				{ 
+					if (eClass.getName().contentEquals(className)){
+						returnSubTypes = eSuperType.getName();
+					}
+				} 
+			} 
+		} 
+		return returnSubTypes;
+	} 
+
+	public HashMap<String, String> getAttributeList(EPackage root, String className, String superClass){
+
+		TreeIterator<EObject> treeItr = root.eAllContents();
+		boolean requiredAttribute = false; 
+		HashMap<String, String> refAttribute = new HashMap<String, String>();
+		boolean annotation = false;
+		boolean dictionaryTest = false;
+		String defaultValue = null;
+		String eType = null;
+
+		//    Pulling out dependency from file
+		while (treeItr.hasNext()) {	    
+			EObject obj = treeItr.next();
+			if (obj instanceof EClassifier) {
+				if (isRequiredAttribute(obj,  className ) || isRequiredAttribute(obj,  superClass )){
+					requiredAttribute = true;
+				}else {
+					requiredAttribute = false;
+				}
+
+			}
+
+			if (requiredAttribute){
+				if (obj instanceof EStructuralFeature) {
+					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
+					if (eStrucClassifier.getEAnnotations().size() != 0) {
+						annotation = annotationTest(eStrucClassifier, configuration, ecomp);
+						dictionaryTest = annotationTest(eStrucClassifier, dictionary, policy);
+						EClassifier refType = ((EStructuralFeature) obj).getEType();
+						if (annotation && !(obj instanceof EReference) && !(refType instanceof EEnumImpl)) {
+							String name = eStrucClassifier.getName();
+							if (dictionaryTest){
+								eType = annotationValue(eStrucClassifier, ANNOTATION_TYPE.DICTIONARY, policy);
+							}else {
+								eType = eStrucClassifier.getEType().getInstanceClassName();
+							}
+							defaultValue = checkDefultValue(((EStructuralFeature) obj).getDefaultValueLiteral());
+
+							String array = arrayCheck(((EStructuralFeature) obj).getUpperBound());
+							String required = checkRequiredPattern(((EStructuralFeature) obj).getUpperBound(), ((EStructuralFeature) obj).getLowerBound());
+							String attributeValue =  eType + defaultValue + required + array;
+							refAttribute.put(name, attributeValue);	
+						}
+					}
+				}
+			}
+		}
+		return refAttribute;
+
+	}
+
+	public String arrayCheck(int upperBound) {
+
+		if (upperBound == -1){
+			return ":MANY-true";
+		}
+
+		return ":MANY-false";
+	}
+
+	public List<String> getDependencyList(EClassifier eClassifier, String className){
+		List<String> returnValue = new ArrayList<>();;
+		EList<EClass> somelist = ((EClass) eClassifier).getEAllSuperTypes();
+		if (somelist.isEmpty()){
+			return returnValue;
+		}
+		for(EClass depend: somelist){
+			if (depend.toString().contains(eProxyURI)){
+				String one = depend.toString().split(eProxyURI)[1];
+				String value = StringUtils.replaceEach(one.split("#")[1], new String[]{"//", ")"}, new String[]{"", ""});
+				returnValue.add(value);
+			}
+		}
+
+		return returnValue;
+	}
+
+	public Map<String, String> buildSubList(HashMap<String, String> subClassAttributes, HashMap<String, MSAttributeObject> classMap, String className){
+		Map<String, String> missingValues = new HashMap<String, String>();
+		Map<String, String> workingMap = new HashMap<String, String>();
+		boolean enumType;
+
+		for ( Entry<String, String> map : classMap.get(className).getRefAttribute().entrySet()){
+			String value = map.getValue().split(":")[0];
+			if (value!=null){
+				classMap.get(className).getEnumType();
+				enumType = classMap.get(className).getEnumType().containsKey(value);
+				if (!enumType){
+					workingMap =  classMap.get(value).getRefAttribute();
+					for ( Entry<String, String> subMab : workingMap.entrySet()){
+						String value2 = subMab.getValue().split(":")[0];
+						if (!subClassAttributes.containsValue(value2)){
+							missingValues.put(subMab.getKey(), subMab.getValue());
+						}
+					}
+
+				}
+			}
+		}
+
+		return missingValues;
+	}
+
+	public Map<String, HashMap<String, String>> recursiveReference(HashMap<String, MSAttributeObject> classMap, String className){
+
+		Map<String, HashMap<String, String>> returnObject = new HashMap<String, HashMap<String, String>>();
+		HashMap<String, String> returnClass = getRefclass(classMap, className);
+		returnObject.put(className, returnClass);
+		for (Entry<String, String> reAttribute :returnClass.entrySet()){
+			if (reAttribute.getValue().split(":")[1].contains("MANY")){
+				if (classMap.get(reAttribute.getValue().split(":")[0]) != null){
+					returnObject.putAll(recursiveReference(classMap, reAttribute.getValue().split(":")[0]));
+				}
+			}
+
+		}
+
+		return returnObject;
+
+	}
+
+	public String createJson(HashMap<String, String> 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()){
+			String value = map.getValue().split(":")[0];
+			if (value!=null){
+				enumType = classMap.get(className).getEnumType().containsKey(value);
+				if (!enumType){
+					if (map.getValue().split(":")[1].contains("MANY")){
+						Map<String, HashMap<String, String>> testRecursive = recursiveReference(classMap, map.getValue().split(":")[0] );
+						myObject.putAll(testRecursive);
+					}
+				}
+			}
+		}
+
+		Gson gson = new Gson(); 
+		String json = gson.toJson(myObject); 
+
+		return json;		
+	}
+
+	public HashMap<String, String> getRefclass(HashMap<String, MSAttributeObject> classMap, String className){
+		HashMap<String, String> missingValues = new HashMap<String, String>();
+
+		if (classMap.get(className).getAttribute()!=null || !classMap.get(className).getAttribute().isEmpty()){
+			missingValues.putAll(classMap.get(className).getAttribute());
+		}
+
+		if (classMap.get(className).getRefAttribute()!=null || !classMap.get(className).getRefAttribute().isEmpty()){
+			missingValues.putAll(classMap.get(className).getRefAttribute());
+		}
+
+		return missingValues;	
+	}
+
+	public String createSubAttributes(ArrayList<String> dependency, HashMap<String, MSAttributeObject> classMap, String modelName) {
+
+		HashMap <String,  String>  workingMap = new HashMap<String,String>();
+		MSAttributeObject tempObject = new MSAttributeObject();
+		if (dependency!=null){
+			if (dependency.size()==0){
+				return "{}";
+			}	
+			dependency.add(modelName);
+			for (String element: dependency){
+				tempObject = classMap.get(element);
+				if (tempObject!=null){
+					workingMap.putAll(classMap.get(element).getSubClass());
+				}
+			}
+		}
+
+		String returnValue = createJson(workingMap, classMap, modelName);			
+		return returnValue;
+	}
+
+	public ArrayList<String> getFullDependencyList(ArrayList<String> dependency, HashMap<String,MSAttributeObject > classMap) {
+		ArrayList<String> returnList = new ArrayList<String>();
+		ArrayList<String> workingList = new ArrayList<String>();
+		returnList.addAll(dependency);
+		for (String element : dependency ){
+			if (classMap.containsKey(element)){
+				MSAttributeObject value = classMap.get(element);
+				String rawValue = StringUtils.replaceEach(value.getDependency(), new String[]{"[", "]"}, new String[]{"", ""});
+				workingList = new ArrayList<String>(Arrays.asList(rawValue.split(",")));	
+				for(String depend : workingList){
+					if (!returnList.contains(depend) && !depend.isEmpty()){
+						returnList.add(depend.trim());
+					}
+				}
+			}
+		}
+
+		return returnList;
+	}
+}
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtitils.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtitils.java
deleted file mode 100644
index dd015be68..000000000
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/MSModelUtitils.java
+++ /dev/null
@@ -1,450 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.policy.rest.util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.TreeIterator;
-import org.eclipse.emf.ecore.EAnnotation;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-import org.json.JSONObject;
-import org.openecomp.policy.rest.XACMLRestProperties;
-
-import com.att.research.xacml.util.XACMLProperties;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-
-
-public class MSModelUtitils {
-	
-	private static final Log logger	= LogFactory.getLog(MSModelUtitils.class);
- 
-	private HashMap<String,MSAttributeObject > classMap = new HashMap<String,MSAttributeObject>();
-
-	public HashMap<String, MSAttributeObject> processEpackage(String xmiFile){
-		EPackage root = getEpackage(xmiFile);
-	    TreeIterator<EObject> treeItr = root.eAllContents();
-	    String className = null;
-	    String returnValue = null;
-	    
-		//    Pulling out dependency from file
-	    while (treeItr.hasNext()) {	    
-	    	EObject obj = (EObject) treeItr.next();
-	        if (obj instanceof EClassifier) {
-	        	EClassifier eClassifier = (EClassifier) obj;
-	        	className = eClassifier.getName();
-	    		
-	    		if (obj instanceof EEnum) {
-	    		//	getEEnum();
-	    			returnValue = null;
-	    		}else if (obj instanceof EClass) {
-	        		String temp = getDependencyList(eClassifier, className).toString();
-	        		returnValue = StringUtils.replaceEach(temp, new String[]{"[", "]"}, new String[]{"", ""});
-	        		getAttributes(className, returnValue, root);
-	    		}        		   		
-	        }
-	    }
-	    return classMap;
-	}
-
-	private EPackage getEpackage(String xmiFile) {
-		ResourceSet resSet = new ResourceSetImpl();
-	    Resource.Factory.Registry reg = Resource.Factory.Registry.INSTANCE;
-	    Map<String, Object> m = reg.getExtensionToFactoryMap();
-	    m.put("xmi", new XMIResourceFactoryImpl());
-	    Resource resource = resSet.getResource(URI.createFileURI(xmiFile), true);
-	    try {
-			resource.load(Collections.EMPTY_MAP);
-		} catch (IOException e) {
-			logger.error("Error loading Encore Resource for new Model");
-		}
-	    
-	    EPackage root = (EPackage) resource.getContents().get(0);
-
-		return root;
-	}
-
-	private void getEEnum() {
-		
-	}
-	
-	public void getAttributes(String className, String dependency, EPackage root) {
-		List<String> dpendList = null;
-	    if (dependency!=null){
-	    	dpendList = new ArrayList<String>(Arrays.asList(dependency.split(",")));
-	    }
-		MSAttributeObject msAttributeObject = new MSAttributeObject();
-		msAttributeObject.setClassName(className);
-		HashMap<String, String> returnRefList = getRefAttributeList(root, className);
-		HashMap<String, String> returnAttributeList = getAttributeList(root, className);
-		HashMap<String, String> returnSubList = getSubAttributeList(root, className);
-		msAttributeObject.setAttribute(returnAttributeList);
-		msAttributeObject.setRefAttribute(returnRefList);
-		msAttributeObject.setSubClass(returnSubList);
-		msAttributeObject.setDependency(dpendList.toString());
-		this.classMap.put(className, msAttributeObject);	
-	}
-	
-	private HashMap<String, String> getSubAttributeList(EPackage root, String className) {
-	    //EPackage root = (EPackage) resource.getContents().get(0);
-	    TreeIterator<EObject> treeItr = root.eAllContents();
-	    boolean requiredAttribute = false; 
-	    HashMap<String, String> subAttribute = new HashMap<String, String>();
-	    int rollingCount = 0;
-	    int processClass = 0;
-	    boolean annotation = false;
-		    
-		//    Pulling out dependency from file
-	    while (treeItr.hasNext() && rollingCount < 2) {	 
-	    	
-	    	EObject obj = treeItr.next();
-	        if (obj instanceof EClassifier) {
-	        	requiredAttribute = isRequiredAttribute(obj,  className); 	
-	        	if (requiredAttribute){
-	        		processClass++;
-	        	}
-	        	rollingCount = rollingCount+processClass;
-			}
-			
-	        if (requiredAttribute)   {
-	        	if (obj instanceof EStructuralFeature) {
-	        		EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
-	        		if (eStrucClassifier.getEAnnotations().size() != 0) {
-	        			annotation = testAnnotation(eStrucClassifier);
-						if (annotation &&  obj instanceof EReference) {
-							EClass refType = ((EReference) obj).getEReferenceType();
-					//		String array = arrayCheck(((EStructuralFeature) obj).getUpperBound());
-							if(!refType.toString().contains("eProxyURI:")){
-								subAttribute.put(eStrucClassifier.getName(), refType.getName());						
-							}
-						}	
-	        		}
-	        	}
-	       }
-	    }
-		return subAttribute;
-	}
-	
-	public String checkDefultValue(String defultValue) {
-		if (defultValue!=null){
-			return ":defaultValue-"+ defultValue;
-		}
-		return ":defaultValue-NA";
-		
-	}
-	
-	public String checkRequiredPattern(int upper, int lower) {	
-		String pattern = XACMLProperties.getProperty(XACMLRestProperties.PROP_XCORE_REQUIRED_PATTERN);
-		
-		if (pattern!=null){
-			if (upper == Integer.parseInt(pattern.split(",")[1]) && lower==Integer.parseInt(pattern.split(",")[0])){
-				return ":required-true";
-			}
-		}
-				
-		return ":required-false";
-	}
-	
-	public JSONObject buildJavaObject(HashMap<String, String> map, String attributeType){
-
-		JSONObject returnValue = new JSONObject(map);
-		
-		return returnValue;
-		
-	}
-	
-	public HashMap<String, String> getRefAttributeList(EPackage root, String className){
-	    
-	    TreeIterator<EObject> treeItr = root.eAllContents();
-	    boolean requiredAttribute = false; 
-	    HashMap<String, String> refAttribute = new HashMap<String, String>();
-	    int rollingCount = 0;
-	    int processClass = 0;
-	    boolean annotation = false;
-		    
-		//    Pulling out dependency from file
-	    while (treeItr.hasNext()) {	    
-	    	EObject obj = treeItr.next();
-	        if (obj instanceof EClassifier) {
-	        	requiredAttribute = isRequiredAttribute(obj,  className); 	
-	        	if (requiredAttribute){
-	        		processClass++;
-	        	}
-	        	rollingCount = rollingCount+processClass;
-			}
-			
-	        if (requiredAttribute)   {
-	        	if (obj instanceof EStructuralFeature) {
-	        		EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
-	        		if (eStrucClassifier.getEAnnotations().size() != 0) {
-	        			annotation = testAnnotation(eStrucClassifier);
-						if ( annotation &&  obj instanceof EReference) {
-							EClass refType = ((EReference) obj).getEReferenceType();
-							if(refType.toString().contains("eProxyURI:")){
-								String one = refType.toString().split("eProxyURI:")[1];
-								String refValue = StringUtils.replaceEach(one.split("#")[1], new String[]{"//", ")"}, new String[]{"", ""});							
-								refAttribute.put(eStrucClassifier.getName(), refValue);							
-							} else {
-								String array = arrayCheck(((EStructuralFeature) obj).getUpperBound());
-								if (array.contains("false")){
-									array = "";
-								}
-								refAttribute.put(eStrucClassifier.getName(), refType.getName() + array);
-							}
-						}	
-	        		}
-	        	}
-	       }
-	    }
-		return refAttribute;
-	}
-	
-	private boolean testAnnotation(EStructuralFeature eStrucClassifier) {
-		String annotationType = null;
-		EAnnotation eAnnotation = null;
-		String ecompType = null;
-		
-		EList<EAnnotation> value = eStrucClassifier.getEAnnotations();
-		
-		for (int i = 0; i < value.size(); i++){
-			annotationType = value.get(i).getSource();
-			eAnnotation = eStrucClassifier.getEAnnotations().get(i);
-			ecompType = eAnnotation.getDetails().get(0).getValue();
-			if (annotationType.contains("http://localhost.com") && ecompType.contains("configuration")){
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	public boolean isRequiredAttribute(EObject obj, String className){
-    	EClassifier eClassifier = (EClassifier) obj;
-    	String workingClass = eClassifier.getName();
-    	workingClass.trim();
-		if (workingClass.equalsIgnoreCase(className)){
-			return  true;
-		}
-
-		return false;
-	}
-
-	public HashMap<String, String> getAttributeList(EPackage root, String className){
-	    
-	    TreeIterator<EObject> treeItr = root.eAllContents();
-	    boolean reference = false;
-	    boolean requiredAttribute = false; 
-	    HashMap<String, String> refAttribute = new HashMap<String, String>();
-	    String workingClass = null;
-	    boolean annotation = false;
-		    
-		//    Pulling out dependency from file
-	    while (treeItr.hasNext()) {	    
-	    	reference = false;
-	    	EObject obj = treeItr.next();
-	        if (obj instanceof EClassifier) {
-	        	requiredAttribute = isRequiredAttribute(obj,  className );
-			}
-			  
-	        if (requiredAttribute){
-	        	if (obj instanceof EStructuralFeature) {
-	        		EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
-	        		if (eStrucClassifier.getEAnnotations().size() != 0) {
-	        			annotation = testAnnotation(eStrucClassifier);
-						if (annotation && !(obj instanceof EReference)) {
-							String name = eStrucClassifier.getName();
-							String defaultValue = checkDefultValue(((EStructuralFeature) obj).getDefaultValueLiteral());
-							String eType = eStrucClassifier.getEType().getInstanceClassName();
-							String array = arrayCheck(((EStructuralFeature) obj).getUpperBound());
-							String required = checkRequiredPattern(((EStructuralFeature) obj).getUpperBound(), ((EStructuralFeature) obj).getLowerBound());
-							String attributeValue =  eType + defaultValue + required + array;
-							refAttribute.put(name, attributeValue);	
-						}
-	        		}
-	            }
-	        }
-	    }
-		return refAttribute;
-		
-	}
-	
-	public String arrayCheck(int upperBound) {
-		
-		if (upperBound == -1){
-			return ":MANY-true";
-		}
-		
-		return ":MANY-false";
-	}
-	
-	public List<String> getDependencyList(EClassifier eClassifier, String className){
-		List<String> returnValue = new ArrayList<>();;
-		EList<EClass> somelist = ((EClass) eClassifier).getEAllSuperTypes();
-		if (somelist.isEmpty()){
-			return returnValue;
-		}
-		for(EClass depend: somelist){
-			if (depend.toString().contains("eProxyURI:")){
-				String one = depend.toString().split("eProxyURI:")[1];
-				String value = StringUtils.replaceEach(one.split("#")[1], new String[]{"//", ")"}, new String[]{"", ""});
-				returnValue.add(value);
-			}
-		}
-
-		return returnValue;
-	}
-	
-	public String createJson(HashMap<String, String> subClassAttributes, HashMap<String, MSAttributeObject> classMap, String className) {
-		String json = "";
-		JSONObject jsonObj; 
-		
-		jsonObj = new JSONObject();
-		
-		Map<String, String> missingValues = new HashMap<String, String>();
-		Map<String, String> workingMap = new HashMap<String, String>();
-		
-		for ( Entry<String, String> map : classMap.get(className).getRefAttribute().entrySet()){
-			String value = map.getValue().split(":")[0];
-			if (value!=null){
-				workingMap =  classMap.get(value).getRefAttribute();
-				for ( Entry<String, String> subMab : workingMap.entrySet()){
-					String value2 = subMab.getValue().split(":")[0];
-					if (!subClassAttributes.containsValue(value2)){
-						missingValues.put(subMab.getKey(), subMab.getValue());
-						classMap.get(value).addAttribute(subMab.getKey(), subMab.getValue());
-					}
-				}
-				
-			}
-		}
-		
-		if (!missingValues.isEmpty()){
-			for (Entry<String, String> addValue : missingValues.entrySet()){
-				subClassAttributes.put(addValue.getKey(), addValue.getValue().split(":")[0]);
-			}
-		}
-		
-		for ( Map.Entry<String, String>  map : subClassAttributes.entrySet()){
-			jsonObj.put(map.getValue().split(":")[0], classMap.get(map.getValue().split(":")[0]).getAttribute());	
-		}
-		
-		if (logger.isDebugEnabled()) {
-			logger.debug("Json value: " + jsonObj);
-		}
-		
-		return jsonObj.toString();		
-	}
-	
-	public String createSubAttributes(ArrayList<String> dependency, HashMap<String, MSAttributeObject> classMap, String modelName) {
-		
-		HashMap <String,  String>  workingMap = new HashMap<String,String>();
-		MSAttributeObject tempObject = new MSAttributeObject(); 
-		HashMap <String, String> refAttribute =  new HashMap<String,String>();
-		 HashMap <String,  String>  workingSubMap = new HashMap<String,String>();
-		Map<String, String> tempPefAttribute = null;
-		LinkedList linkedList = new LinkedList();
-		String addedValue = null;
-		
-		boolean addingValues = false;
-		
-		if (dependency!=null){
-			if (dependency.size()==0){
-				return "{}";
-			}	
-			dependency.add(modelName);
-			for (String element: dependency){
-				tempObject = classMap.get(element);
-				if (tempObject!=null){
-					workingMap.putAll(classMap.get(element).getSubClass());
-		            //        workingSubMap = CheckForSecondSubClass(classMap.get(element).getSubClass(), classMap);
-		             //       if (workingSubMap!=null){
-		            //            workingMap.putAll(workingSubMap);
-		           //         }
-				}
-			}
-		}
-		
-		String returnValue = createJson(workingMap, classMap, modelName);			
-		return returnValue;
-	}
-
-    private HashMap<String, String> CheckForSecondSubClass(HashMap<String, String> subClass, HashMap<String, MSAttributeObject> mainMap) {
-        MSAttributeObject tempObject = new MSAttributeObject(); 
-        HashMap<String, String> subClassValue = new HashMap<String,String>();
-        
-        for (Entry<String, String> classSet : subClass.entrySet()){
-            String key = classSet.getKey();
-            String value = classSet.getValue();
-            tempObject = mainMap.get(value);
-            subClassValue = tempObject.getSubClass();
-            if (subClassValue!=null){
-                return subClassValue;
-            }
-        }
-        return null;
-        
-    }
-    
-	public ArrayList<String> getFullDependencyList(ArrayList<String> dependency, HashMap<String,MSAttributeObject > classMap) {
-		ArrayList<String> returnList = new ArrayList<String>();
-		ArrayList<String> workingList = new ArrayList<String>();
-		int i = 0;
-		MSAttributeObject newDepend = null;
-		returnList.addAll(dependency);
-		for (String element : dependency ){
-			if (classMap.containsKey(element)){
-				MSAttributeObject value = classMap.get(element);
-				String rawValue = StringUtils.replaceEach(value.getDependency(), new String[]{"[", "]"}, new String[]{"", ""});
-				workingList = new ArrayList<String>(Arrays.asList(rawValue.split(",")));	
-				for(String depend : workingList){
-					if (!returnList.contains(depend) && !depend.isEmpty()){
-						returnList.add(depend.trim());
-					}
-				}
-			}
-		}
-		
-		return returnList;
-	}
-}
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/ModelObject.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/ModelObject.java
deleted file mode 100644
index bc7fa9f2d..000000000
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/ModelObject.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ECOMP-REST
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
- 
-
-package org.openecomp.policy.rest.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import com.vaadin.ui.TextField;
-import com.vaadin.ui.VerticalLayout;
-
-public class ModelObject {
-	private String name;
-	private String parent;
-	private List<String> attibutes = new ArrayList<String>();
-	private List<String> arrays = new ArrayList<String>();
-	private List<Integer> integers = new ArrayList<Integer>();
-	private List<ModelObject> subObjects = new ArrayList<ModelObject>();
-	private HashMap<String, LinkedList<ModelObject>> subObjectList = new HashMap<String, LinkedList<ModelObject>>();
-	private HashMap<String, TextField> attribute = new HashMap<String, TextField>();
-	private Map<String, LinkedList<TextField>> arrayTextList =  new HashMap<String, LinkedList<TextField>>();
-	private Map<String,  VerticalLayout> textFieldLayout = new HashMap<String, VerticalLayout>();
-
-	private boolean many = false;
-	
-	public Map<String, LinkedList<TextField>> getArrayTextList() {
-		return arrayTextList;
-	}
-	public void setArrayTextList(Map<String, LinkedList<TextField>> arrayTextList) {
-		this.arrayTextList = arrayTextList;
-	}
-	public void addArrayTextList(String name, TextField textField ){
-		LinkedList<TextField> list = new LinkedList<TextField>();
-		if (getArrayTextList().get(name) != null){
-			list = getArrayTextList().get(name); 
-		}
-
-		list.push(textField);
-		this.arrayTextList.put(name, list);
-	}
-	public void removeLastTextList(String name){
-		LinkedList<TextField> list = getArrayTextList().get(name); 
-		
-		list.pop();
-		this.arrayTextList.put(name, list);
-	}
-	public HashMap<String, TextField> getAttribute() {
-		return attribute;
-	}
-	public void setAttribute(HashMap<String, TextField> attribute) {
-		this.attribute = attribute;
-	}
-    public void addAttribute(String name, TextField textField){
-    	this.attribute.put(name, textField);
-    }
-	public List<String> getAttibutes() {
-		return attibutes;
-	}
-	public void setAttibutes(List<String> attibutes) {
-		this.attibutes = attibutes;
-	}
-	public List<String> getArrays() {
-		return arrays;
-	}
-	public void setArrays(List<String> arrays) {
-		this.arrays = arrays;
-	}
-	public List<Integer> getIntegers() {
-		return integers;
-	}
-	public void setIntegers(List<Integer> integers) {
-		this.integers = integers;
-	}
-	public List<ModelObject> getSubObjects() {
-		return subObjects;
-	}
-	public void setSubObjects(List<ModelObject> subObjects) {
-		this.subObjects = subObjects;
-	}
-	public void addSubObject(ModelObject subObjects ){
-		this.subObjects.add(subObjects);
-	}
-	public void addAttributes(String attibutes){
-		this.attibutes.add(attibutes);
-	}
-	public void addArrays(String arrays){
-		this.arrays.add(arrays);
-	}
-	public void addIntegers(Integer integers){
-		this.integers.add(integers);
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public boolean isMany() {
-		return many;
-	}
-	public void setMany(boolean many) {
-		this.many = many;
-	}
-	public String getParent() {
-		return parent;
-	}
-	public void setParent(String parent) {
-		this.parent = parent;
-	}
-	public HashMap<String, LinkedList<ModelObject>> getSubObjectList() {
-		return subObjectList;
-	}
-	public void setSubObjectList(HashMap<String, LinkedList<ModelObject>> subObjectList) {
-		this.subObjectList = subObjectList;
-	}
-	public void addSubObjectList(String name, ModelObject object) {
-		LinkedList<ModelObject> list = new LinkedList<ModelObject>();
-		if (subObjectList.get(name) != null){
-			list = subObjectList.get(name); 
-		}
-
-		list.push(object);
-
-		this.subObjectList.put(name, list);
-	}
-	public Map<String,  VerticalLayout> getTextFieldLayout() {
-		return textFieldLayout;
-	}
-	public void setTextFieldLayout(Map<String,  VerticalLayout> textFieldLayout) {
-		this.textFieldLayout = textFieldLayout;
-	}
-	public void addTextFieldLayout(String name, VerticalLayout vLayout){
-		this.textFieldLayout.put(name, vLayout);
-	}
-
-}
-*/
diff --git a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/Webapps.java b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/Webapps.java
index c2f4ff2c6..ef1eecf27 100644
--- a/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/Webapps.java
+++ b/ECOMP-REST/src/main/java/org/openecomp/policy/rest/util/Webapps.java
@@ -38,7 +38,7 @@ import org.openecomp.policy.common.logging.eelf.PolicyLogger;
 public class Webapps {
 	private static String actionHome = null;
 	private static String configHome = null;
-	private static Log logger	= LogFactory.getLog(Webapps.class);
+	private static Log LOGGER	= LogFactory.getLog(Webapps.class);
 	
 	private Webapps() {
 	}
@@ -66,8 +66,7 @@ public class Webapps {
 			Path webappsPath = Paths.get(XACMLProperties.getProperty(XACMLRestProperties.PROP_PAP_WEBAPPS));
 			//Sanity Check
 			if (webappsPath == null) {
-				logger.error("Invalid Webapps Path Location property : " + XACMLRestProperties.PROP_PAP_WEBAPPS);
-				// TODO:EELF Cleanup - Remove logger
+				LOGGER.error("Invalid Webapps Path Location property : " + XACMLRestProperties.PROP_PAP_WEBAPPS);
 				PolicyLogger.error("Invalid Webapps Path Location property : " + XACMLRestProperties.PROP_PAP_WEBAPPS);
 				throw new Exception("Invalid Webapps Path Location property : " + XACMLRestProperties.PROP_PAP_WEBAPPS);
 			}
@@ -88,9 +87,8 @@ public class Webapps {
 				try {
 					Files.createDirectories(webappsPathConfig);
 				} catch (IOException e) {
-					logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Failed to create config directory: "
+					LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Failed to create config directory: "
 							+ webappsPathConfig.toAbsolutePath().toString(), e);
-					// TODO:EELF Cleanup - Remove logger
 					PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW, e, "Webapps", "Failed to create config directory");
 				}
 			}
@@ -99,9 +97,8 @@ public class Webapps {
 				try {
 					Files.createDirectories(webappsPathAction);
 				} catch (IOException e) {
-					logger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Failed to create config directory: "
+					LOGGER.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Failed to create config directory: "
 							+ webappsPathAction.toAbsolutePath().toString(), e);
-					// TODO:EELF Cleanup - Remove logger
 					PolicyLogger.error(MessageCodes.ERROR_PROCESS_FLOW, e, "Webapps", "Failed to create config directory");
 				}
 			}