Elevate the public key manager to a top-level manager

James Moger

2014-03-17 245836904ba5cecdc31773cf7c9616396c8ad8c0

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

@@ -17,7 +17,6 @@

import javax.inject.Singleton;

import com.gitblit.git.GitServlet;
import com.gitblit.manager.AuthenticationManager;
import com.gitblit.manager.FederationManager;
import com.gitblit.manager.IAuthenticationManager;
@@ -33,23 +32,12 @@
import com.gitblit.manager.RepositoryManager;
import com.gitblit.manager.RuntimeManager;
import com.gitblit.manager.UserManager;
import com.gitblit.servlet.BranchGraphServlet;
import com.gitblit.servlet.DownloadZipFilter;
import com.gitblit.servlet.DownloadZipServlet;
import com.gitblit.servlet.EnforceAuthenticationFilter;
import com.gitblit.servlet.FederationServlet;
import com.gitblit.servlet.GitFilter;
import com.gitblit.servlet.LogoServlet;
import com.gitblit.servlet.PagesFilter;
import com.gitblit.servlet.PagesServlet;
import com.gitblit.servlet.RobotsTxtServlet;
import com.gitblit.servlet.RpcFilter;
import com.gitblit.servlet.RpcServlet;
import com.gitblit.servlet.SparkleShareInviteServlet;
import com.gitblit.servlet.SyndicationFilter;
import com.gitblit.servlet.SyndicationServlet;
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.StringUtils;
import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitblitWicketFilter;

import dagger.Module;
import dagger.Provides;
@@ -70,6 +58,7 @@
         INotificationManager.class,
         IUserManager.class,
         IAuthenticationManager.class,
         IPublicKeyManager.class,
         IRepositoryManager.class,
         IProjectManager.class,
         IFederationManager.class,
@@ -77,25 +66,9 @@
         // the monolithic manager
         IGitblit.class,

         // filters & servlets
         GitServlet.class,
         GitFilter.class,
         PagesServlet.class,
         PagesFilter.class,
         RpcServlet.class,
         RpcFilter.class,
         DownloadZipServlet.class,
         DownloadZipFilter.class,
         SyndicationServlet.class,
         SyndicationFilter.class,
         FederationServlet.class,
         SparkleShareInviteServlet.class,
         BranchGraphServlet.class,
         RobotsTxtServlet.class,
         LogoServlet.class,
         EnforceAuthenticationFilter.class,
         GitblitWicketFilter.class
   }
         // the Gitblit Wicket app
         GitBlitWebApp.class
      }
)
public class DaggerModule {

@@ -122,6 +95,31 @@
      return new AuthenticationManager(
            runtimeManager,
            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(
@@ -160,6 +158,7 @@
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IPublicKeyManager publicKeyManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IFederationManager federationManager) {
@@ -169,6 +168,7 @@
            notificationManager,
            userManager,
            authenticationManager,
            publicKeyManager,
            repositoryManager,
            projectManager,
            federationManager);
@@ -179,6 +179,7 @@
         INotificationManager notificationManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IPublicKeyManager publicKeyManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IFederationManager federationManager,
@@ -189,151 +190,10 @@
            notificationManager,
            userManager,
            authenticationManager,
            publicKeyManager,
            repositoryManager,
            projectManager,
            federationManager,
            gitblit);
   }

   @Provides @Singleton GitblitWicketFilter provideGitblitWicketFilter(GitBlitWebApp webapp) {
      return new GitblitWicketFilter(webapp);
   }

   @Provides GitServlet provideGitServlet(IGitblit gitblit) {
      return new GitServlet(gitblit);
   }

   @Provides GitFilter provideGitFilter(
         IRuntimeManager runtimeManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager,
         IFederationManager federationManager) {

      return new GitFilter(
            runtimeManager,
            userManager,
            authenticationManager,
            repositoryManager,
            federationManager);
   }

   @Provides @Singleton PagesServlet providePagesServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager) {

      return new PagesServlet(runtimeManager, repositoryManager);
   }

   @Provides @Singleton PagesFilter providePagesFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager) {

      return new PagesFilter(
            runtimeManager,
            authenticationManager,
            repositoryManager);
   }

   @Provides @Singleton RpcServlet provideRpcServlet(IGitblit gitblit) {
      return new RpcServlet(gitblit);
   }

   @Provides @Singleton RpcFilter provideRpcFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager) {

      return new RpcFilter(runtimeManager, authenticationManager);
   }

   @Provides @Singleton DownloadZipServlet provideDownloadZipServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager) {

      return new DownloadZipServlet(runtimeManager, repositoryManager);
   }

   @Provides @Singleton DownloadZipFilter provideDownloadZipFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager) {

      return new DownloadZipFilter(
            runtimeManager,
            authenticationManager,
            repositoryManager);
   }

   @Provides @Singleton SyndicationServlet provideSyndicationServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager) {

      return new SyndicationServlet(
            runtimeManager,
            repositoryManager,
            projectManager);
   }

   @Provides @Singleton SyndicationFilter provideSyndicationFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager) {

      return new SyndicationFilter(
            runtimeManager,
            authenticationManager,
            repositoryManager,
            projectManager);
   }

   @Provides @Singleton FederationServlet provideFederationServlet(
         IRuntimeManager runtimeManager,
         IUserManager userManager,
         IRepositoryManager repositoryManager,
         IFederationManager federationManager) {

      return new FederationServlet(
            runtimeManager,
            userManager,
            repositoryManager,
            federationManager);
   }

   @Provides @Singleton SparkleShareInviteServlet provideSparkleshareInviteServlet(
         IRuntimeManager runtimeManager,
         IUserManager userManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager) {

      return new SparkleShareInviteServlet(
            runtimeManager,
            userManager,
            authenticationManager,
            repositoryManager);
   }

   @Provides @Singleton BranchGraphServlet provideBranchGraphServlet(
         IRuntimeManager runtimeManager,
         IRepositoryManager repositoryManager) {

      return new BranchGraphServlet(runtimeManager, repositoryManager);
   }

   @Provides @Singleton RobotsTxtServlet provideRobotsTxtServlet(IRuntimeManager runtimeManager) {
      return new RobotsTxtServlet(runtimeManager);
   }

   @Provides @Singleton LogoServlet provideLogoServlet(IRuntimeManager runtimeManager) {
      return new LogoServlet(runtimeManager);
   }

   @Provides @Singleton EnforceAuthenticationFilter provideEnforceAuthenticationFilter(
         IRuntimeManager runtimeManager,
         IAuthenticationManager authenticationManager) {

      return new EnforceAuthenticationFilter(runtimeManager, authenticationManager);
   }
}