opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.16'

Browse Source 
* stable-2.16:
  Update download-commands plugin revision
  Upgrade google-java-format to 1.7

Change-Id: I6e959cde5b4790b469902245c3a2278883c65cad
This commit is contained in:
David Pursehouse
2019-03-14 09:46:27 +09:00
parent 398a995ead 7580211362
commit 92175349d7
147 changed files with 221 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/com/google/gerrit/server/permissions/DefaultPermissionBackend.java
View File

@@ -251,8 +251,7 @@ public class DefaultPermissionBackend extends PermissionBackend {
private boolean allow(Collection<PermissionRule> rules) {
return user.getEffectiveGroups()
.containsAnyOf(
rules
.stream()
rules.stream()
.filter(r -> r.getAction() == Action.ALLOW)
.map(r -> r.getGroup().getUUID())
.collect(toSet()));
@@ -260,8 +259,7 @@ public class DefaultPermissionBackend extends PermissionBackend {
private boolean notDenied(Collection<PermissionRule> rules) {
Set<AccountGroup.UUID> denied =
rules
.stream()
rules.stream()
.filter(r -> r.getAction() != Action.ALLOW)
.map(r -> r.getGroup().getUUID())
.collect(toSet());