Merge "Included Policy GUI Enhancements and validations"

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

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java
index c0344d3..a8a4279 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/PDPController.java
@@ -38,7 +38,7 @@ import org.onap.policy.admin.RESTfulPAPEngine;
 import org.onap.policy.common.logging.flexlogger.FlexLogger;
 import org.onap.policy.common.logging.flexlogger.Logger;
 import org.onap.policy.model.PDPGroupContainer;
-import org.onap.policy.model.Roles;
+import org.onap.policy.utils.UserUtils.Pair;
 import org.onap.policy.xacml.api.XACMLErrorConstants;
 import org.onap.policy.xacml.api.pap.OnapPDPGroup;
 import org.onap.policy.xacml.api.pap.PAPPolicyEngine;
@@ -88,26 +88,14 @@ public class PDPController extends RestrictedBaseController {
                        try {
                                PolicyController controller = getPolicyControllerInstance();
                                Set<PDPPolicy> filteredPolicies = new HashSet<>();
-                               Set<String> scopes = null;
-                               List<String> roles = null;
+                               Set<String> scopes;
+                               List<String> roles;
                                String userId =  isJunit()  ? "Test" : UserUtils.getUserSession(request).getOrgUserId();
                                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{
-                                                       scopes.add(userRole.getScope());
-                                               }
-                                       }       
-                               }
+                               Pair<Set<String>, List<String>> pair = org.onap.policy.utils.UserUtils.checkRoleAndScope(userRoles);
+                               roles = pair.u;
+                               scopes = pair.t;
+                               
                                if(!junit&& controller.getPapEngine()==null){
                                    setPAPEngine(request);
                                }
@@ -118,39 +106,37 @@ public class PDPController extends RestrictedBaseController {
                                                this.groups.addAll(this.getGroupsData());
                                        }       
                                }else{
-                                       if(!userRoles.isEmpty()){
-                                               if(!scopes.isEmpty()){
-                                                       this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
-                                                       List<OnapPDPGroup> tempGroups = new ArrayList<>();
-                                                       if(!groups.isEmpty()){
-                                                               Iterator<OnapPDPGroup> pdpGroup = groups.iterator();
-                                                               while(pdpGroup.hasNext()){
-                                                                       OnapPDPGroup group = pdpGroup.next();
-                                                                       Set<PDPPolicy> policies = group.getPolicies();
-                                                                       for(PDPPolicy policy : policies){
-                                                                               for(String scope : scopes){
-                                                                                       scope = scope.replace(File.separator, ".");
-                                                                                       String policyName = policy.getId();
-                                                                                       if(policyName.contains(".Config_")){
-                                                                                               policyName = policyName.substring(0, policyName.lastIndexOf(".Config_"));
-                                                                                       }else if(policyName.contains(".Action_")){
-                                                                                               policyName = policyName.substring(0, policyName.lastIndexOf(".Action_"));
-                                                                                       }else if(policyName.contains(".Decision_")){
-                                                                                               policyName = policyName.substring(0, policyName.lastIndexOf(".Decision_"));
-                                                                                       }
-                                                                                       if(policyName.startsWith(scope)){
-                                                                                               filteredPolicies.add(policy);
-                                                                                       }
+                                       if(!userRoles.isEmpty() && !scopes.isEmpty()){
+                                               this.groups.addAll(controller.getPapEngine().getOnapPDPGroups());
+                                               List<OnapPDPGroup> tempGroups = new ArrayList<>();
+                                               if(!groups.isEmpty()){
+                                                       Iterator<OnapPDPGroup> pdpGroup = groups.iterator();
+                                                       while(pdpGroup.hasNext()){
+                                                               OnapPDPGroup group = pdpGroup.next();
+                                                               Set<PDPPolicy> policies = group.getPolicies();
+                                                               for(PDPPolicy policy : policies){
+                                                                       for(String scope : scopes){
+                                                                               scope = scope.replace(File.separator, ".");
+                                                                               String policyName = policy.getId();
+                                                                               if(policyName.contains(".Config_")){
+                                                                                       policyName = policyName.substring(0, policyName.lastIndexOf(".Config_"));
+                                                                               }else if(policyName.contains(".Action_")){
+                                                                                       policyName = policyName.substring(0, policyName.lastIndexOf(".Action_"));
+                                                                               }else if(policyName.contains(".Decision_")){
+                                                                                       policyName = policyName.substring(0, policyName.lastIndexOf(".Decision_"));
+                                                                               }
+                                                                               if(policyName.startsWith(scope)){
+                                                                                       filteredPolicies.add(policy);
                                                                                }
                                                                        }
-                                                                       pdpGroup.remove();
-                                                                       StdPDPGroup newGroup = (StdPDPGroup) group;
-                                                                       newGroup.setPolicies(filteredPolicies);
-                                                                       tempGroups.add(newGroup);
-                                                               }       
-                                                               groups.clear();
-                                                               groups = tempGroups;    
-                                                       }
+                                                               }
+                                                               pdpGroup.remove();
+                                                               StdPDPGroup newGroup = (StdPDPGroup) group;
+                                                               newGroup.setPolicies(filteredPolicies);
+                                                               tempGroups.add(newGroup);
+                                                       }       
+                                                       groups.clear();
+                                                       groups = tempGroups;    
                                                }
                                        }
                                }
@@ -254,7 +240,7 @@ public class PDPController extends RestrictedBaseController {
                        policyLogger.info("*****************************************************************************************************************************");
                        
                        StdPDPGroup pdpGroupData =  mapper.readValue(root.get("pdpGroupData").toString(), StdPDPGroup.class);
-                       if(pdpGroupData.getName().equals("Default")) {
+                       if("Default".equals(pdpGroupData.getName())) {
                                throw new UnsupportedOperationException("You can't remove the Default Group.");
                        }else{
                                this.container.removeGroup(pdpGroupData, null);
@@ -294,7 +280,7 @@ public class PDPController extends RestrictedBaseController {
                        PolicyController controller = getPolicyControllerInstance();
                        this.container = new PDPGroupContainer(controller.getPapEngine()); 
                        String update = root.get("update").toString();
-                       PdpData pdpGroupData = (PdpData)mapper.readValue(root.get("pdpInGroup").toString(), PdpData.class);
+                       PdpData pdpGroupData = mapper.readValue(root.get("pdpInGroup").toString(), PdpData.class);
                        StdPDPGroup activeGroupData =  mapper.readValue(root.get("activePDP").toString(), StdPDPGroup.class);
                        
                        String userId = UserUtils.getUserSession(request).getOrgUserId();
@@ -362,8 +348,8 @@ public class PDPController extends RestrictedBaseController {
 
                        PrintWriter out = response.getWriter();
                        refreshGroups(request);
-                       String responseString = mapper.writeValueAsString(groups);
-                       JSONObject j = new JSONObject("{pdpEntityDatas: " + responseString + "}");
+                       JsonMessage msg = new JsonMessage(mapper.writeValueAsString(groups));
+                       JSONObject j = new JSONObject(msg);
                        out.write(j.toString());
                }
                catch (Exception e){