From 49dddf03895dcfa2998489eb384181aa142fe0ac Mon Sep 17 00:00:00 2001 From: "Christopher Lott (cl778h)" Date: Mon, 7 Aug 2017 11:42:04 -0400 Subject: Remove icons; revise role centralization. Some icons & images are being removed due to restricted use. Made enhancements to the Role centralization code to allow multiple urls for one function code. This replaces the previous commit by Sunder Tattavarada. Issue: PORTAL-17, PORTAL-21 Change-Id: I1d9dc4f1ae20aeb26af00bb0d6384cca926f2115 Signed-off-by: Christopher Lott (cl778h) --- .../portalsdk/core/service/LoginServiceCentralizedImpl.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java') diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java index 1bfe2aba..270369c5 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/openecomp/portalsdk/core/service/LoginServiceCentralizedImpl.java @@ -139,8 +139,13 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS HashSet rolefun = null; String repsonse = restApiRequestBuilder.getViaREST("/user/" + bean.getUserid(), true, bean.getUserid()); + user = mapper.readValue(repsonse, User.class); + + Set roleFunctionListNew = new HashSet<>(); + Set roleFunctionList = new HashSet<>(); + SortedSet UserAppSet = new TreeSet<>(); @SuppressWarnings("unchecked") Set setAppsObj = user.getUserApps(); @@ -153,8 +158,8 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS rolefun = new HashSet<>(); Role role = nextApp.getRole(); - Set roleFunctionList = role.getRoleFunctions(); - Set roleFunctionListNew = new HashSet<>(); + roleFunctionList = role.getRoleFunctions(); + Iterator itetaror = roleFunctionList.iterator(); while (itetaror.hasNext()) { Object nextValue = itetaror.next(); @@ -165,7 +170,7 @@ public class LoginServiceCentralizedImpl extends FusionService implements LoginS role.setRoleFunctions(roleFunctionListNew); nextApp.setRole(role); nextApp.getRole().getRoleFunctions(); - SortedSet UserAppSet = new TreeSet<>(); + UserAppSet.add(nextApp); user.setUserApps(UserAppSet); } -- cgit 1.2.3-korg