From 639a93766d539a46e41ea11738a7fb18fcf3b565 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Fri, 8 Mar 2013 16:04:59 -0800 Subject: [PATCH] Cache Account.Id during filter inside of DeleteReviewer When filtering through all approval records, cache the Account.Id. This avoids a few method calls and makes the code within the tiny Predicate function even smaller, slightly improving readability to this developer's eyes. Change-Id: I620dd0860b06bb1d4faa730ef831f1c071a97262 --- .../com/google/gerrit/server/change/DeleteReviewer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java index 0311089f79..5bfffac598 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java @@ -18,9 +18,10 @@ import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Lists; import com.google.gerrit.extensions.restapi.AuthException; -import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.ResourceNotFoundException; +import com.google.gerrit.extensions.restapi.Response; import com.google.gerrit.extensions.restapi.RestModifyView; +import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Change; import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.reviewdb.server.ReviewDb; @@ -71,13 +72,14 @@ public class DeleteReviewer implements RestModifyView { } private Iterable approvals(ReviewDb db, - final ReviewerResource rsrc) throws OrmException { + ReviewerResource rsrc) throws OrmException { + final Account.Id user = rsrc.getUser().getAccountId(); return Iterables.filter( db.patchSetApprovals().byChange(rsrc.getChange().getId()), new Predicate() { @Override public boolean apply(PatchSetApproval input) { - return input.getAccountId().equals(rsrc.getUser().getAccountId()); + return user.equals(input.getAccountId()); } }); }