X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2Fcomponents%2FPolicy.java;h=3b3e81ee2f01cb25f3032280903c2f3a9f845822;hb=b6d9063e06ab8cdf2d97fc75810792659344e4a8;hp=20c76f3be97123b87e5335e641afef9db4b63ad1;hpb=e0385921034ae9ce860038ea65d2d13259f7cc4c;p=policy%2Fengine.git

diff --git a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/Policy.java b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/Policy.java
index 20c76f3be..3b3e81ee2 100644
--- a/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/Policy.java
+++ b/ONAP-PAP-REST/src/main/java/org/onap/policy/pap/xacml/rest/components/Policy.java
@@ -108,7 +108,6 @@ public abstract class Policy {
 	public static final String URI_DATATYPE = "http://www.w3.org/2001/XMLSchema#anyURI";
 	public static final String RULE_VARIABLE = "var:";
 	public static final String EMPTY_STRING = "";
-	private static final String String = null;
 
 	protected static String CONFIG_HOME = null;
 	protected static String ACTION_HOME = null;
@@ -205,9 +204,9 @@ public abstract class Policy {
 		String policyDir = EMPTY_STRING;
 		String absolutePath = parent.toString();
 		if (absolutePath != null && !absolutePath.equals(EMPTY_STRING)) {
-			policyDir = absolutePath.substring(absolutePath.lastIndexOf("\\") + 1, absolutePath.length());
+			policyDir = absolutePath.substring(absolutePath.lastIndexOf('\\') + 1, absolutePath.length());
 			if (policyDir == null || policyDir.equals(EMPTY_STRING)) {
-				policyDir = absolutePath.substring(absolutePath.lastIndexOf("/") + 1, absolutePath.length());
+				policyDir = absolutePath.substring(absolutePath.lastIndexOf('/') + 1, absolutePath.length());
 			}
 		}
 
@@ -215,10 +214,9 @@ public abstract class Policy {
 		if (policyDir != null && !policyDir.equals(EMPTY_STRING)) {
 			fileName = policyType + "_" + String.format(polcyFileName) + "." + version + ".xml";
 		} 
-		if (fileName != null) {
-			newFile = Paths.get(parent.toString(), fileName);
-		}
-		if (Files.notExists(newFile)) {
+			
+		newFile = Paths.get(parent.toString(), fileName);
+		if (newFile.toFile().exists()) {
 			return newFile;
 		}
 		return null;
@@ -232,26 +230,28 @@ public abstract class Policy {
 		String policyDir = EMPTY_STRING;
 		String absolutePath = parentPath.toString();
 		if (absolutePath != null && !absolutePath.equals(EMPTY_STRING)) {
-			policyDir = absolutePath.substring(absolutePath.lastIndexOf("\\") + 1, absolutePath.length());
+			policyDir = absolutePath.substring(absolutePath.lastIndexOf('\\') + 1, absolutePath.length());
 			if (policyDir == null || policyDir.equals(EMPTY_STRING)) {
-				policyDir = absolutePath.substring(absolutePath.lastIndexOf("/") + 1, absolutePath.length());
+				policyDir = absolutePath.substring(absolutePath.lastIndexOf('/') + 1, absolutePath.length());
 			}
 		}
 
 		String fileName = "default";
 		if (policyDir != null && !policyDir.equals(EMPTY_STRING)) {
-			if(policyConfigType.equals("ClosedLoop_PM")){
+			if("ClosedLoop_PM".equals(policyConfigType)){
 				fileName = policyType + "_" + "PM" + "_" +java.lang.String.format(policyFileName) + "." +version +".xml";
-			}else if(policyConfigType.equals("ClosedLoop_Fault")){
+			}else if("ClosedLoop_Fault".equals(policyConfigType)){
 				fileName = policyType + "_" + "Fault" + "_" +java.lang.String.format(policyFileName) +  "." + version + ".xml";
-			}else if(policyConfigType.equals("Micro Service")){
+			}else if("Micro Service".equals(policyConfigType)){
 				fileName = policyType + "_" + "MS" + "_" + java.lang.String.format(policyFileName) + "." + version + ".xml";
+			}else if("Optimization".equals(policyConfigType)) {
+				fileName = policyType + "_" + "OOF" + "_" + java.lang.String.format(policyFileName) + "." + version + ".xml";
 			}
 		} 
-		if (fileName != null) {
-			newFile = Paths.get(parentPath.toString(), fileName);
-		}
-		if (Files.notExists(newFile)) {
+
+		newFile = Paths.get(parentPath.toString(), fileName);
+
+		if (newFile.toFile().exists()) {
 			return newFile;
 		}
 		return null;