CHeckstyle and JUnit for base package in ONAP-REST
[policy/engine.git] / POLICY-SDK-APP / src / main / java / org / onap / policy / admin / PolicyManagerServlet.java
index baf27b0..224ee07 100644 (file)
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
+ * Modifications Copyright (C) 2019 Bell Canada
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
 
 package org.onap.policy.admin;
 
+import com.att.research.xacml.util.XACMLProperties;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
 import java.io.ByteArrayInputStream;
@@ -36,7 +41,14 @@ import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 import javax.json.Json;
 import javax.json.JsonArray;
@@ -55,6 +67,7 @@ import org.apache.commons.fileupload.FileItem;
 import org.apache.commons.fileupload.disk.DiskFileItemFactory;
 import org.apache.commons.fileupload.servlet.ServletFileUpload;
 import org.apache.http.HttpStatus;
+import org.elasticsearch.common.Strings;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -63,8 +76,8 @@ import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.components.HumanPolicyComponent;
 import org.onap.policy.controller.PolicyController;
 import org.onap.policy.controller.PolicyExportAndImportController;
-import org.onap.policy.rest.XACMLRest;
-import org.onap.policy.rest.XACMLRestProperties;
+import org.onap.policy.rest.XacmlRest;
+import org.onap.policy.rest.XacmlRestProperties;
 import org.onap.policy.rest.adapter.PolicyRestAdapter;
 import org.onap.policy.rest.jpa.ActionBodyEntity;
 import org.onap.policy.rest.jpa.ConfigurationDataEntity;
@@ -72,18 +85,20 @@ import org.onap.policy.rest.jpa.PolicyEditorScopes;
 import org.onap.policy.rest.jpa.PolicyEntity;
 import org.onap.policy.rest.jpa.PolicyVersion;
 import org.onap.policy.rest.jpa.UserInfo;
+import org.onap.policy.utils.PeCryptoUtils;
 import org.onap.policy.utils.PolicyUtils;
 import org.onap.policy.utils.UserUtils.Pair;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.onap.policy.xacml.util.XACMLPolicyScanner;
 import org.onap.portalsdk.core.web.support.UserUtils;
 
-import com.att.research.xacml.util.XACMLProperties;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@WebServlet(value = "/fm/*", loadOnStartup = 1, initParams = {
-        @WebInitParam(name = "XACML_PROPERTIES_NAME", value = "xacml.admin.properties", description = "The location of the properties file holding configuration information.") })
+@WebServlet(
+        value = "/fm/*",
+        loadOnStartup = 1,
+        initParams = {@WebInitParam(
+                name = "XACML_PROPERTIES_NAME",
+                value = "xacml.admin.properties",
+                description = "The location of the properties file holding configuration information.")})
 public class PolicyManagerServlet extends HttpServlet {
     private static final Logger LOGGER = FlexLogger.getLogger(PolicyManagerServlet.class);
     private static final long serialVersionUID = -8453502699403909016L;
@@ -118,11 +133,13 @@ public class PolicyManagerServlet extends HttpServlet {
     private static final String BACKSLASH = "\\";
     private static final String ESCAPE_BACKSLASH = "\\\\";
     private static final String BACKSLASH_8TIMES = "\\\\\\\\";
-    private static final String DELETE_POLICY_VERSION_WHERE_POLICY_NAME = "delete from PolicyVersion where policy_name ='";
+    private static final String DELETE_POLICY_VERSION_WHERE_POLICY_NAME =
+            "delete from PolicyVersion where policy_name ='";
     private static final String UPDATE_POLICY_VERSION_SET_ACTIVE_VERSION = "update PolicyVersion set active_version='";
     private static final String SPLIT_1 = "split_1";
     private static final String SPLIT_0 = "split_0";
-    private static final String FROM_POLICY_EDITOR_SCOPES_WHERE_SCOPENAME_LIKE_SCOPE_NAME = "from PolicyEditorScopes where SCOPENAME like :scopeName";
+    private static final String FROM_POLICY_EDITOR_SCOPES_WHERE_SCOPENAME_LIKE_SCOPE_NAME =
+            "from PolicyEditorScopes where SCOPENAME like :scopeName";
     private static final String SCOPE_NAME = "scopeName";
     private static final String SUCCESS = "success";
     private static final String SUB_SCOPENAME = "subScopename";
@@ -133,8 +150,18 @@ public class PolicyManagerServlet extends HttpServlet {
     private static String testUserId = null;
 
     private enum Mode {
-        LIST, RENAME, COPY, DELETE, EDITFILE, ADDFOLDER, DESCRIBEPOLICYFILE, VIEWPOLICY, ADDSUBSCOPE, SWITCHVERSION,
-        EXPORT, SEARCHLIST
+        LIST,
+        RENAME,
+        COPY,
+        DELETE,
+        EDITFILE,
+        ADDFOLDER,
+        DESCRIBEPOLICYFILE,
+        VIEWPOLICY,
+        ADDSUBSCOPE,
+        SWITCHVERSION,
+        EXPORT,
+        SEARCHLIST
     }
 
     private static PolicyController policyController;
@@ -165,15 +192,17 @@ public class PolicyManagerServlet extends HttpServlet {
         //
         // Common initialization
         //
-        XACMLRest.xacmlInit(servletConfig);
+        XacmlRest.xacmlInit(servletConfig);
+        // init aes key from prop or env
+        PeCryptoUtils.initAesKey(XACMLProperties.getProperty(XacmlRestProperties.PROP_AES_KEY));
         //
         // Initialize ClosedLoop JSON
         //
-        PolicyManagerServlet.initializeJSONLoad();
+        PolicyManagerServlet.initializeJsonLoad();
     }
 
-    private static void initializeJSONLoad() {
-        Path closedLoopJsonLocation = Paths.get(XACMLProperties.getProperty(XACMLRestProperties.PROP_ADMIN_CLOSEDLOOP));
+    private static void initializeJsonLoad() {
+        Path closedLoopJsonLocation = Paths.get(XACMLProperties.getProperty(XacmlRestProperties.PROP_ADMIN_CLOSEDLOOP));
         String location = closedLoopJsonLocation.toString();
         if (!location.endsWith("json")) {
             LOGGER.warn("JSONConfig file does not end with extension .json");
@@ -215,9 +244,9 @@ public class PolicyManagerServlet extends HttpServlet {
     }
 
     // Set Error Message for Exception
-    private void setError(Exception t, HttpServletResponse response) throws IOException {
+    private void setError(Exception exception, HttpServletResponse response) throws IOException {
         try {
-            JSONObject responseJsonObject = error(t.getMessage());
+            JSONObject responseJsonObject = error(exception.getMessage());
             response.setContentType(CONTENTTYPE);
             PrintWriter out = response.getWriter();
             out.print(responseJsonObject);
@@ -289,17 +318,17 @@ public class PolicyManagerServlet extends HttpServlet {
             return;
         }
         try {
-            JSONObject jObj = new JSONObject(sb.toString());
-            JSONObject params = jObj.getJSONObject("params");
+            JSONObject jsonObject = new JSONObject(sb.toString());
+            JSONObject params = jsonObject.getJSONObject("params");
             Mode mode = Mode.valueOf(params.getString("mode"));
 
             String userId = UserUtils.getUserSession(request).getOrgUserId();
             LOGGER.info(
-                    "****************************************Logging UserID while doing actions on Editor tab*******************************************");
+                    "********************Logging UserID while doing actions on Editor tab****************************");
             LOGGER.info(
                     "UserId:  " + userId + "Action Mode:  " + mode.toString() + "Action Params: " + params.toString());
             LOGGER.info(
-                    "***********************************************************************************************************************************");
+                    "************************************************************************************************");
             responseJsonObject = operateBasedOnMode(mode, params, request);
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While Processing Json" + e);
@@ -361,7 +390,6 @@ public class PolicyManagerServlet extends HttpServlet {
     }
 
     private JSONObject searchPolicyList(JSONObject params, HttpServletRequest request) {
-        List<Object> policyData = new ArrayList<>();
         JSONArray policyList = null;
         if (params.has("policyList")) {
             policyList = (JSONArray) params.get("policyList");
@@ -369,9 +397,9 @@ public class PolicyManagerServlet extends HttpServlet {
         PolicyController controller = getPolicyControllerInstance();
         List<JSONObject> resultList = new ArrayList<>();
         try {
-            if (!lookupPolicyData(request, policyData, policyList, controller, resultList))
+            if (!lookupPolicyData(request, new ArrayList<>(), policyList, controller, resultList)) {
                 return error("No Scopes has been Assigned to the User. Please, Contact Super-Admin");
-
+            }
         } catch (Exception e) {
             LOGGER.error(
                     "Exception occured while reading policy Data from Policy Version table for Policy Search Data" + e);
@@ -382,19 +410,16 @@ public class PolicyManagerServlet extends HttpServlet {
 
     private boolean lookupPolicyData(HttpServletRequest request, List<Object> policyData, JSONArray policyList,
             PolicyController controller, List<JSONObject> resultList) {
-        List<String> roles;
-        Set<String> scopes;// Get the Login Id of the User from Request
         String userId = UserUtils.getUserSession(request).getOrgUserId();
         List<Object> userRoles = controller.getRoles(userId);
         Pair<Set<String>, List<String>> pair = org.onap.policy.utils.UserUtils.checkRoleAndScope(userRoles);
-        roles = pair.u;
-        scopes = pair.t;
+        List<String> roles = pair.second;
+        Set<String> scopes = pair.first;
         if (roles.contains(ADMIN) || roles.contains(EDITOR) || roles.contains(GUEST)) {
             if (scopes.isEmpty()) {
                 return false;
             }
-            Set<String> tempScopes = scopes;
-            for (String scope : tempScopes) {
+            for (String scope : scopes) {
                 addScope(scopes, scope);
             }
         }
@@ -406,18 +431,18 @@ public class PolicyManagerServlet extends HttpServlet {
                 parsePolicyList(resultList, controller, policyName, version);
             }
         } else {
-            getPolicyDataForSUPERRoles(policyData, controller, resultList, roles, scopes);
+            getPolicyDataForSuperRoles(policyData, controller, resultList, roles, scopes);
         }
         return true;
     }
 
-    private void getPolicyDataForSUPERRoles(List<Object> policyData, PolicyController controller,
+    private void getPolicyDataForSuperRoles(List<Object> policyData, PolicyController controller,
             List<JSONObject> resultList, List<String> roles, Set<String> scopes) {
         if (roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST)) {
             policyData = controller.getData(PolicyVersion.class);
         } else {
-            List<Object> filterdatas = controller.getData(PolicyVersion.class);
-            for (Object filter : filterdatas) {
+            List<Object> filterData = controller.getData(PolicyVersion.class);
+            for (Object filter : filterData) {
                 addFilterData(policyData, scopes, (PolicyVersion) filter);
             }
         }
@@ -439,8 +464,8 @@ public class PolicyManagerServlet extends HttpServlet {
     }
 
     private void updateResultList(List<Object> policyData, List<JSONObject> resultList) {
-        for (Object aPolicyData : policyData) {
-            PolicyVersion policy = (PolicyVersion) aPolicyData;
+        for (Object data : policyData) {
+            PolicyVersion policy = (PolicyVersion) data;
             JSONObject el = new JSONObject();
             el.put(NAME, policy.getPolicyName().replace(File.separator, FORWARD_SLASH));
             el.put(DATE, policy.getModifiedDate());
@@ -458,7 +483,8 @@ public class PolicyManagerServlet extends HttpServlet {
         if (policyName.contains(BACKSLASH)) {
             policyName = policyName.replace(BACKSLASH, ESCAPE_BACKSLASH);
         }
-        String policyVersionQuery = "From PolicyVersion where policy_name = :policyName  and active_version = :version and id >0";
+        String policyVersionQuery =
+                "From PolicyVersion where policy_name = :policyName  and active_version = :version and id >0";
         SimpleBindings pvParams = new SimpleBindings();
         pvParams.put("policyName", policyName);
         pvParams.put(VERSION, version);
@@ -480,8 +506,8 @@ public class PolicyManagerServlet extends HttpServlet {
     private void addScope(Set<String> scopes, String scope) {
         List<Object> scopesList = queryPolicyEditorScopes(scope);
         if (!scopesList.isEmpty()) {
-            for (Object aScopesList : scopesList) {
-                PolicyEditorScopes tempScope = (PolicyEditorScopes) aScopesList;
+            for (Object scopeItem : scopesList) {
+                PolicyEditorScopes tempScope = (PolicyEditorScopes) scopeItem;
                 scopes.add(tempScope.getScopeName());
             }
         }
@@ -515,11 +541,11 @@ public class PolicyManagerServlet extends HttpServlet {
             return error("The Version shouldn't be greater than Highest Value");
         }
         activePolicy = policyName + "." + activeVersion + ".xml";
-        String[] splitDBCheckName = modifyPolicyName(activePolicy);
+        String[] splitDbCheckName = modifyPolicyName(activePolicy);
         String peQuery = "FROM PolicyEntity where policyName = :splitDBCheckName_1 and scope = :splitDBCheckName_0";
         SimpleBindings policyParams = new SimpleBindings();
-        policyParams.put("splitDBCheckName_1", splitDBCheckName[1]);
-        policyParams.put("splitDBCheckName_0", splitDBCheckName[0]);
+        policyParams.put("splitDBCheckName_1", splitDbCheckName[1]);
+        policyParams.put("splitDBCheckName_0", splitDbCheckName[0]);
         List<Object> policyEntity = controller.getDataByQuery(peQuery, policyParams);
         PolicyEntity pentity = (PolicyEntity) policyEntity.get(0);
         if (pentity.isDeleted()) {
@@ -532,8 +558,8 @@ public class PolicyManagerServlet extends HttpServlet {
         if (policyName.contains(BACKSLASH)) {
             policyName = policyName.replace(File.separator, BACKSLASH);
         }
-        policyName = splitDBCheckName[0].replace(".", File.separator) + File.separator + policyName;
-        String watchPolicyName = policyName;
+        policyName = splitDbCheckName[0].replace(".", File.separator) + File.separator + policyName;
+        final String watchPolicyName = policyName;
         if (policyName.contains(FORWARD_SLASH)) {
             policyName = policyName.replace(FORWARD_SLASH, File.separator);
         }
@@ -555,7 +581,6 @@ public class PolicyManagerServlet extends HttpServlet {
 
     // Describe Policy
     private JSONObject describePolicy(JSONObject params) throws ServletException {
-        JSONObject object;
         String path = params.getString("path");
         String policyName;
         if (path.startsWith(FORWARD_SLASH)) {
@@ -573,18 +598,12 @@ public class PolicyManagerServlet extends HttpServlet {
         } else if (path.contains(DECISION2)) {
             path = path.replace(DECISION, DECISION1);
         }
-        PolicyController controller = getPolicyControllerInstance();
         String[] split = path.split(":");
         String query = "FROM PolicyEntity where policyName = :split_1 and scope = :split_0";
         SimpleBindings peParams = new SimpleBindings();
         peParams.put(SPLIT_1, split[1]);
         peParams.put(SPLIT_0, split[0]);
-        List<Object> queryData;
-        if (PolicyController.isjUnit()) {
-            queryData = controller.getDataByQuery(query, null);
-        } else {
-            queryData = controller.getDataByQuery(query, peParams);
-        }
+        List<Object> queryData = getDataByQueryFromController(getPolicyControllerInstance(), query, peParams);
         if (queryData.isEmpty()) {
             return error("Error Occured while Describing the Policy - query is empty");
         }
@@ -602,7 +621,7 @@ public class PolicyManagerServlet extends HttpServlet {
         } catch (IOException e) {
             LOGGER.error("Exception Occured while Describing the Policy" + e);
         }
-        object = HumanPolicyComponent.DescribePolicy(temp);
+        JSONObject object = HumanPolicyComponent.DescribePolicy(temp);
         try {
             Files.delete(temp.toPath());
         } catch (IOException e) {
@@ -622,14 +641,13 @@ public class PolicyManagerServlet extends HttpServlet {
     }
 
     private JSONObject processPolicyList(JSONObject params, HttpServletRequest request) throws ServletException {
-        PolicyController controller = getPolicyControllerInstance();
         // Get the Login Id of the User from Request
         String testUserID = getTestUserId();
         String userId = testUserID != null ? testUserID : UserUtils.getUserSession(request).getOrgUserId();
-        List<Object> userRoles = controller.getRoles(userId);
+        List<Object> userRoles = getPolicyControllerInstance().getRoles(userId);
         Pair<Set<String>, List<String>> pair = org.onap.policy.utils.UserUtils.checkRoleAndScope(userRoles);
-        List<String> roles = pair.u;
-        Set<String> scopes = pair.t;
+        List<String> roles = pair.second;
+        Set<String> scopes = pair.first;
         Map<String, String> roleByScope = org.onap.policy.utils.UserUtils.getRoleByScope(userRoles);
 
         List<JSONObject> resultList = new ArrayList<>();
@@ -644,7 +662,7 @@ public class PolicyManagerServlet extends HttpServlet {
                 return error("No Scopes has been Assigned to the User. Please, Contact Super-Admin");
             } else {
                 if (!FORWARD_SLASH.equals(path)) {
-                    String tempScope = path.substring(1, path.length());
+                    String tempScope = path.substring(1);
                     tempScope = tempScope.replace(FORWARD_SLASH, File.separator);
                     scopes.add(tempScope);
                 }
@@ -656,13 +674,11 @@ public class PolicyManagerServlet extends HttpServlet {
                 String scopeName = path.substring(path.indexOf('/') + 1);
                 activePolicyList(scopeName, resultList, roles, scopes, roleByScope);
             } catch (Exception ex) {
-                LOGGER.error("Error Occured While reading Policy Files List" + ex);
+                LOGGER.error("Error Occurred While reading Policy Files List" + ex);
             }
             return new JSONObject().put(RESULT, resultList);
         }
-
         processRoles(scopes, roles, resultList, roleByScope);
-
         return new JSONObject().put(RESULT, resultList);
     }
 
@@ -670,67 +686,56 @@ public class PolicyManagerServlet extends HttpServlet {
             Map<String, String> roleByScope) {
         if (roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST)) {
             List<Object> scopesList = queryPolicyEditorScopes(null);
-            for (Object list : scopesList) {
-                PolicyEditorScopes scope = (PolicyEditorScopes) list;
-                if (!(scope.getScopeName().contains(File.separator))) {
-                    JSONObject el = new JSONObject();
-                    el.put(NAME, scope.getScopeName());
-                    el.put(DATE, scope.getModifiedDate());
-                    el.put(SIZE, "");
-                    el.put(TYPE, "dir");
-                    el.put(CREATED_BY, scope.getUserCreatedBy().getUserName());
-                    el.put(MODIFIED_BY, scope.getUserModifiedBy().getUserName());
-                    el.put(ROLETYPE, roleByScope.get(ALLSCOPES));
-                    if (!scopes.contains(scope.getScopeName())) {
+            scopesList.stream().map(list -> (PolicyEditorScopes) list).filter(
+                scope -> !(scope.getScopeName().contains(File.separator)) && !scopes.contains(scope.getScopeName()))
+                    .forEach(scope -> {
+                        JSONObject el = new JSONObject();
+                        el.put(NAME, scope.getScopeName());
+                        el.put(DATE, scope.getModifiedDate());
+                        el.put(SIZE, "");
+                        el.put(TYPE, "dir");
+                        el.put(CREATED_BY, scope.getUserCreatedBy().getUserName());
+                        el.put(MODIFIED_BY, scope.getUserModifiedBy().getUserName());
+                        el.put(ROLETYPE, roleByScope.get(ALLSCOPES));
                         resultList.add(el);
-                    }
-                }
-            }
+                    });
         }
         if (roles.contains(ADMIN) || roles.contains(EDITOR) || roles.contains(GUEST)) {
-            for (Object scope : scopes) {
-                JSONObject el = new JSONObject();
-                List<Object> scopesList = queryPolicyEditorScopes(scope.toString());
-                if (!scopesList.isEmpty()) {
-                    PolicyEditorScopes scopeById = (PolicyEditorScopes) scopesList.get(0);
-                    el.put(NAME, scopeById.getScopeName());
-                    el.put(DATE, scopeById.getModifiedDate());
-                    el.put(SIZE, "");
-                    el.put(TYPE, "dir");
-                    el.put(CREATED_BY, scopeById.getUserCreatedBy().getUserName());
-                    el.put(MODIFIED_BY, scopeById.getUserModifiedBy().getUserName());
-                    if (!(resultList).stream().anyMatch(item -> item.get("name").equals(scopeById.getScopeName()))) {
-                        el.put(ROLETYPE, roleByScope.get(scopeById.getScopeName()));
-                        resultList.add(el);
-                    }
-                }
-            }
+            scopes.stream().map(this::queryPolicyEditorScopes).filter(scopesList -> !scopesList.isEmpty())
+                    .forEach(scopesList -> {
+                        JSONObject el = new JSONObject();
+                        PolicyEditorScopes scopeById = (PolicyEditorScopes) scopesList.get(0);
+                        el.put(NAME, scopeById.getScopeName());
+                        el.put(DATE, scopeById.getModifiedDate());
+                        el.put(SIZE, "");
+                        el.put(TYPE, "dir");
+                        el.put(CREATED_BY, scopeById.getUserCreatedBy().getUserName());
+                        el.put(MODIFIED_BY, scopeById.getUserModifiedBy().getUserName());
+                        if ((resultList).stream()
+                                .noneMatch(item -> item.get("name").equals(scopeById.getScopeName()))) {
+                            el.put(ROLETYPE, roleByScope.get(scopeById.getScopeName()));
+                            resultList.add(el);
+                        }
+                    });
         }
     }
 
     private List<Object> queryPolicyEditorScopes(String scopeName) {
-        String scopeNamequery;
+        String scopeNameQuery;
         SimpleBindings params = new SimpleBindings();
         if (scopeName == null) {
-            scopeNamequery = "from PolicyEditorScopes";
+            scopeNameQuery = "from PolicyEditorScopes";
         } else {
-            scopeNamequery = FROM_POLICY_EDITOR_SCOPES_WHERE_SCOPENAME_LIKE_SCOPE_NAME;
+            scopeNameQuery = FROM_POLICY_EDITOR_SCOPES_WHERE_SCOPENAME_LIKE_SCOPE_NAME;
             params.put(SCOPE_NAME, scopeName + "%");
         }
         PolicyController controller = getPolicyControllerInstance();
-        List<Object> scopesList;
-        if (PolicyController.isjUnit()) {
-            scopesList = controller.getDataByQuery(scopeNamequery, null);
-        } else {
-            scopesList = controller.getDataByQuery(scopeNamequery, params);
-        }
-        return scopesList;
+        return getDataByQueryFromController(controller, scopeNameQuery, params);
     }
 
-    // Get Active Policy List based on Scope Selection form Policy Version table
+    // Get Active Policy List based on Scope Selection from Policy Version table
     private void activePolicyList(String inScopeName, List<JSONObject> resultList, List<String> roles,
             Set<String> scopes, Map<String, String> roleByScope) {
-        PolicyController controller = getPolicyControllerInstance();
         String scopeName = inScopeName;
         if (scopeName.contains(FORWARD_SLASH)) {
             scopeName = scopeName.replace(FORWARD_SLASH, File.separator);
@@ -739,51 +744,39 @@ public class PolicyManagerServlet extends HttpServlet {
             scopeName = scopeName.replace(BACKSLASH, ESCAPE_BACKSLASH);
         }
         String query = "from PolicyVersion where POLICY_NAME like :scopeName";
-        String scopeNamequery = FROM_POLICY_EDITOR_SCOPES_WHERE_SCOPENAME_LIKE_SCOPE_NAME;
 
         SimpleBindings params = new SimpleBindings();
         params.put(SCOPE_NAME, scopeName + "%");
 
-        List<Object> activePolicies;
-        List<Object> scopesList;
-        if (PolicyController.isjUnit()) {
-            activePolicies = controller.getDataByQuery(query, null);
-            scopesList = controller.getDataByQuery(scopeNamequery, null);
-        } else {
-            activePolicies = controller.getDataByQuery(query, params);
-            scopesList = controller.getDataByQuery(scopeNamequery, params);
-        }
+        List<Object> activePolicies = getDataByQueryFromController(getPolicyControllerInstance(), query, params);
+        List<Object> scopesList = getDataByQueryFromController(getPolicyControllerInstance(),
+                FROM_POLICY_EDITOR_SCOPES_WHERE_SCOPENAME_LIKE_SCOPE_NAME, params);
         for (Object list : scopesList) {
             scopeName = checkScope(resultList, scopeName, (PolicyEditorScopes) list, roleByScope);
         }
-        String scopeNameCheck;
         for (Object list : activePolicies) {
             PolicyVersion policy = (PolicyVersion) list;
-            String scopeNameValue = policy.getPolicyName().substring(0,
-                    policy.getPolicyName().lastIndexOf(File.separator));
+            String scopeNameValue =
+                    policy.getPolicyName().substring(0, policy.getPolicyName().lastIndexOf(File.separator));
             if (roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST)) {
-                if (scopeName.contains(ESCAPE_BACKSLASH)) {
-                    scopeNameCheck = scopeName.replace(ESCAPE_BACKSLASH, File.separator);
-                } else {
-                    scopeNameCheck = scopeName;
-                }
-                if (scopeNameValue.equals(scopeNameCheck)) {
-                    JSONObject el = new JSONObject();
-                    el.put(NAME,
-                            policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator) + 1));
-                    el.put(DATE, policy.getModifiedDate());
-                    el.put(VERSION, policy.getActiveVersion());
-                    el.put(SIZE, "");
-                    el.put(TYPE, "file");
-                    el.put(CREATED_BY, getUserName(policy.getCreatedBy()));
-                    el.put(MODIFIED_BY, getUserName(policy.getModifiedBy()));
-                    String roleType = roleByScope.get(scopeNameValue);
-                    if (roleType == null) {
-                        roleType = roleByScope.get(ALLSCOPES);
-                    }
-                    el.put(ROLETYPE, roleType);
-                    resultList.add(el);
+                String scopeNameCheck =
+                        scopeName.contains(ESCAPE_BACKSLASH) ? scopeName.replace(ESCAPE_BACKSLASH, File.separator)
+                                : scopeName;
+                if (!scopeNameValue.equals(scopeNameCheck)) {
+                    continue;
                 }
+                JSONObject el = new JSONObject();
+                el.put(NAME, policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator) + 1));
+                el.put(DATE, policy.getModifiedDate());
+                el.put(VERSION, policy.getActiveVersion());
+                el.put(SIZE, "");
+                el.put(TYPE, "file");
+                el.put(CREATED_BY, getUserName(policy.getCreatedBy()));
+                el.put(MODIFIED_BY, getUserName(policy.getModifiedBy()));
+                String roleType = Strings.isNullOrEmpty(roleByScope.get(scopeNameValue)) ? roleByScope.get(ALLSCOPES)
+                        : roleByScope.get(scopeNameValue);
+                el.put(ROLETYPE, roleType);
+                resultList.add(el);
             } else if (!scopes.isEmpty() && scopes.contains(scopeNameValue)) {
                 JSONObject el = new JSONObject();
                 el.put(NAME, policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator) + 1));
@@ -798,45 +791,56 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
+    private List<Object> getDataByQueryFromController(final PolicyController controller, final String query,
+            final SimpleBindings params) {
+        final List<Object> activePolicies;
+        if (PolicyController.isjUnit()) {
+            activePolicies = controller.getDataByQuery(query, null);
+        } else {
+            activePolicies = controller.getDataByQuery(query, params);
+        }
+        return activePolicies;
+    }
+
     private String checkScope(List<JSONObject> resultList, String scopeName, PolicyEditorScopes scopeById,
             Map<String, String> roleByScope) {
         String scope = scopeById.getScopeName();
+        if (!scope.contains(File.separator)) {
+            return scopeName;
+        }
+        String targetScope = scope.substring(0, scope.lastIndexOf(File.separator));
+        if (scopeName.contains(ESCAPE_BACKSLASH)) {
+            scopeName = scopeName.replace(ESCAPE_BACKSLASH, File.separator);
+        }
         if (scope.contains(File.separator)) {
-            String targetScope = scope.substring(0, scope.lastIndexOf(File.separator));
-            if (scopeName.contains(ESCAPE_BACKSLASH)) {
-                scopeName = scopeName.replace(ESCAPE_BACKSLASH, File.separator);
-            }
+            scope = scope.substring(targetScope.length() + 1);
             if (scope.contains(File.separator)) {
-                scope = scope.substring(targetScope.length() + 1);
-                if (scope.contains(File.separator)) {
-                    scope = scope.substring(0, scope.indexOf(File.separator));
-                }
+                scope = scope.substring(0, scope.indexOf(File.separator));
             }
-            if (scopeName.equalsIgnoreCase(targetScope)) {
-                JSONObject el = new JSONObject();
-                el.put(NAME, scope);
-                el.put(DATE, scopeById.getModifiedDate());
-                el.put(SIZE, "");
-                el.put(TYPE, "dir");
-                el.put(CREATED_BY, scopeById.getUserCreatedBy().getUserName());
-                el.put(MODIFIED_BY, scopeById.getUserModifiedBy().getUserName());
-                String roleType = roleByScope.get(scopeName);
-                if (roleType == null) {
-                    roleType = roleByScope.get(scopeName + File.separator + scope);
-                    if (roleType == null) {
-                        roleType = roleByScope.get(ALLSCOPES);
-                    }
-                }
-                el.put(ROLETYPE, roleType);
-                resultList.add(el);
+        }
+        if (scopeName.equalsIgnoreCase(targetScope)) {
+            JSONObject el = new JSONObject();
+            el.put(NAME, scope);
+            el.put(DATE, scopeById.getModifiedDate());
+            el.put(SIZE, "");
+            el.put(TYPE, "dir");
+            el.put(CREATED_BY, scopeById.getUserCreatedBy().getUserName());
+            el.put(MODIFIED_BY, scopeById.getUserModifiedBy().getUserName());
+            String roleType = roleByScope.get(ALLSCOPES); // Set default role type to ALL_SCOPES
+            if (!Strings.isNullOrEmpty(roleByScope.get(scopeName))) {
+                roleType = roleByScope.get(scopeName);
+            } else if (!Strings.isNullOrEmpty(roleByScope.get(scopeName + File.separator + scope))) {
+                roleType = roleByScope.get(scopeName + File.separator + scope);
             }
+            el.put(ROLETYPE, roleType);
+            resultList.add(el);
         }
         return scopeName;
     }
 
     private String getUserName(String loginId) {
-        PolicyController controller = getPolicyControllerInstance();
-        UserInfo userInfo = (UserInfo) controller.getEntityItem(UserInfo.class, "userLoginId", loginId);
+        UserInfo userInfo = (UserInfo) getPolicyControllerInstance().getEntityItem(UserInfo.class, "userLoginId",
+                loginId);
         if (userInfo == null) {
             return SUPERADMIN;
         }
@@ -855,8 +859,8 @@ public class PolicyManagerServlet extends HttpServlet {
 
     private JSONObject handlePolicyRename(JSONObject params, HttpServletRequest request) throws ServletException {
         boolean isActive = false;
-        List<String> policyActiveInPDP = new ArrayList<>();
-        Set<String> scopeOfPolicyActiveInPDP = new HashSet<>();
+        List<String> policyActiveInPdp = new ArrayList<>();
+        Set<String> scopeOfPolicyActiveInPdp = new HashSet<>();
         String userId = UserUtils.getUserSession(request).getOrgUserId();
         String oldPath = params.getString("path");
         String newPath = params.getString("newPath");
@@ -865,8 +869,8 @@ public class PolicyManagerServlet extends HttpServlet {
         String checkValidation;
         if (oldPath.endsWith(".xml")) {
             checkValidation = newPath.replace(".xml", "");
-            checkValidation = checkValidation.substring(checkValidation.indexOf('_') + 1,
-                    checkValidation.lastIndexOf("."));
+            checkValidation =
+                    checkValidation.substring(checkValidation.indexOf('_') + 1, checkValidation.lastIndexOf('.'));
             checkValidation = checkValidation.substring(checkValidation.lastIndexOf(FORWARD_SLASH) + 1);
             if (!PolicyUtils.policySpecialCharValidator(checkValidation).contains(SUCCESS)) {
                 return error("Policy Rename Failed. The Name contains special characters.");
@@ -892,11 +896,11 @@ public class PolicyManagerServlet extends HttpServlet {
             }
             PolicyController controller = getPolicyControllerInstance();
             String query = "from PolicyVersion where POLICY_NAME like :scopeName";
-            String scopeNamequery = FROM_POLICY_EDITOR_SCOPES_WHERE_SCOPENAME_LIKE_SCOPE_NAME;
             SimpleBindings pvParams = new SimpleBindings();
             pvParams.put(SCOPE_NAME, scopeName + "%");
             List<Object> activePolicies = controller.getDataByQuery(query, pvParams);
-            List<Object> scopesList = controller.getDataByQuery(scopeNamequery, pvParams);
+            List<Object> scopesList =
+                    controller.getDataByQuery(FROM_POLICY_EDITOR_SCOPES_WHERE_SCOPENAME_LIKE_SCOPE_NAME, pvParams);
             for (Object object : activePolicies) {
                 PolicyVersion activeVersion = (PolicyVersion) object;
                 String policyOldPath = activeVersion.getPolicyName().replace(File.separator, FORWARD_SLASH) + "."
@@ -905,33 +909,29 @@ public class PolicyManagerServlet extends HttpServlet {
                 JSONObject result = policyRename(policyOldPath, policyNewPath, userId);
                 if (!(Boolean) (result.getJSONObject("result").get(SUCCESS))) {
                     isActive = true;
-                    policyActiveInPDP.add(policyOldPath);
+                    policyActiveInPdp.add(policyOldPath);
                     String scope = policyOldPath.substring(0, policyOldPath.lastIndexOf('/'));
-                    scopeOfPolicyActiveInPDP.add(scope.replace(FORWARD_SLASH, File.separator));
+                    scopeOfPolicyActiveInPdp.add(scope.replace(FORWARD_SLASH, File.separator));
                 }
             }
-            boolean rename = false;
-            if (activePolicies.size() != policyActiveInPDP.size()) {
-                rename = true;
-            }
-
-            UserInfo userInfo = new UserInfo();
-            userInfo.setUserLoginId(userId);
-            if (policyActiveInPDP.isEmpty()) {
+            boolean rename = activePolicies.size() != policyActiveInPdp.size();
+            if (policyActiveInPdp.isEmpty()) {
                 renameScope(scopesList, scopeName, newScopeName, controller);
             } else if (rename) {
                 renameScope(scopesList, scopeName, newScopeName, controller);
-                for (String scope : scopeOfPolicyActiveInPDP) {
+                UserInfo userInfo = new UserInfo();
+                userInfo.setUserLoginId(userId);
+                scopeOfPolicyActiveInPdp.forEach(scope -> {
                     PolicyEditorScopes editorScopeEntity = new PolicyEditorScopes();
                     editorScopeEntity.setScopeName(scope.replace(BACKSLASH, BACKSLASH_8TIMES));
                     editorScopeEntity.setUserCreatedBy(userInfo);
                     editorScopeEntity.setUserModifiedBy(userInfo);
                     controller.saveData(editorScopeEntity);
-                }
+                });
             }
             if (isActive) {
                 return error("The Following policies rename failed. Since they are active in PDP Groups"
-                        + policyActiveInPDP);
+                        + policyActiveInPdp);
             }
         }
         return success();
@@ -967,10 +967,11 @@ public class PolicyManagerServlet extends HttpServlet {
             String newpolicyName = newPath.replace("/", ".");
             String[] newPolicySplit = modifyPolicyName(newPath);
 
-            String[] oldPolicySplit = modifyPolicyName(oldPath);
+            final String[] oldPolicySplit = modifyPolicyName(oldPath);
 
             // Check PolicyEntity table with newPolicy Name
-            String policyEntityquery = "FROM PolicyEntity where policyName = :newPolicySplit_1 and scope = :newPolicySplit_0";
+            String policyEntityquery =
+                    "FROM PolicyEntity where policyName = :newPolicySplit_1 and scope = :newPolicySplit_0";
             SimpleBindings policyParams = new SimpleBindings();
             policyParams.put("newPolicySplit_1", newPolicySplit[1]);
             policyParams.put("newPolicySplit_0", newPolicySplit[0]);
@@ -981,14 +982,15 @@ public class PolicyManagerServlet extends HttpServlet {
 
             // Query the Policy Entity with oldPolicy Name
             String policyEntityCheck = oldPolicySplit[1].substring(0, oldPolicySplit[1].indexOf('.'));
-            String oldpolicyEntityquery = "FROM PolicyEntity where policyName like :policyEntityCheck and scope = :oldPolicySplit_0";
+            String oldPolicyEntityQuery =
+                    "FROM PolicyEntity where policyName like :policyEntityCheck and scope = " + ":oldPolicySplit_0";
             SimpleBindings params = new SimpleBindings();
             params.put("policyEntityCheck", policyEntityCheck + "%");
             params.put("oldPolicySplit_0", oldPolicySplit[0]);
-            List<Object> oldEntityData = controller.getDataByQuery(oldpolicyEntityquery, params);
+            List<Object> oldEntityData = controller.getDataByQuery(oldPolicyEntityQuery, params);
             if (oldEntityData.isEmpty()) {
                 return error(
-                        "Policy rename failed due to policy not able to retrieve from database. Please, contact super-admin.");
+                    "Policy rename failed due to policy not able to retrieve from database. Contact super-admin.");
             }
 
             StringBuilder groupQuery = new StringBuilder();
@@ -1019,7 +1021,6 @@ public class PolicyManagerServlet extends HttpServlet {
                             oldPolicySplit[1], policyName, newpolicyName, oldpolicyName, userId);
                 }
             }
-
             return success();
         } catch (Exception e) {
             LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While Renaming Policy" + e);
@@ -1043,21 +1044,21 @@ public class PolicyManagerServlet extends HttpServlet {
         return policyName.split(":");
     }
 
-    private void checkOldPolicyEntryAndUpdate(PolicyEntity entity, String newScope, String removenewPolicyExtension,
-            String oldScope, String removeoldPolicyExtension, String policyName, String newpolicyName,
-            String oldpolicyName, String userId) {
+    private void checkOldPolicyEntryAndUpdate(PolicyEntity entity, String newScope, String removeNewPolicyExtension,
+            String oldScope, String removeOldPolicyExtension, String policyName, String newPolicyName,
+            String oldPolicyName, String userId) {
         try {
             ConfigurationDataEntity configEntity = entity.getConfigurationData();
             ActionBodyEntity actionEntity = entity.getActionBodyEntity();
             PolicyController controller = getPolicyControllerInstance();
 
-            String oldPolicyNameWithoutExtension = removeoldPolicyExtension;
-            String newPolicyNameWithoutExtension = removenewPolicyExtension;
-            if (removeoldPolicyExtension.endsWith(".xml")) {
-                oldPolicyNameWithoutExtension = oldPolicyNameWithoutExtension.substring(0,
-                        oldPolicyNameWithoutExtension.indexOf('.'));
-                newPolicyNameWithoutExtension = newPolicyNameWithoutExtension.substring(0,
-                        newPolicyNameWithoutExtension.indexOf('.'));
+            String oldPolicyNameWithoutExtension = removeOldPolicyExtension;
+            String newPolicyNameWithoutExtension = removeNewPolicyExtension;
+            if (removeOldPolicyExtension.endsWith(".xml")) {
+                oldPolicyNameWithoutExtension =
+                        oldPolicyNameWithoutExtension.substring(0, oldPolicyNameWithoutExtension.indexOf('.'));
+                newPolicyNameWithoutExtension =
+                        newPolicyNameWithoutExtension.substring(0, newPolicyNameWithoutExtension.indexOf('.'));
             }
             entity.setPolicyName(
                     entity.getPolicyName().replace(oldPolicyNameWithoutExtension, newPolicyNameWithoutExtension));
@@ -1068,7 +1069,7 @@ public class PolicyManagerServlet extends HttpServlet {
 
             String oldConfigurationName = null;
             String newConfigurationName = null;
-            if (newpolicyName.contains(CONFIG2)) {
+            if (newPolicyName.contains(CONFIG2)) {
                 oldConfigurationName = configEntity.getConfigurationName();
                 configEntity.setConfigurationName(
                         configEntity.getConfigurationName().replace(oldScope + "." + oldPolicyNameWithoutExtension,
@@ -1077,11 +1078,11 @@ public class PolicyManagerServlet extends HttpServlet {
                 newConfigurationName = configEntity.getConfigurationName();
                 File file = new File(PolicyController.getConfigHome() + File.separator + oldConfigurationName);
                 if (file.exists()) {
-                    File renamefile = new File(
-                            PolicyController.getConfigHome() + File.separator + newConfigurationName);
-                    file.renameTo(renamefile);
+                    File renameFile =
+                            new File(PolicyController.getConfigHome() + File.separator + newConfigurationName);
+                    file.renameTo(renameFile);
                 }
-            } else if (newpolicyName.contains(ACTION2)) {
+            } else if (newPolicyName.contains(ACTION2)) {
                 oldConfigurationName = actionEntity.getActionBodyName();
                 actionEntity.setActionBody(
                         actionEntity.getActionBody().replace(oldScope + "." + oldPolicyNameWithoutExtension,
@@ -1090,26 +1091,26 @@ public class PolicyManagerServlet extends HttpServlet {
                 newConfigurationName = actionEntity.getActionBodyName();
                 File file = new File(PolicyController.getActionHome() + File.separator + oldConfigurationName);
                 if (file.exists()) {
-                    File renamefile = new File(
-                            PolicyController.getActionHome() + File.separator + newConfigurationName);
-                    file.renameTo(renamefile);
+                    File renameFile =
+                            new File(PolicyController.getActionHome() + File.separator + newConfigurationName);
+                    file.renameTo(renameFile);
                 }
             }
             controller.updateData(entity);
 
             PolicyRestController restController = new PolicyRestController();
-            restController.notifyOtherPAPSToUpdateConfigurations("rename", newConfigurationName, oldConfigurationName);
-            PolicyVersion versionEntity = (PolicyVersion) controller.getEntityItem(PolicyVersion.class, "policyName",
-                    oldpolicyName);
+            restController.notifyOtherPapsToUpdateConfigurations("rename", newConfigurationName, oldConfigurationName);
+            PolicyVersion versionEntity =
+                    (PolicyVersion) controller.getEntityItem(PolicyVersion.class, "policyName", oldPolicyName);
             versionEntity.setPolicyName(policyName);
             versionEntity.setModifiedBy(userId);
             controller.updateData(versionEntity);
             String movePolicyCheck = policyName.substring(policyName.lastIndexOf(File.separator) + 1);
-            String moveOldPolicyCheck = oldpolicyName.substring(oldpolicyName.lastIndexOf(File.separator) + 1);
+            String moveOldPolicyCheck = oldPolicyName.substring(oldPolicyName.lastIndexOf(File.separator) + 1);
             if (movePolicyCheck.equals(moveOldPolicyCheck)) {
-                controller.watchPolicyFunction(versionEntity, oldpolicyName, "Move");
+                controller.watchPolicyFunction(versionEntity, oldPolicyName, "Move");
             } else {
-                controller.watchPolicyFunction(versionEntity, oldpolicyName, "Rename");
+                controller.watchPolicyFunction(versionEntity, oldPolicyName, "Rename");
             }
         } catch (Exception e) {
             LOGGER.error(EXCEPTION_OCCURED + e);
@@ -1148,8 +1149,8 @@ public class PolicyManagerServlet extends HttpServlet {
                     .getEntityItem(ConfigurationDataEntity.class, "configurationName", queryEntityName);
             cloneEntity.setConfigurationData(configEntiy);
             newConfigurationName = configEntiy.getConfigurationName();
-            try (FileWriter fw = new FileWriter(
-                    PolicyController.getConfigHome() + File.separator + newConfigurationName);
+            try (FileWriter fw =
+                    new FileWriter(PolicyController.getConfigHome() + File.separator + newConfigurationName);
                     BufferedWriter bw = new BufferedWriter(fw)) {
                 bw.write(configEntiy.getConfigBody());
             } catch (IOException e) {
@@ -1170,8 +1171,8 @@ public class PolicyManagerServlet extends HttpServlet {
                     "actionBodyName", queryEntityName);
             cloneEntity.setActionBodyEntity(actionEntiy);
             newConfigurationName = actionEntiy.getActionBodyName();
-            try (FileWriter fw = new FileWriter(
-                    PolicyController.getActionHome() + File.separator + newConfigurationName);
+            try (FileWriter fw =
+                    new FileWriter(PolicyController.getActionHome() + File.separator + newConfigurationName);
                     BufferedWriter bw = new BufferedWriter(fw)) {
                 bw.write(actionEntiy.getActionBody());
             } catch (IOException e) {
@@ -1187,7 +1188,7 @@ public class PolicyManagerServlet extends HttpServlet {
 
         // Notify others paps regarding clone policy.
         PolicyRestController restController = new PolicyRestController();
-        restController.notifyOtherPAPSToUpdateConfigurations("clonePolicy", newConfigurationName, null);
+        restController.notifyOtherPapsToUpdateConfigurations("clonePolicy", newConfigurationName, null);
     }
 
     // Clone the Policy
@@ -1204,11 +1205,9 @@ public class PolicyManagerServlet extends HttpServlet {
             String policyName = policyVersionName.substring(0, policyVersionName.lastIndexOf('.'))
                     .replace(FORWARD_SLASH, File.separator);
 
-            String newpolicyName = newPath.replace(FORWARD_SLASH, ".");
-
-            String orignalPolicyName = oldPath.replace(FORWARD_SLASH, ".");
+            String newPolicyName = newPath.replace(FORWARD_SLASH, ".");
 
-            String newPolicyCheck = newpolicyName;
+            String newPolicyCheck = newPolicyName;
             if (newPolicyCheck.contains(CONFIG2)) {
                 newPolicyCheck = newPolicyCheck.replace(CONFIG, CONFIG1);
             } else if (newPolicyCheck.contains(ACTION2)) {
@@ -1222,13 +1221,15 @@ public class PolicyManagerServlet extends HttpServlet {
             String[] newPolicySplit = newPolicyCheck.split(":");
 
             String checkValidation = newPolicySplit[1].replace(".xml", "");
-            checkValidation = checkValidation.substring(checkValidation.indexOf('_') + 1,
-                    checkValidation.lastIndexOf("."));
+            checkValidation =
+                    checkValidation.substring(checkValidation.indexOf('_') + 1, checkValidation.lastIndexOf('.'));
             if (!PolicyUtils.policySpecialCharValidator(checkValidation).contains(SUCCESS)) {
                 return error("Policy Clone Failed. The Name contains special characters.");
             }
 
-            String[] oldPolicySplit = modifyPolicyName(orignalPolicyName);
+            String originalPolicyName = oldPath.replace(FORWARD_SLASH, ".");
+
+            final String[] oldPolicySplit = modifyPolicyName(originalPolicyName);
 
             PolicyController controller = getPolicyControllerInstance();
 
@@ -1236,7 +1237,8 @@ public class PolicyManagerServlet extends HttpServlet {
             boolean success = false;
 
             // Check PolicyEntity table with newPolicy Name
-            String policyEntityquery = "FROM PolicyEntity where policyName = :newPolicySplit_1 and scope = :newPolicySplit_0";
+            String policyEntityquery =
+                    "FROM PolicyEntity where policyName = :newPolicySplit_1 and scope = :newPolicySplit_0";
             SimpleBindings policyParams = new SimpleBindings();
             policyParams.put("newPolicySplit_1", newPolicySplit[1]);
             policyParams.put("newPolicySplit_0", newPolicySplit[0]);
@@ -1250,11 +1252,7 @@ public class PolicyManagerServlet extends HttpServlet {
             SimpleBindings peParams = new SimpleBindings();
             peParams.put("oldPolicySplit_1", oldPolicySplit[1]);
             peParams.put("oldPolicySplit_0", oldPolicySplit[0]);
-            if (PolicyController.isjUnit()) {
-                queryData = controller.getDataByQuery(policyEntityquery, null);
-            } else {
-                queryData = controller.getDataByQuery(policyEntityquery, peParams);
-            }
+            queryData = getDataByQueryFromController(controller, policyEntityquery, peParams);
             if (!queryData.isEmpty()) {
                 entity = (PolicyEntity) queryData.get(0);
             }
@@ -1263,7 +1261,6 @@ public class PolicyManagerServlet extends HttpServlet {
                         newPolicySplit[1], entity, userId);
                 success = true;
             }
-
             if (success) {
                 PolicyVersion entityItem = new PolicyVersion();
                 entityItem.setActiveVersion(Integer.parseInt(version));
@@ -1274,9 +1271,7 @@ public class PolicyManagerServlet extends HttpServlet {
                 entityItem.setModifiedDate(new Date());
                 controller.saveData(entityItem);
             }
-
             LOGGER.debug("copy from: {} to: {}" + oldPath + newPath);
-
             return success();
         } catch (Exception e) {
             LOGGER.error("copy", e);
@@ -1316,42 +1311,26 @@ public class PolicyManagerServlet extends HttpServlet {
                 policyParams.put("exactScope", policyNamewithoutExtension);
             }
 
-            List<Object> policyEntityobjects = controller.getDataByQuery(query, policyParams);
+            List<Object> policyEntityObjects = controller.getDataByQuery(query, policyParams);
             String activePolicyName = null;
             boolean pdpCheck = false;
             if (path.endsWith(".xml")) {
                 policyNamewithoutExtension = policyNamewithoutExtension.replace(".", File.separator);
                 int version = Integer.parseInt(policyVersionName.substring(policyVersionName.indexOf('.') + 1));
                 if ("ALL".equals(deleteVersion)) {
-                    if (!policyEntityobjects.isEmpty()) {
-                        for (Object object : policyEntityobjects) {
+                    if (!policyEntityObjects.isEmpty()) {
+                        for (Object object : policyEntityObjects) {
                             policyEntity = (PolicyEntity) object;
-                            String groupEntityquery = "from PolicyGroupEntity where policyid ='"
-                                    + policyEntity.getPolicyId() + "'";
+                            String groupEntityquery =
+                                    "from PolicyGroupEntity where policyid ='" + policyEntity.getPolicyId() + "'";
                             SimpleBindings pgeParams = new SimpleBindings();
                             List<Object> groupobject = controller.getDataByQuery(groupEntityquery, pgeParams);
                             if (!groupobject.isEmpty()) {
                                 pdpCheck = true;
                                 activePolicyName = policyEntity.getScope() + "." + policyEntity.getPolicyName();
                             } else {
-                                // Delete the entity from Elastic Search Database
-                                String searchFileName = policyEntity.getScope() + "." + policyEntity.getPolicyName();
-                                restController.deleteElasticData(searchFileName);
-                                // Delete the entity from Policy Entity table
-                                controller.deleteData(policyEntity);
-                                if (policyNamewithoutExtension.contains(CONFIG2)) {
-                                    Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator
-                                            + policyEntity.getConfigurationData().getConfigurationName()));
-                                    controller.deleteData(policyEntity.getConfigurationData());
-                                    restController.notifyOtherPAPSToUpdateConfigurations(DELETE, null,
-                                            policyEntity.getConfigurationData().getConfigurationName());
-                                } else if (policyNamewithoutExtension.contains(ACTION2)) {
-                                    Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator
-                                            + policyEntity.getActionBodyEntity().getActionBodyName()));
-                                    controller.deleteData(policyEntity.getActionBodyEntity());
-                                    restController.notifyOtherPAPSToUpdateConfigurations(DELETE, null,
-                                            policyEntity.getActionBodyEntity().getActionBodyName());
-                                }
+                                deleteEntityFromEsAndPolicyEntityTable(controller, restController, policyEntity,
+                                        policyNamewithoutExtension);
                             }
                         }
                     }
@@ -1362,15 +1341,15 @@ public class PolicyManagerServlet extends HttpServlet {
                     controller.watchPolicyFunction(versionEntity, policyNamewithExtension, "DeleteAll");
                     if (pdpCheck) {
                         // Delete from policyVersion table
-                        String getActivePDPPolicyVersion = activePolicyName.replace(".xml", "");
-                        getActivePDPPolicyVersion = getActivePDPPolicyVersion
-                                .substring(getActivePDPPolicyVersion.lastIndexOf('.') + 1);
-                        String policyVersionQuery = UPDATE_POLICY_VERSION_SET_ACTIVE_VERSION + getActivePDPPolicyVersion
-                                + "' , highest_version='" + getActivePDPPolicyVersion + "'  where policy_name ='"
+                        String getActivePdpPolicyVersion = activePolicyName.replace(".xml", "");
+                        getActivePdpPolicyVersion =
+                                getActivePdpPolicyVersion.substring(getActivePdpPolicyVersion.lastIndexOf('.') + 1);
+                        String policyVersionQuery = UPDATE_POLICY_VERSION_SET_ACTIVE_VERSION + getActivePdpPolicyVersion
+                                + "' , highest_version='" + getActivePdpPolicyVersion + "'  where policy_name ='"
                                 + policyNamewithoutExtension.replace(BACKSLASH, ESCAPE_BACKSLASH) + "' and id >0";
                         controller.executeQuery(policyVersionQuery);
                         return error(
-                                "Policies with Same name has been deleted. Except the Active Policy in PDP.     PolicyName: "
+                            "Policies with Same name has been deleted. Except the Active Policy in PDP. PolicyName: "
                                         + activePolicyName);
                     } else {
                         // No Active Policy in PDP. So, deleting all entries from policyVersion table
@@ -1379,12 +1358,13 @@ public class PolicyManagerServlet extends HttpServlet {
                         controller.executeQuery(policyVersionQuery);
                     }
                 } else if ("CURRENT".equals(deleteVersion)) {
-                    String currentVersionPolicyName = policyNamewithExtension
-                            .substring(policyNamewithExtension.lastIndexOf(File.separator) + 1);
-                    String currentVersionScope = policyNamewithExtension
-                            .substring(0, policyNamewithExtension.lastIndexOf(File.separator))
-                            .replace(File.separator, ".");
-                    query = "FROM PolicyEntity where policyName = :currentVersionPolicyName and scope = :currentVersionScope";
+                    String currentVersionPolicyName =
+                            policyNamewithExtension.substring(policyNamewithExtension.lastIndexOf(File.separator) + 1);
+                    String currentVersionScope =
+                            policyNamewithExtension.substring(0, policyNamewithExtension.lastIndexOf(File.separator))
+                                    .replace(File.separator, ".");
+                    query = "FROM PolicyEntity where policyName = :currentVersionPolicyName and "
+                            + "scope = :currentVersionScope";
 
                     SimpleBindings peParams = new SimpleBindings();
                     peParams.put("currentVersionPolicyName", currentVersionPolicyName);
@@ -1398,7 +1378,8 @@ public class PolicyManagerServlet extends HttpServlet {
                         return success();
                     }
 
-                    String groupEntityquery = "from PolicyGroupEntity where policyid = :policyEntityId and policyid > 0";
+                    String groupEntityquery =
+                            "from PolicyGroupEntity where policyid = :policyEntityId and policyid > 0";
                     SimpleBindings geParams = new SimpleBindings();
                     geParams.put("policyEntityId", policyEntity.getPolicyId());
                     List<Object> groupobject = controller.getDataByQuery(groupEntityquery, geParams);
@@ -1408,28 +1389,13 @@ public class PolicyManagerServlet extends HttpServlet {
                     }
 
                     // Delete the entity from Elastic Search Database
-                    String searchFileName = policyEntity.getScope() + "." + policyEntity.getPolicyName();
-                    restController.deleteElasticData(searchFileName);
-                    // Delete the entity from Policy Entity table
-                    controller.deleteData(policyEntity);
-                    if (policyNamewithoutExtension.contains(CONFIG2)) {
-                        Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator
-                                + policyEntity.getConfigurationData().getConfigurationName()));
-                        controller.deleteData(policyEntity.getConfigurationData());
-                        restController.notifyOtherPAPSToUpdateConfigurations(DELETE, null,
-                                policyEntity.getConfigurationData().getConfigurationName());
-                    } else if (policyNamewithoutExtension.contains(ACTION2)) {
-                        Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator
-                                + policyEntity.getActionBodyEntity().getActionBodyName()));
-                        controller.deleteData(policyEntity.getActionBodyEntity());
-                        restController.notifyOtherPAPSToUpdateConfigurations(DELETE, null,
-                                policyEntity.getActionBodyEntity().getActionBodyName());
-                    }
+                    deleteEntityFromEsAndPolicyEntityTable(controller, restController, policyEntity,
+                            policyNamewithoutExtension);
 
                     if (version > 1) {
                         int highestVersion = 0;
-                        if (!policyEntityobjects.isEmpty()) {
-                            for (Object object : policyEntityobjects) {
+                        if (!policyEntityObjects.isEmpty()) {
+                            for (Object object : policyEntityObjects) {
                                 policyEntity = (PolicyEntity) object;
                                 String policyEntityName = policyEntity.getPolicyName().replace(".xml", "");
                                 int policyEntityVersion = Integer
@@ -1464,22 +1430,22 @@ public class PolicyManagerServlet extends HttpServlet {
                     }
                 }
             } else {
-                List<String> activePoliciesInPDP = new ArrayList<>();
-                if (policyEntityobjects.isEmpty()) {
+                List<String> activePoliciesInPdp = new ArrayList<>();
+                if (policyEntityObjects.isEmpty()) {
                     String policyScopeQuery = "delete PolicyEditorScopes where SCOPENAME like '"
                             + path.replace(BACKSLASH, ESCAPE_BACKSLASH) + PERCENT_AND_ID_GT_0;
                     controller.executeQuery(policyScopeQuery);
                     return success();
                 }
-                for (Object object : policyEntityobjects) {
+                for (Object object : policyEntityObjects) {
                     policyEntity = (PolicyEntity) object;
-                    String groupEntityquery = "from PolicyGroupEntity where policyid = :policyEntityId";
+                    String groupEntityQuery = "from PolicyGroupEntity where policyid = :policyEntityId";
                     SimpleBindings geParams = new SimpleBindings();
                     geParams.put("policyEntityId", policyEntity.getPolicyId());
-                    List<Object> groupobject = controller.getDataByQuery(groupEntityquery, geParams);
+                    List<Object> groupobject = controller.getDataByQuery(groupEntityQuery, geParams);
                     if (!groupobject.isEmpty()) {
                         pdpCheck = true;
-                        activePoliciesInPDP.add(policyEntity.getScope() + "." + policyEntity.getPolicyName());
+                        activePoliciesInPdp.add(policyEntity.getScope() + "." + policyEntity.getPolicyName());
                     } else {
                         // Delete the entity from Elastic Search Database
                         String searchFileName = policyEntity.getScope() + "." + policyEntity.getPolicyName();
@@ -1491,13 +1457,13 @@ public class PolicyManagerServlet extends HttpServlet {
                             Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator
                                     + policyEntity.getConfigurationData().getConfigurationName()));
                             controller.deleteData(policyEntity.getConfigurationData());
-                            restController.notifyOtherPAPSToUpdateConfigurations(DELETE, null,
+                            restController.notifyOtherPapsToUpdateConfigurations(DELETE, null,
                                     policyEntity.getConfigurationData().getConfigurationName());
                         } else if (policyNamewithoutExtension.contains(ACTION2)) {
                             Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator
                                     + policyEntity.getActionBodyEntity().getActionBodyName()));
                             controller.deleteData(policyEntity.getActionBodyEntity());
-                            restController.notifyOtherPAPSToUpdateConfigurations(DELETE, null,
+                            restController.notifyOtherPapsToUpdateConfigurations(DELETE, null,
                                     policyEntity.getActionBodyEntity().getActionBodyName());
                         }
                     }
@@ -1514,23 +1480,22 @@ public class PolicyManagerServlet extends HttpServlet {
                 controller.watchPolicyFunction(entity, path, "DeleteScope");
                 if (pdpCheck) {
                     // Add Active Policies List to PolicyVersionTable
-                    for (String anActivePoliciesInPDP : activePoliciesInPDP) {
-                        String activePDPPolicyName = anActivePoliciesInPDP.replace(".xml", "");
-                        int activePDPPolicyVersion = Integer
-                                .parseInt(activePDPPolicyName.substring(activePDPPolicyName.lastIndexOf('.') + 1));
-                        activePDPPolicyName = activePDPPolicyName.substring(0, activePDPPolicyName.lastIndexOf('.'))
+                    for (String anActivePoliciesInPdp : activePoliciesInPdp) {
+                        String activePdpPolicyName = anActivePoliciesInPdp.replace(".xml", "");
+                        int activePdpPolicyVersion = Integer
+                                .parseInt(activePdpPolicyName.substring(activePdpPolicyName.lastIndexOf('.') + 1));
+                        activePdpPolicyName = activePdpPolicyName.substring(0, activePdpPolicyName.lastIndexOf('.'))
                                 .replace(".", File.separator);
-                        PolicyVersion insertactivePDPVersion = new PolicyVersion();
-                        insertactivePDPVersion.setPolicyName(activePDPPolicyName);
-                        insertactivePDPVersion.setHigherVersion(activePDPPolicyVersion);
-                        insertactivePDPVersion.setActiveVersion(activePDPPolicyVersion);
-                        insertactivePDPVersion.setCreatedBy(userId);
-                        insertactivePDPVersion.setModifiedBy(userId);
-                        controller.saveData(insertactivePDPVersion);
+                        PolicyVersion insertActivePdpVersion = new PolicyVersion();
+                        insertActivePdpVersion.setPolicyName(activePdpPolicyName);
+                        insertActivePdpVersion.setHigherVersion(activePdpPolicyVersion);
+                        insertActivePdpVersion.setActiveVersion(activePdpPolicyVersion);
+                        insertActivePdpVersion.setCreatedBy(userId);
+                        insertActivePdpVersion.setModifiedBy(userId);
+                        controller.saveData(insertActivePdpVersion);
                     }
-
                     return error("All the Policies has been deleted in Scope. Except the following list of Policies:"
-                            + activePoliciesInPDP);
+                            + activePoliciesInPdp);
                 } else {
                     String policyScopeQuery = "delete PolicyEditorScopes where SCOPENAME like '"
                             + path.replace(BACKSLASH, ESCAPE_BACKSLASH) + PERCENT_AND_ID_GT_0;
@@ -1545,12 +1510,34 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
+    private void deleteEntityFromEsAndPolicyEntityTable(final PolicyController controller,
+            final PolicyRestController restController, final PolicyEntity policyEntity,
+            final String policyNamewithoutExtension) throws IOException {
+        // Delete the entity from Elastic Search Database
+        String searchFileName = policyEntity.getScope() + "." + policyEntity.getPolicyName();
+        restController.deleteElasticData(searchFileName);
+        // Delete the entity from Policy Entity table
+        controller.deleteData(policyEntity);
+        if (policyNamewithoutExtension.contains(CONFIG2)) {
+            Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator
+                    + policyEntity.getConfigurationData().getConfigurationName()));
+            controller.deleteData(policyEntity.getConfigurationData());
+            restController.notifyOtherPapsToUpdateConfigurations(DELETE, null,
+                    policyEntity.getConfigurationData().getConfigurationName());
+        } else if (policyNamewithoutExtension.contains(ACTION2)) {
+            Files.deleteIfExists(Paths.get(PolicyController.getActionHome() + File.separator
+                    + policyEntity.getActionBodyEntity().getActionBodyName()));
+            controller.deleteData(policyEntity.getActionBodyEntity());
+            restController.notifyOtherPapsToUpdateConfigurations(DELETE, null,
+                    policyEntity.getActionBodyEntity().getActionBodyName());
+        }
+    }
+
     // Edit the Policy
     private JSONObject editFile(JSONObject params) throws ServletException {
         // get content
         try {
-            PolicyController controller = getPolicyControllerInstance();
-            String mode = params.getString("mode");
+            final String mode = params.getString("mode");
             String path = params.getString("path");
             LOGGER.debug("editFile path: {}" + path);
 
@@ -1566,12 +1553,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;
-            if (PolicyController.isjUnit()) {
-                queryData = controller.getDataByQuery(query, null);
-            } else {
-                queryData = controller.getDataByQuery(query, peParams);
-            }
+            List<Object> queryData = getDataByQueryFromController(getPolicyControllerInstance(), query, peParams);
             PolicyEntity entity = (PolicyEntity) queryData.get(0);
             InputStream stream = new ByteArrayInputStream(entity.getPolicyData().getBytes(StandardCharsets.UTF_8));
 
@@ -1593,8 +1575,8 @@ public class PolicyManagerServlet extends HttpServlet {
             policyName = policyName.substring(0, policyName.lastIndexOf('.'));
             policyAdapter.setPolicyName(policyName.substring(policyName.lastIndexOf('.') + 1));
 
-            PolicyAdapter setpolicyAdapter = PolicyAdapter.getInstance();
-            Objects.requireNonNull(setpolicyAdapter).configure(policyAdapter, entity);
+            PolicyAdapter setPolicyAdapter = PolicyAdapter.getInstance();
+            Objects.requireNonNull(setPolicyAdapter).configure(policyAdapter, entity);
 
             policyAdapter.setParentPath(null);
             ObjectMapper mapper = new ObjectMapper();
@@ -1610,54 +1592,33 @@ public class PolicyManagerServlet extends HttpServlet {
 
     // Add Scopes
     private JSONObject addFolder(JSONObject params, HttpServletRequest request) throws ServletException {
-        PolicyController controller = getPolicyControllerInstance();
-        String name = "";
         try {
-            String userId = UserUtils.getUserSession(request).getOrgUserId();
-            String path = params.getString("path");
-            try {
-                if (params.has(SUB_SCOPENAME)) {
-                    if (!"".equals(params.getString(SUB_SCOPENAME))) {
-                        name = params.getString("path").replace(FORWARD_SLASH, File.separator) + File.separator
-                                + params.getString(SUB_SCOPENAME);
-                    }
-                } else {
-                    name = params.getString(NAME);
-                }
-            } catch (Exception e) {
-                name = params.getString(NAME);
-                LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While Adding Scope" + e);
-            }
-            String validateName;
-            if (name.contains(File.separator)) {
-                validateName = name.substring(name.lastIndexOf(File.separator) + 1);
-            } else {
-                validateName = name;
-            }
+            String name = getNameFromParams(params);
+            String validateName =
+                    name.contains(File.separator) ? name.substring(name.lastIndexOf(File.separator) + 1) : name;
             if (!name.isEmpty()) {
                 String validate = PolicyUtils.policySpecialCharValidator(validateName);
                 if (!validate.contains(SUCCESS)) {
                     return error(validate);
                 }
-            }
-            LOGGER.debug("addFolder path: {} name: {}" + path + name);
-            if (!"".equals(name)) {
+                LOGGER.debug("addFolder path: {} name: {}" + params.getString("path") + name);
                 if (name.startsWith(File.separator)) {
                     name = name.substring(1);
                 }
-                PolicyEditorScopes entity = (PolicyEditorScopes) controller.getEntityItem(PolicyEditorScopes.class,
-                        SCOPE_NAME, name);
-                if (entity == null) {
-                    UserInfo userInfo = new UserInfo();
-                    userInfo.setUserLoginId(userId);
-                    PolicyEditorScopes newScope = new PolicyEditorScopes();
-                    newScope.setScopeName(name);
-                    newScope.setUserCreatedBy(userInfo);
-                    newScope.setUserModifiedBy(userInfo);
-                    controller.saveData(newScope);
-                } else {
+                PolicyEditorScopes entity =
+                        (PolicyEditorScopes) getPolicyControllerInstance().getEntityItem(
+                                PolicyEditorScopes.class, SCOPE_NAME, name);
+                if (entity != null) {
                     return error("Scope Already Exists");
                 }
+                String userId = UserUtils.getUserSession(request).getOrgUserId();
+                UserInfo userInfo = new UserInfo();
+                userInfo.setUserLoginId(userId);
+                PolicyEditorScopes newScope = new PolicyEditorScopes();
+                newScope.setScopeName(name);
+                newScope.setUserCreatedBy(userInfo);
+                newScope.setUserModifiedBy(userInfo);
+                getPolicyControllerInstance().saveData(newScope);
             }
             return success();
         } catch (Exception e) {
@@ -1666,6 +1627,24 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
+    private String getNameFromParams(final JSONObject params) {
+        String name = "";
+        try {
+            if (params.has(SUB_SCOPENAME)) {
+                if (!"".equals(params.getString(SUB_SCOPENAME))) {
+                    name = params.getString("path").replace(FORWARD_SLASH, File.separator) + File.separator
+                            + params.getString(SUB_SCOPENAME);
+                }
+            } else {
+                name = params.getString(NAME);
+            }
+        } catch (Exception e) {
+            name = params.getString(NAME);
+            LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occurred While Adding Scope" + e);
+        }
+        return name;
+    }
+
     // Return Error Object
     private JSONObject error(String msg) throws ServletException {
         try {
@@ -1701,4 +1680,4 @@ public class PolicyManagerServlet extends HttpServlet {
     public static void setTestUserId(String testUserId) {
         PolicyManagerServlet.testUserId = testUserId;
     }
-}
\ No newline at end of file
+}