SecurityPolicy methods now return streams (#285)

Author: labkey-adam

mcc/src/org/labkey/mcc/MccController.java

@@ -73,6 +73,7 @@
 import org.labkey.api.util.ExceptionUtil;
 import org.labkey.api.util.GUID;
 import org.labkey.api.util.HtmlString;
+import org.labkey.api.util.IntegerUtils;
 import org.labkey.api.util.MailHelper;
 import org.labkey.api.util.PageFlowUtil;
 import org.labkey.api.util.Path;
@@ -104,8 +105,6 @@
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import static org.labkey.api.exp.api.ExperimentService.asInteger;
-
 public class MccController extends SpringActionController
 {
     private static final DefaultActionResolver _actionResolver = new DefaultActionResolver(MccController.class);
@@ -358,7 +357,7 @@ public Object execute(ApproveUserRequestsForm form, BindException errors) throws
                     User u;
                     if (map.get("userId") != null)
                     {
-                        Integer userId = asInteger(map.get("userId"));
+                        Integer userId = IntegerUtils.asInteger(map.get("userId"));
                         u = UserManager.getUser(userId);
                         existingUsersGivenAccess.add(u);
                     }
@@ -587,31 +586,31 @@ public boolean handlePost(Object o, BindException errors) throws Exception
             if (requestContainer != null)
             {
                 Group requestGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.REQUEST_GROUP_NAME, GroupEnumType.SITE);
-                if (!requestContainer.getPolicy().getAssignedRoles(requestGroup).contains(RoleManager.getRole(MccRequesterRole.class)))
+                if (requestContainer.getPolicy().getAssignedRoles(requestGroup).noneMatch(role -> role.equals(RoleManager.getRole(MccRequesterRole.class))))
                 {
                     MutableSecurityPolicy policy = new MutableSecurityPolicy(requestContainer.getPolicy());
                     policy.addRoleAssignment(requestGroup, RoleManager.getRole(MccRequesterRole.class));
                     SecurityPolicyManager.savePolicy(policy, getUser());
                 }
 
                 Group reviewGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.REQUEST_REVIEW_GROUP_NAME, GroupEnumType.SITE);
-                if (!requestContainer.getPolicy().getAssignedRoles(reviewGroup).contains(RoleManager.getRole(MccRabReviewerRole.class)))
+                if (requestContainer.getPolicy().getAssignedRoles(reviewGroup).noneMatch(role -> role.equals(RoleManager.getRole(MccRabReviewerRole.class))))
                 {
                     MutableSecurityPolicy policy = new MutableSecurityPolicy(requestContainer.getPolicy());
                     policy.addRoleAssignment(reviewGroup, RoleManager.getRole(MccRabReviewerRole.class));
                     SecurityPolicyManager.savePolicy(policy, getUser());
                 }
 
                 Group finalGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.FINAL_REVIEW_GROUP_NAME, GroupEnumType.SITE);
-                if (!requestContainer.getPolicy().getAssignedRoles(finalGroup).contains(RoleManager.getRole(MccFinalReviewerRole.class)))
+                if (requestContainer.getPolicy().getAssignedRoles(finalGroup).noneMatch(role -> role.equals(RoleManager.getRole(MccFinalReviewerRole.class))))
                 {
                     MutableSecurityPolicy policy = new MutableSecurityPolicy(requestContainer.getPolicy());
                     policy.addRoleAssignment(finalGroup, RoleManager.getRole(MccFinalReviewerRole.class));
                     SecurityPolicyManager.savePolicy(policy, getUser());
                 }
 
                 Group adminGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.ADMIN_GROUP_NAME, GroupEnumType.SITE);
-                if (!requestContainer.getPolicy().getAssignedRoles(adminGroup).contains(RoleManager.getRole(MccDataAdminRole.class)))
+                if (requestContainer.getPolicy().getAssignedRoles(adminGroup).noneMatch(role -> role.equals(RoleManager.getRole(MccDataAdminRole.class))))
                 {
                     MutableSecurityPolicy policy = new MutableSecurityPolicy(requestContainer.getPolicy());
                     policy.addRoleAssignment(adminGroup, RoleManager.getRole(MccDataAdminRole.class));
@@ -623,7 +622,7 @@ public boolean handlePost(Object o, BindException errors) throws Exception
             if (dataContainer != null)
             {
                 Group adminGroup = GroupManager.getGroup(ContainerManager.getRoot(), MccManager.ADMIN_GROUP_NAME, GroupEnumType.SITE);
-                if (!dataContainer.getPolicy().getAssignedRoles(adminGroup).contains(RoleManager.getRole(MccDataAdminRole.class)))
+                if (dataContainer.getPolicy().getAssignedRoles(adminGroup).noneMatch(role -> role.equals(RoleManager.getRole(MccDataAdminRole.class))))
                 {
                     MutableSecurityPolicy policy = new MutableSecurityPolicy(dataContainer.getPolicy());
                     policy.addRoleAssignment(adminGroup, RoleManager.getRole(MccDataAdminRole.class));