From: Jorge Hernandez <jorge.hernandez-herrero@att.com>
Date: Tue, 13 Aug 2019 13:53:49 +0000 (+0000)
Subject: Merge "Fix issue for policies not loading on GUI push tab"
X-Git-Tag: 1.5.2~12
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=102d5151bc603961ebd2b232f97edb313f70b138;hp=80133d27f21e27c8da4b3e8d635fb2c05f2f7721

Merge "Fix issue for policies not loading on GUI push tab"
---

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 44a133068..a42d3d8d7 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
@@ -114,6 +114,13 @@ public class AutoPushController extends RestrictedBaseController {
         return policyController != null ? getPolicyController() : new PolicyController();
     }
 
+    private Set<String> addAllScopes(Roles userRole, Set<String> scopes) {
+        if (userRole.getScope() != null) {
+            scopes.addAll(Stream.of(userRole.getScope().split(",")).collect(Collectors.toSet()));
+        }
+        return scopes;
+    }
+
     @RequestMapping(value = {"/get_AutoPushPoliciesContainerData"}, method = {RequestMethod.GET},
             produces = MediaType.APPLICATION_JSON_VALUE)
     public void getPolicyGroupContainerData(HttpServletRequest request, HttpServletResponse response) {
@@ -130,8 +137,9 @@ public class AutoPushController extends RestrictedBaseController {
             for (Object role : userRoles) {
                 Roles userRole = (Roles) role;
                 roles.add(userRole.getRole());
-                scopes.addAll(Stream.of(userRole.getScope().split(",")).collect(Collectors.toSet()));
+                addAllScopes(userRole, scopes);
             }
+
             if (roles.contains("super-admin") || roles.contains("super-editor") || roles.contains("super-guest")) {
                 data = commonClassDao.getData(PolicyVersion.class);
             } else {