Use Dagger to inject managers into all filters and servlets

James Moger

2013-11-18 cacf8bff097fbb66a7be1bfe267b5da2605145f8

 src/main/java/com/gitblit/wicket/GitblitWicketFilter.java

@@ -17,16 +17,17 @@


import java.util.Date;



import javax.inject.Inject;

import javax.inject.Singleton;

import javax.servlet.http.HttpServletRequest;



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

import org.apache.wicket.util.string.Strings;

import org.eclipse.jgit.lib.Repository;

import org.eclipse.jgit.revwalk.RevCommit;



import com.gitblit.GitBlit;

import com.gitblit.IStoredSettings;

import com.gitblit.Keys;

import com.gitblit.dagger.DaggerWicketFilter;

import com.gitblit.manager.IProjectManager;

import com.gitblit.manager.IRepositoryManager;

import com.gitblit.manager.IRuntimeManager;

@@ -43,7 +44,29 @@
 * @author James Moger

 *

 */

public class GitblitWicketFilter extends WicketFilter {

@Singleton

public class GitblitWicketFilter extends DaggerWicketFilter {



   private final IStoredSettings settings;



   private final IRuntimeManager runtimeManager;



   private final IRepositoryManager repositoryManager;



   private final IProjectManager projectManager;



   @Inject

   public GitblitWicketFilter(

         IRuntimeManager runtimeManager,

         IRepositoryManager repositoryManager,

         IProjectManager projectManager) {



      super();

      this.settings = runtimeManager.getSettings();

      this.runtimeManager = runtimeManager;

      this.repositoryManager = repositoryManager;

      this.projectManager = projectManager;

   }



   /**

    * Determines the last-modified date of the requested resource.

@@ -54,8 +77,9 @@
   @Override

   protected long getLastModified(final HttpServletRequest servletRequest)   {

      final String pathInfo = getRelativePath(servletRequest);

      if (Strings.isEmpty(pathInfo))

      if (Strings.isEmpty(pathInfo)) {

         return -1;

      }

      long lastModified = super.getLastModified(servletRequest);

      if (lastModified > -1) {

         return lastModified;

@@ -80,11 +104,6 @@
      if (!StringUtils.isEmpty(servletRequest.getParameter("h"))) {

         commitId = servletRequest.getParameter("h");

      }



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

      IStoredSettings settings = runtimeManager.getSettings();

      IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

      IProjectManager projectManager = GitBlit.getManager(IProjectManager.class);



      repo = repo.replace("%2f", "/").replace("%2F", "/").replace(settings.getChar(Keys.web.forwardSlashCharacter, '/'), '/');