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 672177d..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
@@ -141,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);
                                }
                        }
 
@@ -372,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();
@@ -428,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);
@@ -461,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);