commit e611a95b9a8acf5f6bd1d9b2c5b397fd5db2876c
author Shawn Pearce <sop@google.com> Wed Aug 16 17:59:16 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 16 17:59:16 2017 +0000
tree 124421e436ca283f09bf316aa154e57b9105a443
parent f94d097ac1bd06062e4d5c8bb683b5e095c0084f
parent 5726c97909c417032f12620ab17aac11cc55db3f

Merge "PostPrivate: Use BooleanCondition for #setVisible"

gerrit-server/src/main/java/com/google/gerrit/server/change/PostPrivate.java

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostPrivate.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostPrivate.java
index 771e669..ad8e72c 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/PostPrivate.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/PostPrivate.java
@@ -14,7 +14,11 @@
 
 package com.google.gerrit.server.change;
 
+import static com.google.gerrit.extensions.conditions.BooleanCondition.and;
+import static com.google.gerrit.extensions.conditions.BooleanCondition.or;
+
 import com.google.gerrit.common.TimeUtil;
+import com.google.gerrit.extensions.conditions.BooleanCondition;
 import com.google.gerrit.extensions.restapi.AuthException;
 import com.google.gerrit.extensions.restapi.Response;
 import com.google.gerrit.extensions.restapi.RestApiException;
@@ -57,7 +61,7 @@
   public Response<String> applyImpl(
       BatchUpdate.Factory updateFactory, ChangeResource rsrc, SetPrivateOp.Input input)
       throws RestApiException, UpdateException {
-    if (!canSetPrivate(rsrc)) {
+    if (!canSetPrivate(rsrc).value()) {
       throw new AuthException("not allowed to mark private");
     }
 
@@ -85,12 +89,13 @@
     return new UiAction.Description()
         .setLabel("Mark private")
         .setTitle("Mark change as private")
-        .setVisible(!change.isPrivate() && canSetPrivate(rsrc));
+        .setVisible(and(!change.isPrivate(), canSetPrivate(rsrc)));
   }
 
-  private boolean canSetPrivate(ChangeResource rsrc) {
+  private BooleanCondition canSetPrivate(ChangeResource rsrc) {
     PermissionBackend.WithUser user = permissionBackend.user(rsrc.getUser());
-    return user.testOrFalse(GlobalPermission.ADMINISTRATE_SERVER)
-        || (rsrc.isUserOwner() && rsrc.getChange().getStatus() != Change.Status.MERGED);
+    return or(
+        rsrc.isUserOwner() && rsrc.getChange().getStatus() != Change.Status.MERGED,
+        user.testCond(GlobalPermission.ADMINISTRATE_SERVER));
   }
 }