X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=POLICY-SDK-APP%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fpolicy%2Fcontroller%2FPDPController.java;h=a8a4279704f0ff8c7349e13eb0754d3db91d3642;hb=9beb01fafe35a819d85bc66668b499f25aa0857a;hp=1dce3a6b0a9bd546f39c10fdaa2bdd6a7154d84a;hpb=b65e96826d7339ce29ddb73e3ed6775bd4f54753;p=policy%2Fengine.git

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 1dce3a6b0..a8a427970 100644
--- 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;
@@ -92,22 +92,10 @@ public class PDPController extends RestrictedBaseController {
 				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);
 				}
@@ -360,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){