Merge "Add capability for multi-role support"

10 files changed, 1515 insertions, 1105 deletions

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 fa9e759b7..baf27b06f 100644
--- 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
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -82,16 +82,17 @@ 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 Logger LOGGER = FlexLogger.getLogger(PolicyManagerServlet.class);
     private static final long serialVersionUID = -8453502699403909016L;
     private static final String VERSION = "version";
     private static final String NAME = "name";
     private static final String DATE = "date";
     private static final String SIZE = "size";
     private static final String TYPE = "type";
+    private static final String ROLETYPE = "roleType";
     private static final String CREATED_BY = "createdBy";
     private static final String MODIFIED_BY = "modifiedBy";
     private static final String CONTENTTYPE = "application/json";
@@ -125,16 +126,19 @@ public class PolicyManagerServlet extends HttpServlet {
     private static final String SCOPE_NAME = "scopeName";
     private static final String SUCCESS = "success";
     private static final String SUB_SCOPENAME = "subScopename";
+    private static final String ALLSCOPES = "@All@";
     private static final String PERCENT_AND_ID_GT_0 = "%' and id >0";
     private static List<String> serviceTypeNamesList = new ArrayList<>();
     private static JsonArray policyNames;
     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;
+
     private synchronized PolicyController getPolicyController() {
         return policyController;
     }
@@ -163,21 +167,20 @@ public class PolicyManagerServlet extends HttpServlet {
         //
         XACMLRest.xacmlInit(servletConfig);
         //
-        //Initialize ClosedLoop JSON
+        // Initialize ClosedLoop JSON
         //
         PolicyManagerServlet.initializeJSONLoad();
     }
 
     private static void initializeJSONLoad() {
-        Path closedLoopJsonLocation = Paths.get(XACMLProperties
-                .getProperty(XACMLRestProperties.PROP_ADMIN_CLOSEDLOOP));
+        Path closedLoopJsonLocation = Paths.get(XACMLProperties.getProperty(XACMLRestProperties.PROP_ADMIN_CLOSEDLOOP));
         String location = closedLoopJsonLocation.toString();
-        if (! location.endsWith("json")) {
+        if (!location.endsWith("json")) {
             LOGGER.warn("JSONConfig file does not end with extension .json");
             return;
         }
         try (FileInputStream inputStream = new FileInputStream(location);
-             JsonReader jsonReader = Json.createReader(inputStream)) {
+                JsonReader jsonReader = Json.createReader(inputStream)) {
             policyNames = jsonReader.readArray();
             serviceTypeNamesList = new ArrayList<>();
             for (int i = 0; i < policyNames.size(); i++) {
@@ -186,7 +189,7 @@ public class PolicyManagerServlet extends HttpServlet {
                 serviceTypeNamesList.add(name);
             }
         } catch (IOException e) {
-            LOGGER.error("Exception Occured while initializing the JSONConfig file"+e);
+            LOGGER.error("Exception Occured while initializing the JSONConfig file" + e);
         }
     }
 
@@ -205,13 +208,13 @@ public class PolicyManagerServlet extends HttpServlet {
         } catch (Exception e) {
             try {
                 setError(e, response);
-            }catch(Exception e1){
-                LOGGER.error(EXCEPTION_OCCURED +e1);
+            } catch (Exception e1) {
+                LOGGER.error(EXCEPTION_OCCURED + e1);
             }
         }
     }
 
-    //Set Error Message for Exception
+    // Set Error Message for Exception
     private void setError(Exception t, HttpServletResponse response) throws IOException {
         try {
             JSONObject responseJsonObject = error(t.getMessage());
@@ -220,12 +223,12 @@ public class PolicyManagerServlet extends HttpServlet {
             out.print(responseJsonObject);
             out.flush();
         } catch (Exception x) {
-            LOGGER.error(EXCEPTION_OCCURED +x);
+            LOGGER.error(EXCEPTION_OCCURED + x);
             response.sendError(HttpStatus.SC_INTERNAL_SERVER_ERROR, x.getMessage());
         }
     }
 
-    //Policy Import Functionality
+    // Policy Import Functionality
     private void uploadFile(HttpServletRequest request, HttpServletResponse response) throws ServletException {
         try {
             Map<String, InputStream> files = new HashMap<>();
@@ -253,27 +256,24 @@ public class PolicyManagerServlet extends HttpServlet {
 
     private void processFormFile(HttpServletRequest request, FileItem item) {
         String newFile;
-        if(item.getName().endsWith(".xls") && item.getSize() <= PolicyController.getFileSizeLimit()){
+        if (item.getName().endsWith(".xls") && item.getSize() <= PolicyController.getFileSizeLimit()) {
             File file = new File(item.getName());
-            try (OutputStream outputStream = new FileOutputStream(file))
-            {
+            try (OutputStream outputStream = new FileOutputStream(file)) {
                 IOUtils.copy(item.getInputStream(), outputStream);
                 newFile = file.toString();
                 PolicyExportAndImportController importController = new PolicyExportAndImportController();
                 importController.importRepositoryFile(newFile, request);
-            }catch(Exception e){
+            } catch (Exception e) {
                 LOGGER.error("Upload error : " + e);
             }
-        }
-        else if (!item.getName().endsWith(".xls")) {
+        } else if (!item.getName().endsWith(".xls")) {
             LOGGER.error("Non .xls filetype uploaded: " + item.getName());
-        }
-        else { //uploaded file size is greater than allowed
+        } else { // uploaded file size is greater than allowed
             LOGGER.error("Upload file size limit exceeded! File size (Bytes) is: " + item.getSize());
         }
     }
 
-    //File Operation Functionality
+    // File Operation Functionality
     private void fileOperation(HttpServletRequest request, HttpServletResponse response) throws ServletException {
         JSONObject responseJsonObject;
         StringBuilder sb = new StringBuilder();
@@ -294,9 +294,12 @@ public class PolicyManagerServlet extends HttpServlet {
             Mode mode = Mode.valueOf(params.getString("mode"));
 
             String userId = UserUtils.getUserSession(request).getOrgUserId();
-            LOGGER.info("****************************************Logging UserID while doing actions on Editor tab*******************************************");
-            LOGGER.info("UserId:  " + userId + "Action Mode:  "+ mode.toString() + "Action Params: "+params.toString());
-            LOGGER.info("***********************************************************************************************************************************");
+            LOGGER.info(
+                    "****************************************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);
@@ -315,8 +318,8 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-
-    private JSONObject operateBasedOnMode(Mode mode, JSONObject params, HttpServletRequest request) throws ServletException{
+    private JSONObject operateBasedOnMode(Mode mode, JSONObject params, HttpServletRequest request)
+            throws ServletException {
         JSONObject responseJsonObject;
         switch (mode) {
             case ADDFOLDER:
@@ -357,11 +360,10 @@ public class PolicyManagerServlet extends HttpServlet {
         return responseJsonObject;
     }
 
-
     private JSONObject searchPolicyList(JSONObject params, HttpServletRequest request) {
         List<Object> policyData = new ArrayList<>();
         JSONArray policyList = null;
-        if(params.has("policyList")){
+        if (params.has("policyList")) {
             policyList = (JSONArray) params.get("policyList");
         }
         PolicyController controller = getPolicyControllerInstance();
@@ -370,66 +372,69 @@ public class PolicyManagerServlet extends HttpServlet {
             if (!lookupPolicyData(request, policyData, 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);
+        } catch (Exception e) {
+            LOGGER.error(
+                    "Exception occured while reading policy Data from Policy Version table for Policy Search Data" + e);
         }
 
         return new JSONObject().put(RESULT, resultList);
     }
 
-    private boolean lookupPolicyData(HttpServletRequest request, List<Object> policyData, JSONArray policyList, PolicyController controller, List<JSONObject> resultList){
+    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();
+        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;
-        if (roles.contains(ADMIN) || roles.contains(EDITOR) || roles.contains(GUEST) ) {
-            if(scopes.isEmpty()){
+        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 : tempScopes) {
                 addScope(scopes, scope);
             }
         }
-        if(policyList!= null){
-            for(int i = 0; i < policyList.length(); i++){
+        if (policyList != null) {
+            for (int i = 0; i < policyList.length(); i++) {
                 String policyName = policyList.get(i).toString().replace(".xml", "");
-                String version = policyName.substring(policyName.lastIndexOf('.')+1);
+                String version = policyName.substring(policyName.lastIndexOf('.') + 1);
                 policyName = policyName.substring(0, policyName.lastIndexOf('.')).replace(".", File.separator);
                 parsePolicyList(resultList, controller, policyName, version);
             }
-        }else {
+        } else {
             getPolicyDataForSUPERRoles(policyData, controller, resultList, roles, scopes);
         }
         return true;
     }
 
-    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) ){
+    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{
+        } else {
             List<Object> filterdatas = controller.getData(PolicyVersion.class);
-            for(Object filter : filterdatas) {
+            for (Object filter : filterdatas) {
                 addFilterData(policyData, scopes, (PolicyVersion) filter);
             }
         }
 
-        if(!policyData.isEmpty()){
+        if (!policyData.isEmpty()) {
             updateResultList(policyData, resultList);
         }
     }
 
     private void addFilterData(List<Object> policyData, Set<String> scopes, PolicyVersion filter) {
-        try{
+        try {
             String scopeName = filter.getPolicyName().substring(0, filter.getPolicyName().lastIndexOf(File.separator));
-            if(scopes.contains(scopeName)){
+            if (scopes.contains(scopeName)) {
                 policyData.add(filter);
             }
-        }catch(Exception e){
-            LOGGER.error("Exception occured while filtering policyversion data"+e);
+        } catch (Exception e) {
+            LOGGER.error("Exception occured while filtering policyversion data" + e);
         }
     }
 
@@ -448,8 +453,9 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-    private void parsePolicyList(List<JSONObject> resultList, PolicyController controller, String policyName, String version) {
-        if(policyName.contains(BACKSLASH)){
+    private void parsePolicyList(List<JSONObject> resultList, PolicyController controller, String policyName,
+            String version) {
+        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";
@@ -457,7 +463,7 @@ public class PolicyManagerServlet extends HttpServlet {
         pvParams.put("policyName", policyName);
         pvParams.put(VERSION, version);
         List<Object> activeData = controller.getDataByQuery(policyVersionQuery, pvParams);
-        if(!activeData.isEmpty()){
+        if (!activeData.isEmpty()) {
             PolicyVersion policy = (PolicyVersion) activeData.get(0);
             JSONObject el = new JSONObject();
             el.put(NAME, policy.getPolicyName().replace(File.separator, FORWARD_SLASH));
@@ -473,7 +479,7 @@ public class PolicyManagerServlet extends HttpServlet {
 
     private void addScope(Set<String> scopes, String scope) {
         List<Object> scopesList = queryPolicyEditorScopes(scope);
-        if(!scopesList.isEmpty()){
+        if (!scopesList.isEmpty()) {
             for (Object aScopesList : scopesList) {
                 PolicyEditorScopes tempScope = (PolicyEditorScopes) aScopesList;
                 scopes.add(tempScope.getScopeName());
@@ -481,63 +487,64 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-    //Switch Version Functionality
-    private JSONObject switchVersion(JSONObject params, HttpServletRequest request) throws ServletException{
+    // Switch Version Functionality
+    private JSONObject switchVersion(JSONObject params, HttpServletRequest request) throws ServletException {
         String path = params.getString("path");
         String userId = null;
         try {
             userId = UserUtils.getUserSession(request).getOrgUserId();
         } catch (Exception e) {
-            LOGGER.error("Exception Occured while reading userid from cookie" +e);
+            LOGGER.error("Exception Occured while reading userid from cookie" + e);
         }
         String policyName;
         String removeExtension = path.replace(".xml", "");
-        if(path.startsWith(FORWARD_SLASH)){
+        if (path.startsWith(FORWARD_SLASH)) {
             policyName = removeExtension.substring(1, removeExtension.lastIndexOf('.'));
-        }else{
+        } else {
             policyName = removeExtension.substring(0, removeExtension.lastIndexOf('.'));
         }
 
         String activePolicy;
         PolicyController controller = getPolicyControllerInstance();
-        if(! params.toString().contains("activeVersion")){
+        if (!params.toString().contains("activeVersion")) {
             return controller.switchVersionPolicyContent(policyName);
         }
         String activeVersion = params.getString("activeVersion");
         String highestVersion = params.get("highestVersion").toString();
-        if(Integer.parseInt(activeVersion) > Integer.parseInt(highestVersion)){
+        if (Integer.parseInt(activeVersion) > Integer.parseInt(highestVersion)) {
             return error("The Version shouldn't be greater than Highest Value");
         }
         activePolicy = policyName + "." + activeVersion + ".xml";
         String[] splitDBCheckName = modifyPolicyName(activePolicy);
-        String peQuery =   "FROM PolicyEntity where policyName = :splitDBCheckName_1 and scope = :splitDBCheckName_0";
+        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]);
         List<Object> policyEntity = controller.getDataByQuery(peQuery, policyParams);
         PolicyEntity pentity = (PolicyEntity) policyEntity.get(0);
-        if(pentity.isDeleted()){
+        if (pentity.isDeleted()) {
             return error("The Policy is Not Existing in Workspace");
         }
-        if(policyName.contains(FORWARD_SLASH)){
+        if (policyName.contains(FORWARD_SLASH)) {
             policyName = policyName.replace(FORWARD_SLASH, File.separator);
         }
-        policyName = policyName.substring(policyName.indexOf(File.separator)+1);
-        if(policyName.contains(BACKSLASH)){
+        policyName = policyName.substring(policyName.indexOf(File.separator) + 1);
+        if (policyName.contains(BACKSLASH)) {
             policyName = policyName.replace(File.separator, BACKSLASH);
         }
-        policyName = splitDBCheckName[0].replace(".", File.separator)+File.separator+policyName;
+        policyName = splitDBCheckName[0].replace(".", File.separator) + File.separator + policyName;
         String watchPolicyName = policyName;
-        if(policyName.contains(FORWARD_SLASH)){
+        if (policyName.contains(FORWARD_SLASH)) {
             policyName = policyName.replace(FORWARD_SLASH, File.separator);
         }
-        if(policyName.contains(BACKSLASH)){
+        if (policyName.contains(BACKSLASH)) {
             policyName = policyName.replace(BACKSLASH, ESCAPE_BACKSLASH);
         }
-        String query = UPDATE_POLICY_VERSION_SET_ACTIVE_VERSION +activeVersion+"' where policy_name ='"+policyName+"'  and id >0";
-        //query the database
+        String query = UPDATE_POLICY_VERSION_SET_ACTIVE_VERSION + activeVersion + "' where policy_name ='" + policyName
+                + "'  and id >0";
+        // query the database
         controller.executeQuery(query);
-        //Policy Notification
+        // Policy Notification
         PolicyVersion entity = new PolicyVersion();
         entity.setPolicyName(watchPolicyName);
         entity.setActiveVersion(Integer.parseInt(activeVersion));
@@ -546,24 +553,24 @@ public class PolicyManagerServlet extends HttpServlet {
         return success();
     }
 
-    //Describe Policy
-    private JSONObject describePolicy(JSONObject params) throws ServletException{
+    // Describe Policy
+    private JSONObject describePolicy(JSONObject params) throws ServletException {
         JSONObject object;
         String path = params.getString("path");
         String policyName;
-        if(path.startsWith(FORWARD_SLASH)){
+        if (path.startsWith(FORWARD_SLASH)) {
             path = path.substring(1);
-            policyName = path.substring(path.lastIndexOf('/') +1);
+            policyName = path.substring(path.lastIndexOf('/') + 1);
             path = path.replace(FORWARD_SLASH, ".");
-        }else{
+        } else {
             path = path.replace(FORWARD_SLASH, ".");
             policyName = path;
         }
-        if(path.contains(CONFIG2)){
+        if (path.contains(CONFIG2)) {
             path = path.replace(CONFIG, CONFIG1);
-        }else if(path.contains(ACTION2)){
+        } else if (path.contains(ACTION2)) {
             path = path.replace(ACTION, ACTION1);
-        }else if(path.contains(DECISION2)){
+        } else if (path.contains(DECISION2)) {
             path = path.replace(DECISION, DECISION1);
         }
         PolicyController controller = getPolicyControllerInstance();
@@ -573,12 +580,12 @@ public class PolicyManagerServlet extends HttpServlet {
         peParams.put(SPLIT_1, split[1]);
         peParams.put(SPLIT_0, split[0]);
         List<Object> queryData;
-        if(PolicyController.isjUnit()){
+        if (PolicyController.isjUnit()) {
             queryData = controller.getDataByQuery(query, null);
-        }else{
+        } else {
             queryData = controller.getDataByQuery(query, peParams);
         }
-        if(queryData.isEmpty()){
+        if (queryData.isEmpty()) {
             return error("Error Occured while Describing the Policy - query is empty");
         }
         PolicyEntity entity = (PolicyEntity) queryData.get(0);
@@ -593,7 +600,7 @@ public class PolicyManagerServlet extends HttpServlet {
         try (BufferedWriter bw = new BufferedWriter(new FileWriter(temp))) {
             bw.write(entity.getPolicyData());
         } catch (IOException e) {
-            LOGGER.error("Exception Occured while Describing the Policy"+e);
+            LOGGER.error("Exception Occured while Describing the Policy" + e);
         }
         object = HumanPolicyComponent.DescribePolicy(temp);
         try {
@@ -604,7 +611,7 @@ public class PolicyManagerServlet extends HttpServlet {
         return object;
     }
 
-    //Get the List of Policies and Scopes for Showing in Editor tab
+    // Get the List of Policies and Scopes for Showing in Editor tab
     private JSONObject list(JSONObject params, HttpServletRequest request) throws ServletException {
         try {
             return processPolicyList(params, request);
@@ -616,26 +623,27 @@ 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
+        // Get the Login Id of the User from Request
         String testUserID = getTestUserId();
-        String userId =  testUserID != null ? testUserID : UserUtils.getUserSession(request).getOrgUserId();
+        String userId = testUserID != null ? testUserID : UserUtils.getUserSession(request).getOrgUserId();
         List<Object> userRoles = controller.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;
+        Map<String, String> roleByScope = org.onap.policy.utils.UserUtils.getRoleByScope(userRoles);
 
         List<JSONObject> resultList = new ArrayList<>();
-        boolean onlyFolders = params.getBoolean("onlyFolders");
         String path = params.getString("path");
-        if(path.contains("..xml")){
+        if (path.contains("..xml")) {
             path = path.replaceAll("..xml", "").trim();
         }
 
-        if (roles.contains(ADMIN) || roles.contains(EDITOR) || roles.contains(GUEST) ) {
-            if(scopes.isEmpty()){
+        if (roles.contains(ADMIN) || roles.contains(EDITOR) || roles.contains(GUEST)) {
+            if (scopes.isEmpty()
+                    && !(roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST))) {
                 return error("No Scopes has been Assigned to the User. Please, Contact Super-Admin");
-            }else{
-                if(!FORWARD_SLASH.equals(path)){
+            } else {
+                if (!FORWARD_SLASH.equals(path)) {
                     String tempScope = path.substring(1, path.length());
                     tempScope = tempScope.replace(FORWARD_SLASH, File.separator);
                     scopes.add(tempScope);
@@ -644,26 +652,27 @@ public class PolicyManagerServlet extends HttpServlet {
         }
 
         if (!FORWARD_SLASH.equals(path)) {
-            try{
-                String scopeName = path.substring(path.indexOf('/') +1);
-                activePolicyList(scopeName, resultList, roles, scopes, onlyFolders);
+            try {
+                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 Occured While reading Policy Files List" + ex);
             }
             return new JSONObject().put(RESULT, resultList);
         }
 
-        processRoles(scopes, roles, resultList);
+        processRoles(scopes, roles, resultList, roleByScope);
 
         return new JSONObject().put(RESULT, resultList);
     }
 
-    private void processRoles(Set<String> scopes, List<String> roles, List<JSONObject> resultList) {
-        if(roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST)){
+    private void processRoles(Set<String> scopes, List<String> roles, List<JSONObject> resultList,
+            Map<String, String> roleByScope) {
+        if (roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST)) {
             List<Object> scopesList = queryPolicyEditorScopes(null);
-            for(Object list : scopesList){
+            for (Object list : scopesList) {
                 PolicyEditorScopes scope = (PolicyEditorScopes) list;
-                if(!(scope.getScopeName().contains(File.separator))){
+                if (!(scope.getScopeName().contains(File.separator))) {
                     JSONObject el = new JSONObject();
                     el.put(NAME, scope.getScopeName());
                     el.put(DATE, scope.getModifiedDate());
@@ -671,14 +680,18 @@ public class PolicyManagerServlet extends HttpServlet {
                     el.put(TYPE, "dir");
                     el.put(CREATED_BY, scope.getUserCreatedBy().getUserName());
                     el.put(MODIFIED_BY, scope.getUserModifiedBy().getUserName());
-                    resultList.add(el);
+                    el.put(ROLETYPE, roleByScope.get(ALLSCOPES));
+                    if (!scopes.contains(scope.getScopeName())) {
+                        resultList.add(el);
+                    }
                 }
             }
-        }else if(roles.contains(ADMIN) || roles.contains(EDITOR) || roles.contains(GUEST)){
-            for(Object scope : scopes){
+        }
+        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()){
+                if (!scopesList.isEmpty()) {
                     PolicyEditorScopes scopeById = (PolicyEditorScopes) scopesList.get(0);
                     el.put(NAME, scopeById.getScopeName());
                     el.put(DATE, scopeById.getModifiedDate());
@@ -686,39 +699,43 @@ public class PolicyManagerServlet extends HttpServlet {
                     el.put(TYPE, "dir");
                     el.put(CREATED_BY, scopeById.getUserCreatedBy().getUserName());
                     el.put(MODIFIED_BY, scopeById.getUserModifiedBy().getUserName());
-                    resultList.add(el);
+                    if (!(resultList).stream().anyMatch(item -> item.get("name").equals(scopeById.getScopeName()))) {
+                        el.put(ROLETYPE, roleByScope.get(scopeById.getScopeName()));
+                        resultList.add(el);
+                    }
                 }
             }
         }
     }
 
-    private List<Object> queryPolicyEditorScopes(String scopeName){
+    private List<Object> queryPolicyEditorScopes(String scopeName) {
         String scopeNamequery;
         SimpleBindings params = new SimpleBindings();
-        if(scopeName == null){
+        if (scopeName == null) {
             scopeNamequery = "from PolicyEditorScopes";
-        }else{
+        } else {
             scopeNamequery = FROM_POLICY_EDITOR_SCOPES_WHERE_SCOPENAME_LIKE_SCOPE_NAME;
             params.put(SCOPE_NAME, scopeName + "%");
         }
         PolicyController controller = getPolicyControllerInstance();
         List<Object> scopesList;
-        if(PolicyController.isjUnit()){
+        if (PolicyController.isjUnit()) {
             scopesList = controller.getDataByQuery(scopeNamequery, null);
-        }else{
+        } else {
             scopesList = controller.getDataByQuery(scopeNamequery, params);
         }
-        return  scopesList;
+        return scopesList;
     }
 
-    //Get Active Policy List based on Scope Selection form Policy Version table
-    private void activePolicyList(String inScopeName, List<JSONObject> resultList, List<String> roles, Set<String> scopes, boolean onlyFolders){
+    // Get Active Policy List based on Scope Selection form 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)){
+        if (scopeName.contains(FORWARD_SLASH)) {
             scopeName = scopeName.replace(FORWARD_SLASH, File.separator);
         }
-        if(scopeName.contains(BACKSLASH)){
+        if (scopeName.contains(BACKSLASH)) {
             scopeName = scopeName.replace(BACKSLASH, ESCAPE_BACKSLASH);
         }
         String query = "from PolicyVersion where POLICY_NAME like :scopeName";
@@ -729,40 +746,47 @@ public class PolicyManagerServlet extends HttpServlet {
 
         List<Object> activePolicies;
         List<Object> scopesList;
-        if(PolicyController.isjUnit()){
+        if (PolicyController.isjUnit()) {
             activePolicies = controller.getDataByQuery(query, null);
             scopesList = controller.getDataByQuery(scopeNamequery, null);
-        }else{
+        } else {
             activePolicies = controller.getDataByQuery(query, params);
             scopesList = controller.getDataByQuery(scopeNamequery, params);
         }
-        for(Object list : scopesList) {
-            scopeName = checkScope(resultList, scopeName, (PolicyEditorScopes) list);
+        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));
-            if(roles.contains(SUPERADMIN) || roles.contains(SUPEREDITOR) || roles.contains(SUPERGUEST)){
-                if(scopeName.contains(ESCAPE_BACKSLASH)){
+            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{
+                } else {
                     scopeNameCheck = scopeName;
                 }
-                if(scopeNameValue.equals(scopeNameCheck)){
+                if (scopeNameValue.equals(scopeNameCheck)) {
                     JSONObject el = new JSONObject();
-                    el.put(NAME, policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator)+1));
+                    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);
                 }
-            }else if(!scopes.isEmpty() && scopes.contains(scopeNameValue)){
+            } else if (!scopes.isEmpty() && scopes.contains(scopeNameValue)) {
                 JSONObject el = new JSONObject();
-                el.put(NAME, policy.getPolicyName().substring(policy.getPolicyName().lastIndexOf(File.separator)+1));
+                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, "");
@@ -774,20 +798,21 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-    private String checkScope(List<JSONObject> resultList, String scopeName, PolicyEditorScopes scopeById) {
+    private String checkScope(List<JSONObject> resultList, String scopeName, PolicyEditorScopes scopeById,
+            Map<String, String> roleByScope) {
         String scope = scopeById.getScopeName();
-        if(scope.contains(File.separator)){
+        if (scope.contains(File.separator)) {
             String targetScope = scope.substring(0, scope.lastIndexOf(File.separator));
-            if(scopeName.contains(ESCAPE_BACKSLASH)){
+            if (scopeName.contains(ESCAPE_BACKSLASH)) {
                 scopeName = scopeName.replace(ESCAPE_BACKSLASH, File.separator);
             }
-            if(scope.contains(File.separator)){
-                scope = scope.substring(targetScope.length()+1);
-                if(scope.contains(File.separator)){
+            if (scope.contains(File.separator)) {
+                scope = scope.substring(targetScope.length() + 1);
+                if (scope.contains(File.separator)) {
                     scope = scope.substring(0, scope.indexOf(File.separator));
                 }
             }
-            if(scopeName.equalsIgnoreCase(targetScope)){
+            if (scopeName.equalsIgnoreCase(targetScope)) {
                 JSONObject el = new JSONObject();
                 el.put(NAME, scope);
                 el.put(DATE, scopeById.getModifiedDate());
@@ -795,27 +820,35 @@ public class PolicyManagerServlet extends HttpServlet {
                 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);
             }
         }
         return scopeName;
     }
 
-    private String getUserName(String loginId){
+    private String getUserName(String loginId) {
         PolicyController controller = getPolicyControllerInstance();
         UserInfo userInfo = (UserInfo) controller.getEntityItem(UserInfo.class, "userLoginId", loginId);
-        if(userInfo == null){
+        if (userInfo == null) {
             return SUPERADMIN;
         }
         return userInfo.getUserName();
     }
 
-    //Rename Policy
+    // Rename Policy
     private JSONObject rename(JSONObject params, HttpServletRequest request) throws ServletException {
         try {
             return handlePolicyRename(params, request);
         } catch (Exception e) {
-            LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE+"Exception Occured While Renaming Policy"+e);
+            LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While Renaming Policy" + e);
             return error(e.getMessage());
         }
     }
@@ -827,33 +860,34 @@ public class PolicyManagerServlet extends HttpServlet {
         String userId = UserUtils.getUserSession(request).getOrgUserId();
         String oldPath = params.getString("path");
         String newPath = params.getString("newPath");
-        oldPath = oldPath.substring(oldPath.indexOf('/')+1);
-        newPath = newPath.substring(newPath.indexOf('/')+1);
+        oldPath = oldPath.substring(oldPath.indexOf('/') + 1);
+        newPath = newPath.substring(newPath.indexOf('/') + 1);
         String checkValidation;
-        if(oldPath.endsWith(".xml")){
+        if (oldPath.endsWith(".xml")) {
             checkValidation = newPath.replace(".xml", "");
-            checkValidation = checkValidation.substring(checkValidation.indexOf('_') + 1, checkValidation.lastIndexOf("."));
-            checkValidation = checkValidation.substring(checkValidation.lastIndexOf(FORWARD_SLASH)+1);
-            if(!PolicyUtils.policySpecialCharValidator(checkValidation).contains(SUCCESS)){
+            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.");
             }
             JSONObject result = policyRename(oldPath, newPath, userId);
-            if(!(Boolean)(result.getJSONObject(RESULT).get(SUCCESS))){
+            if (!(Boolean) (result.getJSONObject(RESULT).get(SUCCESS))) {
                 return result;
             }
-        }else{
+        } else {
             String scopeName = oldPath;
             String newScopeName = newPath;
-            if(scopeName.contains(FORWARD_SLASH)){
+            if (scopeName.contains(FORWARD_SLASH)) {
                 scopeName = scopeName.replace(FORWARD_SLASH, File.separator);
                 newScopeName = newScopeName.replace(FORWARD_SLASH, File.separator);
             }
-            checkValidation = newScopeName.substring(newScopeName.lastIndexOf(File.separator)+1);
-            if(scopeName.contains(BACKSLASH)){
+            checkValidation = newScopeName.substring(newScopeName.lastIndexOf(File.separator) + 1);
+            if (scopeName.contains(BACKSLASH)) {
                 scopeName = scopeName.replace(BACKSLASH, BACKSLASH_8TIMES);
                 newScopeName = newScopeName.replace(BACKSLASH, BACKSLASH_8TIMES);
             }
-            if(!PolicyUtils.policySpecialCharValidator(checkValidation).contains(SUCCESS)){
+            if (!PolicyUtils.policySpecialCharValidator(checkValidation).contains(SUCCESS)) {
                 return error("Scope Rename Failed. The Name contains special characters.");
             }
             PolicyController controller = getPolicyControllerInstance();
@@ -863,12 +897,13 @@ public class PolicyManagerServlet extends HttpServlet {
             pvParams.put(SCOPE_NAME, scopeName + "%");
             List<Object> activePolicies = controller.getDataByQuery(query, pvParams);
             List<Object> scopesList = controller.getDataByQuery(scopeNamequery, pvParams);
-            for(Object object : activePolicies){
+            for (Object object : activePolicies) {
                 PolicyVersion activeVersion = (PolicyVersion) object;
-                String policyOldPath = activeVersion.getPolicyName().replace(File.separator, FORWARD_SLASH) + "." + activeVersion.getActiveVersion() + ".xml";
+                String policyOldPath = activeVersion.getPolicyName().replace(File.separator, FORWARD_SLASH) + "."
+                        + activeVersion.getActiveVersion() + ".xml";
                 String policyNewPath = policyOldPath.replace(oldPath, newPath);
                 JSONObject result = policyRename(policyOldPath, policyNewPath, userId);
-                if(!(Boolean)(result.getJSONObject("result").get(SUCCESS))){
+                if (!(Boolean) (result.getJSONObject("result").get(SUCCESS))) {
                     isActive = true;
                     policyActiveInPDP.add(policyOldPath);
                     String scope = policyOldPath.substring(0, policyOldPath.lastIndexOf('/'));
@@ -876,17 +911,17 @@ public class PolicyManagerServlet extends HttpServlet {
                 }
             }
             boolean rename = false;
-            if(activePolicies.size() != policyActiveInPDP.size()){
+            if (activePolicies.size() != policyActiveInPDP.size()) {
                 rename = true;
             }
 
             UserInfo userInfo = new UserInfo();
             userInfo.setUserLoginId(userId);
-            if(policyActiveInPDP.isEmpty()){
+            if (policyActiveInPDP.isEmpty()) {
                 renameScope(scopesList, scopeName, newScopeName, controller);
-            }else if(rename){
+            } else if (rename) {
                 renameScope(scopesList, scopeName, newScopeName, controller);
-                for(String scope : scopeOfPolicyActiveInPDP){
+                for (String scope : scopeOfPolicyActiveInPDP) {
                     PolicyEditorScopes editorScopeEntity = new PolicyEditorScopes();
                     editorScopeEntity.setScopeName(scope.replace(BACKSLASH, BACKSLASH_8TIMES));
                     editorScopeEntity.setUserCreatedBy(userInfo);
@@ -894,18 +929,20 @@ public class PolicyManagerServlet extends HttpServlet {
                     controller.saveData(editorScopeEntity);
                 }
             }
-            if(isActive){
-                return error("The Following policies rename failed. Since they are active in PDP Groups" +policyActiveInPDP);
+            if (isActive) {
+                return error("The Following policies rename failed. Since they are active in PDP Groups"
+                        + policyActiveInPDP);
             }
         }
         return success();
     }
 
-    private void renameScope(List<Object> scopesList, String inScopeName, String newScopeName, PolicyController controller){
-        for(Object object : scopesList){
+    private void renameScope(List<Object> scopesList, String inScopeName, String newScopeName,
+            PolicyController controller) {
+        for (Object object : scopesList) {
             PolicyEditorScopes editorScopeEntity = (PolicyEditorScopes) object;
             String scopeName = inScopeName;
-            if(scopeName.contains(BACKSLASH_8TIMES)){
+            if (scopeName.contains(BACKSLASH_8TIMES)) {
                 scopeName = scopeName.replace(BACKSLASH_8TIMES, File.separator);
                 newScopeName = newScopeName.replace(BACKSLASH_8TIMES, File.separator);
             }
@@ -921,52 +958,55 @@ public class PolicyManagerServlet extends HttpServlet {
             PolicyController controller = getPolicyControllerInstance();
 
             String policyVersionName = newPath.replace(".xml", "");
-            String policyName = policyVersionName.substring(0, policyVersionName.lastIndexOf('.')).replace(FORWARD_SLASH, File.separator);
+            String policyName = policyVersionName.substring(0, policyVersionName.lastIndexOf('.'))
+                    .replace(FORWARD_SLASH, File.separator);
 
             String oldpolicyVersionName = oldPath.replace(".xml", "");
-            String oldpolicyName = oldpolicyVersionName.substring(0, oldpolicyVersionName.lastIndexOf('.')).replace(FORWARD_SLASH, File.separator);
+            String oldpolicyName = oldpolicyVersionName.substring(0, oldpolicyVersionName.lastIndexOf('.'))
+                    .replace(FORWARD_SLASH, File.separator);
             String newpolicyName = newPath.replace("/", ".");
             String[] newPolicySplit = modifyPolicyName(newPath);
 
             String[] oldPolicySplit = modifyPolicyName(oldPath);
 
-            //Check PolicyEntity table with newPolicy Name
+            // Check PolicyEntity table with newPolicy Name
             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]);
             List<Object> queryData = controller.getDataByQuery(policyEntityquery, policyParams);
-            if(!queryData.isEmpty()){
+            if (!queryData.isEmpty()) {
                 return error("Policy rename failed. Since, the policy with same name already exists.");
             }
 
-            //Query the Policy Entity with oldPolicy Name
+            // 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";
             SimpleBindings params = new SimpleBindings();
             params.put("policyEntityCheck", policyEntityCheck + "%");
             params.put("oldPolicySplit_0", oldPolicySplit[0]);
             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.");
+            if (oldEntityData.isEmpty()) {
+                return error(
+                        "Policy rename failed due to policy not able to retrieve from database. Please, contact super-admin.");
             }
 
             StringBuilder groupQuery = new StringBuilder();
             groupQuery.append("FROM PolicyGroupEntity where (");
             SimpleBindings geParams = new SimpleBindings();
-            for(int i=0; i<oldEntityData.size(); i++){
+            for (int i = 0; i < oldEntityData.size(); i++) {
                 entity = (PolicyEntity) oldEntityData.get(i);
-                if(i == 0){
+                if (i == 0) {
                     groupQuery.append("policyid = :policyId");
                     geParams.put("policyId", entity.getPolicyId());
-                }else{
+                } else {
                     groupQuery.append(" or policyid = :policyId").append(i);
                     geParams.put("policyId" + i, entity.getPolicyId());
                 }
             }
             groupQuery.append(")");
             List<Object> groupEntityData = controller.getDataByQuery(groupQuery.toString(), geParams);
-            if(! groupEntityData.isEmpty()){
+            if (!groupEntityData.isEmpty()) {
                 return error("Policy rename failed. Since the policy or its version is active in PDP Groups.");
             }
             for (Object anOldEntityData : oldEntityData) {
@@ -975,13 +1015,14 @@ public class PolicyManagerServlet extends HttpServlet {
                 checkEntityName = checkEntityName.substring(0, checkEntityName.lastIndexOf('.'));
                 String originalPolicyName = oldpolicyName.substring(oldpolicyName.lastIndexOf(File.separator) + 1);
                 if (checkEntityName.equals(originalPolicyName)) {
-                    checkOldPolicyEntryAndUpdate(entity, newPolicySplit[0], newPolicySplit[1], oldPolicySplit[0], oldPolicySplit[1], policyName, newpolicyName, oldpolicyName, userId);
+                    checkOldPolicyEntryAndUpdate(entity, newPolicySplit[0], newPolicySplit[1], oldPolicySplit[0],
+                            oldPolicySplit[1], policyName, newpolicyName, oldpolicyName, userId);
                 }
             }
 
             return success();
         } catch (Exception e) {
-            LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE+"Exception Occured While Renaming Policy"+e);
+            LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While Renaming Policy" + e);
             return error(e.getMessage());
         }
     }
@@ -992,18 +1033,19 @@ public class PolicyManagerServlet extends HttpServlet {
 
     private String[] modifyPolicyName(String separator, String pathName) {
         String policyName = pathName.replace(separator, ".");
-        if(policyName.contains(CONFIG2)){
+        if (policyName.contains(CONFIG2)) {
             policyName = policyName.replace(CONFIG, CONFIG1);
-        }else if(policyName.contains(ACTION2)){
+        } else if (policyName.contains(ACTION2)) {
             policyName = policyName.replace(ACTION, ACTION1);
-        }else if(policyName.contains(DECISION2)){
+        } else if (policyName.contains(DECISION2)) {
             policyName = policyName.replace(DECISION, DECISION1);
         }
         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();
@@ -1011,35 +1053,45 @@ public class PolicyManagerServlet extends HttpServlet {
 
             String oldPolicyNameWithoutExtension = removeoldPolicyExtension;
             String newPolicyNameWithoutExtension = removenewPolicyExtension;
-            if(removeoldPolicyExtension.endsWith(".xml")){
-                oldPolicyNameWithoutExtension = oldPolicyNameWithoutExtension.substring(0, oldPolicyNameWithoutExtension.indexOf('.'));
-                newPolicyNameWithoutExtension = newPolicyNameWithoutExtension.substring(0, newPolicyNameWithoutExtension.indexOf('.'));
+            if (removeoldPolicyExtension.endsWith(".xml")) {
+                oldPolicyNameWithoutExtension = oldPolicyNameWithoutExtension.substring(0,
+                        oldPolicyNameWithoutExtension.indexOf('.'));
+                newPolicyNameWithoutExtension = newPolicyNameWithoutExtension.substring(0,
+                        newPolicyNameWithoutExtension.indexOf('.'));
             }
-            entity.setPolicyName(entity.getPolicyName().replace(oldPolicyNameWithoutExtension, newPolicyNameWithoutExtension));
-            entity.setPolicyData(entity.getPolicyData().replace(oldScope +"."+oldPolicyNameWithoutExtension, newScope+"."+newPolicyNameWithoutExtension));
+            entity.setPolicyName(
+                    entity.getPolicyName().replace(oldPolicyNameWithoutExtension, newPolicyNameWithoutExtension));
+            entity.setPolicyData(entity.getPolicyData().replace(oldScope + "." + oldPolicyNameWithoutExtension,
+                    newScope + "." + newPolicyNameWithoutExtension));
             entity.setScope(newScope);
             entity.setModifiedBy(userId);
 
             String oldConfigurationName = null;
             String newConfigurationName = null;
-            if(newpolicyName.contains(CONFIG2)){
+            if (newpolicyName.contains(CONFIG2)) {
                 oldConfigurationName = configEntity.getConfigurationName();
-                configEntity.setConfigurationName(configEntity.getConfigurationName().replace(oldScope +"."+oldPolicyNameWithoutExtension, newScope+"."+newPolicyNameWithoutExtension));
+                configEntity.setConfigurationName(
+                        configEntity.getConfigurationName().replace(oldScope + "." + oldPolicyNameWithoutExtension,
+                                newScope + "." + newPolicyNameWithoutExtension));
                 controller.updateData(configEntity);
                 newConfigurationName = configEntity.getConfigurationName();
                 File file = new File(PolicyController.getConfigHome() + File.separator + oldConfigurationName);
-                if(file.exists()){
-                    File renamefile = new File(PolicyController.getConfigHome() + File.separator + newConfigurationName);
+                if (file.exists()) {
+                    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, newScope+"."+newPolicyNameWithoutExtension));
+                actionEntity.setActionBody(
+                        actionEntity.getActionBody().replace(oldScope + "." + oldPolicyNameWithoutExtension,
+                                newScope + "." + newPolicyNameWithoutExtension));
                 controller.updateData(actionEntity);
                 newConfigurationName = actionEntity.getActionBodyName();
                 File file = new File(PolicyController.getActionHome() + File.separator + oldConfigurationName);
-                if(file.exists()){
-                    File renamefile = new File(PolicyController.getActionHome() + File.separator + newConfigurationName);
+                if (file.exists()) {
+                    File renamefile = new File(
+                            PolicyController.getActionHome() + File.separator + newConfigurationName);
                     file.renameTo(renamefile);
                 }
             }
@@ -1047,25 +1099,26 @@ public class PolicyManagerServlet extends HttpServlet {
 
             PolicyRestController restController = new PolicyRestController();
             restController.notifyOtherPAPSToUpdateConfigurations("rename", newConfigurationName, oldConfigurationName);
-            PolicyVersion versionEntity = (PolicyVersion) controller.getEntityItem(PolicyVersion.class, "policyName", oldpolicyName);
+            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);
-            if(movePolicyCheck.equals(moveOldPolicyCheck)){
+            String movePolicyCheck = policyName.substring(policyName.lastIndexOf(File.separator) + 1);
+            String moveOldPolicyCheck = oldpolicyName.substring(oldpolicyName.lastIndexOf(File.separator) + 1);
+            if (movePolicyCheck.equals(moveOldPolicyCheck)) {
                 controller.watchPolicyFunction(versionEntity, oldpolicyName, "Move");
-            }else{
+            } else {
                 controller.watchPolicyFunction(versionEntity, oldpolicyName, "Rename");
             }
         } catch (Exception e) {
-            LOGGER.error(EXCEPTION_OCCURED +e);
+            LOGGER.error(EXCEPTION_OCCURED + e);
             throw e;
         }
     }
 
     private void cloneRecord(String newpolicyName, String oldScope, String inRemoveoldPolicyExtension, String newScope,
-                             String inRemovenewPolicyExtension, PolicyEntity entity, String userId) throws IOException{
+            String inRemovenewPolicyExtension, PolicyEntity entity, String userId) throws IOException {
         String queryEntityName;
         PolicyController controller = getPolicyControllerInstance();
         PolicyEntity cloneEntity = new PolicyEntity();
@@ -1074,14 +1127,16 @@ public class PolicyManagerServlet extends HttpServlet {
         String removenewPolicyExtension = inRemovenewPolicyExtension;
         removeoldPolicyExtension = removeoldPolicyExtension.replace(".xml", "");
         removenewPolicyExtension = removenewPolicyExtension.replace(".xml", "");
-        cloneEntity.setPolicyData(entity.getPolicyData().replace(oldScope+"."+removeoldPolicyExtension, newScope+"."+removenewPolicyExtension));
+        cloneEntity.setPolicyData(entity.getPolicyData().replace(oldScope + "." + removeoldPolicyExtension,
+                newScope + "." + removenewPolicyExtension));
         cloneEntity.setScope(entity.getScope());
         String oldConfigRemoveExtension = removeoldPolicyExtension.replace(".xml", "");
         String newConfigRemoveExtension = removenewPolicyExtension.replace(".xml", "");
         String newConfigurationName = null;
-        if(newpolicyName.contains(CONFIG2)){
+        if (newpolicyName.contains(CONFIG2)) {
             ConfigurationDataEntity configurationDataEntity = new ConfigurationDataEntity();
-            configurationDataEntity.setConfigurationName(entity.getConfigurationData().getConfigurationName().replace(oldScope+"."+oldConfigRemoveExtension, newScope+"."+newConfigRemoveExtension));
+            configurationDataEntity.setConfigurationName(entity.getConfigurationData().getConfigurationName()
+                    .replace(oldScope + "." + oldConfigRemoveExtension, newScope + "." + newConfigRemoveExtension));
             queryEntityName = configurationDataEntity.getConfigurationName();
             configurationDataEntity.setConfigBody(entity.getConfigurationData().getConfigBody());
             configurationDataEntity.setConfigType(entity.getConfigurationData().getConfigType());
@@ -1089,33 +1144,38 @@ public class PolicyManagerServlet extends HttpServlet {
             configurationDataEntity.setCreatedBy(userId);
             configurationDataEntity.setModifiedBy(userId);
             controller.saveData(configurationDataEntity);
-            ConfigurationDataEntity configEntiy = (ConfigurationDataEntity) controller.getEntityItem(ConfigurationDataEntity.class, "configurationName", queryEntityName);
+            ConfigurationDataEntity configEntiy = (ConfigurationDataEntity) controller
+                    .getEntityItem(ConfigurationDataEntity.class, "configurationName", queryEntityName);
             cloneEntity.setConfigurationData(configEntiy);
             newConfigurationName = configEntiy.getConfigurationName();
-            try (FileWriter fw = new FileWriter(PolicyController.getConfigHome() + File.separator + newConfigurationName);
-                 BufferedWriter bw = new BufferedWriter(fw)){
+            try (FileWriter fw = new FileWriter(
+                    PolicyController.getConfigHome() + File.separator + newConfigurationName);
+                    BufferedWriter bw = new BufferedWriter(fw)) {
                 bw.write(configEntiy.getConfigBody());
             } catch (IOException e) {
-                LOGGER.error("Exception Occured While cloning the configuration file"+e);
+                LOGGER.error("Exception Occured While cloning the configuration file" + e);
                 throw e;
             }
-        }else if(newpolicyName.contains(ACTION2)){
+        } else if (newpolicyName.contains(ACTION2)) {
             ActionBodyEntity actionBodyEntity = new ActionBodyEntity();
-            actionBodyEntity.setActionBodyName(entity.getActionBodyEntity().getActionBodyName().replace(oldScope+"."+oldConfigRemoveExtension, newScope+"."+newConfigRemoveExtension));
+            actionBodyEntity.setActionBodyName(entity.getActionBodyEntity().getActionBodyName()
+                    .replace(oldScope + "." + oldConfigRemoveExtension, newScope + "." + newConfigRemoveExtension));
             queryEntityName = actionBodyEntity.getActionBodyName();
             actionBodyEntity.setActionBody(entity.getActionBodyEntity().getActionBody());
             actionBodyEntity.setDeleted(false);
             actionBodyEntity.setCreatedBy(userId);
             actionBodyEntity.setModifiedBy(userId);
             controller.saveData(actionBodyEntity);
-            ActionBodyEntity actionEntiy = (ActionBodyEntity) controller.getEntityItem(ActionBodyEntity.class, "actionBodyName", queryEntityName);
+            ActionBodyEntity actionEntiy = (ActionBodyEntity) controller.getEntityItem(ActionBodyEntity.class,
+                    "actionBodyName", queryEntityName);
             cloneEntity.setActionBodyEntity(actionEntiy);
             newConfigurationName = actionEntiy.getActionBodyName();
-            try (FileWriter fw = new FileWriter(PolicyController.getActionHome() + File.separator + newConfigurationName);
-                 BufferedWriter bw = new BufferedWriter(fw)){
+            try (FileWriter fw = new FileWriter(
+                    PolicyController.getActionHome() + File.separator + newConfigurationName);
+                    BufferedWriter bw = new BufferedWriter(fw)) {
                 bw.write(actionEntiy.getActionBody());
             } catch (IOException e) {
-                LOGGER.error("Exception Occured While cloning the configuration file"+e);
+                LOGGER.error("Exception Occured While cloning the configuration file" + e);
                 throw e;
             }
         }
@@ -1125,44 +1185,46 @@ public class PolicyManagerServlet extends HttpServlet {
         cloneEntity.setModifiedBy(userId);
         controller.saveData(cloneEntity);
 
-        //Notify others paps regarding clone policy.
+        // Notify others paps regarding clone policy.
         PolicyRestController restController = new PolicyRestController();
         restController.notifyOtherPAPSToUpdateConfigurations("clonePolicy", newConfigurationName, null);
     }
 
-    //Clone the Policy
+    // Clone the Policy
     private JSONObject copy(JSONObject params, HttpServletRequest request) throws ServletException {
         try {
             String userId = UserUtils.getUserSession(request).getOrgUserId();
             String oldPath = params.getString("path");
             String newPath = params.getString("newPath");
-            oldPath = oldPath.substring(oldPath.indexOf('/')+1);
-            newPath = newPath.substring(newPath.indexOf('/')+1);
+            oldPath = oldPath.substring(oldPath.indexOf('/') + 1);
+            newPath = newPath.substring(newPath.indexOf('/') + 1);
 
             String policyVersionName = newPath.replace(".xml", "");
-            String version = policyVersionName.substring(policyVersionName.indexOf('.')+1);
-            String policyName = policyVersionName.substring(0, policyVersionName.lastIndexOf('.')).replace(FORWARD_SLASH, File.separator);
+            String version = policyVersionName.substring(policyVersionName.indexOf('.') + 1);
+            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 newPolicyCheck = newpolicyName;
-            if(newPolicyCheck.contains(CONFIG2)){
+            if (newPolicyCheck.contains(CONFIG2)) {
                 newPolicyCheck = newPolicyCheck.replace(CONFIG, CONFIG1);
-            }else if(newPolicyCheck.contains(ACTION2)){
+            } else if (newPolicyCheck.contains(ACTION2)) {
                 newPolicyCheck = newPolicyCheck.replace(ACTION, ACTION1);
-            }else if(newPolicyCheck.contains(DECISION2)){
+            } else if (newPolicyCheck.contains(DECISION2)) {
                 newPolicyCheck = newPolicyCheck.replace(DECISION, DECISION1);
             }
-            if(!newPolicyCheck.contains(":")){
+            if (!newPolicyCheck.contains(":")) {
                 return error("Policy Clone Failed. The Name contains special characters.");
             }
             String[] newPolicySplit = newPolicyCheck.split(":");
 
             String checkValidation = newPolicySplit[1].replace(".xml", "");
-            checkValidation = checkValidation.substring(checkValidation.indexOf('_') + 1, checkValidation.lastIndexOf("."));
-            if(!PolicyUtils.policySpecialCharValidator(checkValidation).contains(SUCCESS)){
+            checkValidation = checkValidation.substring(checkValidation.indexOf('_') + 1,
+                    checkValidation.lastIndexOf("."));
+            if (!PolicyUtils.policySpecialCharValidator(checkValidation).contains(SUCCESS)) {
                 return error("Policy Clone Failed. The Name contains special characters.");
             }
 
@@ -1173,35 +1235,36 @@ public class PolicyManagerServlet extends HttpServlet {
             PolicyEntity entity = null;
             boolean success = false;
 
-            //Check PolicyEntity table with newPolicy Name
+            // Check PolicyEntity table with newPolicy Name
             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]);
             List<Object> queryData = controller.getDataByQuery(policyEntityquery, policyParams);
-            if(!queryData.isEmpty()){
+            if (!queryData.isEmpty()) {
                 return error("Policy already exists with same name");
             }
 
-            //Query the Policy Entity with oldPolicy Name
+            // Query the Policy Entity with oldPolicy Name
             policyEntityquery = "FROM PolicyEntity where policyName = :oldPolicySplit_1 and scope = :oldPolicySplit_0";
             SimpleBindings peParams = new SimpleBindings();
             peParams.put("oldPolicySplit_1", oldPolicySplit[1]);
             peParams.put("oldPolicySplit_0", oldPolicySplit[0]);
-            if(PolicyController.isjUnit()){
+            if (PolicyController.isjUnit()) {
                 queryData = controller.getDataByQuery(policyEntityquery, null);
-            }else{
+            } else {
                 queryData = controller.getDataByQuery(policyEntityquery, peParams);
             }
-            if(!queryData.isEmpty()){
+            if (!queryData.isEmpty()) {
                 entity = (PolicyEntity) queryData.get(0);
             }
-            if(entity != null){
-                cloneRecord(newPolicySplit[1], oldPolicySplit[0], oldPolicySplit[1],  newPolicySplit[0], newPolicySplit[1], entity, userId);
+            if (entity != null) {
+                cloneRecord(newPolicySplit[1], oldPolicySplit[0], oldPolicySplit[1], newPolicySplit[0],
+                        newPolicySplit[1], entity, userId);
                 success = true;
             }
 
-            if(success){
+            if (success) {
                 PolicyVersion entityItem = new PolicyVersion();
                 entityItem.setActiveVersion(Integer.parseInt(version));
                 entityItem.setHigherVersion(Integer.parseInt(version));
@@ -1212,7 +1275,7 @@ public class PolicyManagerServlet extends HttpServlet {
                 controller.saveData(entityItem);
             }
 
-            LOGGER.debug("copy from: {} to: {}" + oldPath +newPath);
+            LOGGER.debug("copy from: {} to: {}" + oldPath + newPath);
 
             return success();
         } catch (Exception e) {
@@ -1221,7 +1284,7 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-    //Delete Policy or Scope Functionality
+    // Delete Policy or Scope Functionality
     private JSONObject delete(JSONObject params, HttpServletRequest request) throws ServletException {
         PolicyController controller = getPolicyControllerInstance();
         PolicyRestController restController = new PolicyRestController();
@@ -1231,81 +1294,96 @@ public class PolicyManagerServlet extends HttpServlet {
             String userId = UserUtils.getUserSession(request).getOrgUserId();
             String deleteVersion = "";
             String path = params.getString("path");
-            LOGGER.debug("delete {}" +path);
-            if(params.has("deleteVersion")){
-                deleteVersion  = params.getString("deleteVersion");
+            LOGGER.debug("delete {}" + path);
+            if (params.has("deleteVersion")) {
+                deleteVersion = params.getString("deleteVersion");
             }
-            path = path.substring(path.indexOf('/')+1);
+            path = path.substring(path.indexOf('/') + 1);
             String policyNamewithExtension = path.replace(FORWARD_SLASH, File.separator);
             String policyVersionName = policyNamewithExtension.replace(".xml", "");
             String query;
             SimpleBindings policyParams = new SimpleBindings();
-            if(path.endsWith(".xml")){
+            if (path.endsWith(".xml")) {
                 policyNamewithoutExtension = policyVersionName.substring(0, policyVersionName.lastIndexOf('.'));
                 String[] split = modifyPolicyName(File.separator, policyNamewithoutExtension);
                 query = "FROM PolicyEntity where policyName like :split_1 and scope = :split_0";
                 policyParams.put(SPLIT_1, split[1] + "%");
                 policyParams.put(SPLIT_0, split[0]);
-            }else{
+            } else {
                 policyNamewithoutExtension = path.replace(File.separator, ".");
-                query = "FROM PolicyEntity where scope like :policyNamewithoutExtension";
-                policyParams.put("policyNamewithoutExtension", policyNamewithoutExtension + "%");
+                query = "FROM PolicyEntity where scope like :policyNamewithoutExtension or scope = :exactScope";
+                policyParams.put("policyNamewithoutExtension", policyNamewithoutExtension + ".%");
+                policyParams.put("exactScope", policyNamewithoutExtension);
             }
 
             List<Object> policyEntityobjects = controller.getDataByQuery(query, policyParams);
             String activePolicyName = null;
             boolean pdpCheck = false;
-            if(path.endsWith(".xml")){
+            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){
+                int version = Integer.parseInt(policyVersionName.substring(policyVersionName.indexOf('.') + 1));
+                if ("ALL".equals(deleteVersion)) {
+                    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()){
+                            if (!groupobject.isEmpty()) {
                                 pdpCheck = true;
-                                activePolicyName = policyEntity.getScope() +"."+ policyEntity.getPolicyName();
-                            }else{
-                                //Delete the entity from Elastic Search Database
+                                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
+                                // 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()));
+                                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()));
+                                    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());
+                                    restController.notifyOtherPAPSToUpdateConfigurations(DELETE, null,
+                                            policyEntity.getActionBodyEntity().getActionBodyName());
                                 }
                             }
                         }
                     }
-                    //Policy Notification
+                    // Policy Notification
                     PolicyVersion versionEntity = new PolicyVersion();
                     versionEntity.setPolicyName(policyNamewithoutExtension);
                     versionEntity.setModifiedBy(userId);
                     controller.watchPolicyFunction(versionEntity, policyNamewithExtension, "DeleteAll");
-                    if(pdpCheck){
-                        //Delete from policyVersion table
+                    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 ='" +policyNamewithoutExtension.replace(BACKSLASH, ESCAPE_BACKSLASH)+"' and id >0";
+                        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: "+activePolicyName);
-                    }else{
-                        //No Active Policy in PDP. So, deleting all entries from policyVersion table
-                        String policyVersionQuery = DELETE_POLICY_VERSION_WHERE_POLICY_NAME +policyNamewithoutExtension.replace(BACKSLASH, ESCAPE_BACKSLASH)+"' and id >0";
+                        return error(
+                                "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
+                        String policyVersionQuery = DELETE_POLICY_VERSION_WHERE_POLICY_NAME
+                                + policyNamewithoutExtension.replace(BACKSLASH, ESCAPE_BACKSLASH) + "' and id >0";
                         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, ".");
+                } 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";
 
                     SimpleBindings peParams = new SimpleBindings();
@@ -1313,10 +1391,10 @@ public class PolicyManagerServlet extends HttpServlet {
                     peParams.put("currentVersionScope", currentVersionScope);
 
                     List<Object> policyEntitys = controller.getDataByQuery(query, peParams);
-                    if(!policyEntitys.isEmpty()){
+                    if (!policyEntitys.isEmpty()) {
                         policyEntity = (PolicyEntity) policyEntitys.get(0);
                     }
-                    if(policyEntity == null){
+                    if (policyEntity == null) {
                         return success();
                     }
 
@@ -1324,39 +1402,45 @@ public class PolicyManagerServlet extends HttpServlet {
                     SimpleBindings geParams = new SimpleBindings();
                     geParams.put("policyEntityId", policyEntity.getPolicyId());
                     List<Object> groupobject = controller.getDataByQuery(groupEntityquery, geParams);
-                    if(!groupobject.isEmpty()){
-                        return error("Policy can't be deleted, it is active in PDP Groups.     PolicyName: '"+policyEntity.getScope() + "." +policyEntity.getPolicyName()+"'");
+                    if (!groupobject.isEmpty()) {
+                        return error("Policy can't be deleted, it is active in PDP Groups.     PolicyName: '"
+                                + policyEntity.getScope() + "." + policyEntity.getPolicyName() + "'");
                     }
 
-                    //Delete the entity from Elastic Search Database
+                    // Delete the entity from Elastic Search Database
                     String searchFileName = policyEntity.getScope() + "." + policyEntity.getPolicyName();
                     restController.deleteElasticData(searchFileName);
-                    //Delete the entity from Policy Entity table
+                    // 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()));
+                    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()));
+                        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());
+                        restController.notifyOtherPAPSToUpdateConfigurations(DELETE, null,
+                                policyEntity.getActionBodyEntity().getActionBodyName());
                     }
 
-                    if(version > 1){
+                    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.parseInt(policyEntityName.substring(policyEntityName.lastIndexOf('.')+1));
-                                if(policyEntityVersion > highestVersion && policyEntityVersion != version){
+                                int policyEntityVersion = Integer
+                                        .parseInt(policyEntityName.substring(policyEntityName.lastIndexOf('.') + 1));
+                                if (policyEntityVersion > highestVersion && policyEntityVersion != version) {
                                     highestVersion = policyEntityVersion;
                                 }
                             }
                         }
 
-                        //Policy Notification
+                        // Policy Notification
                         PolicyVersion entity = new PolicyVersion();
                         entity.setPolicyName(policyNamewithoutExtension);
                         entity.setActiveVersion(highestVersion);
@@ -1364,66 +1448,78 @@ public class PolicyManagerServlet extends HttpServlet {
                         controller.watchPolicyFunction(entity, policyNamewithExtension, "DeleteOne");
 
                         String updatequery;
-                        if(highestVersion != 0){
-                            updatequery = UPDATE_POLICY_VERSION_SET_ACTIVE_VERSION +highestVersion+"' , highest_version='"+highestVersion+"' where policy_name ='" +policyNamewithoutExtension.replace("\\", "\\\\")+"'";
-                        }else{
-                            updatequery = DELETE_POLICY_VERSION_WHERE_POLICY_NAME +policyNamewithoutExtension.replace("\\", "\\\\")+"' and id >0";
+                        if (highestVersion != 0) {
+                            updatequery = UPDATE_POLICY_VERSION_SET_ACTIVE_VERSION + highestVersion
+                                    + "' , highest_version='" + highestVersion + "' where policy_name ='"
+                                    + policyNamewithoutExtension.replace("\\", "\\\\") + "'";
+                        } else {
+                            updatequery = DELETE_POLICY_VERSION_WHERE_POLICY_NAME
+                                    + policyNamewithoutExtension.replace("\\", "\\\\") + "' and id >0";
                         }
                         controller.executeQuery(updatequery);
-                    }else{
-                        String policyVersionQuery = DELETE_POLICY_VERSION_WHERE_POLICY_NAME +policyNamewithoutExtension.replace("\\", "\\\\")+"' and id >0";
+                    } else {
+                        String policyVersionQuery = DELETE_POLICY_VERSION_WHERE_POLICY_NAME
+                                + policyNamewithoutExtension.replace("\\", "\\\\") + "' and id >0";
                         controller.executeQuery(policyVersionQuery);
                     }
                 }
-            }else{
+            } else {
                 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;
+                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";
                     SimpleBindings geParams = new SimpleBindings();
                     geParams.put("policyEntityId", policyEntity.getPolicyId());
                     List<Object> groupobject = controller.getDataByQuery(groupEntityquery, geParams);
-                    if(!groupobject.isEmpty()){
+                    if (!groupobject.isEmpty()) {
                         pdpCheck = true;
-                        activePoliciesInPDP.add(policyEntity.getScope()+"."+policyEntity.getPolicyName());
-                    }else{
-                        //Delete the entity from Elastic Search Database
+                        activePoliciesInPDP.add(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
+                        // Delete the entity from Policy Entity table
                         controller.deleteData(policyEntity);
                         policyNamewithoutExtension = policyEntity.getPolicyName();
-                        if(policyNamewithoutExtension.contains(CONFIG2)){
-                            Files.deleteIfExists(Paths.get(PolicyController.getConfigHome() + File.separator + policyEntity.getConfigurationData().getConfigurationName()));
+                        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()));
+                            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());
+                            restController.notifyOtherPAPSToUpdateConfigurations(DELETE, null,
+                                    policyEntity.getActionBodyEntity().getActionBodyName());
                         }
                     }
                 }
-                //Delete from policyVersion and policyEditor Scope table
-                String policyVersionQuery = "delete PolicyVersion where POLICY_NAME like '"+path.replace(BACKSLASH, ESCAPE_BACKSLASH)+PERCENT_AND_ID_GT_0;
+                // Delete from policyVersion and policyEditor Scope table
+                String policyVersionQuery = "delete PolicyVersion where POLICY_NAME like '"
+                        + path.replace(BACKSLASH, ESCAPE_BACKSLASH) + File.separator + PERCENT_AND_ID_GT_0;
                 controller.executeQuery(policyVersionQuery);
 
-                //Policy Notification
+                // Policy Notification
                 PolicyVersion entity = new PolicyVersion();
                 entity.setPolicyName(path);
                 entity.setModifiedBy(userId);
                 controller.watchPolicyFunction(entity, path, "DeleteScope");
-                if(pdpCheck){
-                    //Add Active Policies List to PolicyVersionTable
+                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('.')).replace(".", File.separator);
+                        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);
@@ -1433,9 +1529,11 @@ public class PolicyManagerServlet extends HttpServlet {
                         controller.saveData(insertactivePDPVersion);
                     }
 
-                    return error("All the Policies has been deleted in Scope. Except the following list of Policies:"+activePoliciesInPDP);
-                }else{
-                    String policyScopeQuery = "delete PolicyEditorScopes where SCOPENAME like '"+path.replace(BACKSLASH, ESCAPE_BACKSLASH)+PERCENT_AND_ID_GT_0;
+                    return error("All the Policies has been deleted in Scope. Except the following list of Policies:"
+                            + activePoliciesInPDP);
+                } else {
+                    String policyScopeQuery = "delete PolicyEditorScopes where SCOPENAME like '"
+                            + path.replace(BACKSLASH, ESCAPE_BACKSLASH) + PERCENT_AND_ID_GT_0;
                     controller.executeQuery(policyScopeQuery);
                 }
 
@@ -1447,14 +1545,14 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-    //Edit the Policy
+    // Edit the Policy
     private JSONObject editFile(JSONObject params) throws ServletException {
         // get content
         try {
             PolicyController controller = getPolicyControllerInstance();
             String mode = params.getString("mode");
             String path = params.getString("path");
-            LOGGER.debug("editFile path: {}"+ path);
+            LOGGER.debug("editFile path: {}" + path);
 
             String domain = path.substring(1, path.lastIndexOf('/'));
             domain = domain.replace(FORWARD_SLASH, ".");
@@ -1469,23 +1567,22 @@ public class PolicyManagerServlet extends HttpServlet {
             peParams.put(SPLIT_1, split[1]);
             peParams.put(SPLIT_0, split[0]);
             List<Object> queryData;
-            if(PolicyController.isjUnit()){
+            if (PolicyController.isjUnit()) {
                 queryData = controller.getDataByQuery(query, null);
-            }else{
+            } else {
                 queryData = controller.getDataByQuery(query, peParams);
             }
             PolicyEntity entity = (PolicyEntity) queryData.get(0);
             InputStream stream = new ByteArrayInputStream(entity.getPolicyData().getBytes(StandardCharsets.UTF_8));
 
-
             Object policy = XACMLPolicyScanner.readPolicy(stream);
-            PolicyRestAdapter policyAdapter  = new PolicyRestAdapter();
+            PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
             policyAdapter.setData(policy);
 
-            if("viewPolicy".equalsIgnoreCase(mode)){
+            if ("viewPolicy".equalsIgnoreCase(mode)) {
                 policyAdapter.setReadOnly(true);
                 policyAdapter.setEditPolicy(false);
-            }else{
+            } else {
                 policyAdapter.setReadOnly(false);
                 policyAdapter.setEditPolicy(true);
             }
@@ -1494,10 +1591,10 @@ public class PolicyManagerServlet extends HttpServlet {
             policyAdapter.setPolicyData(policy);
             String policyName = path.replace(".xml", "");
             policyName = policyName.substring(0, policyName.lastIndexOf('.'));
-            policyAdapter.setPolicyName(policyName.substring(policyName.lastIndexOf('.')+1));
+            policyAdapter.setPolicyName(policyName.substring(policyName.lastIndexOf('.') + 1));
 
             PolicyAdapter setpolicyAdapter = PolicyAdapter.getInstance();
-            Objects.requireNonNull(setpolicyAdapter).configure(policyAdapter,entity);
+            Objects.requireNonNull(setpolicyAdapter).configure(policyAdapter, entity);
 
             policyAdapter.setParentPath(null);
             ObjectMapper mapper = new ObjectMapper();
@@ -1511,44 +1608,46 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-    //Add Scopes
+    // 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);
+            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{
+                } else {
                     name = params.getString(NAME);
                 }
-            }catch(Exception e){
+            } catch (Exception e) {
                 name = params.getString(NAME);
-                LOGGER.error(XACMLErrorConstants.ERROR_DATA_ISSUE + "Exception Occured While Adding Scope"+e);
+                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{
+            if (name.contains(File.separator)) {
+                validateName = name.substring(name.lastIndexOf(File.separator) + 1);
+            } else {
                 validateName = name;
             }
-            if(!name.isEmpty()){
+            if (!name.isEmpty()) {
                 String validate = PolicyUtils.policySpecialCharValidator(validateName);
-                if(!validate.contains(SUCCESS)){
+                if (!validate.contains(SUCCESS)) {
                     return error(validate);
                 }
             }
-            LOGGER.debug("addFolder path: {} name: {}" + path +name);
-            if(! "".equals(name)){
-                if(name.startsWith(File.separator)){
+            LOGGER.debug("addFolder path: {} name: {}" + path + name);
+            if (!"".equals(name)) {
+                if (name.startsWith(File.separator)) {
                     name = name.substring(1);
                 }
-                PolicyEditorScopes entity = (PolicyEditorScopes) controller.getEntityItem(PolicyEditorScopes.class, SCOPE_NAME, name);
-                if(entity == null){
+                PolicyEditorScopes entity = (PolicyEditorScopes) controller.getEntityItem(PolicyEditorScopes.class,
+                        SCOPE_NAME, name);
+                if (entity == null) {
                     UserInfo userInfo = new UserInfo();
                     userInfo.setUserLoginId(userId);
                     PolicyEditorScopes newScope = new PolicyEditorScopes();
@@ -1556,7 +1655,7 @@ public class PolicyManagerServlet extends HttpServlet {
                     newScope.setUserCreatedBy(userInfo);
                     newScope.setUserModifiedBy(userInfo);
                     controller.saveData(newScope);
-                }else{
+                } else {
                     return error("Scope Already Exists");
                 }
             }
@@ -1567,7 +1666,7 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-    //Return Error Object
+    // Return Error Object
     private JSONObject error(String msg) throws ServletException {
         try {
             JSONObject result = new JSONObject();
@@ -1579,7 +1678,7 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-    //Return Success Object
+    // Return Success Object
     private JSONObject success() throws ServletException {
         try {
             JSONObject result = new JSONObject();
@@ -1591,7 +1690,7 @@ public class PolicyManagerServlet extends HttpServlet {
         }
     }
 
-    private PolicyController getPolicyControllerInstance(){
+    private PolicyController getPolicyControllerInstance() {
         return policyController != null ? getPolicyController() : new PolicyController();
     }
 
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
index e5e868fd9..018668fc7 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/AutoPushController.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 package org.onap.policy.controller;
 
-
 import java.io.BufferedWriter;
 import java.io.File;
 import java.io.FileWriter;
@@ -72,336 +71,345 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-
 @Controller
-@RequestMapping({"/"})
-public class AutoPushController extends RestrictedBaseController{
+@RequestMapping({ "/" })
+public class AutoPushController extends RestrictedBaseController {
 
-	private static final Logger logger = FlexLogger.getLogger(AutoPushController.class);
+    private static final Logger logger = FlexLogger.getLogger(AutoPushController.class);
     private static final String UTF8 = "UTF-8";
 
-	
-	@Autowired
-	CommonClassDao commonClassDao;
-
-	private PDPGroupContainer container;
-	protected List<OnapPDPGroup> groups = Collections.synchronizedList(new ArrayList<OnapPDPGroup>());
-	
-	private PDPPolicyContainer policyContainer;
-
-	private PolicyController policyController;
-	public PolicyController getPolicyController() {
-		return policyController;
-	}
-
-	public void setPolicyController(PolicyController policyController) {
-		this.policyController = policyController;
-	}
-
-	private List<Object> data;
-
-	public synchronized void refreshGroups() {
-		synchronized(this.groups) { 
-			this.groups.clear();
-			try {
-				PolicyController controller = getPolicyControllerInstance();
-				this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
-			} catch (PAPException e) {
-				String message = "Unable to retrieve Groups from server: " + e;
-				logger.error(XACMLErrorConstants.ERROR_DATA_ISSUE + message);
-			}
-
-		}
-	}
-
-	private PolicyController getPolicyControllerInstance(){
-		return policyController != null ? getPolicyController() : new PolicyController();
-	}
-	
-	@RequestMapping(value={"/get_AutoPushPoliciesContainerData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getPolicyGroupContainerData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Set<String> scopes;
-			List<String> roles;
-			data = new ArrayList<>();
-			String userId = UserUtils.getUserSession(request).getOrgUserId();
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			PolicyController controller = policyController != null ? getPolicyController() : new PolicyController();
-			List<Object> userRoles = controller.getRoles(userId);
-			roles = new ArrayList<>();
-			scopes = new HashSet<>();
-			for(Object role: userRoles){
-				Roles userRole = (Roles) role;
-				roles.add(userRole.getRole());
-				if(userRole.getScope() != null){
-					if(userRole.getScope().contains(",")){
-						String[] multipleScopes = userRole.getScope().split(",");
-						for(int i =0; i < multipleScopes.length; i++){
-							scopes.add(multipleScopes[i]);
-						}
-					}else{
-						if(!"".equals(userRole.getScope())){
-							scopes.add(userRole.getScope());
-						}
-					}		
-				}
-			}
-			if (roles.contains("super-admin") || roles.contains("super-editor")  || roles.contains("super-guest")) {
-				data = commonClassDao.getData(PolicyVersion.class);
-			}else{
-				if(!scopes.isEmpty()){
-					for(String scope : scopes){
-						scope += "%";
-						String query = "From PolicyVersion where policy_name like :scope and id > 0";
-						SimpleBindings params = new SimpleBindings();
-						params.put("scope", scope);
-						List<Object> filterdatas = commonClassDao.getDataByQuery(query, params);
-						if(filterdatas != null){
-							for(int i =0; i < filterdatas.size(); i++){
-								data.add(filterdatas.get(i));
-							}	
-						}
-					}
-				}else{
-					PolicyVersion emptyPolicyName = new PolicyVersion();
-					emptyPolicyName.setPolicyName("Please Contact Policy Super Admin, There are no scopes assigned to you");
-					data.add(emptyPolicyName);
-				}
-			}
-			model.put("policydatas", mapper.writeValueAsString(data));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			logger.error("Exception Occured"+e);
-		}
-	}
-
-	@RequestMapping(value={"/auto_Push/PushPolicyToPDP.htm"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView pushPolicyToPDPGroup(HttpServletRequest request, HttpServletResponse response) throws IOException {
-		try {
-			ArrayList<Object> selectedPDPS = new ArrayList<>();
-			ArrayList<String> selectedPoliciesInUI = new ArrayList<>();
-			PolicyController controller = getPolicyControllerInstance();
-			this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
-			ObjectMapper mapper = new ObjectMapper();
-			this.container = new PDPGroupContainer(controller.getPapEngine());
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());
-			
-			String userId = UserUtils.getUserSession(request).getOrgUserId();
-			logger.info("****************************************Logging UserID while Pushing  Policy to PDP Group*****************************************");
-			logger.info("UserId:  " + userId + "Push Policy Data:  "+ root.get("pushTabData").toString());
-			logger.info("***********************************************************************************************************************************");
-			
-			AutoPushTabAdapter adapter = mapper.readValue(root.get("pushTabData").toString(), AutoPushTabAdapter.class);
-			for (Object pdpGroupId :  adapter.getPdpDatas()) {
-				LinkedHashMap<?, ?> selectedPDP = (LinkedHashMap<?, ?>)pdpGroupId;
-				for(OnapPDPGroup pdpGroup : this.groups){
-					if(pdpGroup.getId().equals(selectedPDP.get("id"))){
-						selectedPDPS.add(pdpGroup);
-					}
-				}
-			}
-
-			for (Object policyId :  adapter.getPolicyDatas()) {
-				LinkedHashMap<?, ?> selected = (LinkedHashMap<?, ?>)policyId;
-				String policyName = selected.get("policyName").toString() + "." + selected.get("activeVersion").toString() + ".xml";
-				selectedPoliciesInUI.add(policyName);
-			}
-
-			for (Object pdpDestinationGroupId :  selectedPDPS) {
-				Set<PDPPolicy> currentPoliciesInGroup = new HashSet<>();
-				Set<PDPPolicy> selectedPolicies = new HashSet<>();
-				for (String policyId : selectedPoliciesInUI) {
-					logger.debug("Handlepolicies..." + pdpDestinationGroupId + policyId);
-					
-					//
-					// Get the current selection
-					String selectedItem = policyId;
-					//
-					assert selectedItem != null;
-					// create the id of the target file
-					// Our standard for file naming is:
-					// <domain>.<filename>.<version>.xml
-					// since the file name usually has a ".xml", we need to strip
-					// that
-					// before adding the other parts
-					String name = selectedItem.replace(File.separator, ".");
-					String id = name;
-					if (id.endsWith(".xml")) {
-						id = id.replace(".xml", "");
-						id = id.substring(0, id.lastIndexOf('.'));
-					}
-					
-					// Default policy to be Root policy; user can change to deferred
-					// later
-					
-					StdPDPPolicy selectedPolicy = null;
-					String dbCheckName = name;
-					if(dbCheckName.contains("Config_")){
-						dbCheckName = dbCheckName.replace(".Config_", ":Config_");
-					}else if(dbCheckName.contains("Action_")){
-						dbCheckName = dbCheckName.replace(".Action_", ":Action_");
-					}else if(dbCheckName.contains("Decision_")){
-						dbCheckName = dbCheckName.replace(".Decision_", ":Decision_");
-					}
-					String[] split = dbCheckName.split(":");
-					String query = "FROM PolicyEntity where policyName = :split_1 and scope = :split_0";
-					SimpleBindings policyParams = new SimpleBindings();
-					policyParams.put("split_1", split[1]);
-					policyParams.put("split_0", split[0]);
-					List<Object> queryData = controller.getDataByQuery(query, policyParams);
-					PolicyEntity policyEntity = (PolicyEntity) queryData.get(0);
-					File temp = new File(name);
-					BufferedWriter bw = new BufferedWriter(new FileWriter(temp));
-					bw.write(policyEntity.getPolicyData());
-					bw.close();
-					URI selectedURI = temp.toURI();
-					try {
-						//
-						// Create the policy
-						selectedPolicy = new StdPDPPolicy(name, true, id, selectedURI);
-					} catch (IOException e) {
-						logger.error("Unable to create policy '" + name + "': "+ e.getMessage(), e);
-					}
-					StdPDPGroup selectedGroup = (StdPDPGroup) pdpDestinationGroupId;
-					if (selectedPolicy != null) {
-						// Add Current policies from container
-						for (OnapPDPGroup group : container.getGroups()) {
-							if (group.getId().equals(selectedGroup.getId())) {
-								currentPoliciesInGroup.addAll(group.getPolicies());
-							}
-						}
-						// copy policy to PAP
-						try {
-							controller.getPapEngine().copyPolicy(selectedPolicy, (StdPDPGroup) pdpDestinationGroupId);
-						} catch (PAPException e) {
-							logger.error("Exception Occured"+e);
-							return null;
-						}
-						selectedPolicies.add(selectedPolicy);
-					}
-					temp.delete();
-				}
-				StdPDPGroup pdpGroup = (StdPDPGroup) pdpDestinationGroupId;
-				StdPDPGroup updatedGroupObject = new StdPDPGroup(pdpGroup.getId(), pdpGroup.isDefaultGroup(), pdpGroup.getName(), pdpGroup.getDescription(), pdpGroup.getDirectory());
-				updatedGroupObject.setOnapPdps(pdpGroup.getOnapPdps());
-				updatedGroupObject.setPipConfigs(pdpGroup.getPipConfigs());
-				updatedGroupObject.setStatus(pdpGroup.getStatus());
-				updatedGroupObject.setOperation("push");
-
-				// replace the original set of Policies with the set from the
-				// container (possibly modified by the user)
-				// do not allow multiple copies of same policy
-				Iterator<PDPPolicy> policyIterator = currentPoliciesInGroup.iterator();
-				logger.debug("policyIterator....." + selectedPolicies);
-				while (policyIterator.hasNext()) {
-					PDPPolicy existingPolicy = policyIterator.next();
-					for (PDPPolicy selPolicy : selectedPolicies) {
-						if (selPolicy.getName().equals(existingPolicy.getName())) {
-							if (selPolicy.getVersion().equals(existingPolicy.getVersion())) {
-								if (selPolicy.getId().equals(existingPolicy.getId())) {
-									policyIterator.remove();
-									logger.debug("Removing policy: " + selPolicy);
-									break;
-								}
-							} else {
-								policyIterator.remove();
-								logger.debug("Removing Old Policy version: "+ selPolicy);
-								break;
-							}
-						}
-					}
-				}
-
-				currentPoliciesInGroup.addAll(selectedPolicies);
-				updatedGroupObject.setPolicies(currentPoliciesInGroup);
-				this.container.updateGroup(updatedGroupObject);
-
-				response.setCharacterEncoding(UTF8);
-				response.setContentType("application / json");
-				request.setCharacterEncoding(UTF8);
-
-				PrintWriter out = response.getWriter();
-				refreshGroups();
-				JsonMessage msg = new JsonMessage(mapper.writeValueAsString(groups));
-				JSONObject j = new JSONObject(msg);
-				out.write(j.toString());
-				//
-				// Why is this here? This defeats the purpose of the loop??
-				// Sonar says to remove it or make it conditional
-				//
-				return null;
-			}
-		}
-		catch (Exception e){
-			response.setCharacterEncoding(UTF8);
-			request.setCharacterEncoding(UTF8);
-			PrintWriter out = response.getWriter();
-			logger.error(e);
-			out.write(PolicyUtils.CATCH_EXCEPTION);
-		}
-		return null;
-	}
-
-	@SuppressWarnings("unchecked")
-	@RequestMapping(value={"/auto_Push/remove_GroupPolicies.htm"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView removePDPGroup(HttpServletRequest request, HttpServletResponse response) throws IOException {
-		try {
-			PolicyController controller = getPolicyControllerInstance();
-			this.container = new PDPGroupContainer(controller.getPapEngine());
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			JsonNode root = mapper.readTree(request.getReader());  
-			StdPDPGroup group = mapper.readValue(root.get("activePdpGroup").toString(), StdPDPGroup.class);
-			JsonNode removePolicyData = root.get("data");
-			
-			String userId = UserUtils.getUserSession(request).getOrgUserId();
-			logger.info("****************************************Logging UserID while Removing Policy from PDP Group*****************************************");
-			logger.info("UserId:  " + userId + "PDP Group Data:  "+ root.get("activePdpGroup").toString() + "Remove Policy Data: "+root.get("data"));
-			logger.info("***********************************************************************************************************************************");
-			
-			policyContainer = new PDPPolicyContainer(group);
-			if(removePolicyData.size() > 0){
-				for(int i = 0 ; i < removePolicyData.size(); i++){
-					String polData = removePolicyData.get(i).toString();
-					this.policyContainer.removeItem(polData);
-				}
-				Set<PDPPolicy> changedPolicies = new HashSet<>();
-				changedPolicies.addAll((Collection<PDPPolicy>) this.policyContainer.getItemIds());
-				StdPDPGroup updatedGroupObject = new StdPDPGroup(group.getId(), group.isDefaultGroup(), group.getName(), group.getDescription(),null);
-				updatedGroupObject.setPolicies(changedPolicies);
-				updatedGroupObject.setOnapPdps(group.getOnapPdps());
-				updatedGroupObject.setPipConfigs(group.getPipConfigs());
-				updatedGroupObject.setStatus(group.getStatus());
-				updatedGroupObject.setOperation("delete");
-				this.container.updateGroup(updatedGroupObject);
-			}
-			
-			response.setCharacterEncoding(UTF8);
-			response.setContentType("application / json");
-			request.setCharacterEncoding(UTF8);
-
-			PrintWriter out = response.getWriter();
-			refreshGroups();
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(groups));
-			JSONObject j = new JSONObject(msg);
-
-			out.write(j.toString());
-
-			return null;
-		}
-		catch (Exception e){
-			response.setCharacterEncoding(UTF8);
-			request.setCharacterEncoding(UTF8);
-			PrintWriter out = response.getWriter();
-			logger.error(e);
-			out.write(PolicyUtils.CATCH_EXCEPTION);
-		}
-		return null;
-	}
+    @Autowired
+    CommonClassDao commonClassDao;
+
+    private PDPGroupContainer container;
+    protected List<OnapPDPGroup> groups = Collections.synchronizedList(new ArrayList<OnapPDPGroup>());
+
+    private PDPPolicyContainer policyContainer;
+
+    private PolicyController policyController;
+
+    public PolicyController getPolicyController() {
+        return policyController;
+    }
+
+    public void setPolicyController(PolicyController policyController) {
+        this.policyController = policyController;
+    }
+
+    private List<Object> data;
+
+    public synchronized void refreshGroups() {
+        synchronized (this.groups) {
+            this.groups.clear();
+            try {
+                PolicyController controller = getPolicyControllerInstance();
+                this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
+            } catch (PAPException e) {
+                String message = "Unable to retrieve Groups from server: " + e;
+                logger.error(XACMLErrorConstants.ERROR_DATA_ISSUE + message);
+            }
+
+        }
+    }
+
+    private PolicyController getPolicyControllerInstance() {
+        return policyController != null ? getPolicyController() : new PolicyController();
+    }
+
+    @RequestMapping(value = { "/get_AutoPushPoliciesContainerData" }, method = {
+            org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
+    public void getPolicyGroupContainerData(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            Set<String> scopes;
+            List<String> roles;
+            data = new ArrayList<>();
+            String userId = UserUtils.getUserSession(request).getOrgUserId();
+            Map<String, Object> model = new HashMap<>();
+            ObjectMapper mapper = new ObjectMapper();
+            PolicyController controller = policyController != null ? getPolicyController() : new PolicyController();
+            List<Object> userRoles = controller.getRoles(userId);
+            roles = new ArrayList<>();
+            scopes = new HashSet<>();
+            for (Object role : userRoles) {
+                Roles userRole = (Roles) role;
+                roles.add(userRole.getRole());
+                if (userRole.getScope() != null) {
+                    if (userRole.getScope().contains(",")) {
+                        String[] multipleScopes = userRole.getScope().split(",");
+                        for (int i = 0; i < multipleScopes.length; i++) {
+                            scopes.add(multipleScopes[i].replace("[", "").replace("]", "").replace("\"", "").trim());
+                        }
+                    } else {
+                        if (!"".equals(userRole.getScope())) {
+                            scopes.add(userRole.getScope().replace("[", "").replace("]", "").replace("\"", "").trim());
+                        }
+                    }
+                }
+            }
+            if (roles.contains("super-admin") || roles.contains("super-editor") || roles.contains("super-guest")) {
+                data = commonClassDao.getData(PolicyVersion.class);
+            } else {
+                if (!scopes.isEmpty()) {
+                    for (String scope : scopes) {
+                        scope += "%";
+                        String query = "From PolicyVersion where policy_name like :scope and id > 0";
+                        SimpleBindings params = new SimpleBindings();
+                        params.put("scope", scope);
+                        List<Object> filterdatas = commonClassDao.getDataByQuery(query, params);
+                        if (filterdatas != null) {
+                            for (int i = 0; i < filterdatas.size(); i++) {
+                                data.add(filterdatas.get(i));
+                            }
+                        }
+                    }
+                } else {
+                    PolicyVersion emptyPolicyName = new PolicyVersion();
+                    emptyPolicyName
+                            .setPolicyName("Please Contact Policy Super Admin, There are no scopes assigned to you");
+                    data.add(emptyPolicyName);
+                }
+            }
+            model.put("policydatas", mapper.writeValueAsString(data));
+            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
+            JSONObject j = new JSONObject(msg);
+            response.getWriter().write(j.toString());
+        } catch (Exception e) {
+            logger.error("Exception Occured" + e);
+        }
+    }
+
+    @RequestMapping(value = { "/auto_Push/PushPolicyToPDP.htm" }, method = {
+            org.springframework.web.bind.annotation.RequestMethod.POST })
+    public ModelAndView pushPolicyToPDPGroup(HttpServletRequest request, HttpServletResponse response)
+            throws IOException {
+        try {
+            ArrayList<Object> selectedPDPS = new ArrayList<>();
+            ArrayList<String> selectedPoliciesInUI = new ArrayList<>();
+            PolicyController controller = getPolicyControllerInstance();
+            this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
+            ObjectMapper mapper = new ObjectMapper();
+            this.container = new PDPGroupContainer(controller.getPapEngine());
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            JsonNode root = mapper.readTree(request.getReader());
+
+            String userId = UserUtils.getUserSession(request).getOrgUserId();
+            logger.info(
+                    "****************************************Logging UserID while Pushing  Policy to PDP Group*****************************************");
+            logger.info("UserId:  " + userId + "Push Policy Data:  " + root.get("pushTabData").toString());
+            logger.info(
+                    "***********************************************************************************************************************************");
+
+            AutoPushTabAdapter adapter = mapper.readValue(root.get("pushTabData").toString(), AutoPushTabAdapter.class);
+            for (Object pdpGroupId : adapter.getPdpDatas()) {
+                LinkedHashMap<?, ?> selectedPDP = (LinkedHashMap<?, ?>) pdpGroupId;
+                for (OnapPDPGroup pdpGroup : this.groups) {
+                    if (pdpGroup.getId().equals(selectedPDP.get("id"))) {
+                        selectedPDPS.add(pdpGroup);
+                    }
+                }
+            }
+
+            for (Object policyId : adapter.getPolicyDatas()) {
+                LinkedHashMap<?, ?> selected = (LinkedHashMap<?, ?>) policyId;
+                String policyName = selected.get("policyName").toString() + "."
+                        + selected.get("activeVersion").toString() + ".xml";
+                selectedPoliciesInUI.add(policyName);
+            }
+
+            for (Object pdpDestinationGroupId : selectedPDPS) {
+                Set<PDPPolicy> currentPoliciesInGroup = new HashSet<>();
+                Set<PDPPolicy> selectedPolicies = new HashSet<>();
+                for (String policyId : selectedPoliciesInUI) {
+                    logger.debug("Handlepolicies..." + pdpDestinationGroupId + policyId);
+
+                    //
+                    // Get the current selection
+                    String selectedItem = policyId;
+                    //
+                    assert selectedItem != null;
+                    // create the id of the target file
+                    // Our standard for file naming is:
+                    // <domain>.<filename>.<version>.xml
+                    // since the file name usually has a ".xml", we need to strip
+                    // that
+                    // before adding the other parts
+                    String name = selectedItem.replace(File.separator, ".");
+                    String id = name;
+                    if (id.endsWith(".xml")) {
+                        id = id.replace(".xml", "");
+                        id = id.substring(0, id.lastIndexOf('.'));
+                    }
+
+                    // Default policy to be Root policy; user can change to deferred
+                    // later
+
+                    StdPDPPolicy selectedPolicy = null;
+                    String dbCheckName = name;
+                    if (dbCheckName.contains("Config_")) {
+                        dbCheckName = dbCheckName.replace(".Config_", ":Config_");
+                    } else if (dbCheckName.contains("Action_")) {
+                        dbCheckName = dbCheckName.replace(".Action_", ":Action_");
+                    } else if (dbCheckName.contains("Decision_")) {
+                        dbCheckName = dbCheckName.replace(".Decision_", ":Decision_");
+                    }
+                    String[] split = dbCheckName.split(":");
+                    String query = "FROM PolicyEntity where policyName = :split_1 and scope = :split_0";
+                    SimpleBindings policyParams = new SimpleBindings();
+                    policyParams.put("split_1", split[1]);
+                    policyParams.put("split_0", split[0]);
+                    List<Object> queryData = controller.getDataByQuery(query, policyParams);
+                    PolicyEntity policyEntity = (PolicyEntity) queryData.get(0);
+                    File temp = new File(name);
+                    BufferedWriter bw = new BufferedWriter(new FileWriter(temp));
+                    bw.write(policyEntity.getPolicyData());
+                    bw.close();
+                    URI selectedURI = temp.toURI();
+                    try {
+                        //
+                        // Create the policy
+                        selectedPolicy = new StdPDPPolicy(name, true, id, selectedURI);
+                    } catch (IOException e) {
+                        logger.error("Unable to create policy '" + name + "': " + e.getMessage(), e);
+                    }
+                    StdPDPGroup selectedGroup = (StdPDPGroup) pdpDestinationGroupId;
+                    if (selectedPolicy != null) {
+                        // Add Current policies from container
+                        for (OnapPDPGroup group : container.getGroups()) {
+                            if (group.getId().equals(selectedGroup.getId())) {
+                                currentPoliciesInGroup.addAll(group.getPolicies());
+                            }
+                        }
+                        // copy policy to PAP
+                        try {
+                            controller.getPapEngine().copyPolicy(selectedPolicy, (StdPDPGroup) pdpDestinationGroupId);
+                        } catch (PAPException e) {
+                            logger.error("Exception Occured" + e);
+                            return null;
+                        }
+                        selectedPolicies.add(selectedPolicy);
+                    }
+                    temp.delete();
+                }
+                StdPDPGroup pdpGroup = (StdPDPGroup) pdpDestinationGroupId;
+                StdPDPGroup updatedGroupObject = new StdPDPGroup(pdpGroup.getId(), pdpGroup.isDefaultGroup(),
+                        pdpGroup.getName(), pdpGroup.getDescription(), pdpGroup.getDirectory());
+                updatedGroupObject.setOnapPdps(pdpGroup.getOnapPdps());
+                updatedGroupObject.setPipConfigs(pdpGroup.getPipConfigs());
+                updatedGroupObject.setStatus(pdpGroup.getStatus());
+                updatedGroupObject.setOperation("push");
+
+                // replace the original set of Policies with the set from the
+                // container (possibly modified by the user)
+                // do not allow multiple copies of same policy
+                Iterator<PDPPolicy> policyIterator = currentPoliciesInGroup.iterator();
+                logger.debug("policyIterator....." + selectedPolicies);
+                while (policyIterator.hasNext()) {
+                    PDPPolicy existingPolicy = policyIterator.next();
+                    for (PDPPolicy selPolicy : selectedPolicies) {
+                        if (selPolicy.getName().equals(existingPolicy.getName())) {
+                            if (selPolicy.getVersion().equals(existingPolicy.getVersion())) {
+                                if (selPolicy.getId().equals(existingPolicy.getId())) {
+                                    policyIterator.remove();
+                                    logger.debug("Removing policy: " + selPolicy);
+                                    break;
+                                }
+                            } else {
+                                policyIterator.remove();
+                                logger.debug("Removing Old Policy version: " + selPolicy);
+                                break;
+                            }
+                        }
+                    }
+                }
+
+                currentPoliciesInGroup.addAll(selectedPolicies);
+                updatedGroupObject.setPolicies(currentPoliciesInGroup);
+                this.container.updateGroup(updatedGroupObject);
+
+                response.setCharacterEncoding(UTF8);
+                response.setContentType("application / json");
+                request.setCharacterEncoding(UTF8);
+
+                PrintWriter out = response.getWriter();
+                refreshGroups();
+                JsonMessage msg = new JsonMessage(mapper.writeValueAsString(groups));
+                JSONObject j = new JSONObject(msg);
+                out.write(j.toString());
+                //
+                // Why is this here? This defeats the purpose of the loop??
+                // Sonar says to remove it or make it conditional
+                //
+                return null;
+            }
+        } catch (Exception e) {
+            response.setCharacterEncoding(UTF8);
+            request.setCharacterEncoding(UTF8);
+            PrintWriter out = response.getWriter();
+            logger.error(e);
+            out.write(PolicyUtils.CATCH_EXCEPTION);
+        }
+        return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    @RequestMapping(value = { "/auto_Push/remove_GroupPolicies.htm" }, method = {
+            org.springframework.web.bind.annotation.RequestMethod.POST })
+    public ModelAndView removePDPGroup(HttpServletRequest request, HttpServletResponse response) throws IOException {
+        try {
+            PolicyController controller = getPolicyControllerInstance();
+            this.container = new PDPGroupContainer(controller.getPapEngine());
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            JsonNode root = mapper.readTree(request.getReader());
+            StdPDPGroup group = mapper.readValue(root.get("activePdpGroup").toString(), StdPDPGroup.class);
+            JsonNode removePolicyData = root.get("data");
+
+            String userId = UserUtils.getUserSession(request).getOrgUserId();
+            logger.info(
+                    "****************************************Logging UserID while Removing Policy from PDP Group*****************************************");
+            logger.info("UserId:  " + userId + "PDP Group Data:  " + root.get("activePdpGroup").toString()
+                    + "Remove Policy Data: " + root.get("data"));
+            logger.info(
+                    "***********************************************************************************************************************************");
+
+            policyContainer = new PDPPolicyContainer(group);
+            if (removePolicyData.size() > 0) {
+                for (int i = 0; i < removePolicyData.size(); i++) {
+                    String polData = removePolicyData.get(i).toString();
+                    this.policyContainer.removeItem(polData);
+                }
+                Set<PDPPolicy> changedPolicies = new HashSet<>();
+                changedPolicies.addAll((Collection<PDPPolicy>) this.policyContainer.getItemIds());
+                StdPDPGroup updatedGroupObject = new StdPDPGroup(group.getId(), group.isDefaultGroup(), group.getName(),
+                        group.getDescription(), null);
+                updatedGroupObject.setPolicies(changedPolicies);
+                updatedGroupObject.setOnapPdps(group.getOnapPdps());
+                updatedGroupObject.setPipConfigs(group.getPipConfigs());
+                updatedGroupObject.setStatus(group.getStatus());
+                updatedGroupObject.setOperation("delete");
+                this.container.updateGroup(updatedGroupObject);
+            }
+
+            response.setCharacterEncoding(UTF8);
+            response.setContentType("application / json");
+            request.setCharacterEncoding(UTF8);
+
+            PrintWriter out = response.getWriter();
+            refreshGroups();
+            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(groups));
+            JSONObject j = new JSONObject(msg);
+
+            out.write(j.toString());
+
+            return null;
+        } catch (Exception e) {
+            response.setCharacterEncoding(UTF8);
+            request.setCharacterEncoding(UTF8);
+            PrintWriter out = response.getWriter();
+            logger.error(e);
+            out.write(PolicyUtils.CATCH_EXCEPTION);
+        }
+        return null;
+    }
 
 }
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
index 3b4d03de8..69444c478 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyController.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved.
  * Modified Copyright (C) 2018 Samsung Electronics Co., Ltd.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,6 +23,7 @@ package org.onap.policy.controller;
 
 import com.att.research.xacml.util.XACMLProperties;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -34,7 +35,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Properties;
 import java.util.Set;
-import java.util.TreeMap;
+import java.nio.charset.StandardCharsets;
 import javax.annotation.PostConstruct;
 import javax.mail.MessagingException;
 import javax.script.SimpleBindings;
@@ -43,6 +44,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.json.JSONObject;
 import org.onap.policy.admin.PolicyNotificationMail;
 import org.onap.policy.admin.RESTfulPAPEngine;
+import org.onap.policy.common.logging.eelf.MessageCodes;
+import org.onap.policy.common.logging.eelf.PolicyLogger;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.model.PDPGroupContainer;
@@ -57,6 +60,7 @@ import org.onap.policy.rest.jpa.UserInfo;
 import org.onap.policy.utils.UserUtils.Pair;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
+import org.onap.policy.xacml.util.XACMLPolicyScanner;
 import org.onap.portalsdk.core.controller.RestrictedBaseController;
 import org.onap.portalsdk.core.domain.UserApp;
 import org.onap.portalsdk.core.web.support.JsonMessage;
@@ -67,7 +71,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.servlet.ModelAndView;
-
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicySetType;
+import oasis.names.tc.xacml._3_0.core.schema.wd_17.PolicyType;
 
 @Controller
 @RequestMapping("/")
@@ -105,6 +110,9 @@ public class PolicyController extends RestrictedBaseController {
     private static final String characterEncoding = "UTF-8";
     private static final String contentType = "application/json";
     private static final String file = "file";
+    private static final String SUPERADMIN = "super-admin";
+    private static final String POLICYGUEST = "Policy Guest";
+    private static final String LOGINID = "loginId";
 
     // Smtp Java Mail Properties
     private static String smtpHost = null;
@@ -147,7 +155,6 @@ public class PolicyController extends RestrictedBaseController {
 
     private static boolean jUnit = false;
 
-
     public static boolean isjUnit() {
         return jUnit;
     }
@@ -296,12 +303,11 @@ public class PolicyController extends RestrictedBaseController {
     /**
      * Get Functional Definition data.
      * 
-     * @param request HttpServletRequest.
+     * @param request  HttpServletRequest.
      * @param response HttpServletResponse.
      */
-    @RequestMapping(value = {"/get_FunctionDefinitionDataByName"},
-            method = {org.springframework.web.bind.annotation.RequestMethod.GET},
-            produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = { "/get_FunctionDefinitionDataByName" }, method = {
+            org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
     public void getFunctionDefinitionData(HttpServletRequest request, HttpServletResponse response) {
         try {
             Map<String, Object> model = new HashMap<>();
@@ -320,7 +326,7 @@ public class PolicyController extends RestrictedBaseController {
     /**
      * Get PolicyEntity Data from db.
      * 
-     * @param scope scopeName.
+     * @param scope      scopeName.
      * @param policyName policyName.
      * @return policyEntity data.
      */
@@ -338,7 +344,7 @@ public class PolicyController extends RestrictedBaseController {
      */
     public List<String> getRolesOfUser(String userId) {
         List<String> rolesList = new ArrayList<>();
-        List<Object> roles = commonClassDao.getDataById(Roles.class, "loginId", userId);
+        List<Object> roles = commonClassDao.getDataById(Roles.class, LOGINID, userId);
         for (Object role : roles) {
             rolesList.add(((Roles) role).getRole());
         }
@@ -346,18 +352,17 @@ public class PolicyController extends RestrictedBaseController {
     }
 
     public List<Object> getRoles(String userId) {
-        return commonClassDao.getDataById(Roles.class, "loginId", userId);
+        return commonClassDao.getDataById(Roles.class, LOGINID, userId);
     }
 
     /**
      * Get List of User Roles.
      * 
-     * @param request HttpServletRequest.
+     * @param request  HttpServletRequest.
      * @param response HttpServletResponse.
      */
-    @RequestMapping(value = {"/get_UserRolesData"},
-            method = {org.springframework.web.bind.annotation.RequestMethod.GET},
-            produces = MediaType.APPLICATION_JSON_VALUE)
+    @RequestMapping(value = { "/get_UserRolesData" }, method = {
+            org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
     public void getUserRolesEntityData(HttpServletRequest request, HttpServletResponse response) {
         try {
             String userId = UserUtils.getUserSession(request).getOrgUserId();
@@ -378,7 +383,7 @@ public class PolicyController extends RestrictedBaseController {
      * @param request Request input.
      * @return view model.
      */
-    @RequestMapping(value = {"/policy", "/policy/Editor"}, method = RequestMethod.GET)
+    @RequestMapping(value = { "/policy", "/policy/Editor" }, method = RequestMethod.GET)
     public ModelAndView view(HttpServletRequest request) {
         getUserRoleFromSession(request);
         String myRequestUrl = request.getRequestURL().toString();
@@ -386,8 +391,8 @@ public class PolicyController extends RestrictedBaseController {
             //
             // Set the URL for the RESTful PAP Engine
             //
-            setPapEngine((PAPPolicyEngine) new RESTfulPAPEngine(myRequestUrl));
-            new PDPGroupContainer((PAPPolicyEngine) new RESTfulPAPEngine(myRequestUrl));
+            setPapEngine(new RESTfulPAPEngine(myRequestUrl));
+            new PDPGroupContainer(new RESTfulPAPEngine(myRequestUrl));
         } catch (Exception e) {
             policyLogger.error(XACMLErrorConstants.ERROR_SYSTEM_ERROR + "Exception Occured while loading PAP" + e);
         }
@@ -396,9 +401,9 @@ public class PolicyController extends RestrictedBaseController {
     }
 
     /**
-     * Read the role from session.
+     * Read the role from session for inserting into the database.
      * 
-     * @param request Request input.
+     * @param request Request input for Role.
      */
     public void getUserRoleFromSession(HttpServletRequest request) {
         // While user landing on Policy page, fetch the userId and Role from
@@ -415,26 +420,50 @@ public class PolicyController extends RestrictedBaseController {
             newRoles.add(userApp.getRole().getName());
         }
         List<Object> userRoles = getRoles(userId);
-        String filteredRole = filterRole(newRoles);
-        if (userRoles == null || userRoles.isEmpty()) {
-            savePolicyRoles(name, filteredRole, userId);
-        } else {
-            Pair<Set<String>, List<String>> pair = org.onap.policy.utils.UserUtils.checkRoleAndScope(userRoles);
-            roles = pair.u;
-            if (!roles.contains(filteredRole)) {
-                String query = "delete from Roles where loginid='" + userId + "'";
-                commonClassDao.updateQuery(query);
+        List<String> filteredRoles = filterRole(newRoles);
+        if (!filteredRoles.isEmpty()) {
+            cleanUpRoles(filteredRoles, userId);
+        }
+        for (String filteredRole : filteredRoles) {
+            if (userRoles == null || userRoles.isEmpty()) {
                 savePolicyRoles(name, filteredRole, userId);
+            } else {
+                userRoles = getRoles(userId);
+                Pair<Set<String>, List<String>> pair = org.onap.policy.utils.UserUtils.checkRoleAndScope(userRoles);
+                roles = pair.u;
+                if (!roles.contains(filteredRole)) {
+                    savePolicyRoles(name, filteredRole, userId);
+                }
+            }
+        }
+    }
+
+    /**
+     * Build a delete query for cleaning up roles and execute it.
+     * 
+     * @param filteredRoles Filtered roles list.
+     * @param userId        UserID.
+     */
+    private void cleanUpRoles(List<String> filteredRoles, String userId) {
+        StringBuilder query = new StringBuilder();
+        query.append("delete from Roles where loginid = '" + userId + "'");
+        if (filteredRoles.contains(SUPERADMIN)) {
+            query.append("and not role = '" + SUPERADMIN + "'");
+        } else {
+            for (String filteredRole : filteredRoles) {
+                query.append("and not role = '" + filteredRole + "'");
             }
         }
+        query.append("and id > 0");
+        commonClassDao.updateQuery(query.toString());
     }
 
     /**
      * Save the Role to DB.
      * 
-     * @param name User Name.
+     * @param name         User Name.
      * @param filteredRole Role Name.
-     * @param userId User LoginID.
+     * @param userId       User LoginID.
      */
     private void savePolicyRoles(String name, String filteredRole, String userId) {
         UserInfo userInfo = new UserInfo();
@@ -454,25 +483,35 @@ public class PolicyController extends RestrictedBaseController {
      * @param newRoles list of roles from request.
      * @return
      */
-    private String filterRole(List<String> newRoles) {
-        Map<Integer, String> roleMap = new TreeMap<>();
-        roleMap.put(6, "guest");
+    private List<String> filterRole(List<String> newRoles) {
+        List<String> roles = new ArrayList<>();
+        boolean superCheck = false;
         for (String role : newRoles) {
-            if ("Policy Super Admin".equalsIgnoreCase(role.trim())
+            if ("Policy Super Guest".equalsIgnoreCase(role.trim())) {
+                superCheck = true;
+                roles.add("super-guest");
+            } else if ("Policy Super Editor".equalsIgnoreCase(role.trim())) {
+                superCheck = true;
+                roles.clear();
+                roles.add("super-editor");
+            } else if ("Policy Super Admin".equalsIgnoreCase(role.trim())
                     || "System Administrator".equalsIgnoreCase(role.trim())
                     || "Standard User".equalsIgnoreCase(role.trim())) {
-                roleMap.put(1, "super-admin");
-            } else if ("Policy Super Editor".equalsIgnoreCase(role.trim())) {
-                roleMap.put(2, "super-editor");
-            } else if ("Policy Super Guest".equalsIgnoreCase(role.trim())) {
-                roleMap.put(3, "super-guest");
-            } else if ("Policy Admin".equalsIgnoreCase(role.trim())) {
-                roleMap.put(4, "admin");
-            } else if ("Policy Editor".equalsIgnoreCase(role.trim())) {
-                roleMap.put(5, "editor");
+                superCheck = true;
+                roles.clear();
+                roles.add(SUPERADMIN);
+            }
+            if (!roles.contains(SUPERADMIN) || (POLICYGUEST.equalsIgnoreCase(role) && !superCheck)) {
+                if ("Policy Admin".equalsIgnoreCase(role.trim())) {
+                    roles.add("admin");
+                } else if ("Policy Editor".equalsIgnoreCase(role.trim())) {
+                    roles.add("editor");
+                } else if (POLICYGUEST.equalsIgnoreCase(role.trim())) {
+                    roles.add("guest");
+                }
             }
         }
-        return roleMap.entrySet().iterator().next().getValue();
+        return roles;
     }
 
     public PAPPolicyEngine getPapEngine() {
@@ -491,12 +530,13 @@ public class PolicyController extends RestrictedBaseController {
      */
     public String getUserName(String createdBy) {
         String loginId = createdBy;
-        List<Object> data = commonClassDao.getDataById(UserInfo.class, "loginId", loginId);
+        List<Object> data = commonClassDao.getDataById(UserInfo.class, LOGINID, loginId);
         return data.get(0).toString();
     }
 
     /**
      * Check if the Policy is Active or not.
+     * 
      * @param query sql query.
      * @return boolean.
      */
@@ -532,19 +572,17 @@ public class PolicyController extends RestrictedBaseController {
         return commonClassDao.getDataByQuery(query, params);
     }
 
-
     @SuppressWarnings("rawtypes")
     public Object getEntityItem(Class className, String columname, String key) {
         return commonClassDao.getEntityItem(className, columname, key);
     }
 
-
     /**
      * Watch Policy Function.
      * 
-     * @param entity PolicyVersion entity.
+     * @param entity     PolicyVersion entity.
      * @param policyName updated policy name.
-     * @param mode type of action rename/delete/import.
+     * @param mode       type of action rename/delete/import.
      */
     public void watchPolicyFunction(PolicyVersion entity, String policyName, String mode) {
         PolicyNotificationMail email = new PolicyNotificationMail();
@@ -569,6 +607,8 @@ public class PolicyController extends RestrictedBaseController {
             dbCheckName = dbCheckName.replace(".Config_", ":Config_");
         } else if (dbCheckName.contains("Action_")) {
             dbCheckName = dbCheckName.replace(".Action_", ":Action_");
+        } else if (dbCheckName.contains("Decision_MS_")) {
+            dbCheckName = dbCheckName.replace(".Decision_MS_", ":Decision_MS_");
         } else if (dbCheckName.contains("Decision_")) {
             dbCheckName = dbCheckName.replace(".Decision_", ":Decision_");
         }
@@ -583,13 +623,14 @@ public class PolicyController extends RestrictedBaseController {
             PolicyEntity pEntity = (PolicyEntity) entity;
             String removeExtension = pEntity.getPolicyName().replace(".xml", "");
             String version = removeExtension.substring(removeExtension.lastIndexOf('.') + 1);
-            av.add(version);
+            String userName = getUserId(pEntity, "@ModifiedBy:");
+            av.add(version + " | " + pEntity.getModifiedDate() + " | " + userName);
         }
         if (policyName.contains("/")) {
             policyName = policyName.replace("/", File.separator);
         }
-        PolicyVersion entity =
-                (PolicyVersion) commonClassDao.getEntityItem(PolicyVersion.class, "policyName", policyName);
+        PolicyVersion entity = (PolicyVersion) commonClassDao.getEntityItem(PolicyVersion.class, "policyName",
+                policyName);
         JSONObject el = new JSONObject();
         el.put("activeVersion", entity.getActiveVersion());
         el.put("availableVersions", av);
@@ -597,6 +638,50 @@ public class PolicyController extends RestrictedBaseController {
         return el;
     }
 
+    public String getUserId(PolicyEntity data, String value) {
+        String userId = "";
+        String uValue = value;
+        String description = getDescription(data);
+        if (description.contains(uValue)) {
+            userId = description.substring(description.indexOf(uValue) + uValue.length(),
+                    description.lastIndexOf(uValue));
+        }
+        UserInfo userInfo = (UserInfo) getEntityItem(UserInfo.class, "userLoginId", userId);
+        if (userInfo == null) {
+            return SUPERADMIN;
+        }
+        return userInfo.getUserName();
+    }
+
+    public String getDescription(PolicyEntity data) {
+        InputStream stream = new ByteArrayInputStream(data.getPolicyData().getBytes(StandardCharsets.UTF_8));
+        Object policy = XACMLPolicyScanner.readPolicy(stream);
+        if (policy instanceof PolicySetType) {
+            return ((PolicySetType) policy).getDescription();
+        } else if (policy instanceof PolicyType) {
+            return ((PolicyType) policy).getDescription();
+        } else {
+            PolicyLogger.error(MessageCodes.ERROR_DATA_ISSUE + "Expecting a PolicySet/Policy/Rule object. Got: "
+                    + policy.getClass().getCanonicalName());
+            return null;
+        }
+    }
+
+    public String[] getUserInfo(PolicyEntity data, List<PolicyVersion> activePolicies) {
+        String policyName = data.getScope().replace(".", File.separator) + File.separator
+                + data.getPolicyName().substring(0, data.getPolicyName().indexOf('.'));
+        PolicyVersion pVersion = activePolicies.stream().filter(a -> policyName.equals(a.getPolicyName())).findAny()
+                .orElse(null);
+        String[] result = new String[2];
+
+        UserInfo userCreate = (UserInfo) getEntityItem(UserInfo.class, "userLoginId", pVersion.getCreatedBy());
+        UserInfo userModify = (UserInfo) getEntityItem(UserInfo.class, "userLoginId", pVersion.getModifiedBy());
+        result[0] = userCreate != null ? userCreate.getUserName() : "super-admin";
+        result[1] = userModify != null ? userModify.getUserName() : "super-admin";
+
+        return result;
+    }
+
     public static String getLogTableLimit() {
         return logTableLimit;
     }
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java
index daf3d6c97..b02da1996 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PolicyRolesController.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,6 @@
 
 package org.onap.policy.controller;
 
-
 import java.io.PrintWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -54,123 +53,175 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 
 @Controller
 @RequestMapping("/")
-public class PolicyRolesController extends RestrictedBaseController{
-	
-	private static final Logger LOGGER	= FlexLogger.getLogger(PolicyRolesController.class);
-	
-	@Autowired
-	CommonClassDao commonClassDao;
-	
-	public void setCommonClassDao(CommonClassDao commonClassDao) {
-		this.commonClassDao = commonClassDao;
-	}
-	
-	List<String> scopelist;
-	
-	@RequestMapping(value={"/get_RolesData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getPolicyRolesEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			model.put("rolesDatas", mapper.writeValueAsString(commonClassDao.getUserRoles()));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error("Exception Occured"+e);
-		}
-	}
-	
-	@RequestMapping(value={"/save_NonSuperRolesData"}, method={org.springframework.web.bind.annotation.RequestMethod.POST})
-	public ModelAndView SaveRolesEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			StringBuilder scopeName = new StringBuilder();
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-			String userId = UserUtils.getUserSession(request).getOrgUserId();
-		    JsonNode root = mapper.readTree(request.getReader());
-		    ReadScopes adapter = mapper.readValue(root.get("editRoleData").toString(), ReadScopes.class);
-		    for(int i = 0; i < adapter.getScope().size(); i++){
-		    	if(i == 0){
-		    		scopeName.append(adapter.getScope().get(0));
-		    	}else{
-		    		scopeName.append("," + adapter.getScope().get(i));
-		    	}	
-		    }
-		    LOGGER.info("****************************************Logging UserID for Roles Function********************************************************");
-			LOGGER.info("UserId:  " + userId + "Updating the Scope for following user" + adapter.getLoginId() + "ScopeNames" + adapter.getScope());
-			LOGGER.info("*********************************************************************************************************************************");
-		    PolicyRoles roles = new PolicyRoles();
-		    roles.setId(adapter.getId());
-		    roles.setLoginId(adapter.getLoginId());
-		    roles.setRole(adapter.getRole());
-		    roles.setScope(scopeName.toString());
-		    commonClassDao.update(roles);
-		    response.setCharacterEncoding("UTF-8");
-			response.setContentType("application / json");
-			request.setCharacterEncoding("UTF-8");
-		
-			PrintWriter out = response.getWriter();
-			String responseString = mapper.writeValueAsString(commonClassDao.getUserRoles());
-			JSONObject j = new JSONObject("{rolesDatas: " + responseString + "}");
-
-			out.write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error("Exception Occured"+e);
-		}
-		return null;
-	}
-	
-	@RequestMapping(value={"/get_PolicyRolesScopeData"}, method={org.springframework.web.bind.annotation.RequestMethod.GET} , produces=MediaType.APPLICATION_JSON_VALUE)
-	public void getPolicyScopesEntityData(HttpServletRequest request, HttpServletResponse response){
-		try{
-			scopelist = new ArrayList<>();
-			Map<String, Object> model = new HashMap<>();
-			ObjectMapper mapper = new ObjectMapper();
-			mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
-			List<String> scopesData = commonClassDao.getDataByColumn(PolicyEditorScopes.class, "scopeName");
-			model.put("scopeDatas", mapper.writeValueAsString(scopesData));
-			JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
-			JSONObject j = new JSONObject(msg);
-			response.getWriter().write(j.toString());
-		}
-		catch (Exception e){
-			LOGGER.error("Exception Occured"+e);
-		}
-	}
+public class PolicyRolesController extends RestrictedBaseController {
+
+    private static final Logger LOGGER = FlexLogger.getLogger(PolicyRolesController.class);
+
+    @Autowired
+    CommonClassDao commonClassDao;
+
+    public void setCommonClassDao(CommonClassDao commonClassDao) {
+        this.commonClassDao = commonClassDao;
+    }
+
+    List<String> scopelist;
+
+    /**
+     * Gets the policy roles entity data.
+     *
+     * @param request  the request
+     * @param response the response
+     */
+    @RequestMapping(value = { "/get_RolesData" }, method = {
+            org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
+    public void getPolicyRolesEntityData(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            Map<String, Object> model = new HashMap<>();
+            ObjectMapper mapper = new ObjectMapper();
+            model.put("rolesDatas", mapper.writeValueAsString(commonClassDao.getUserRoles()));
+            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
+            JSONObject j = new JSONObject(msg);
+            response.getWriter().write(j.toString());
+        } catch (Exception e) {
+            LOGGER.error("Exception Occured" + e);
+        }
+    }
+
+    /**
+     * Save roles and Mechid entity data.
+     *
+     * @param request  the request
+     * @param response the response
+     * @return the model and view
+     */
+    @RequestMapping(value = { "/save_NonSuperRolesData" }, method = {
+            org.springframework.web.bind.annotation.RequestMethod.POST })
+    public ModelAndView SaveRolesEntityData(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            StringBuilder scopeName = new StringBuilder();
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+            String userId = UserUtils.getUserSession(request).getOrgUserId();
+            JsonNode root = mapper.readTree(request.getReader());
+            ReadScopes adapter = mapper.readValue(root.get("editRoleData").toString(), ReadScopes.class);
+            for (int i = 0; i < adapter.getScope().size(); i++) {
+                if (i == 0) {
+                    scopeName.append(adapter.getScope().get(0));
+                } else {
+                    scopeName.append("," + adapter.getScope().get(i));
+                }
+            }
+            LOGGER.info(
+                    "****************************************Logging UserID for Roles Function********************************************************");
+            LOGGER.info("UserId:  " + userId + "Updating the Scope for following user" + adapter.getLoginId()
+                    + "ScopeNames" + adapter.getScope());
+            LOGGER.info(
+                    "*********************************************************************************************************************************");
+            UserInfo userInfo = new UserInfo();
+            userInfo.setUserLoginId(adapter.getLoginId().getUserName());
+            userInfo.setUserName(adapter.getLoginId().getUserName());
+
+            boolean checkNew = false;
+            if (adapter.getId() == 0 && "mechid".equals(adapter.getRole())) {
+                // Save new mechid scopes entity data.
+                LOGGER.info(
+                        "****************************************Logging UserID for New Mechid Function***************************************************");
+                LOGGER.info("UserId:" + userId + "Adding new mechid-scopes for following user" + adapter.getLoginId()
+                        + "ScopeNames " + adapter.getScope());
+                LOGGER.info(
+                        "*********************************************************************************************************************************");
+                // First add the mechid to userinfo
+                commonClassDao.save(userInfo);
+                checkNew = true;
+            }
+
+            PolicyRoles roles = new PolicyRoles();
+            roles.setId(adapter.getId());
+            roles.setLoginId(adapter.getLoginId());
+            roles.setRole(adapter.getRole());
+            roles.setScope(scopeName.toString());
+            if (checkNew) {
+                roles.setLoginId(userInfo);
+                commonClassDao.save(roles);
+            } else {
+                commonClassDao.update(roles);
+            }
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("application / json");
+            request.setCharacterEncoding("UTF-8");
+
+            PrintWriter out = response.getWriter();
+            String responseString = mapper.writeValueAsString(commonClassDao.getUserRoles());
+            JSONObject j = new JSONObject("{rolesDatas: " + responseString + "}");
+
+            out.write(j.toString());
+        } catch (Exception e) {
+            LOGGER.error("Exception Occured" + e);
+        }
+        return null;
+    }
+
+    /**
+     * Gets the policy scopes entity data.
+     *
+     * @param request  the request
+     * @param response the response
+     */
+    @RequestMapping(value = { "/get_PolicyRolesScopeData" }, method = {
+            org.springframework.web.bind.annotation.RequestMethod.GET }, produces = MediaType.APPLICATION_JSON_VALUE)
+    public void getPolicyScopesEntityData(HttpServletRequest request, HttpServletResponse response) {
+        try {
+            scopelist = new ArrayList<>();
+            Map<String, Object> model = new HashMap<>();
+            ObjectMapper mapper = new ObjectMapper();
+            mapper.setVisibility(PropertyAccessor.FIELD, Visibility.ANY);
+            List<String> scopesData = commonClassDao.getDataByColumn(PolicyEditorScopes.class, "scopeName");
+            model.put("scopeDatas", mapper.writeValueAsString(scopesData));
+            JsonMessage msg = new JsonMessage(mapper.writeValueAsString(model));
+            JSONObject j = new JSONObject(msg);
+            response.getWriter().write(j.toString());
+        } catch (Exception e) {
+            LOGGER.error("Exception Occured" + e);
+        }
+    }
 }
 
-class ReadScopes{
-	private int id;
-	private UserInfo loginId;
-	private String role;
-	private List<String> scope;
-	
-	public int getId() {
-		return id;
-	}
-	public void setId(int id) {
-		this.id = id;
-	}
-	public UserInfo getLoginId() {
-		return loginId;
-	}
-	public void setLoginId(UserInfo loginId) {
-		this.loginId = loginId;
-	}
-	public String getRole() {
-		return role;
-	}
-	public void setRole(String role) {
-		this.role = role;
-	}
-	public List<String> getScope() {
-		return scope;
-	}
-	public void setScope(List<String> scope) {
-		this.scope = scope;
-	}
+class ReadScopes {
+    private int id;
+    private UserInfo loginId;
+    private String role;
+    private List<String> scope;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public UserInfo getLoginId() {
+        return loginId;
+    }
+
+    public void setLoginId(UserInfo loginId) {
+        this.loginId = loginId;
+    }
+
+    public String getRole() {
+        return role;
+    }
+
+    public void setRole(String role) {
+        this.role = role;
+    }
+
+    public List<String> getScope() {
+        return scope;
+    }
+
+    public void setScope(List<String> scope) {
+        this.scope = scope;
+    }
 
 }
diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/UserUtils.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/UserUtils.java
index 1f68ffc0e..40c839676 100644
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/UserUtils.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/utils/UserUtils.java
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,49 +20,107 @@
 package org.onap.policy.utils;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 
 import org.onap.policy.model.Roles;
 
 public final class UserUtils {
-	
-	private UserUtils () {
-		// Empty Constructor
-	}
-	
-	public static class Pair<T, U> {
-		public final T t;
-		public final U u;
-		
-		public Pair (T t, U u) {
-			this.t = t;
-			this.u = u;
-		}
-	}
-	
-	public static Pair<Set<String>, List<String>> checkRoleAndScope(List<Object> userRoles) {
-		Set<String> scopes;
-		List<String> roles;
-		//Check if the Role and Scope Size are Null get the values from db. 
-		roles = new ArrayList<>();
-		scopes = new HashSet<>();
-		for(Object role: userRoles){
-			Roles userRole = (Roles) role;
-			roles.add(userRole.getRole());
-			if(userRole.getScope() != null){
-				if(userRole.getScope().contains(",")){
-					String[] multipleScopes = userRole.getScope().split(",");
-					for(int i =0; i < multipleScopes.length; i++){
-						scopes.add(multipleScopes[i]);
-					}
-				}else{
-					scopes.add(userRole.getScope());
-				}		
-			}
-		}
-		return new Pair<>(scopes, roles);
-	}
+
+    private UserUtils() {
+        // Empty Constructor
+    }
+
+    public static class Pair<T, U> {
+        public final T t;
+        public final U u;
+
+        public Pair(T t, U u) {
+            this.t = t;
+            this.u = u;
+        }
+    }
+
+    /**
+     * Check Role and its Scopes.
+     * 
+     * @param userRoles list of UserRoles.
+     * @return return role and scope from UserRole Object.
+     */
+    public static Pair<Set<String>, List<String>> checkRoleAndScope(List<Object> userRoles) {
+        Set<String> scopes;
+        List<String> roles;
+        // Check if the Role and Scope Size are Null get the values from db.
+        roles = new ArrayList<>();
+        scopes = new HashSet<>();
+        for (Object role : userRoles) {
+            Roles userRole = (Roles) role;
+            roles.add(userRole.getRole());
+            if (userRole.getScope() != null) {
+                if (userRole.getScope().contains(",")) {
+                    String[] multipleScopes = userRole.getScope().split(",");
+                    for (int i = 0; i < multipleScopes.length; i++) {
+                        scopes.add(trimScope(multipleScopes[i]));
+                    }
+                } else {
+                    scopes.add(trimScope(userRole.getScope()));
+                }
+            }
+        }
+        return new Pair<>(scopes, roles);
+    }
+
+    /**
+     * Get Role by Scope based on UserRole Object.
+     * 
+     * @param userRoles list of UserRoles.
+     * @return return the map<scope, role>.
+     */
+    public static Map<String, String> getRoleByScope(List<Object> userRoles) {
+        Map<String, String> rolesList = new HashMap<>();
+        for (Object role : userRoles) {
+            Roles userRole = (Roles) role;
+            if (!userRole.getRole().startsWith("super-")) {
+                rolesList = addNonSuperUserScopes(userRole, rolesList);
+            } else {
+                rolesList.put("@All@", userRole.getRole());
+            }
+        }
+        return rolesList;
+    }
+
+    /**
+     * Read non super role scopes and add to map.
+     * 
+     * @param userRole  Role Object.
+     * @param rolesList roleList Object.
+     * @return return the map<scope, role>.
+     */
+    private static Map<String, String> addNonSuperUserScopes(Roles userRole, Map<String, String> rolesList) {
+        if (userRole.getScope() != null && !(userRole.getScope().trim().isEmpty())) {
+            if (userRole.getScope().contains(",")) {
+                String[] multipleScopes = userRole.getScope().split(",");
+                for (int i = 0; i < multipleScopes.length; i++) {
+                    rolesList.put(trimScope(multipleScopes[i]), userRole.getRole());
+                }
+            } else {
+                rolesList.put(trimScope(userRole.getScope()), userRole.getRole());
+            }
+        }
+        return rolesList;
+    }
+
+    /**
+     * Trim Scope Value.
+     * 
+     * @param scope string scope name.
+     * @return trim scope.
+     */
+    private static String trimScope(String scope) {
+        return scope.replace("[", "").replace("]", "").replace("\"", "").trim();
+    }
 
 }
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
index 7974d4e3f..6b23e3280 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/Windows/Edit_Roles_Window.html
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,38 +17,88 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */-->
+ <style>
+ @import "bourbon";
+
+$melon: #F97D75;
+$black: #2E3641;
+
+roleul {
+  list-style: none;
+  padding-left: 0;
+  margin-top: 25px;
+}
+
+roleli {
+  border: 1px solid black;
+  display: inline-block;
+  padding: 5px 10px;
+  margin-right: 5px;
+  margin-bottom: 5px;
+  text-transform: capitalize;
+}
+
+.fa-close {
+  cursor: pointer;
+}
+
+[contenteditable] {
+  &:focus, &:active {
+    outline:0;
+  }
+}
+ </style>
+ 
+ 
 <script type="text/ng-template" id="edit_Role_popup.html">
 <div class="modal" tabindex="-1">
 <div class="modal-dialog modal-lg">
-	<div class="modal-content">
-		<div class="modal-header">
-			<h2 class="font-showcase-font-name" style="color : #157bb2">{{label}}</h2>
-		</div>
-		<div class="modal-body">
-			<div class="form-group row">
-			<div class="form-group col-sm-6">
-				<label><sup><b>*</b></sup>Name:</label><br>
-				<input type="text" class="form-control" ng-readonly="true" ng-model="editRole.loginId.userName" maxlength="30" />
-			</div>
-			</div>
-			<div class="form-group row">
-			<div class="form-group col-sm-6" >
-				<label><sup><b>*</b></sup>Role:</label><br>
-				<input type="text" class="form-control" ng-readonly="true" ng-model="editRole.role" maxlength="30" />
-			</div>
-			</div>
-			<div class="form-group row">
-			<div class="form-group col-sm-6" >
-				<label><sup><b>*</b></sup>Scope:</label><br>
-				<select class="form-control" multiple  ng-model="editRole.scope" ng-options="option for option in scopeDatas" title="Select the Scopes from the dropdown."></select>
-			</div>
-			</div>
-		</div>
-		<div class="modal-footer">
-			<button class="btn btn-success" herf="javascript:void(0)" ng-click="saveRole(editRole);" title="OnClick Policy Role is saved.">Save</button>
-			<button class="btn btn-default" herf="javascript:void(0)" ng-click="close()" title="OnClick Policy Role Window is closed.">Close</button>
-		</div>
-	</div>
+    <div class="modal-content">
+        <div class="modal-header">
+            <h2 class="font-showcase-font-name" style="color : #157bb2">{{label}}</h2>
+        </div>
+        <div class="modal-body">
+            <div class="form-group row">
+            <div class="form-group col-sm-6">
+                <label><sup><b>*</b></sup>Name:</label><br>
+                <input type="text" class="form-control" ng-readonly="disableCd" ng-model="editRole.loginId.userName" maxlength="256" />
+            </div>
+            </div>
+            <div class="form-group row">
+            <div class="form-group col-sm-6" >
+                <label><sup><b>*</b></sup>Role:</label><br>
+                <input type="text" class="form-control" ng-readonly="true" ng-model="editRole.role" maxlength="30" />
+            </div>
+            </div>
+            <div class="form-group row">
+            <div class="form-group col-sm-12" >
+                <label><sup><b>*</b></sup>Assigned Scopes:</label><br>
+                <roleul>
+                    <roleli ng-model="editRole.scope" ng-repeat="option in activeScopes" class="{'fadeOut' : option}">
+                          <span class="fa fa-close" ng-click="deleteScope($index)"></span>
+                          <span>{{option}}</span>
+                    </roleli>
+                  </roleul>
+            </div>
+            </div>
+            <div class="form-group row">
+            <div class="form-group col-sm-12" >
+                <label><sup><b>*</b></sup>Scope: To Multi Select Scopes press ctrl (Windows) and cmd (Mac) and then select.</label><br>
+                <input type="text" class="form-control" ng-model="searchKey" placeholder="Filter Scopes.." title="Enter Scope name."><br>
+                <select class="form-control" multiple style="height: 400px;" ng-model="editRole.scopeList" ng-options="option for option in scopeDatas | filter: searchKey" title="Select the Scopes from the dropdown."></select>
+            </div>
+            </div>
+            <div class="form-group row">
+            <div class="form-group col-sm-12" >
+                <button class="btn btn-primary" ng-click="addScope(editRole.scopeList);" title="On Click Scopes added to Active Scope List">Add Scopes</button>
+            </div>
+            </div>
+        </div>
+        <div class="modal-footer">
+            <button class="btn btn-success" herf="javascript:void(0)" ng-click="saveRole(editRole);" title="OnClick Policy Role is saved.">Save</button>
+            <button class="btn btn-default" herf="javascript:void(0)" ng-click="$close()" title="OnClick Policy Role Window is closed.">Close</button>
+        </div>
+    </div>
 </div>
 </div>
 </script>
\ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js
index 42760a222..051a9130c 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyAddScopeRoleController.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,12 +18,28 @@
  * ============LICENSE_END=========================================================
  */
 app.controller('editRoleController' ,  function ($scope, PolicyAppService, $modalInstance, message){
-    if(message.editRoleData!=null){
+    if (message.editRoleData != null) {
         $scope.label='Edit Role'
         $scope.disableCd=true;
+    } else {
+        $scope.label='Add Role'
+        $scope.disableCd=false;
+        message.editRoleData = {
+            role : "mechid"
+        }
     }
+
     $scope.editRole = message.editRoleData;
 
+    $scope.activeScopes = [];
+    if (message.editRoleData != null && message.editRoleData.scope != null) {
+        if (message.editRoleData.scope.constructor === Array) {
+            $scope.activeScopes = message.editRoleData.scope;
+        } else {
+            $scope.activeScopes = message.editRoleData.scope.split(',');
+        }
+    }
+
     PolicyAppService.getData('get_PolicyRolesScopeData').then(function (data) {
         var j = data;
         $scope.data = JSON.parse(j.data);
@@ -36,6 +52,7 @@ app.controller('editRoleController' ,  function ($scope, PolicyAppService, $moda
 
     $scope.saveRole = function(editRoleData) {
         var uuu = "save_NonSuperRolesData.htm";
+        editRoleData.scope = $scope.activeScopes;
         var postData={editRoleData: editRoleData};
         $.ajax({
             type : 'POST',
@@ -55,7 +72,39 @@ app.controller('editRoleController' ,  function ($scope, PolicyAppService, $moda
         });
     };
 
-    $scope.close = function() {
-        $modalInstance.close();
+
+    $scope.createMechidScope = function(editRoleData) {
+        var uuu = "save_NewMechidScopesData";
+        editRoleData.scope = $scope.activeScopes;
+        var postData={editRoleData: editRoleData};
+        $.ajax({
+            type : 'POST',
+            url : uuu,
+            dataType: 'json',
+            contentType: 'application/json',
+            data: JSON.stringify(postData),
+            success : function(data){
+                $scope.$apply(function(){
+                    $scope.rolesDatas=data.rolesDatas;});
+                console.log($scope.rolesDatas);
+                $modalInstance.close({rolesDatas:$scope.rolesDatas});
+            },
+            error : function(data) {
+                alert("Error while Creating Mechid scopes.");
+            }
+        });
+    };
+
+
+
+    $scope.addScope = function(scopes) {
+        for (var i = 0; i < scopes.length; i++) {
+            if ($.inArray(scopes[i], $scope.activeScopes) === -1) {
+                $scope.activeScopes.push(scopes[i]);
+            }
+        }
+    };
+    $scope.deleteScope = function(index) {
+        $scope.activeScopes.splice(index, 1);
     };
 });
\ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js
index ddd6b232c..ed1b8bd23 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/controller/PolicyRolesController.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,23 +19,23 @@
  */
 app.controller('policyRolesController', function ($scope, PolicyAppService, modalService, $modal, Notification){
     $( "#dialog" ).hide();
-    
+
     $scope.isDisabled = true;
+
+    PolicyAppService.getData('get_LockDownData').then(function(data) {
+        var j = data;
+        $scope.data = JSON.parse(j.data);
+        $scope.lockdowndata = JSON.parse($scope.data.lockdowndata);
+        if ($scope.lockdowndata[0].lockdown == true) {
+            $scope.isDisabled = true;
+        } else {
+            $scope.isDisabled = false;
+        }
+        console.log($scope.data);
+    }, function(error) {
+        console.log("failed");
+    });
     
-    PolicyAppService.getData('get_LockDownData').then(function(data){
-		 var j = data;
-		 $scope.data = JSON.parse(j.data);
-		 $scope.lockdowndata = JSON.parse($scope.data.lockdowndata);
-		 if($scope.lockdowndata[0].lockdown == true){
-			 $scope.isDisabled = true;
-		 }else{
-			 $scope.isDisabled = false;
-		 }
-		 console.log($scope.data);
-	 },function(error){
-		 console.log("failed");
-	 });
-	 
     $scope.scopeDatas = [];
     PolicyAppService.getData('get_RolesData').then(function (data) {
         var j = data;
@@ -51,7 +51,8 @@ app.controller('policyRolesController', function ($scope, PolicyAppService, moda
         data : 'rolesDatas',
         enableFiltering: true,
         columnDefs: [{
-            field: 'id', enableFiltering: false, 
+            field: 'id', enableFiltering: false, headerCellTemplate: '' +
+            '<button id=\'New\' ng-click="grid.appScope.editRolesWindow(null)" class="btn btn-success">' + 'Create</button>',
             cellTemplate:
             '<button  type="button"  class="btn btn-primary"  ng-click="grid.appScope.editRolesWindow(row.entity)"><i class="fa fa-pencil-square-o"></i></button>' ,  width: '4%'
         },
@@ -63,30 +64,30 @@ app.controller('policyRolesController', function ($scope, PolicyAppService, moda
 
 
     $scope.editRoleName = null;
-   
+
     $scope.editRolesWindow = function(editRoleData) {
-    	if($scope.lockdowndata[0].lockdown == true){
-    		Notification.error("Policy Application has been Locked")
-    	}else{
-    		$scope.editRoleName = editRoleData;
-    		var modalInstance = $modal.open({
-    			backdrop: 'static', keyboard: false,
-    			templateUrl : 'edit_Role_popup.html',
-    			controller: 'editRoleController',
-    			resolve: {
-    				message: function () {
-    					var message = {
-    							editRoleData: $scope.editRoleName
-    					};
-    					return message;
-    				}
-    			}
-    		});
-    		modalInstance.result.then(function(response){
-    			console.log('response', response);
-    		});
-    	}
-       
+        if ($scope.lockdowndata[0].lockdown == true) {
+            Notification.error("Policy Application has been Locked")
+        } else {
+            $scope.editRoleName = editRoleData;
+            var modalInstance = $modal.open({
+                backdrop: 'static', keyboard: false,
+                templateUrl : 'edit_Role_popup.html',
+                controller: 'editRoleController',
+                resolve: {
+                    message: function () {
+                        var message = {
+                            editRoleData: $scope.editRoleName
+                        };
+                        return message;
+                    }
+                }
+            });
+            modalInstance.result.then(function(response) {
+                console.log('response', response);
+                $scope.rolesDatas = response.rolesDatas;
+            });
+        }
     };
 
 });
\ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
index 7568030cf..0aec30c1d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 app.controller('PolicyManagerController', [
         '$scope', '$q', '$window', '$cookies', 'policyManagerConfig', 'item', 'policyNavigator', 'policyUploader', 'Notification','PolicyAppService',
         function($scope, $q, $Window, $cookies, policyManagerConfig, Item, PolicyNavigator, PolicyUploader, Notification, PolicyAppService ) {
-        	
+
         $scope.isDisabled = true;
         $scope.superAdminId = false;
         $scope.exportPolicyId = false;
@@ -35,109 +35,75 @@ app.controller('PolicyManagerController', [
         $scope.describePolicyId = false;
         $scope.viewPolicyId = false;
         $scope.deletePolicyId = false;
-        PolicyAppService.getData('get_LockDownData').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	$scope.lockdowndata = JSON.parse($scope.data.lockdowndata);
-        	if($scope.lockdowndata[0].lockdown == true){
-        		$scope.isDisabled = true;
-        	}else{
-        		$scope.isDisabled = false;
-        	}
-        	console.log($scope.data);
-        },function(error){
-        	console.log("failed");
+        PolicyAppService.getData('get_LockDownData').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            $scope.lockdowndata = JSON.parse($scope.data.lockdowndata);
+            if ($scope.lockdowndata[0].lockdown == true) {
+                $scope.isDisabled = true;
+            } else {
+                $scope.isDisabled = false;
+            }
+            console.log($scope.data);
+        }, function(error) {
+            console.log("failed");
         });
-        
-        PolicyAppService.getData('getDictionary/get_DescriptiveScopeByName').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	console.log($scope.data);
-        	$scope.descriptiveScopeDictionaryDatas = JSON.parse($scope.data.descriptiveScopeDictionaryDatas);	
+
+        PolicyAppService.getData('getDictionary/get_DescriptiveScopeByName').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.descriptiveScopeDictionaryDatas = JSON.parse($scope.data.descriptiveScopeDictionaryDatas);
         }, function (error) {
-        	console.log("failed");
+            console.log("failed");
         });
 
-        PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	console.log($scope.data);
-        	$scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);	
+        PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.onapNameDictionaryDatas = JSON.parse($scope.data.onapNameDictionaryDatas);
         }, function (error) {
         	console.log("failed");
         });
 
-        PolicyAppService.getData('getDictionary/get_VSCLActionDataByName').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	console.log($scope.data);
-        	$scope.vsclActionDictionaryDatas = JSON.parse($scope.data.vsclActionDictionaryDatas);	
+        PolicyAppService.getData('getDictionary/get_VSCLActionDataByName').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.vsclActionDictionaryDatas = JSON.parse($scope.data.vsclActionDictionaryDatas);
         }, function (error) {
-        	console.log("failed");
+            console.log("failed");
         });
 
-        PolicyAppService.getData('getDictionary/get_VNFTypeDataByName').then(function(data){
-        	var j = data;
-        	$scope.data = JSON.parse(j.data);
-        	console.log($scope.data);
-        	$scope.vnfTypeDictionaryDatas = JSON.parse($scope.data.vnfTypeDictionaryDatas);	
+        PolicyAppService.getData('getDictionary/get_VNFTypeDataByName').then(function(data) {
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.vnfTypeDictionaryDatas = JSON.parse($scope.data.vnfTypeDictionaryDatas);	
         }, function (error) {
-        	console.log("failed");
+            console.log("failed");
         });
 
-        
+
         PolicyAppService.getData('get_UserRolesData').then(function (data) {
-     	   var j = data;
-     	   $scope.data = JSON.parse(j.data);
-     	   console.log($scope.data);
-     	   $scope.userRolesDatas = JSON.parse($scope.data.userRolesDatas);
-     	   console.log($scope.userRolesDatas);
-     	   if($scope.userRolesDatas[0] == 'super-admin'){
-     		  $scope.superAdminId = true;
-     		  $scope.exportPolicyId = true;
-              $scope.importPolicyId = true;
-     		  $scope.createScopeId = true;
-     	      $scope.deleteScopeId = true;
-     	      $scope.renameId = true;
-     	      $scope.createPolicyId = true;
-     	      $scope.cloneId = true;
-     	      $scope.editPolicyId = true;
-     	      $scope.switchVersionId = true;
-     	      $scope.describePolicyId = true;
-     	      $scope.viewPolicyId = true;
-     	      $scope.deletePolicyId = true; 
-     	   }else if($scope.userRolesDatas[0] == 'super-editor' || $scope.userRolesDatas[0] == 'editor'){
-     		  $scope.exportPolicyId = true;
-              $scope.importPolicyId = true; 
-   	          $scope.cloneId = true;
-   	          $scope.editPolicyId = true;
-   	          $scope.createPolicyId = true;
-	          $scope.cloneId = true;
-	          $scope.editPolicyId = true;
-	          $scope.switchVersionId = true;
-	          $scope.describePolicyId = true;
-	          $scope.viewPolicyId = true;
-	          $scope.deletePolicyId = true; 
-     	   }else if($scope.userRolesDatas[0] == 'super-guest' || $scope.userRolesDatas[0] == 'guest'){
-     		  $scope.describePolicyId = true;
-	          $scope.viewPolicyId = true;
-     	   }else if($scope.userRolesDatas[0] == 'admin'){
-     		  $scope.exportPolicyId = true;
-              $scope.importPolicyId = true;
-     		  $scope.createScopeId = true;
-   	          $scope.renameId = true;
-   	          $scope.createPolicyId = true;
-   	          $scope.cloneId = true;
-   	          $scope.editPolicyId = true;
-   	          $scope.switchVersionId = true;
-   	          $scope.describePolicyId = true;
-   	          $scope.viewPolicyId = true;
-   	          $scope.deletePolicyId = true;  
-     	   }
-     	   }, function (error) {
-     	      console.log("failed");
-     	});
-        
+            var j = data;
+            $scope.data = JSON.parse(j.data);
+            console.log($scope.data);
+            $scope.userRolesDatas = JSON.parse($scope.data.userRolesDatas);
+            console.log($scope.userRolesDatas);
+            if ($scope.userRolesDatas[0] == 'super-admin') {
+                $scope.superAdminId = true;
+                $scope.exportPolicyId = true;
+                $scope.importPolicyId = true;
+           } else if ($scope.userRolesDatas[0] == 'super-editor' || $scope.userRolesDatas[0] == 'editor' || $scope.userRolesDatas[0] == 'admin') {
+               $scope.exportPolicyId = true;
+               $scope.importPolicyId = true; 
+           }
+        }, function (error) {
+            console.log("failed");
+        });
+
         $scope.config = policyManagerConfig;
         $scope.reverse = false;
         $scope.predicate = ['model.type', 'model.name'];
@@ -160,6 +126,49 @@ app.controller('PolicyManagerController', [
             item = item instanceof Item ? item : new Item();
             item.revert();
             $scope.temp = item;
+            $scope.createScopeId = false;
+            $scope.deleteScopeId = false;
+            $scope.renameId = false;
+            $scope.createPolicyId = false;
+            $scope.cloneId = false;
+            $scope.editPolicyId = false;
+            $scope.switchVersionId = false;
+            $scope.describePolicyId = false;
+            $scope.viewPolicyId = false;
+            $scope.deletePolicyId = false;
+            if ($scope.temp.model.roleType == 'super-admin') {
+                $scope.createScopeId = true;
+                $scope.deleteScopeId = true;
+                $scope.renameId = true;
+                $scope.createPolicyId = true;
+                $scope.cloneId = true;
+                $scope.editPolicyId = true;
+                $scope.switchVersionId = true;
+                $scope.describePolicyId = true;
+                $scope.viewPolicyId = true;
+                $scope.deletePolicyId = true; 
+            } else if ($scope.temp.model.roleType == 'super-editor' || $scope.temp.model.roleType == 'editor') {
+                $scope.cloneId = true;
+                $scope.editPolicyId = true;
+                $scope.createPolicyId = true;
+                $scope.switchVersionId = true;
+                $scope.describePolicyId = true;
+                $scope.viewPolicyId = true;
+                $scope.deletePolicyId = true; 
+            } else if ($scope.temp.model.roleType == 'super-guest' || $scope.temp.model.roleType == 'guest') {
+                $scope.describePolicyId = true;
+                $scope.viewPolicyId = true;
+            } else if ($scope.temp.model.roleType == 'admin') {
+                $scope.createScopeId = true;
+                $scope.renameId = true;
+                $scope.createPolicyId = true;
+                $scope.cloneId = true;
+                $scope.editPolicyId = true;
+                $scope.switchVersionId = true;
+                $scope.describePolicyId = true;
+                $scope.viewPolicyId = true;
+                $scope.deletePolicyId = true;  
+            }
         };
 
         $scope.smartClick = function(item) {
@@ -186,10 +195,10 @@ app.controller('PolicyManagerController', [
             return currentPath.indexOf(path) !== -1;
         };
          
-       $scope.watchPolicy = function(item){
+       $scope.watchPolicy = function(item) {
            var uuu = "watchPolicy";
            var data = {name : item.model.name,
-        		   path : item.model.path};
+                   path : item.model.path};
            var postData={watchData: data};
            $.ajax({
                type : 'POST',
@@ -197,32 +206,31 @@ app.controller('PolicyManagerController', [
                dataType: 'json',
                contentType: 'application/json',
                data: JSON.stringify(postData),
-               success : function(data){
-                   $scope.$apply(function(){
+               success : function(data) {
+                   $scope.$apply(function() {
                        $scope.watchData=data.watchData;});
                    Notification.success($scope.watchData);
                    console.log($scope.watchData);
                },
-               error : function(data){
+               error : function(data) {
                    alert("Error while saving.");
                }
            });
        };
-     
-         
-       $scope.refresh = function(){
-    	   $scope.policyNavigator.refresh();
+
+       $scope.refresh = function() {
+           $scope.policyNavigator.refresh();
        };
-       
-         $scope.switchVersion = function(item){
-        	 if ($scope.policyNavigator.fileNameExists(item.tempModel.content.activeVersion)) {
+
+         $scope.switchVersion = function(item) {
+             if ($scope.policyNavigator.fileNameExists(item.tempModel.content.activeVersion)) {
                  item.error = 'Invalid filename or already exists, specify another name';
                  return false;
              }
-        	 item.getSwitchVersionContent().then(function(){
-        		 $scope.policyNavigator.refresh();
-        		 $scope.modal('switchVersion', true);
-        	 });
+             item.getSwitchVersionContent().then(function(){
+                 $scope.policyNavigator.refresh();
+                 $scope.modal('switchVersion', true);
+             });
          };
 
         $scope.copy = function(item) {
@@ -250,7 +258,7 @@ app.controller('PolicyManagerController', [
                 $scope.modal('deletePolicy', true);
             });
         };
-        
+
         $scope.rename = function(item) {
             var samePath = item.tempModel.path.join() === item.model.path.join();
             if (samePath && $scope.policyNavigator.fileNameExists(item.tempModel.name)) {
@@ -262,7 +270,7 @@ app.controller('PolicyManagerController', [
                 $scope.modal('rename', true);
             });
         };
-        
+
         $scope.move = function(item) {
             var samePath = item.tempModel.path.join() === item.model.path.join();
             if (samePath && $scope.policyNavigator.fileNameExists(item.tempModel.name)) {
@@ -291,22 +299,22 @@ app.controller('PolicyManagerController', [
         };
 
         $scope.subScopeFolder = function(item) {
-        	var name = item.tempModel.name +"\\" + item.tempModel.subScopename && item.tempModel.name.trim() + "\\"+item.tempModel.subScopename.trim() ;
-        	item.tempModel.type = 'dir';
-        	item.tempModel.path = $scope.policyNavigator.currentPath;
-        	if (name && !$scope.policyNavigator.fileNameExists(name)) {
-        		item.getScopeContent().then(function() {
-        			$scope.policyNavigator.refresh();
-        			$scope.modal('addSubScope', true);
-        		});
-        	} else {
-        		item.error = 'Invalid filename or already exists, specify another name';
-        		return false;
-        	}
+            var name = item.tempModel.name +"\\" + item.tempModel.subScopename && item.tempModel.name.trim() + "\\"+item.tempModel.subScopename.trim() ;
+            item.tempModel.type = 'dir';
+            item.tempModel.path = $scope.policyNavigator.currentPath;
+            if (name && !$scope.policyNavigator.fileNameExists(name)) {
+                item.getScopeContent().then(function() {
+                    $scope.policyNavigator.refresh();
+                    $scope.modal('addSubScope', true);
+                });
+            } else {
+                item.error = 'Invalid filename or already exists, specify another name';
+                return false;
+            }
         };
-        
-        $scope.closefunction = function(fianlPath){
-        	$scope.policyNavigator.policyrefresh(fianlPath);
+
+        $scope.closefunction = function(fianlPath) {
+            $scope.policyNavigator.policyrefresh(fianlPath);
         };
 
         $scope.uploadFiles = function() {
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js
index 0e095a841..26cdf67c3 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/entities/item.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP Policy Engine
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017, 2019 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
                 version: model && model.version || '',
                 createdBy: model && model.createdBy || '',
                 modifiedBy: model && model.modifiedBy || '',
+                roleType: model && model.roleType || '',
                 content: model && model.content || '',
                 recursive: false,
                 sizeKb: function() {
@@ -84,7 +85,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             this.update();
             return deferred.resolve(data);
         };
-		
+
         Item.prototype.createFolder = function() {
             var self = this;
             var deferred = $q.defer();
@@ -139,11 +140,11 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             self.inprocess = true;
             self.error = '';
             $http.post(policyManagerConfig.renameUrl, data).success(function(data) {
-            	if(data.result.error != undefined){
-            		var value = data.result.error;
-            		value = value.replace("rename" , "move");
-            		data.result.error = value;
-            	}
+                if(data.result.error != undefined){
+                    var value = data.result.error;
+                    value = value.replace("rename" , "move");
+                    data.result.error = value;
+                }
                 self.deferredHandler(data, deferred);
             }).error(function(data) {
                 self.deferredHandler(data, deferred, 'Error Occured While Moving');
@@ -152,7 +153,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             });
             return deferred.promise;
         };
-        
+
         Item.prototype.copy = function() {
             var self = this;
             var deferred = $q.defer();
@@ -249,7 +250,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             });
             return deferred.promise;
         };
-        
+
         Item.prototype.getDescribePolicyContent = function() {
             var self = this;
             var deferred = $q.defer();
@@ -263,7 +264,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             $http.post(policyManagerConfig.describePolicyUrl, data).success(function(data) {
                 self.tempModel.content =  self.model.content = data.html;
                 var describeTemplate =  self.tempModel.content;
-             
+
                 self.deferredHandler(data, deferred);
             }).error(function(data) {
                 self.deferredHandler(data, deferred, 'Error Occured While retrieving the Policy Data to Describe');
@@ -315,7 +316,7 @@ angular.module('abs').factory('item', ['$http', '$q', 'policyManagerConfig', fun
             });
             return deferred.promise;
         };
-        
+
         Item.prototype.removePolicy = function() {
             var self = this;
             var deferred = $q.defer();