opendev/gerrit
Code Issues Proposed changes

Merge "Cache Account.Id during filter inside of DeleteReviewer"

Browse Source
This commit is contained in:
Shawn Pearce
2013-03-09 00:42:42 +00:00
committed by Gerrit Code Review
parent 11c5a835e6 639a93766d
commit ec013e80c6
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteReviewer.java
View File

@@ -18,9 +18,10 @@ import com.google.common.base.Predicate;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.gerrit.extensions.restapi.AuthException; 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.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestModifyView; 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.Change;
import com.google.gerrit.reviewdb.client.PatchSetApproval; import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
@@ -71,13 +72,14 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
} }
private Iterable<PatchSetApproval> approvals(ReviewDb db, private Iterable<PatchSetApproval> approvals(ReviewDb db,
final ReviewerResource rsrc) throws OrmException { ReviewerResource rsrc) throws OrmException {
final Account.Id user = rsrc.getUser().getAccountId();
return Iterables.filter( return Iterables.filter(
db.patchSetApprovals().byChange(rsrc.getChange().getId()), db.patchSetApprovals().byChange(rsrc.getChange().getId()),
new Predicate<PatchSetApproval>() { new Predicate<PatchSetApproval>() {
@Override @Override
public boolean apply(PatchSetApproval input) { public boolean apply(PatchSetApproval input) {
return input.getAccountId().equals(rsrc.getUser().getAccountId()); return user.equals(input.getAccountId());
} }
}); });
} }