X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=blobdiff_plain;f=ONAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Frest%2Futil%2FMSModelUtils.java;h=3880b35d844a700fe580f3de80317200f5581753;hp=fa2c51d18d329db7b942f002ba5a9c5f1b9f1bfa;hb=401b48bc573561f097960a9ca7abe6d788456f28;hpb=9301fed7c290f52208922f780fdfe4b5a880b5aa

diff --git a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
index fa2c51d18..3880b35d8 100644
--- a/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
+++ b/ONAP-REST/src/main/java/org/onap/policy/rest/util/MSModelUtils.java
@@ -86,7 +86,7 @@ public class MSModelUtils {
 	};
 
 
-	public HashMap<String, MSAttributeObject> processEpackage(String file, MODEL_TYPE model){
+	public Map<String, MSAttributeObject> processEpackage(String file, MODEL_TYPE model){
 		if (model == MODEL_TYPE.XMI ){
 			processXMIEpackage(file);
 		}
@@ -97,8 +97,8 @@ public class MSModelUtils {
 	private void processXMIEpackage(String xmiFile){
 		EPackage root = getEpackage(xmiFile);
 		TreeIterator<EObject> treeItr = root.eAllContents();
-		String className = null;
-		String returnValue = null;
+		String className;
+		String returnValue;
 
 		//    Pulling out dependency from file
 		while (treeItr.hasNext()) {	    
@@ -151,15 +151,13 @@ public class MSModelUtils {
 
 
 	private void UpdateMatching(HashMap<String, String> tempAttribute, String key) {
-		Map<String, MSAttributeObject> newClass = null;
-
-		newClass = classMap;
+		Map<String, MSAttributeObject> newClass = classMap;
 
 		for (Entry<String, MSAttributeObject> updateClass :  newClass.entrySet()){
-			HashMap<String, String> valueMap = updateClass.getValue().getMatchingSet();
+			Map<String, String> valueMap = updateClass.getValue().getMatchingSet();
 			String keymap = updateClass.getKey();
 			if (valueMap.containsKey(key)){
-				HashMap<String, String> modifyMap = classMap.get(keymap).getMatchingSet();
+				Map<String, String> modifyMap = classMap.get(keymap).getMatchingSet();
 				modifyMap.remove(key);
 				modifyMap.putAll(tempAttribute);
 				classMap.get(keymap).setMatchingSet(modifyMap);
@@ -181,7 +179,7 @@ public class MSModelUtils {
 		m.put("xmi", new XMIResourceFactoryImpl());
 		Resource resource = resSet.getResource(URI.createFileURI(xmiFile), true);
 		try {
-			resource.load(Collections.EMPTY_MAP);
+			resource.load(Collections.emptyMap());
 		} catch (IOException e) {
 			logger.error("Error loading Encore Resource for new Model" + e);
 		}
@@ -210,14 +208,14 @@ public class MSModelUtils {
 	public void getAttributes(String className, String dependency, EPackage root) {
 		List<String> dpendList = new ArrayList<>();
 		if (dependency!=null){
-			dpendList = new ArrayList<String>(Arrays.asList(dependency.split(",")));
+			dpendList = new ArrayList<>(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, Object> returnSubList = getSubAttributeList(root, className, extendClass);
+		Map<String, String> returnRefList = getRefAttributeList(root, className, extendClass);
+		Map<String, String> returnAttributeList = getAttributeList(root, className, extendClass);
+		Map<String, Object> returnSubList = getSubAttributeList(root, className, extendClass);
 		HashMap<String, String> returnAnnotation = getAnnotation(root, className, extendClass);
 		msAttributeObject.setAttribute(returnAttributeList);
 		msAttributeObject.setRefAttribute(returnRefList);
@@ -234,9 +232,9 @@ public class MSModelUtils {
 		boolean requiredAttribute = false; 
 		boolean requiredMatchAttribute = false;
 		HashMap<String, String> annotationSet = new HashMap<>();
-		String  matching  = null;
-		String range   = null;
-		String dictionary = null;
+		String  matching;
+		String range;
+		String dictionary;
 
 		//    Pulling out dependency from file
 		while (treeItr.hasNext()) {	    
@@ -249,7 +247,7 @@ public class MSModelUtils {
 			if (requiredAttribute){
 				if (obj instanceof EStructuralFeature) {
 					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
-					if (eStrucClassifier.getEAnnotations().size() != 0) {
+					if (!eStrucClassifier.getEAnnotations().isEmpty()) {
 						matching  = annotationValue(eStrucClassifier, ANNOTATION_TYPE.MATCHING, policy);
 						if (matching!=null){
 							annotationSet.put(eStrucClassifier.getName(), matching);
@@ -267,7 +265,7 @@ public class MSModelUtils {
 			} else if (requiredMatchAttribute){
 				if (obj instanceof EStructuralFeature) {
 					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
-					if (eStrucClassifier.getEAnnotations().size() != 0) {
+					if (!eStrucClassifier.getEAnnotations().isEmpty()) {
 						matching  = annotationValue(eStrucClassifier, ANNOTATION_TYPE.MATCHING, policy);
 						if (matching!=null){
 							if (obj instanceof EReference){
@@ -285,13 +283,13 @@ public class MSModelUtils {
 		return annotationSet;
 	}
 
-	private HashMap<String, Object> getSubAttributeList(EPackage root, String className , String superClass) {
+	private Map<String, Object> getSubAttributeList(EPackage root, String className , String superClass) {
 		TreeIterator<EObject> treeItr = root.eAllContents();
 		boolean requiredAttribute = false; 
-		HashMap<String, Object> subAttribute = new HashMap<String, Object>();
+		Map<String, Object> subAttribute = new HashMap<>();
 		int rollingCount = 0;
 		int processClass = 0;
-		boolean annotation = false;
+		boolean annotation;
 
 		//    Pulling out dependency from file
 		while (treeItr.hasNext() && rollingCount < 2) {	 
@@ -312,7 +310,7 @@ public class MSModelUtils {
 			if (requiredAttribute)   {
 				if (obj instanceof EStructuralFeature) {
 					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
-					if (eStrucClassifier.getEAnnotations().size() != 0) {
+					if (!eStrucClassifier.getEAnnotations().isEmpty()) {
 						annotation = annotationTest(eStrucClassifier, configuration, onap);
 						if (annotation &&  obj instanceof EReference) {
 							EClass refType = ((EReference) obj).getEReferenceType();
@@ -348,7 +346,7 @@ public class MSModelUtils {
 		return ":required-false";
 	}
 
-	public JSONObject buildJavaObject(HashMap<String, String> map, String attributeType){
+	public JSONObject buildJavaObject(Map<String, String> map){
 
 		JSONObject returnValue = new JSONObject(map);
 
@@ -356,14 +354,14 @@ public class MSModelUtils {
 
 	}
 
-	public HashMap<String, String> getRefAttributeList(EPackage root, String className, String superClass){
+	public Map<String, String> getRefAttributeList(EPackage root, String className, String superClass){
 
 		TreeIterator<EObject> treeItr = root.eAllContents();
 		boolean requiredAttribute = false; 
 		HashMap<String, String> refAttribute = new HashMap<>();
 		int rollingCount = 0;
 		int processClass = 0;
-		boolean annotation = false;
+		boolean annotation;
 		//    Pulling out dependency from file
 		while (treeItr.hasNext()) {	    
 			EObject obj = treeItr.next();
@@ -382,7 +380,7 @@ public class MSModelUtils {
 			if (requiredAttribute)   {
 				if (obj instanceof EStructuralFeature) {
 					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
-					if (eStrucClassifier.getEAnnotations().size() != 0) {
+					if (!eStrucClassifier.getEAnnotations().isEmpty()) {
 						annotation = annotationTest(eStrucClassifier, configuration, onap);
 						if ( annotation &&  obj instanceof EReference) {
 							EClass refType = ((EReference) obj).getEReferenceType();
@@ -408,10 +406,10 @@ public class MSModelUtils {
 	}
 
 	private boolean annotationTest(EStructuralFeature eStrucClassifier, String annotation, String type) {
-		String annotationType = null;
-		EAnnotation eAnnotation = null;
-		String onapType = null;
-		String onapValue = null;
+		String annotationType;
+		EAnnotation eAnnotation;
+		String onapType;
+		String onapValue;
 
 		EList<EAnnotation> value = eStrucClassifier.getEAnnotations();
 
@@ -432,9 +430,9 @@ public class MSModelUtils {
 
 
 	private String annotationValue(EStructuralFeature eStrucClassifier, ANNOTATION_TYPE annotation, String type) {
-		String annotationType = null;
-		EAnnotation eAnnotation = null;
-		String onapType = null;
+		String annotationType;
+		EAnnotation eAnnotation;
+		String onapType;
 		String onapValue = null;
 
 		EList<EAnnotation> value = eStrucClassifier.getEAnnotations();
@@ -501,15 +499,15 @@ public class MSModelUtils {
 		return returnSubTypes;
 	} 
 
-	public HashMap<String, String> getAttributeList(EPackage root, String className, String superClass){
+	public Map<String, String> getAttributeList(EPackage root, String className, String superClass){
 
 		TreeIterator<EObject> treeItr = root.eAllContents();
 		boolean requiredAttribute = false; 
 		HashMap<String, String> refAttribute = new HashMap<>();
-		boolean annotation = false;
-		boolean dictionaryTest = false;
-		String defaultValue = null;
-		String eType = null;
+		boolean annotation;
+		boolean dictionaryTest;
+		String defaultValue;
+		String eType;
 
 		//    Pulling out dependency from file
 		while (treeItr.hasNext()) {	    
@@ -526,7 +524,7 @@ public class MSModelUtils {
 			if (requiredAttribute){
 				if (obj instanceof EStructuralFeature) {
 					EStructuralFeature eStrucClassifier = (EStructuralFeature) obj;
-					if (eStrucClassifier.getEAnnotations().size() != 0) {
+					if (!eStrucClassifier.getEAnnotations().isEmpty()) {
 						annotation = annotationTest(eStrucClassifier, configuration, onap);
 						dictionaryTest = annotationTest(eStrucClassifier, dictionary, policy);
 						EClassifier refType = ((EStructuralFeature) obj).getEType();
@@ -578,9 +576,9 @@ public class MSModelUtils {
 		return returnValue;
 	}
 
-	public Map<String, String> buildSubList(HashMap<String, String> subClassAttributes, HashMap<String, MSAttributeObject> classMap, String className){
+	public Map<String, String> buildSubList(Map<String, String> subClassAttributes, Map<String, MSAttributeObject> classMap, String className){
 		Map<String, String> missingValues = new HashMap<>();
-		Map<String, String> workingMap = new HashMap<>();
+		Map<String, String> workingMap;
 		boolean enumType;
 
 		for ( Entry<String, String> map : classMap.get(className).getRefAttribute().entrySet()){
@@ -604,10 +602,10 @@ public class MSModelUtils {
 		return missingValues;
 	}
 
-	public Map<String, HashMap<String, String>> recursiveReference(HashMap<String, MSAttributeObject> classMap, String className){
+	public Map<String, Map<String, String>> recursiveReference(Map<String, MSAttributeObject> classMap, String className){
 
-		Map<String, HashMap<String, String>> returnObject = new HashMap<>();
-		HashMap<String, String> returnClass = getRefclass(classMap, className);
+		Map<String, Map<String, String>> returnObject = new HashMap<>();
+		Map<String, String> returnClass = getRefclass(classMap, className);
 		returnObject.put(className, returnClass);
 		for (Entry<String, String> reAttribute :returnClass.entrySet()){
 			if (reAttribute.getValue().split(":")[1].contains("MANY")){
@@ -622,16 +620,16 @@ public class MSModelUtils {
 
 	}
 
-	public String createJson(HashMap<String, Object> subClassAttributes, HashMap<String, MSAttributeObject> classMap, String className) { 
+	public String createJson(Map<String, Object> subClassAttributes, Map<String, MSAttributeObject> classMap, String className) {
 		boolean enumType;
-		Map<String, HashMap<String, String>> myObject = new HashMap<>();
+		Map<String, Map<String, String>> myObject = new HashMap<>();
 		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] );
+						Map<String, Map<String, String>> testRecursive = recursiveReference(classMap, map.getValue().split(":")[0] );
 						myObject.putAll(testRecursive);
 					}
 				}
@@ -644,7 +642,7 @@ public class MSModelUtils {
 		return json;		
 	}
 
-	public HashMap<String, String> getRefclass(HashMap<String, MSAttributeObject> classMap, String className){
+	public Map<String, String> getRefclass(Map<String, MSAttributeObject> classMap, String className){
 		HashMap<String, String> missingValues = new HashMap<>();
 
 		if (classMap.get(className).getAttribute()!=null || !classMap.get(className).getAttribute().isEmpty()){
@@ -658,12 +656,12 @@ public class MSModelUtils {
 		return missingValues;	
 	}
 
-	public String createSubAttributes(ArrayList<String> dependency, HashMap<String, MSAttributeObject> classMap, String modelName) {
+	public String createSubAttributes(List<String> dependency, Map<String, MSAttributeObject> classMap, String modelName) {
 
 		HashMap <String,  Object>  workingMap = new HashMap<>();
-		MSAttributeObject tempObject = new MSAttributeObject();
+		MSAttributeObject tempObject;
 		if (dependency!=null){
-			if (dependency.size()==0){
+			if (dependency.isEmpty()){
 				return "{}";
 			}	
 			dependency.add(modelName);
@@ -679,15 +677,15 @@ public class MSModelUtils {
 		return returnValue;
 	}
 
-	public ArrayList<String> getFullDependencyList(ArrayList<String> dependency, HashMap<String,MSAttributeObject > classMap) {
+	public List<String> getFullDependencyList(List<String> dependency, Map<String,MSAttributeObject > classMap) {
 		ArrayList<String> returnList = new ArrayList<>();
-		ArrayList<String> workingList = new ArrayList<>();
+		ArrayList<String> workingList;
 		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(",")));	
+				workingList = new ArrayList<>(Arrays.asList(rawValue.split(",")));
 				for(String depend : workingList){
 					if (!returnList.contains(depend) && !depend.isEmpty()){
 						returnList.add(depend.trim());