diff --git a/Documentation/cmd-stream-events.txt b/Documentation/cmd-stream-events.txt index 197cac8416..85fb5e62b0 100644 --- a/Documentation/cmd-stream-events.txt +++ b/Documentation/cmd-stream-events.txt @@ -255,9 +255,9 @@ change:: link:json.html#change[change attribute] patchSet:: link:json.html#patchSet[patchSet attribute] -reviewer:: link:json.html#account[account attribute] +reviewer:: reviewer that was removed as link:json.html#account[account attribute] -author:: link:json.html#account[account attribute] +remover:: user that removed the reviewer as link:json.html#account[account attribute] approvals:: All link:json.html#approval[approval attributes] removed. diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerDeletedEvent.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerDeletedEvent.java index f206cac6a4..02f9d438c2 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerDeletedEvent.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/ReviewerDeletedEvent.java @@ -22,6 +22,7 @@ import com.google.gerrit.server.data.ApprovalAttribute; public class ReviewerDeletedEvent extends PatchSetEvent { public static final String TYPE = "reviewer-deleted"; public Supplier reviewer; + public Supplier remover; public Supplier approvals; public String comment; diff --git a/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java b/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java index 614bb408e7..b76cbefee3 100644 --- a/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java +++ b/gerrit-server/src/main/java/com/google/gerrit/server/events/StreamEventsApiListener.java @@ -309,6 +309,7 @@ public class StreamEventsApiListener event.change = changeAttributeSupplier(change); event.patchSet = patchSetAttributeSupplier(change, psUtil.current(db.get(), notes)); event.reviewer = accountAttributeSupplier(ev.getReviewer()); + event.remover = accountAttributeSupplier(ev.getWho()); event.comment = ev.getComment(); event.approvals = approvalsAttributeSupplier(change, ev.getNewApprovals(), ev.getOldApprovals());