Merge "Fix technical debt and reduce lines"

[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 7234a3b..63d0cb2 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
@@ -52,8 +52,8 @@ import org.onap.policy.rest.dao.CommonClassDao;
 import org.onap.policy.rest.jpa.PolicyVersion;
 import org.onap.policy.utils.PolicyUtils;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.web.support.UserUtils;
+import org.onap.portalsdk.core.controller.RestrictedBaseController;
+import org.onap.portalsdk.core.web.support.UserUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
@@ -82,8 +82,26 @@ public class PolicyRestController extends RestrictedBaseController{
        private static final String modal = "model";
        private static final String importDictionary = "import_dictionary";
        
+       private static CommonClassDao commonClassDao;
+       
+       public PolicyRestController(){
+               //default constructor
+       }
+
        @Autowired
-       CommonClassDao commonClassDao;
+       private PolicyRestController(CommonClassDao commonClassDao){
+               PolicyRestController.commonClassDao = commonClassDao;
+       }
+       
+       public static CommonClassDao getCommonClassDao() {
+               return commonClassDao;
+       }
+
+       public static void setCommonClassDao(CommonClassDao commonClassDao) {
+               PolicyRestController.commonClassDao = commonClassDao;
+       }
+       
+
 
        @RequestMapping(value={"/policycreation/save_policy"}, method={RequestMethod.POST})
        public void policyCreationController(HttpServletRequest request, HttpServletResponse response) {
@@ -92,7 +110,11 @@ public class PolicyRestController extends RestrictedBaseController{
                mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
                try{
                        JsonNode root = mapper.readTree(request.getReader());
-
+                       
+                       policyLogger.info("****************************************Logging UserID while Create/Update Policy**************************************************");
+                       policyLogger.info("UserId:  " + userId + "Policy Data Object:  "+ root.get(PolicyController.getPolicydata()).get("policy").toString());
+                       policyLogger.info("***********************************************************************************************************************************");
+                       
                        PolicyRestAdapter policyData = mapper.readValue(root.get(PolicyController.getPolicydata()).get("policy").toString(), PolicyRestAdapter.class);
 
                        if("file".equals(root.get(PolicyController.getPolicydata()).get(modal).get("type").toString().replace("\"", ""))){
@@ -109,7 +131,7 @@ public class PolicyRestController extends RestrictedBaseController{
                                        policyData.setDomainDir(dirName + root.get(PolicyController.getPolicydata()).get(modal).get("name").toString().replace("\"", ""));
                                }
                        }else{
-                               String domain = root.get(PolicyController.getPolicydata()).get("model").get("name").toString();
+                               String domain = root.get(PolicyController.getPolicydata()).get(modal).get("name").toString();
                                if(domain.contains("/")){
                                        domain = domain.substring(0, domain.lastIndexOf('/')).replace("/", File.separator);
                                }
@@ -119,14 +141,11 @@ public class PolicyRestController extends RestrictedBaseController{
 
                        if(policyData.getConfigPolicyType() != null){
                                if("ClosedLoop_Fault".equalsIgnoreCase(policyData.getConfigPolicyType())){
-                                       CreateClosedLoopFaultController faultController = new CreateClosedLoopFaultController();
-                                       policyData = faultController.setDataToPolicyRestAdapter(policyData, root);
+                                       policyData = new CreateClosedLoopFaultController().setDataToPolicyRestAdapter(policyData, root);
                                }else if("Firewall Config".equalsIgnoreCase(policyData.getConfigPolicyType())){
-                                       CreateFirewallController fwController = new CreateFirewallController();
-                                       policyData = fwController.setDataToPolicyRestAdapter(policyData);
+                                       policyData = new CreateFirewallController().setDataToPolicyRestAdapter(policyData);
                                }else if("Micro Service".equalsIgnoreCase(policyData.getConfigPolicyType())){
-                                       CreateDcaeMicroServiceController msController = new CreateDcaeMicroServiceController();
-                                       policyData = msController.setDataToPolicyRestAdapter(policyData, root);
+                                       policyData = new CreateDcaeMicroServiceController().setDataToPolicyRestAdapter(policyData, root);
                                }
                        }
 
@@ -188,9 +207,13 @@ public class PolicyRestController extends RestrictedBaseController{
                HttpEntity<?> requestEntity = new HttpEntity<>(body, headers);
                ResponseEntity<?> result = null;
                HttpClientErrorException exception = null;
-       
+               String uri = requestURI;
+               if(uri.startsWith("/")){
+                       uri = uri.substring(uri.indexOf('/')+1);
+               }
+               uri = "onap" + uri.substring(uri.indexOf('/'));
                try{
-                       result = restTemplate.exchange(papUrl + requestURI, method, requestEntity, String.class);
+                       result = restTemplate.exchange(papUrl + uri, method, requestEntity, String.class);
                }catch(Exception e){
                        policyLogger.error(XACMLErrorConstants.ERROR_PROCESS_FLOW + "Error while connecting to " + papUrl, e);
                        exception = new HttpClientErrorException(HttpStatus.INTERNAL_SERVER_ERROR, e.getMessage());
@@ -346,7 +369,7 @@ public class PolicyRestController extends RestrictedBaseController{
        @RequestMapping(value={"/getDictionary/*"}, method={RequestMethod.GET})
        public void getDictionaryController(HttpServletRequest request, HttpServletResponse response){
                String uri = request.getRequestURI().replace("/getDictionary", "");
-               String body = null;
+               String body;
                ResponseEntity<?> responseEntity = sendToPAP(null, uri, HttpMethod.GET);
                if(responseEntity != null){
                        body = responseEntity.getBody().toString();
@@ -362,11 +385,21 @@ public class PolicyRestController extends RestrictedBaseController{
        
        @RequestMapping(value={"/saveDictionary/*/*"}, method={RequestMethod.POST})
        public ModelAndView saveDictionaryController(HttpServletRequest request, HttpServletResponse response) throws IOException{
+               String userId = "";
                String uri = request.getRequestURI().replace("/saveDictionary", "");
+               if(uri.startsWith("/")){
+                       uri = uri.substring(uri.indexOf('/')+1);
+               }
+               uri = "/onap" + uri.substring(uri.indexOf('/'));
                if(uri.contains(importDictionary)){
-                       String userId = UserUtils.getUserSession(request).getOrgUserId();
+                       userId = UserUtils.getUserSession(request).getOrgUserId();
                        uri = uri+ "?userId=" +userId;
                }
+               
+               policyLogger.info("****************************************Logging UserID while Saving Dictionary*****************************************************");
+               policyLogger.info("UserId:  " + userId);
+               policyLogger.info("***********************************************************************************************************************************");
+               
                String body = callPAP(request, "POST", uri.replaceFirst("/", "").trim());
                response.getWriter().write(body);
                return null;
@@ -375,6 +408,16 @@ public class PolicyRestController extends RestrictedBaseController{
        @RequestMapping(value={"/deleteDictionary/*/*"}, method={RequestMethod.POST})
        public ModelAndView deletetDictionaryController(HttpServletRequest request, HttpServletResponse response) throws IOException {
                String uri = request.getRequestURI().replace("/deleteDictionary", "");
+               if(uri.startsWith("/")){
+                       uri = uri.substring(uri.indexOf('/')+1);
+               }
+               uri = "/onap" + uri.substring(uri.indexOf('/'));
+               
+               String userId = UserUtils.getUserSession(request).getOrgUserId();
+               policyLogger.info("****************************************Logging UserID while Deleting Dictionary*****************************************************");
+               policyLogger.info("UserId:  " + userId);
+               policyLogger.info("*************************************************************************************************************************************");
+               
                String body = callPAP(request, "POST", uri.replaceFirst("/", "").trim());
                response.getWriter().write(body);
                return null;
@@ -382,8 +425,12 @@ public class PolicyRestController extends RestrictedBaseController{
        
        @RequestMapping(value={"/searchDictionary"}, method={RequestMethod.POST})
        public ModelAndView searchDictionaryController(HttpServletRequest request, HttpServletResponse response) throws IOException {
-               Object resultList = null;
+               Object resultList;
                String uri = request.getRequestURI();
+               if(uri.startsWith("/")){
+                       uri = uri.substring(uri.indexOf('/')+1);
+               }
+               uri = "/onap" + uri.substring(uri.indexOf('/'));
                try{
                        String body = callPAP(request, "POST", uri.replaceFirst("/", "").trim());
                        if(body.contains("CouldNotConnectException")){
@@ -411,8 +458,12 @@ public class PolicyRestController extends RestrictedBaseController{
        
        @RequestMapping(value={"/searchPolicy"}, method={RequestMethod.POST})
        public ModelAndView searchPolicy(HttpServletRequest request, HttpServletResponse response) throws IOException{
-               Object resultList = null;
+               Object resultList;
                String uri = request.getRequestURI()+"?action=search";
+               if(uri.startsWith("/")){
+                       uri = uri.substring(uri.indexOf('/')+1);
+               }
+               uri = "/onap" + uri.substring(uri.indexOf('/'));
                String body = callPAP(request, "POST", uri.replaceFirst("/", "").trim());
 
                JSONObject json = new JSONObject(body);
@@ -440,4 +491,4 @@ public class PolicyRestController extends RestrictedBaseController{
                callPAP(null, "POST", uri.trim());
        }
 
-}
\ No newline at end of file
+}