Fix repository deletion bug where the Lucene ticket index was not purged

James Moger

2014-09-08 c599bd17342d7019c68cd6dbea48c0b27efebd38

 src/main/java/com/gitblit/DaggerModule.java

@@ -23,15 +23,24 @@
import com.gitblit.manager.IFederationManager;
import com.gitblit.manager.IGitblit;
import com.gitblit.manager.INotificationManager;
import com.gitblit.manager.IPluginManager;
import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.IUserManager;
import com.gitblit.manager.NotificationManager;
import com.gitblit.manager.PluginManager;
import com.gitblit.manager.ProjectManager;
import com.gitblit.manager.RepositoryManager;
import com.gitblit.manager.RuntimeManager;
import com.gitblit.manager.UserManager;
import com.gitblit.transport.ssh.FileKeyManager;
import com.gitblit.transport.ssh.IPublicKeyManager;
import com.gitblit.transport.ssh.MemoryKeyManager;
import com.gitblit.transport.ssh.NullKeyManager;
import com.gitblit.utils.JSoupXssFilter;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.XssFilter;
import com.gitblit.wicket.GitBlitWebApp;

import dagger.Module;
@@ -47,12 +56,15 @@
   library = true,
   injects = {
         IStoredSettings.class,
         XssFilter.class,

         // core managers
         IRuntimeManager.class,
         IPluginManager.class,
         INotificationManager.class,
         IUserManager.class,
         IAuthenticationManager.class,
         IPublicKeyManager.class,
         IRepositoryManager.class,
         IProjectManager.class,
         IFederationManager.class,
@@ -62,7 +74,7 @@

         // the Gitblit Wicket app
         GitBlitWebApp.class
   }
      }
)
public class DaggerModule {

@@ -70,16 +82,27 @@
      return new FileSettings();
   }

   @Provides @Singleton IRuntimeManager provideRuntimeManager(IStoredSettings settings) {
      return new RuntimeManager(settings);
   @Provides @Singleton XssFilter provideXssFilter() {
      return new JSoupXssFilter();
   }

   @Provides @Singleton IRuntimeManager provideRuntimeManager(IStoredSettings settings, XssFilter xssFilter) {
      return new RuntimeManager(settings, xssFilter);
   }

   @Provides @Singleton IPluginManager providePluginManager(IRuntimeManager runtimeManager) {
      return new PluginManager(runtimeManager);
   }

   @Provides @Singleton INotificationManager provideNotificationManager(IStoredSettings settings) {
      return new NotificationManager(settings);
   }

   @Provides @Singleton IUserManager provideUserManager(IRuntimeManager runtimeManager) {
      return new UserManager(runtimeManager);
   @Provides @Singleton IUserManager provideUserManager(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager) {

      return new UserManager(runtimeManager, pluginManager);
   }

   @Provides @Singleton IAuthenticationManager provideAuthenticationManager(
@@ -91,12 +114,39 @@
            userManager);
   }

   @Provides @Singleton IPublicKeyManager providePublicKeyManager(
         IStoredSettings settings,
         IRuntimeManager runtimeManager) {

      String clazz = settings.getString(Keys.git.sshKeysManager, FileKeyManager.class.getName());
      if (StringUtils.isEmpty(clazz)) {
         clazz = FileKeyManager.class.getName();
      }
      if (FileKeyManager.class.getName().equals(clazz)) {
         return new FileKeyManager(runtimeManager);
      } else if (NullKeyManager.class.getName().equals(clazz)) {
         return new NullKeyManager();
      } else if (MemoryKeyManager.class.getName().equals(clazz)) {
         return new MemoryKeyManager();
      } else {
         try {
            Class<?> mgrClass = Class.forName(clazz);
            return (IPublicKeyManager) mgrClass.newInstance();
         } catch (Exception e) {

         }
         return null;
      }
   }

   @Provides @Singleton IRepositoryManager provideRepositoryManager(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         IUserManager userManager) {

      return new RepositoryManager(
            runtimeManager,
            pluginManager,
            userManager);
   }

@@ -124,18 +174,22 @@

   @Provides @Singleton IGitblit provideGitblit(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IPublicKeyManager publicKeyManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IFederationManager federationManager) {

      return new GitBlit(
            runtimeManager,
            pluginManager,
            notificationManager,
            userManager,
            authenticationManager,
            publicKeyManager,
            repositoryManager,
            projectManager,
            federationManager);
@@ -143,9 +197,11 @@

   @Provides @Singleton GitBlitWebApp provideWebApplication(
         IRuntimeManager runtimeManager,
         IPluginManager pluginManager,
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IPublicKeyManager publicKeyManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IFederationManager federationManager,
@@ -153,9 +209,11 @@

      return new GitBlitWebApp(
            runtimeManager,
            pluginManager,
            notificationManager,
            userManager,
            authenticationManager,
            publicKeyManager,
            repositoryManager,
            projectManager,
            federationManager,