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 f38f3e2..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
@@ -84,23 +84,25 @@ public class PolicyRestController extends RestrictedBaseController{
        
        private static CommonClassDao commonClassDao;
        
-       public static CommonClassDao getCommonClassDao() {
-               return commonClassDao;
+       public PolicyRestController(){
+               //default constructor
        }
 
-       public static void setCommonClassDao(CommonClassDao commonClassDao) {
-               PolicyRestController.commonClassDao = commonClassDao;
-       }
-       
        @Autowired
        private PolicyRestController(CommonClassDao commonClassDao){
                PolicyRestController.commonClassDao = commonClassDao;
        }
        
-       public PolicyRestController(){
-               //default constructor
+       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) {
                String userId = UserUtils.getUserSession(request).getOrgUserId();
@@ -129,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);
                                }
@@ -139,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);
                                }
                        }
 
@@ -370,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();
@@ -426,7 +425,7 @@ 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);
@@ -459,7 +458,7 @@ 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);
@@ -492,4 +491,4 @@ public class PolicyRestController extends RestrictedBaseController{
                callPAP(null, "POST", uri.trim());
        }
 
-}
\ No newline at end of file
+}