Merge "Fix for Sonar major issues"

[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / controller / PolicyController.java

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
index 35b9b95..321dc72 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
@@ -40,6 +40,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.json.JSONObject;
 import org.onap.policy.admin.PolicyNotificationMail;
 import org.onap.policy.admin.RESTfulPAPEngine;
+import org.onap.policy.common.logging.flexlogger.FlexLogger;
+import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.model.PDPGroupContainer;
 import org.onap.policy.rest.XACMLRestProperties;
 import org.onap.policy.rest.XacmlAdminAuthorization;
@@ -49,6 +51,8 @@ import org.onap.policy.rest.jpa.FunctionDefinition;
 import org.onap.policy.rest.jpa.PolicyEntity;
 import org.onap.policy.rest.jpa.PolicyVersion;
 import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.xacml.api.XACMLErrorConstants;
+import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
 import org.openecomp.policy.model.Roles;
 import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
 import org.openecomp.portalsdk.core.web.support.JsonMessage;
@@ -60,15 +64,9 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
 
-import org.onap.policy.xacml.api.XACMLErrorConstants;
-import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
-
 import com.att.research.xacml.util.XACMLProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import org.onap.policy.common.logging.flexlogger.FlexLogger;
-import org.onap.policy.common.logging.flexlogger.Logger;
-
 
 @Controller
 @RequestMapping("/")
@@ -145,6 +143,17 @@ public class PolicyController extends RestrictedBaseController {
        //WebApp directories
        private static String configHome;
        private static String actionHome;
+       
+       private static boolean jUnit = false;
+       
+
+       public static boolean isjUnit() {
+               return jUnit;
+       }
+
+       public static void setjUnit(boolean jUnit) {
+               PolicyController.jUnit = jUnit;
+       }
 
        @Autowired
        private PolicyController(CommonClassDao commonClassDao){
@@ -159,7 +168,12 @@ public class PolicyController extends RestrictedBaseController {
                Properties prop = new Properties();
                InputStream input = null;
                try {
-                       input = new FileInputStream("xacml.admin.properties");
+                       if(jUnit){
+                               File file = new File(new File(".").getCanonicalPath() + File.separator + "src"+ File.separator + "test" + File.separator + "resources" + File.separator + "JSONConfig.json");
+                               input = new FileInputStream(file);
+                       }else{
+                               input = new FileInputStream("xacml.admin.properties");
+                       }
                        // load a properties file
                        prop.load(input);
                        //pap url
@@ -321,7 +335,7 @@ public class PolicyController extends RestrictedBaseController {
        }
 
        //Policy tabs Model and View
-       @RequestMapping(value= {"/policy", "/policy/Editor" } , method = RequestMethod.GET)
+    @RequestMapping(value= {"/policy", "/policy/Editor" } , method = RequestMethod.GET)
        public ModelAndView view(HttpServletRequest request){
                String myRequestURL = request.getRequestURL().toString();
                try {
@@ -341,7 +355,7 @@ public class PolicyController extends RestrictedBaseController {
                return papEngine;
        }
 
-       public void setPapEngine(PAPPolicyEngine papEngine) {
+       public static void setPapEngine(PAPPolicyEngine papEngine) {
                PolicyController.papEngine = papEngine;
        }
 
@@ -352,7 +366,7 @@ public class PolicyController extends RestrictedBaseController {
        }
 
        public static boolean getActivePolicy(String query) {
-               if(commonClassDao.getDataByQuery(query, new SimpleBindings()).size() > 0){
+               if(!commonClassDao.getDataByQuery(query, new SimpleBindings()).isEmpty()){
                        return true;
                }else{
                        return false;
@@ -696,4 +710,12 @@ public class PolicyController extends RestrictedBaseController {
        public static String getFile() {
                return file;
        }
+       
+       public String convertDate(String dateTTL) {
+               String formateDate = null;
+               if(dateTTL.contains("-")){
+                       formateDate = dateTTL.replace("-", "/");
+               }
+               return formateDate;
+       }
 }