remove old hook system in favor of event bus

scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java

@@ -39,7 +39,6 @@ import com.google.common.base.Strings;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import com.google.inject.Inject;
-import com.google.inject.Provider;
 import com.google.inject.Singleton;
 
 import org.apache.shiro.SecurityUtils;
@@ -106,22 +105,16 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
    * @param keyGenerator
    * @param repositoryDAO
    * @param handlerSet
-   * @param repositoryListenersProvider
-   * @param repositoryHooksProvider
    * @param preProcessorUtil
    */
   @Inject
   public DefaultRepositoryManager(ScmConfiguration configuration,
     SCMContextProvider contextProvider, KeyGenerator keyGenerator,
-    RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet,
-    Provider<Set<RepositoryHook>> repositoryHooksProvider,
-    PreProcessorUtil preProcessorUtil)
+    RepositoryDAO repositoryDAO, Set<RepositoryHandler> handlerSet)
   {
     this.configuration = configuration;
     this.keyGenerator = keyGenerator;
     this.repositoryDAO = repositoryDAO;
-    this.repositoryHooksProvider = repositoryHooksProvider;
-    this.preProcessorUtil = preProcessorUtil;
 
     //J-
     ThreadFactory factory = new ThreadFactoryBuilder()
@@ -256,54 +249,7 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
 
     fireEvent(repository, HandlerEvent.DELETE);
   }
-
-  /**
-   * Method description
-   *
-   *
-   * @param type
-   * @param name
-   * @param event
-   *
-   * @throws RepositoryNotFoundException
-   */
-  @Override
-  public void fireHookEvent(String type, String name, RepositoryHookEvent event)
-    throws RepositoryNotFoundException
-  {
-    Repository repository = repositoryDAO.get(type, name);
-
-    if (repository == null)
-    {
-      throw new RepositoryNotFoundException();
-    }
-
-    fireHookEvent(repository, event);
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param id
-   * @param event
-   *
-   * @throws RepositoryNotFoundException
-   */
-  @Override
-  public void fireHookEvent(String id, RepositoryHookEvent event)
-    throws RepositoryNotFoundException
-  {
-    Repository repository = repositoryDAO.get(id);
-
-    if (repository == null)
-    {
-      throw new RepositoryNotFoundException();
-    }
-
-    fireHookEvent(repository, event);
-  }
-
+  
   /**
    * Method description
    *
@@ -329,12 +275,6 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
   @Override
   public void init(SCMContextProvider context)
   {
-    Set<RepositoryHook> hooks = repositoryHooksProvider.get();
-
-    if (Util.isNotEmpty(hooks))
-    {
-      addHooks(hooks);
-    }
   }
 
   /**
@@ -712,53 +652,6 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
 
   //~--- methods --------------------------------------------------------------
 
-  /**
-   * Method description
-   *
-   *
-   * @param hook
-   * @param event
-   */
-  @Override
-  protected void fireHookEvent(RepositoryHook hook, RepositoryHookEvent event)
-  {
-    if (hook.isAsync())
-    {
-      executorService.execute(new RepositoryHookTask(hook, event));
-    }
-    else
-    {
-      if (logger.isDebugEnabled())
-      {
-        Object[] args = new Object[] { event.getType(),
-          hook.getClass().getName(), event.getRepository().getName() };
-
-        logger.debug("execute {} hook {} for repository {}", args);
-      }
-
-      hook.onEvent(event);
-    }
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @param event
-   *
-   * @return
-   */
-  @Override
-  protected RepositoryHookEvent prepareHookEvent(RepositoryHookEvent event)
-  {
-    if (!(event instanceof ExtendedRepositoryHookEvent))
-    {
-      event = SynchronizedRepositoryHookEvent.wrap(event, preProcessorUtil);
-    }
-
-    return event;
-  }
-
   /**
    * Method description
    *
@@ -922,26 +815,20 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
   //~--- fields ---------------------------------------------------------------
 
   /** Field description */
-  private ScmConfiguration configuration;
+  private final ScmConfiguration configuration;
 
   /** Field description */
-  private ExecutorService executorService;
+  private final ExecutorService executorService;
 
   /** Field description */
-  private Map<String, RepositoryHandler> handlerMap;
+  private final Map<String, RepositoryHandler> handlerMap;
 
   /** Field description */
-  private KeyGenerator keyGenerator;
+  private final KeyGenerator keyGenerator;
 
   /** Field description */
-  private PreProcessorUtil preProcessorUtil;
+  private final RepositoryDAO repositoryDAO;
 
   /** Field description */
-  private RepositoryDAO repositoryDAO;
-
-  /** Field description */
-  private Provider<Set<RepositoryHook>> repositoryHooksProvider;
-
-  /** Field description */
-  private Set<Type> types;
+  private final Set<Type> types;
 }

scm-webapp/src/main/java/sonia/scm/repository/SynchronizedRepositoryHookEvent.java

@@ -1,224 +0,0 @@
-/**
- * Copyright (c) 2010, Sebastian Sdorra
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice,
- *    this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- *    this list of conditions and the following disclaimer in the documentation
- *    and/or other materials provided with the distribution.
- * 3. Neither the name of SCM-Manager; nor the names of its
- *    contributors may be used to endorse or promote products derived from this
- *    software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
- * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * http://bitbucket.org/sdorra/scm-manager
- *
- */
-
-
-package sonia.scm.repository;
-
-//~--- non-JDK imports --------------------------------------------------------
-
-import com.google.common.base.Stopwatch;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-//~--- JDK imports ------------------------------------------------------------
-
-import java.util.Collection;
-
-/**
- *
- * @author Sebastian Sdorra
- */
-public class SynchronizedRepositoryHookEvent implements RepositoryHookEvent
-{
-
-  /** Field description */
-  private static final Object LOCK = new Object();
-
-  /**
-   * the logger for SynchronizedRepositoryHookEvent
-   */
-  private static final Logger logger =
-    LoggerFactory.getLogger(SynchronizedRepositoryHookEvent.class);
-
-  //~--- constructors ---------------------------------------------------------
-
-  /**
-   * Constructs ...
-   *
-   *
-   * @param wrappedEvent
-   * @param preProcessorUtil
-   */
-  private SynchronizedRepositoryHookEvent(RepositoryHookEvent wrappedEvent,
-    PreProcessorUtil preProcessorUtil)
-  {
-    this.wrappedEvent = wrappedEvent;
-    this.preProcessorUtil = preProcessorUtil;
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param event
-   * @param preProcessorUtil
-   *
-   * @return
-   */
-  public static SynchronizedRepositoryHookEvent wrap(RepositoryHookEvent event,
-    PreProcessorUtil preProcessorUtil)
-  {
-    SynchronizedRepositoryHookEvent syncedEvent;
-
-    if (event instanceof SynchronizedRepositoryHookEvent)
-    {
-      syncedEvent = (SynchronizedRepositoryHookEvent) event;
-    }
-    else
-    {
-      syncedEvent = new SynchronizedRepositoryHookEvent(event,
-        preProcessorUtil);
-    }
-
-    return syncedEvent;
-  }
-
-  //~--- get methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  public Collection<Changeset> getChangesets()
-  {
-    if (changesets == null)
-    {
-      synchronized (LOCK)
-      {
-        if (changesets == null)
-        {
-          fetchChangesets();
-
-          if (changesets != null)
-          {
-            prepareChangesetsForReturn();
-          }
-        }
-      }
-    }
-
-    return changesets;
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  public Repository getRepository()
-  {
-    return wrappedEvent.getRepository();
-  }
-
-  /**
-   * Method description
-   *
-   *
-   * @return
-   */
-  @Override
-  public RepositoryHookType getType()
-  {
-    return wrappedEvent.getType();
-  }
-
-  //~--- set methods ----------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   *
-   * @param repository
-   */
-  @Override
-  public void setRepository(Repository repository)
-  {
-    wrappedEvent.setRepository(repository);
-  }
-
-  //~--- methods --------------------------------------------------------------
-
-  /**
-   * Method description
-   *
-   */
-  private void fetchChangesets()
-  {
-    if (logger.isDebugEnabled())
-    {
-      Stopwatch sw = new Stopwatch().start();
-
-      changesets = wrappedEvent.getChangesets();
-      sw.stop();
-      logger.debug("getChangesets() took {}", sw);
-    }
-    else
-    {
-      changesets = wrappedEvent.getChangesets();
-    }
-  }
-
-  /**
-   * Method description
-   *
-   */
-  private void prepareChangesetsForReturn()
-  {
-    Repository repository = getRepository();
-
-    logger.debug("prepare changesets of repository {} for return to hook",
-      repository.getName());
-
-    for (Changeset c : changesets)
-    {
-      preProcessorUtil.prepareForReturn(repository, c);
-    }
-  }
-
-  //~--- fields ---------------------------------------------------------------
-
-  /** Field description */
-  private volatile Collection<Changeset> changesets;
-
-  /** Field description */
-  private PreProcessorUtil preProcessorUtil;
-
-  /** Field description */
-  private RepositoryHookEvent wrappedEvent;
-}