Remove @Inject references because they confuse JEE containers

James Moger

2013-12-10 cc47aad618137ee6481c8bc164d8074bd30fde9e

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

@@ -17,23 +17,37 @@

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.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.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitblitWicketFilter;

@@ -47,6 +61,7 @@
 *
 */
@Module(
   library = true,
   injects = {
         IStoredSettings.class,

@@ -54,14 +69,13 @@
         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,
@@ -85,13 +99,6 @@
)
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 +115,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 +144,196 @@
            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,
            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);
   }
}