opendev/gerrit
Code Issues Proposed changes

Support notify option for delete vote REST endpoint

Browse Source 
Some automated tools may want to suppress email notifications when
removing votes.

Change-Id: I390fa30486574306642f6eb9248ebaab714d2a5a
Signed-off-by: Edwin Kempin <ekempin@google.com>
This commit is contained in:
Edwin Kempin
2016-06-16 10:45:00 +02:00
parent 4d7df73fa9
commit 1dfecb6657
7 changed files with 149 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gerrit-server/src/main/java/com/google/gerrit/server/api/changes/ReviewerApiImpl.java
View File

@@ -14,6 +14,7 @@
package com.google.gerrit.server.api.changes;
import com.google.gerrit.extensions.api.changes.DeleteVoteInput;
import com.google.gerrit.extensions.api.changes.ReviewerApi;
import com.google.gerrit.extensions.restapi.RestApiException;
import com.google.gerrit.server.change.DeleteReviewer;
@@ -67,6 +68,15 @@ public class ReviewerApiImpl implements ReviewerApi {
}
}
@Override
public void deleteVote(DeleteVoteInput input) throws RestApiException {
try {
deleteVote.apply(new VoteResource(reviewer, input.label), input);
} catch (UpdateException e) {
throw new RestApiException("Cannot delete vote", e);
}
}
@Override
public void remove() throws RestApiException {
try {

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

@@ -18,7 +18,10 @@ import com.google.gerrit.common.ChangeHooks;
import com.google.gerrit.common.TimeUtil;
import com.google.gerrit.common.data.LabelType;
import com.google.gerrit.common.data.LabelTypes;
import com.google.gerrit.extensions.api.changes.DeleteVoteInput;
import com.google.gerrit.extensions.api.changes.ReviewInput.NotifyHandling;
import com.google.gerrit.extensions.restapi.AuthException;
import com.google.gerrit.extensions.restapi.BadRequestException;
import com.google.gerrit.extensions.restapi.ResourceNotFoundException;
import com.google.gerrit.extensions.restapi.Response;
import com.google.gerrit.extensions.restapi.RestApiException;
@@ -34,7 +37,6 @@ import com.google.gerrit.server.ChangeMessagesUtil;
import com.google.gerrit.server.ChangeUtil;
import com.google.gerrit.server.IdentifiedUser;
import com.google.gerrit.server.PatchSetUtil;
import com.google.gerrit.server.change.DeleteVote.Input;
import com.google.gerrit.server.git.BatchUpdate;
import com.google.gerrit.server.git.BatchUpdate.ChangeContext;
import com.google.gerrit.server.git.BatchUpdate.Context;
@@ -55,12 +57,10 @@ import java.util.HashMap;
import java.util.Map;
@Singleton
public class DeleteVote implements RestModifyView<VoteResource, Input> {
public class DeleteVote
implements RestModifyView<VoteResource, DeleteVoteInput> {
private static final Logger log = LoggerFactory.getLogger(DeleteVote.class);
public static class Input {
}
private final Provider<ReviewDb> db;
private final BatchUpdate.Factory batchUpdateFactory;
private final ApprovalsUtil approvalsUtil;
@@ -90,14 +90,23 @@ public class DeleteVote implements RestModifyView<VoteResource, Input> {
}
@Override
public Response<?> apply(VoteResource rsrc, Input input)
public Response<?> apply(VoteResource rsrc, DeleteVoteInput input)
throws RestApiException, UpdateException {
if (input == null) {
input = new DeleteVoteInput();
}
if (input.label != null && !rsrc.getLabel().equals(input.label)) {
throw new BadRequestException("label must match URL");
}
if (input.notify == null) {
input.notify = NotifyHandling.ALL;
}
ReviewerResource r = rsrc.getReviewer();
Change change = r.getChange();
try (BatchUpdate bu = batchUpdateFactory.create(db.get(),
change.getProject(), r.getControl().getUser(), TimeUtil.nowTs())) {
bu.addOp(change.getId(),
new Op(r.getReviewerUser().getAccountId(), rsrc.getLabel()));
new Op(r.getReviewerUser().getAccountId(), rsrc.getLabel(), input));
bu.execute();
}
@@ -107,15 +116,17 @@ public class DeleteVote implements RestModifyView<VoteResource, Input> {
private class Op extends BatchUpdate.Op {
private final Account.Id accountId;
private final String label;
private final DeleteVoteInput input;
private ChangeMessage changeMessage;
private Change change;
private PatchSet ps;
private Map<String, Short> newApprovals = new HashMap<>();
private Map<String, Short> oldApprovals = new HashMap<>();
private Op(Account.Id accountId, String label) {
private Op(Account.Id accountId, String label, DeleteVoteInput input) {
this.accountId = accountId;
this.label = label;
this.input = input;
}
@Override
@@ -191,14 +202,17 @@ public class DeleteVote implements RestModifyView<VoteResource, Input> {
}
IdentifiedUser user = ctx.getUser().asIdentifiedUser();
try {
ReplyToChangeSender cm = deleteVoteSenderFactory.create(
ctx.getProject(), change.getId());
cm.setFrom(user.getAccountId());
cm.setChangeMessage(changeMessage);
cm.send();
} catch (Exception e) {
log.error("Cannot email update for change " + change.getId(), e);
if (input.notify.compareTo(NotifyHandling.NONE) > 0) {
try {
ReplyToChangeSender cm = deleteVoteSenderFactory.create(
ctx.getProject(), change.getId());
cm.setFrom(user.getAccountId());
cm.setChangeMessage(changeMessage);
cm.setNotify(input.notify);
cm.send();
} catch (Exception e) {
log.error("Cannot email update for change " + change.getId(), e);
}
}
try {

1
gerrit-server/src/main/java/com/google/gerrit/server/change/Module.java
View File

@@ -80,6 +80,7 @@ public class Module extends RestApiModule {
delete(REVIEWER_KIND).to(DeleteReviewer.class);
child(REVIEWER_KIND, "votes").to(Votes.class);
delete(VOTE_KIND).to(DeleteVote.class);
post(VOTE_KIND, "delete").to(DeleteVote.class);
child(CHANGE_KIND, "revisions").to(Revisions.class);
get(REVISION_KIND, "actions").to(GetRevisionActions.class);