Reduce technical debt

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
index e62c878..3be7de3 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/admin/PolicyManagerServlet.java
@@ -314,8 +314,8 @@ public class PolicyManagerServlet extends HttpServlet {
        }
 
        private JSONObject searchPolicyList(JSONObject params, HttpServletRequest request) {
-               Set<String> scopes = null;
-               List<String> roles = null;
+               Set<String> scopes;
+               List<String> roles;
                List<Object> policyData = new ArrayList<>();
                JSONArray policyList = null;
                if(params.has("policyList")){
@@ -442,7 +442,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        policyName = removeExtension.substring(0, removeExtension.lastIndexOf('.'));
                }
 
-               String activePolicy = null;
+               String activePolicy;
                PolicyController controller = getPolicyControllerInstance();
                if(params.toString().contains("activeVersion")){
                        String activeVersion = params.getString("activeVersion");
@@ -659,7 +659,7 @@ public class PolicyManagerServlet extends HttpServlet {
        }
 
        private List<Object> queryPolicyEditorScopes(String scopeName){
-               String scopeNamequery = "";
+               String scopeNamequery;
                SimpleBindings params = new SimpleBindings();
                if(scopeName == null){
                        scopeNamequery = "from PolicyEditorScopes";
@@ -668,7 +668,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        params.put("scopeName", scopeName + "%");
                }
                PolicyController controller = getPolicyControllerInstance();
-               List<Object> scopesList = null;
+               List<Object> scopesList;
                if(PolicyController.isjUnit()){
                        scopesList = controller.getDataByQuery(scopeNamequery, null);
                }else{
@@ -692,8 +692,8 @@ public class PolicyManagerServlet extends HttpServlet {
                SimpleBindings params = new SimpleBindings();
                params.put("scopeName", scopeName + "%");
 
-               List<Object> activePolicies = null;
-               List<Object> scopesList = null;
+               List<Object> activePolicies;
+               List<Object> scopesList;
                if(PolicyController.isjUnit()){
                        activePolicies = controller.getDataByQuery(query, null);
                        scopesList = controller.getDataByQuery(scopeNamequery, null);
@@ -727,7 +727,7 @@ public class PolicyManagerServlet extends HttpServlet {
                                }
                        }
                }
-               String scopeNameCheck = null;
+               String scopeNameCheck;
                for (Object list : activePolicies) {
                        PolicyVersion policy = (PolicyVersion) list;
                        String scopeNameValue = policy.getPolicyName().substring(0, policy.getPolicyName().lastIndexOf(File.separator));
@@ -862,7 +862,7 @@ public class PolicyManagerServlet extends HttpServlet {
 
        private JSONObject policyRename(String oldPath, String newPath, String userId) throws ServletException {
                try {
-                       PolicyEntity entity = null;
+                       PolicyEntity entity;
                        PolicyController controller = getPolicyControllerInstance();
 
                        String policyVersionName = newPath.replace(".xml", "");
@@ -1004,7 +1004,7 @@ public class PolicyManagerServlet extends HttpServlet {
 
        private JSONObject cloneRecord(String newpolicyName, String oldScope, String removeoldPolicyExtension, String newScope, String removenewPolicyExtension, PolicyEntity entity, String userId) throws ServletException{
                FileWriter fw = null;
-               String queryEntityName = null;
+               String queryEntityName;
                PolicyController controller = getPolicyControllerInstance();
                PolicyEntity cloneEntity = new PolicyEntity();
                cloneEntity.setPolicyName(newpolicyName);
@@ -1174,7 +1174,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        path = path.substring(path.indexOf('/')+1);
                        String policyNamewithExtension = path.replace("/", File.separator);
                        String policyVersionName = policyNamewithExtension.replace(".xml", "");
-                       String query = "";
+                       String query;
                        SimpleBindings policyParams = new SimpleBindings();
                        if(path.endsWith(".xml")){
                                policyNamewithoutExtension = policyVersionName.substring(0, policyVersionName.lastIndexOf('.'));
@@ -1413,7 +1413,7 @@ public class PolicyManagerServlet extends HttpServlet {
                        SimpleBindings peParams = new SimpleBindings();
                        peParams.put("split_1", split[1]);
                        peParams.put("split_0", split[0]);
-                       List<Object> queryData = null;
+                       List<Object> queryData;
                        if(PolicyController.isjUnit()){
                                queryData = controller.getDataByQuery(query, null);
                        }else{