Use Dagger to inject managers into all filters and servlets

James Moger

2013-11-18 cacf8bff097fbb66a7be1bfe267b5da2605145f8

 src/main/java/com/gitblit/RpcFilter.java

@@ -18,6 +18,8 @@
import java.io.IOException;

import java.text.MessageFormat;



import javax.inject.Inject;

import javax.inject.Singleton;

import javax.servlet.FilterChain;

import javax.servlet.ServletException;

import javax.servlet.ServletRequest;

@@ -27,6 +29,7 @@


import com.gitblit.Constants.RpcRequest;

import com.gitblit.manager.IRuntimeManager;

import com.gitblit.manager.ISessionManager;

import com.gitblit.models.UserModel;



/**

@@ -42,7 +45,22 @@
 * @author James Moger

 *

 */

@Singleton

public class RpcFilter extends AuthenticationFilter {



   private final IStoredSettings settings;



   private final IRuntimeManager runtimeManager;



   @Inject

   public RpcFilter(

         IRuntimeManager runtimeManager,

         ISessionManager sessionManager) {



      super(sessionManager);

      this.settings = runtimeManager.getSettings();

      this.runtimeManager = runtimeManager;

   }



   /**

    * doFilter does the actual work of preprocessing the request to ensure that

@@ -64,9 +82,6 @@
         httpResponse.sendError(HttpServletResponse.SC_NOT_IMPLEMENTED);

         return;

      }



      IRuntimeManager runtimeManager = GitBlit.getManager(IRuntimeManager.class);

      IStoredSettings settings = runtimeManager.getSettings();



      boolean adminRequest = requestType.exceeds(RpcRequest.LIST_SETTINGS);