Add plugin name when adding eventlistener
DynamicSet stores the name of the plugin that binds the item since
812635aae2f5a66aaaa47cc389af82bce28e7e6e
Change-Id: Ib8bdcd063ba253c6916624c6f521aef3b784bd99
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Manager.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Manager.java
index d4f1c59..ae26bc0 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Manager.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/Manager.java
@@ -77,7 +77,7 @@
publisher.start();
String listenAs = properties.getSection(Gerrit.class).listenAs;
if (!listenAs.isEmpty()) {
- userEventWorker.addPublisher(publisher, listenAs);
+ userEventWorker.addPublisher(pluginName, publisher, listenAs);
} else {
defaultEventWorker.addPublisher(publisher);
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/DefaultEventWorker.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/DefaultEventWorker.java
index 36afede..1916be3 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/DefaultEventWorker.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/DefaultEventWorker.java
@@ -36,7 +36,7 @@
}
@Override
- public void addPublisher(Publisher publisher, String userName) {
+ public void addPublisher(String pluginName, Publisher publisher, String userName) {
LOGGER.warn("addPublisher() with username '{}' was called. Hence no operation.", userName);
}
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/EventWorker.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/EventWorker.java
index e25d3c6..97392c9 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/EventWorker.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/EventWorker.java
@@ -5,7 +5,7 @@
public interface EventWorker {
void addPublisher(Publisher publisher);
- void addPublisher(Publisher publisher, String userName);
+ void addPublisher(String pluginName, Publisher publisher, String userName);
void removePublisher(Publisher publisher);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/UserEventWorker.java b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/UserEventWorker.java
index b156727..32c1ec7 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/UserEventWorker.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/rabbitmq/worker/UserEventWorker.java
@@ -78,7 +78,8 @@
}
@Override
- public void addPublisher(final Publisher publisher, final String userName) {
+ public void addPublisher(
+ final String pluginName, final Publisher publisher, final String userName) {
workQueue
.getDefaultQueue()
.submit(
@@ -124,6 +125,7 @@
final IdentifiedUser user = userFactory.create(userAccount.getId());
RegistrationHandle registration =
eventListeners.add(
+ pluginName,
new UserScopedEventListener() {
@Override
public void onEvent(Event event) {
