Merge "Add New Junit Tests For ONAP-XACML"

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java
index e99f35b..08f8030 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyRestController.java
@@ -82,8 +82,24 @@ public class PolicyRestController extends RestrictedBaseController{
        private static final String modal = "model";
        private static final String importDictionary = "import_dictionary";
        
+       private static CommonClassDao commonClassDao;
+       
+       public static CommonClassDao getCommonClassDao() {
+               return commonClassDao;
+       }
+
+       public static void setCommonClassDao(CommonClassDao commonClassDao) {
+               PolicyRestController.commonClassDao = commonClassDao;
+       }
+       
        @Autowired
-       CommonClassDao commonClassDao;
+       private PolicyRestController(CommonClassDao commonClassDao){
+               PolicyRestController.commonClassDao = commonClassDao;
+       }
+       
+       public PolicyRestController(){
+               //default constructor
+       }
 
        @RequestMapping(value={"/policycreation/save_policy"}, method={RequestMethod.POST})
        public void policyCreationController(HttpServletRequest request, HttpServletResponse response) {
@@ -361,7 +377,7 @@ public class PolicyRestController extends RestrictedBaseController{
        }
        
        @RequestMapping(value={"/saveDictionary/*/*"}, method={RequestMethod.POST})
-       public ModelAndView saveDictionaryController(HttpServletRequest request, HttpServletResponse response) throws Exception{
+       public ModelAndView saveDictionaryController(HttpServletRequest request, HttpServletResponse response) throws IOException{
                String uri = request.getRequestURI().replace("/saveDictionary", "");
                if(uri.contains(importDictionary)){
                        String userId = UserUtils.getUserSession(request).getOrgUserId();
@@ -373,7 +389,7 @@ public class PolicyRestController extends RestrictedBaseController{
        }
        
        @RequestMapping(value={"/deleteDictionary/*/*"}, method={RequestMethod.POST})
-       public ModelAndView deletetDictionaryController(HttpServletRequest request, HttpServletResponse response) throws Exception{
+       public ModelAndView deletetDictionaryController(HttpServletRequest request, HttpServletResponse response) throws IOException {
                String uri = request.getRequestURI().replace("/deleteDictionary", "");
                String body = callPAP(request, "POST", uri.replaceFirst("/", "").trim());
                response.getWriter().write(body);
@@ -381,7 +397,7 @@ public class PolicyRestController extends RestrictedBaseController{
        }
        
        @RequestMapping(value={"/searchDictionary"}, method={RequestMethod.POST})
-       public ModelAndView searchDictionaryController(HttpServletRequest request, HttpServletResponse response) throws Exception{
+       public ModelAndView searchDictionaryController(HttpServletRequest request, HttpServletResponse response) throws IOException {
                Object resultList = null;
                String uri = request.getRequestURI();
                try{
@@ -410,7 +426,7 @@ public class PolicyRestController extends RestrictedBaseController{
        }
        
        @RequestMapping(value={"/searchPolicy"}, method={RequestMethod.POST})
-       public ModelAndView searchPolicy(HttpServletRequest request, HttpServletResponse response) throws Exception{
+       public ModelAndView searchPolicy(HttpServletRequest request, HttpServletResponse response) throws IOException{
                Object resultList = null;
                String uri = request.getRequestURI()+"?action=search";
                String body = callPAP(request, "POST", uri.replaceFirst("/", "").trim());