From eea33ed68c09cef5c785c12cb93458d2f4727756 Mon Sep 17 00:00:00 2001
From: Patrick Hiesel <hiesel@google.com>
Date: Wed, 16 Aug 2017 17:05:08 +0200
Subject: [PATCH] Move: Use BooleanCondition for #setVisible

Change-Id: I95e6732d239d836f80ee26d9d036d16bb15676d7
---
 .../com/google/gerrit/server/change/Move.java     | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java
index 5f690ba7d8..10c30b2bc1 100644
--- a/gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java
+++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/Move.java
@@ -14,6 +14,7 @@
 
 package com.google.gerrit.server.change;
 
+import static com.google.gerrit.extensions.conditions.BooleanCondition.and;
 import static com.google.gerrit.server.permissions.ChangePermission.ABANDON;
 import static com.google.gerrit.server.permissions.RefPermission.CREATE_CHANGE;
 import static com.google.gerrit.server.query.change.ChangeData.asChanges;
@@ -215,11 +216,13 @@ public class Move extends RetryingRestModifyView<ChangeResource, MoveInput, Chan
         .setLabel("Move Change")
         .setTitle("Move change to a different branch")
         .setVisible(
-            change.getStatus().isOpen()
-                && permissionBackend
-                    .user(rsrc.getUser())
-                    .ref(change.getDest())
-                    .testOrFalse(CREATE_CHANGE)
-                && rsrc.permissions().database(dbProvider).testOrFalse(ABANDON));
+            and(
+                change.getStatus().isOpen(),
+                and(
+                    permissionBackend
+                        .user(rsrc.getUser())
+                        .ref(change.getDest())
+                        .testCond(CREATE_CHANGE),
+                    rsrc.permissions().database(dbProvider).testCond(ABANDON))));
   }
 }