opendev/gerrit
Code Issues Proposed changes

Use proper ChangeData method for reviewer predicates

Browse Source 
Change-Id: Icd3b5c53a503aea9c1ca2560c2dcd3989e4a6aed
This commit is contained in:
Dave Borowitz
2014-01-21 16:55:24 -08:00
parent b713b6393f
commit 3860ddace9
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gerrit-server/src/main/java/com/google/gerrit/server/query/change/IsReviewedPredicate.java
View File

@@ -34,8 +34,8 @@ class IsReviewedPredicate extends IndexPredicate<ChangeData> {
} }
PatchSet.Id current = c.currentPatchSetId(); PatchSet.Id current = c.currentPatchSetId();
for (PatchSetApproval p : object.approvals().values()) { for (PatchSetApproval p : object.approvals().get(current)) {
if (p.getPatchSetId().equals(current) && p.getValue() != 0) { if (p.getValue() != 0) {
return true; return true;
} }
} }

5
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerPredicate.java
View File

@@ -15,7 +15,6 @@
package com.google.gerrit.server.query.change; package com.google.gerrit.server.query.change;
import com.google.gerrit.reviewdb.client.Account; import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.server.index.ChangeField; import com.google.gerrit.server.index.ChangeField;
import com.google.gerrit.server.index.IndexPredicate; import com.google.gerrit.server.index.IndexPredicate;
import com.google.gwtorm.server.OrmException; import com.google.gwtorm.server.OrmException;
@@ -34,8 +33,8 @@ class ReviewerPredicate extends IndexPredicate<ChangeData> {
@Override @Override
public boolean match(final ChangeData object) throws OrmException { public boolean match(final ChangeData object) throws OrmException {
for (PatchSetApproval p : object.approvals().values()) { for (Account.Id accountId : object.reviewers().values()) {
if (id.equals(p.getAccountId())) { if (id.equals(accountId)) {
return true; return true;
} }
} }

7
gerrit-server/src/main/java/com/google/gerrit/server/query/change/ReviewerinPredicate.java
View File

@@ -14,8 +14,8 @@
package com.google.gerrit.server.query.change; package com.google.gerrit.server.query.change;
import com.google.gerrit.reviewdb.client.Account;
import com.google.gerrit.reviewdb.client.AccountGroup; import com.google.gerrit.reviewdb.client.AccountGroup;
import com.google.gerrit.reviewdb.client.PatchSetApproval;
import com.google.gerrit.reviewdb.server.ReviewDb; import com.google.gerrit.reviewdb.server.ReviewDb;
import com.google.gerrit.server.IdentifiedUser; import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.query.OperatorPredicate; import com.google.gerrit.server.query.OperatorPredicate;
@@ -41,9 +41,8 @@ class ReviewerinPredicate extends OperatorPredicate<ChangeData> {
@Override @Override
public boolean match(final ChangeData object) throws OrmException { public boolean match(final ChangeData object) throws OrmException {
for (PatchSetApproval p : object.approvals().values()) { for (Account.Id accountId : object.reviewers().values()) {
final IdentifiedUser reviewer = userFactory.create(dbProvider, IdentifiedUser reviewer = userFactory.create(dbProvider, accountId);
p.getAccountId());
if (reviewer.getEffectiveGroups().contains(uuid)) { if (reviewer.getEffectiveGroups().contains(uuid)) {
return true; return true;
} }