opendev/gerrit
Code Issues Proposed changes

Merge branch 'stable-2.15' into stable-2.16

Browse Source 
* stable-2.15:
  Upgrade google-java-format to 1.7

Change-Id: Ia7383822ef59fb60bb5559956a065ae46b2e4f4a
This commit is contained in:
David Pursehouse
2019-03-14 09:01:59 +09:00
parent fed5a852ff 70c569da87
commit 7a519876e5
149 changed files with 225 additions and 604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -252,8 +252,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()));
@@ -261,8 +260,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());