Processing events on Bitbucket Server's event threads #78

Author: tomasbjerre

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Changelog of Pull Request Notifier for Bitbucket.
 
+## 2.10
+* Processing events on Bitbucket Server's event threads.
+
 ## 2.9
 * Url encoding evaluated values when they are used in URL invocations.
 

src/main/java/se/bjurr/prnfb/listener/PrnfbPullRequestEventListener.java

@@ -18,6 +18,7 @@
 import static se.bjurr.prnfb.settings.SettingsStorage.getPrnfbSettings;
 
 import java.util.Map;
+import java.util.concurrent.ExecutorService;
 import java.util.logging.Logger;
 
 import se.bjurr.prnfb.listener.PrnfbRenderer.PrnfbVariable;
@@ -54,6 +55,7 @@ public class PrnfbPullRequestEventListener {
  private final RepositoryService repositoryService;
  private final ApplicationPropertiesService propertiesService;
  private final PullRequestService pullRequestService;
+ private final ExecutorService executorService;
  private static final Logger logger = getLogger(PrnfbPullRequestEventListener.class.getName());
 
  private static Invoker invoker = urlInvoker -> urlInvoker.invoke();
@@ -64,65 +66,76 @@ public static void setInvoker(Invoker invoker) {
  }
 
  public PrnfbPullRequestEventListener(PluginSettingsFactory pluginSettingsFactory, RepositoryService repositoryService,
-   ApplicationPropertiesService propertiesService, PullRequestService pullRequestService) {
+   ApplicationPropertiesService propertiesService, PullRequestService pullRequestService,
+   ExecutorService executorService) {
   this.pluginSettingsFactory = pluginSettingsFactory;
   this.repositoryService = repositoryService;
   this.propertiesService = propertiesService;
   this.pullRequestService = pullRequestService;
+  this.executorService = executorService;
  }
 
  @EventListener
  public void onEvent(PullRequestApprovedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @EventListener
  public void onEvent(PullRequestCommentAddedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @EventListener
  public void onEvent(PullRequestCommentRepliedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @EventListener
  public void onEvent(PullRequestDeclinedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @EventListener
  public void onEvent(PullRequestMergedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @EventListener
  public void onEvent(PullRequestOpenedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @EventListener
  public void onEvent(PullRequestReopenedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @EventListener
  public void onEvent(final PullRequestRescopedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @EventListener
  public void onEvent(PullRequestUnapprovedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @EventListener
  public void onEvent(PullRequestUpdatedEvent e) {
-  handleEvent(e);
+  handleEventAsync(e);
  }
 
  @VisibleForTesting
- public void handleEvent(final PullRequestEvent pullRequestEvent) {
+ public void handleEventAsync(final PullRequestEvent pullRequestEvent) {
+  executorService.execute(new Runnable() {
+   @Override
+   public void run() {
+    handleEvent(pullRequestEvent);
+   }
+  });
+ }
+
+ private void handleEvent(final PullRequestEvent pullRequestEvent) {
   try {
    if (pullRequestEvent.getPullRequest().isClosed() && pullRequestEvent instanceof PullRequestCommentEvent) {
     return;

src/main/resources/atlassian-plugin.xml

@@ -17,6 +17,7 @@
     <component-import key="pluginSettingsFactory" interface="com.atlassian.sal.api.pluginsettings.PluginSettingsFactory" />
     <component-import key="transactionTemplate" interface="com.atlassian.sal.api.transaction.TransactionTemplate" />
     <component-import key="repositoryService" interface="com.atlassian.bitbucket.repository.RepositoryService" />
+    <component-import key="executorService" interface="java.util.concurrent.ExecutorService"/>
 
     <rest key="rest" path="/prnfb-admin" version="1.0">
         <description>Provides REST resources for the admin UI.</description>

src/test/java/se/bjurr/prnbs/admin/utils/PrnfbTestBuilder.java

@@ -154,7 +154,7 @@ public <T> T execute(TransactionCallback<T> action) {
   configResource = new ConfigResource(userManager, pluginSettingsFactory, transactionTemplate, securityService);
   pullRequestService = mock(PullRequestService.class);
   listener = new PrnfbPullRequestEventListener(pluginSettingsFactory, repositoryService, propertiesService,
-    pullRequestService);
+    pullRequestService, new SyncExecutorService());
   UserService userService = mock(UserService.class);
   withPullRequest(pullRequestEventBuilder().build().getPullRequest());
   manualResouce = new ManualResource(userManager, userService, pluginSettingsFactory, pullRequestService, listener,
@@ -295,7 +295,7 @@ public PrnfbTestBuilder store() throws Exception {
 
  public PrnfbTestBuilder trigger(PullRequestEvent event) {
   setInvoker(urlInvoker -> urlInvokers.add(urlInvoker));
-  listener.handleEvent(event);
+  listener.handleEventAsync(event);
   return this;
  }
 

src/test/java/se/bjurr/prnbs/admin/utils/SyncExecutorService.java

@@ -0,0 +1,78 @@
+package se.bjurr.prnbs.admin.utils;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+public class SyncExecutorService implements ExecutorService {
+ @Override
+ public boolean awaitTermination(final long timeout, final TimeUnit unit) throws InterruptedException {
+  return false;
+ }
+
+ @Override
+ public void execute(final Runnable command) {
+  command.run();
+ }
+
+ @Override
+ public <T> List<Future<T>> invokeAll(final Collection<? extends Callable<T>> tasks) throws InterruptedException {
+  return null;
+ }
+
+ @Override
+ public <T> List<Future<T>> invokeAll(final Collection<? extends Callable<T>> tasks, final long timeout,
+   final TimeUnit unit) throws InterruptedException {
+  return null;
+ }
+
+ @Override
+ public <T> T invokeAny(final Collection<? extends Callable<T>> tasks) throws InterruptedException, ExecutionException {
+  return null;
+ }
+
+ @Override
+ public <T> T invokeAny(final Collection<? extends Callable<T>> tasks, final long timeout, final TimeUnit unit)
+   throws InterruptedException, ExecutionException, TimeoutException {
+  return null;
+ }
+
+ @Override
+ public boolean isShutdown() {
+  return false;
+ }
+
+ @Override
+ public boolean isTerminated() {
+  return false;
+ }
+
+ @Override
+ public void shutdown() {
+ }
+
+ @Override
+ public List<Runnable> shutdownNow() {
+  return null;
+ }
+
+ @Override
+ public <T> Future<T> submit(final Callable<T> task) {
+  return null;
+ }
+
+ @Override
+ public Future<?> submit(final Runnable task) {
+  return null;
+ }
+
+ @Override
+ public <T> Future<T> submit(final Runnable task, final T result) {
+  return null;
+ }
+}