SecurityPolicy methods now return streams (#595)

Author: labkey-adam

panoramapublic/src/org/labkey/panoramapublic/query/JournalManager.java

@@ -210,7 +210,7 @@ private static void changeJournalPermissions(ExperimentAnnotations exptAnnotatio
     private static void addPermission(Container folder, UserPrincipal journalGroup)
     {
         SecurityPolicy oldPolicy = folder.getPolicy();
-        if (oldPolicy.getOwnPermissions(journalGroup).contains(FolderExportPermission.class))
+        if (oldPolicy.getOwnPermissions(journalGroup).anyMatch(permClass -> permClass == FolderExportPermission.class))
             return;
         MutableSecurityPolicy newPolicy = new MutableSecurityPolicy(folder, oldPolicy);
 
@@ -249,19 +249,16 @@ private static void addPermission(Container folder, UserPrincipal journalGroup)
     private static void removePermission(Container folder, UserPrincipal journalGroup)
     {
         SecurityPolicy oldPolicy = folder.getPolicy();
-        if (!oldPolicy.getOwnPermissions(journalGroup).contains(FolderExportPermission.class))
+        if (oldPolicy.getOwnPermissions(journalGroup).noneMatch(permClass -> permClass == FolderExportPermission.class))
             return;
-        List<Role> roles = oldPolicy.getAssignedRoles(journalGroup);
 
         MutableSecurityPolicy newPolicy = new MutableSecurityPolicy(folder, oldPolicy);
         newPolicy.clearAssignedRoles(journalGroup);
-        for(Role role: roles)
-        {
-            if(!(role instanceof CopyTargetedMSExperimentRole))
-            {
-                newPolicy.addRoleAssignment(journalGroup, role);
-            }
-        }
+
+        oldPolicy.getAssignedRoles(journalGroup)
+            .filter(role -> !(role instanceof CopyTargetedMSExperimentRole))
+            .forEach(role -> newPolicy.addRoleAssignment(journalGroup, role));
+
         SecurityPolicyManager.savePolicy(newPolicy, User.getAdminServiceUser());
     }
 

panoramapublic/src/org/labkey/panoramapublic/query/SubmissionManager.java

@@ -279,7 +279,7 @@ private static void ensureEditorRole(@NotNull ShortURLRecord shortUrl, User user
         //           A folder admin updating the submission request made by another submitter may want to change the shortUrl. They
         //           will need permission to delete the old shortUrl.
         MutableSecurityPolicy policy = new MutableSecurityPolicy(SecurityPolicyManager.getPolicy(shortUrl));
-        boolean isEditor = policy.getAssignedRoles(user).stream().anyMatch(r -> r instanceof EditorRole);
+        boolean isEditor = policy.getAssignedRoles(user).anyMatch(r -> r instanceof EditorRole);
         if (!isEditor)
         {
             policy.addRoleAssignment(user, EditorRole.class);