Renaming getDeny() to isDeny() in the PermissionRule class. Since getDeny returns boolean value it is more readable when named isDeny. In a follow up change a new method "isBlock" will be introduced and this change is just preparing this class for this new method. Unfortunately, renaming the getForce, another boolean method, to hasForce, breaks the build of the gerrit-gwtui component. The reason must be that the property 'force' from the PermissionRuleEditor.ui.xml gets resolved by using the "getForce" method. Leaving this method name unchanged. Change-Id: I1f7d99ed8148dc336e3e35369f04169c905bc0ba
diff --git a/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java b/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java index 8268be8..6deb14f 100644 --- a/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java +++ b/gerrit-common/src/main/java/com/google/gerrit/common/data/PermissionRule.java
@@ -45,7 +45,7 @@ this.action = action; } - public boolean getDeny() { + public boolean isDeny() { return action == Action.DENY; }
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java index 932160a..1196b02 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/PermissionCollection.java
@@ -111,7 +111,7 @@ for (PermissionRule rule : permission.getRules()) { SeenRule s = new SeenRule(section, permission, rule); - if (seen.add(s) && !rule.getDeny()) { + if (seen.add(s) && !rule.isDeny()) { List<PermissionRule> r = permissions.get(permission.getName()); if (r == null) { r = new ArrayList<PermissionRule>(2);
diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java index 8a2966a..1024f9a 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/project/ProjectControl.java
@@ -393,7 +393,7 @@ } for (PermissionRule rule : permission.getRules()) { - if (rule.getDeny() || !match(rule)) { + if (rule.isDeny() || !match(rule)) { continue; }