opendev/gerrit
Code Issues Proposed changes

ReviewerResource: Rename getUser to getReviewerUser

Browse Source 
This avoids ambiguity with the user inherited from the ChangeResource.

Change-Id: If8e486fc42dab8d4439bf6465847fd34b99dca13
This commit is contained in:
Dave Borowitz
2015-12-09 10:17:21 -05:00
parent bc8006f7e8
commit 220c45bc17
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -105,7 +105,7 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
} }
ChangeUtil.bumpRowVersionNotLastUpdatedOn(rsrc.getId(), db); ChangeUtil.bumpRowVersionNotLastUpdatedOn(rsrc.getId(), db);
db.patchSetApprovals().delete(del); db.patchSetApprovals().delete(del);
update.removeReviewer(rsrc.getUser().getAccountId()); update.removeReviewer(rsrc.getReviewerUser().getAccountId());
if (msg.length() > 0) { if (msg.length() > 0) {
ChangeMessage changeMessage = ChangeMessage changeMessage =
@@ -136,7 +136,7 @@ public class DeleteReviewer implements RestModifyView<ReviewerResource, Input> {
private Iterable<PatchSetApproval> approvals(ReviewDb db, private Iterable<PatchSetApproval> approvals(ReviewDb db,
ReviewerResource rsrc) throws OrmException { ReviewerResource rsrc) throws OrmException {
final Account.Id user = rsrc.getUser().getAccountId(); final Account.Id user = rsrc.getReviewerUser().getAccountId();
return Iterables.filter( return Iterables.filter(
approvalsUtil.byChange(db, rsrc.getNotes()).values(), approvalsUtil.byChange(db, rsrc.getNotes()).values(),
new Predicate<PatchSetApproval>() { new Predicate<PatchSetApproval>() {

2
gerrit-server/src/main/java/com/google/gerrit/server/change/DeleteVote.java
View File

@@ -76,7 +76,7 @@ public class DeleteVote implements RestModifyView<VoteResource, Input> {
change.getProject(), ctl.getUser().asIdentifiedUser(), change.getProject(), ctl.getUser().asIdentifiedUser(),
TimeUtil.nowTs())) { TimeUtil.nowTs())) {
bu.addOp(change.getId(), bu.addOp(change.getId(),
new Op(r.getUser().getAccountId(), rsrc.getLabel())); new Op(r.getReviewerUser().getAccountId(), rsrc.getLabel()));
bu.execute(); bu.execute();
} }

2
gerrit-server/src/main/java/com/google/gerrit/server/change/PostReviewers.java
View File

@@ -149,7 +149,7 @@ public class PostReviewers implements RestModifyView<ChangeResource, AddReviewer
private PostResult putAccount(ReviewerResource rsrc) throws OrmException, private PostResult putAccount(ReviewerResource rsrc) throws OrmException,
IOException { IOException {
Account member = rsrc.getUser().getAccount(); Account member = rsrc.getReviewerUser().getAccount();
ChangeControl control = rsrc.getControl(); ChangeControl control = rsrc.getControl();
PostResult result = new PostResult(); PostResult result = new PostResult();
if (isValidReviewer(member, control)) { if (isValidReviewer(member, control)) {

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerJson.java
View File

@@ -67,7 +67,7 @@ public class ReviewerJson {
AccountLoader loader = accountLoaderFactory.create(true); AccountLoader loader = accountLoaderFactory.create(true);
for (ReviewerResource rsrc : rsrcs) { for (ReviewerResource rsrc : rsrcs) {
ReviewerInfo info = format(new ReviewerInfo( ReviewerInfo info = format(new ReviewerInfo(
rsrc.getUser().getAccountId()), rsrc.getReviewerUser().getAccountId()),
rsrc.getUserControl()); rsrc.getUserControl());
loader.put(info); loader.put(info);
infos.add(info); infos.add(info);

2
gerrit-server/src/main/java/com/google/gerrit/server/change/ReviewerResource.java
View File

@@ -47,7 +47,7 @@ public class ReviewerResource extends ChangeResource {
this(rsrc, userFactory.create(id)); this(rsrc, userFactory.create(id));
} }
public IdentifiedUser getUser() { public IdentifiedUser getReviewerUser() {
return user; return user;
} }

2
gerrit-server/src/main/java/com/google/gerrit/server/change/Votes.java
View File

@@ -79,7 +79,7 @@ public class Votes implements ChildCollection<ReviewerResource, VoteResource> {
db.get(), db.get(),
rsrc.getControl(), rsrc.getControl(),
rsrc.getChange().currentPatchSetId(), rsrc.getChange().currentPatchSetId(),
rsrc.getUser().getAccountId()); rsrc.getReviewerUser().getAccountId());
for (PatchSetApproval psa : byPatchSetUser) { for (PatchSetApproval psa : byPatchSetUser) {
votes.put(psa.getLabel(), psa.getValue()); votes.put(psa.getLabel(), psa.getValue());
} }