Replace Dagger with Guice 4.0 beta and update Guava to 16.0.1

James Moger

2014-05-16 aa1361d04cfe09f90e7d8bece90c00dd6e4185bb

 src/main/java/com/gitblit/servlet/EnforceAuthenticationFilter.java

@@ -34,9 +34,7 @@

import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
import com.gitblit.Keys.web;
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.ISessionManager;
import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.models.UserModel;

/**
@@ -52,25 +50,25 @@

   protected transient Logger logger = LoggerFactory.getLogger(getClass());

   private final IStoredSettings settings;
   private IStoredSettings settings;

   private final ISessionManager sessionManager;
   private IAuthenticationManager authenticationManager;

   @Inject
   public EnforceAuthenticationFilter(
         IRuntimeManager runtimeManager,
         ISessionManager sessionManager) {
         IStoredSettings settings,
         IAuthenticationManager authenticationManager) {

      super();
      this.settings = runtimeManager.getSettings();
      this.sessionManager = sessionManager;
      this.settings = settings;
      this.authenticationManager = authenticationManager;
   }

   /*
    * @see javax.servlet.Filter#init(javax.servlet.FilterConfig)
    */
   @Override
   public void init(FilterConfig filterConfig) throws ServletException {
   public void init(FilterConfig config) {
   }

   @Override
   public void destroy() {
   }

   /*
@@ -86,7 +84,7 @@

      HttpServletRequest  httpRequest  = (HttpServletRequest) request;
      HttpServletResponse httpResponse = (HttpServletResponse) response;
      UserModel user = sessionManager.authenticate(httpRequest);
      UserModel user = authenticationManager.authenticate(httpRequest);

      if (mustForceAuth && (user == null)) {
         // not authenticated, enforce now:
@@ -100,13 +98,5 @@
         // user is authenticated, or don't care, continue handling
         chain.doFilter(request, response);
      }
   }


   /*
    * @see javax.servlet.Filter#destroy()
    */
   @Override
   public void destroy() {
   }
}