Merge "ONAP code change for log files consolidation"

[policy/engine.git] / ONAP-PAP-REST / src / main / java / org / onap / policy / pap / xacml / rest / components / Policy.java

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 169e6e1..3b3e81e 100644 (file)
--- 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
@@ -20,23 +20,17 @@
 
 package org.onap.policy.pap.xacml.rest.components;
 
-import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.net.URI;
 import java.net.URISyntaxException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.json.Json;
-import javax.json.JsonReader;
-
 import org.apache.commons.io.FilenameUtils;
-import org.json.JSONObject;
 import org.onap.policy.common.logging.eelf.MessageCodes;
 import org.onap.policy.common.logging.eelf.PolicyLogger;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
@@ -114,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;
@@ -202,33 +195,6 @@ public abstract class Policy {
                return dynamicMatch;
        }
 
-       //validation for numeric
-       protected boolean isNumeric(String str){
-               for (char c : str.toCharArray()){
-                       if (!Character.isDigit(c)) return false;
-               }
-               return true;
-       }
-
-       // Validation for json.
-       protected static boolean isJSONValid(String data) {
-               JsonReader jsonReader = null;
-               try {
-                   new JSONObject(data);
-                       InputStream stream = new ByteArrayInputStream(data.getBytes(StandardCharsets.UTF_8));
-                       jsonReader = Json.createReader(stream);
-                       LOGGER.info("Json Value is: " + jsonReader.read().toString() );
-               } catch (Exception e) {
-                       LOGGER.error("Exception Occured while reading json"+e);
-                       return false;
-               }finally{
-                       if(jsonReader != null){
-                               jsonReader.close();
-                       }
-               }
-               return true;
-       }
-
        //  the Policy Name as Unique One throws error
        @SuppressWarnings("static-access")
        protected Path getNextFilename(Path parent, String policyType, String polcyFileName, Integer version) {
@@ -238,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());
                        }
                }
 
@@ -248,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;
@@ -265,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;