Automerger Plugin: remove dependence for drafts
Change-Id: I671cd200aefcbb77b8370866d3ba3b11357e9c7a
diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergerModule.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergerModule.java
index 456b8e2..b588a2f 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergerModule.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/AutomergerModule.java
@@ -20,7 +20,6 @@
import com.google.gerrit.extensions.events.ChangeAbandonedListener;
import com.google.gerrit.extensions.events.ChangeRestoredListener;
import com.google.gerrit.extensions.events.CommentAddedListener;
-import com.google.gerrit.extensions.events.DraftPublishedListener;
import com.google.gerrit.extensions.events.RevisionCreatedListener;
import com.google.gerrit.extensions.events.TopicEditedListener;
import com.google.gerrit.extensions.registration.DynamicSet;
@@ -38,7 +37,6 @@
DynamicSet.bind(binder(), CommentAddedListener.class).to(DownstreamCreator.class);
DynamicSet.bind(binder(), ChangeAbandonedListener.class).to(DownstreamCreator.class);
DynamicSet.bind(binder(), ChangeRestoredListener.class).to(DownstreamCreator.class);
- DynamicSet.bind(binder(), DraftPublishedListener.class).to(DownstreamCreator.class);
DynamicSet.bind(binder(), RevisionCreatedListener.class).to(DownstreamCreator.class);
DynamicSet.bind(binder(), TopicEditedListener.class).to(DownstreamCreator.class);
DynamicSet.bind(binder(), MergeValidationListener.class).to(MergeValidator.class);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
index 34b08eb..65b65c8 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/automerger/DownstreamCreator.java
@@ -34,7 +34,6 @@
import com.google.gerrit.extensions.events.ChangeAbandonedListener;
import com.google.gerrit.extensions.events.ChangeRestoredListener;
import com.google.gerrit.extensions.events.CommentAddedListener;
-import com.google.gerrit.extensions.events.DraftPublishedListener;
import com.google.gerrit.extensions.events.RevisionCreatedListener;
import com.google.gerrit.extensions.events.TopicEditedListener;
import com.google.gerrit.extensions.restapi.AuthException;
@@ -69,7 +68,6 @@
implements ChangeAbandonedListener,
ChangeRestoredListener,
CommentAddedListener,
- DraftPublishedListener,
RevisionCreatedListener,
TopicEditedListener {
private static final Logger log = LoggerFactory.getLogger(DownstreamCreator.class);
@@ -261,25 +259,6 @@
}
/**
- * Automerges changes downstream if a draft is published.
- *
- * @param event Event we are listening to.
- */
- @Override
- public void onDraftPublished(DraftPublishedListener.Event event) {
- try (ManualRequestContext ctx = oneOffRequestContext.openAs(config.getContextUserId())) {
- ChangeInfo change = event.getChange();
- automergeChanges(change, event.getRevision());
- } catch (RestApiException
- | IOException
- | ConfigInvalidException
- | InvalidQueryParameterException
- | OrmException e) {
- log.error("Automerger plugin failed onDraftPublished for {}", event.getChange().id, e);
- }
- }
-
- /**
* Automerges changes downstream if a revision is created.
*
* @param event Event we are listening to.
