commit 6349aac5ea26c5020ae3439a9338e3a1ce20d26f
author Hongkai Liu <hongkai.liu@ericsson.com> Tue May 16 09:06:50 2017 -0400
committer Hongkai Liu <hongkai.liu@ericsson.com> Tue May 16 09:11:17 2017 -0400
tree 8b6e093f5bb4e0e7d061b75a4b1574e81949b72e
parent 2e3d57ce4f007e4c038c35983162a92bd77db577
parent 90036bddc0a5b683565a5ad97501b0c99474cdd8

Merge branch 'stable-2.12' into stable-2.13

* stable-2.12:
  Update reviewers on DraftPublishedEvent

Change-Id: Ic25c5e69c4d019554284c562bdda90833a366091

src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java
index e4c5771..3811d01 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/reviewers/ChangeEventListener.java
@@ -33,6 +33,7 @@
 import com.google.gerrit.server.account.AccountResolver;
 import com.google.gerrit.server.account.GroupMembers;
 import com.google.gerrit.server.data.ChangeAttribute;
+import com.google.gerrit.server.events.DraftPublishedEvent;
 import com.google.gerrit.server.events.Event;
 import com.google.gerrit.server.events.PatchSetCreatedEvent;
 import com.google.gerrit.server.git.GitRepositoryManager;
@@ -115,12 +116,22 @@
 
   @Override
   public void onEvent(Event event) {
-    if (!(event instanceof PatchSetCreatedEvent)) {
-      return;
+    if (event instanceof PatchSetCreatedEvent) {
+      PatchSetCreatedEvent e = (PatchSetCreatedEvent) event;
+      ChangeAttribute c = e.change.get();
+      onEvent(new Project.NameKey(c.project),
+          Integer.parseInt(e.change.get().number), e.uploader.get().email);
+    } else if (event instanceof DraftPublishedEvent) {
+      DraftPublishedEvent e = (DraftPublishedEvent) event;
+      ChangeAttribute c = e.change.get();
+      onEvent(new Project.NameKey(c.project),
+          Integer.parseInt(e.change.get().number), e.uploader.get().email);
     }
-    PatchSetCreatedEvent e = (PatchSetCreatedEvent) event;
-    ChangeAttribute c = e.change.get();
-    Project.NameKey projectName = new Project.NameKey(c.project);
+  }
+
+  private void onEvent(Project.NameKey projectName, int changeNumber,
+      String email) {
+
     // TODO(davido): we have to cache per project configuration
     ReviewersConfig config = configFactory.create(projectName);
     List<ReviewerFilterSection> sections = config.getReviewerFilterSections();
@@ -133,7 +144,7 @@
         RevWalk rw = new RevWalk(git);
         ReviewDb reviewDb = schemaFactory.open()) {
       ChangeData changeData = changeDataFactory.create(
-          reviewDb, projectName, new Change.Id(Integer.parseInt(c.number)));
+          reviewDb, projectName, new Change.Id(changeNumber));
       Set<String> reviewers = findReviewers(sections, changeData);
       if (reviewers.isEmpty()) {
         return;
@@ -141,8 +152,7 @@
 
       final Change change = changeData.change();
       final Runnable task = reviewersFactory.create(change,
-          toAccounts(reviewDb, reviewers, projectName,
-              e.uploader.get().email));
+          toAccounts(reviewDb, reviewers, projectName, email));
 
       workQueue.getDefaultQueue().submit(new Runnable() {
         ReviewDb db = null;