Move cache to IKeyManager and implement isStale() in FileKeyManager

James Moger

2014-03-14 aaecd8f2a36d2c0d780b42425aa57725fe708551

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

@@ -17,25 +17,22 @@

import javax.inject.Singleton;

import org.apache.wicket.protocol.http.WebApplication;

import com.gitblit.git.GitServlet;
import com.gitblit.manager.AuthenticationManager;
import com.gitblit.manager.FederationManager;
import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IFederationManager;
import com.gitblit.manager.IGitblitManager;
import com.gitblit.manager.IGitblit;
import com.gitblit.manager.INotificationManager;
import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.ISessionManager;
import com.gitblit.manager.IUserManager;
import com.gitblit.manager.NotificationManager;
import com.gitblit.manager.ProjectManager;
import com.gitblit.manager.RepositoryManager;
import com.gitblit.manager.RuntimeManager;
import com.gitblit.manager.SessionManager;
import com.gitblit.manager.UserManager;
import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitblitWicketFilter;

import dagger.Module;
import dagger.Provides;
@@ -47,6 +44,7 @@
 *
 */
@Module(
   library = true,
   injects = {
         IStoredSettings.class,

@@ -54,43 +52,19 @@
         IRuntimeManager.class,
         INotificationManager.class,
         IUserManager.class,
         ISessionManager.class,
         IAuthenticationManager.class,
         IRepositoryManager.class,
         IProjectManager.class,
         IGitblitManager.class,
         IFederationManager.class,

         // the monolithic manager
         Gitblit.class,
         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 {

   final GitBlit gitblit;

   // HACK but necessary for now
   public DaggerModule(GitBlit gitblit) {
      this.gitblit = gitblit;
   }

   @Provides @Singleton IStoredSettings provideSettings() {
      return new FileSettings();
@@ -108,11 +82,11 @@
      return new UserManager(runtimeManager);
   }

   @Provides @Singleton ISessionManager provideSessionManager(
   @Provides @Singleton IAuthenticationManager provideAuthenticationManager(
         IRuntimeManager runtimeManager,
         IUserManager userManager) {

      return new SessionManager(
      return new AuthenticationManager(
            runtimeManager,
            userManager);
   }
@@ -137,53 +111,54 @@
            repositoryManager);
   }

   @Provides @Singleton IGitblitManager provideGitblitManager() {
      return gitblit;
   @Provides @Singleton IFederationManager provideFederationManager(
         IRuntimeManager runtimeManager,
         INotificationManager notificationManager,
         IRepositoryManager repositoryManager) {

      return new FederationManager(
            runtimeManager,
            notificationManager,
            repositoryManager);
   }

   @Provides @Singleton IFederationManager provideFederationManager() {
      return gitblit;
   }

   @Provides @Singleton Gitblit provideGitblit(
   @Provides @Singleton IGitblit provideGitblit(
         IRuntimeManager runtimeManager,
         INotificationManager notificationManager,
         IUserManager userManager,
         ISessionManager sessionManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IGitblitManager gitblitManager,
         IFederationManager federationManager) {

      return new Gitblit(
      return new GitBlit(
            runtimeManager,
            notificationManager,
            userManager,
            sessionManager,
            authenticationManager,
            repositoryManager,
            projectManager,
            federationManager,
            gitblitManager);
            federationManager);
   }

   @Provides @Singleton WebApplication provideWebApplication(
   @Provides @Singleton GitBlitWebApp provideWebApplication(
         IRuntimeManager runtimeManager,
         INotificationManager notificationManager,
         IUserManager userManager,
         ISessionManager sessionManager,
         IAuthenticationManager authenticationManager,
         IRepositoryManager repositoryManager,
         IProjectManager projectManager,
         IGitblitManager gitblitManager,
         IFederationManager federationManager) {
         IFederationManager federationManager,
         IGitblit gitblit) {

      return new GitBlitWebApp(
            runtimeManager,
            notificationManager,
            userManager,
            sessionManager,
            authenticationManager,
            repositoryManager,
            projectManager,
            gitblitManager,
            federationManager);
            federationManager,
            gitblit);
   }
}