Embrace @Inject for Managers, Servlets, and Filters

1 files changed, 13 insertions, 12 deletions

diff --git a/src/main/java/com/gitblit/servlet/BranchGraphServlet.java b/src/main/java/com/gitblit/servlet/BranchGraphServlet.java
index 0abe347f..c1ad0806 100644
--- a/src/main/java/com/gitblit/servlet/BranchGraphServlet.java
+++ b/src/main/java/com/gitblit/servlet/BranchGraphServlet.java
@@ -36,7 +36,10 @@ import java.util.Set;
 import java.util.TreeSet;

 

 import javax.imageio.ImageIO;

+import javax.inject.Inject;

+import javax.inject.Singleton;

 import javax.servlet.ServletException;

+import javax.servlet.http.HttpServlet;

 import javax.servlet.http.HttpServletRequest;

 import javax.servlet.http.HttpServletResponse;

 

@@ -52,20 +55,18 @@ import org.eclipse.jgit.revwalk.RevCommit;
 import com.gitblit.Constants;

 import com.gitblit.IStoredSettings;

 import com.gitblit.Keys;

-import com.gitblit.dagger.DaggerServlet;

 import com.gitblit.manager.IRepositoryManager;

 import com.gitblit.utils.JGitUtils;

 import com.gitblit.utils.StringUtils;

 

-import dagger.ObjectGraph;

-

 /**

  * Handles requests for branch graphs

  *

  * @author James Moger

  *

  */

-public class BranchGraphServlet extends DaggerServlet {

+@Singleton

+public class BranchGraphServlet extends HttpServlet {

 

 	private static final long serialVersionUID = 1L;

 

@@ -82,20 +83,20 @@ public class BranchGraphServlet extends DaggerServlet {
 

 	private IRepositoryManager repositoryManager;

 

-	public BranchGraphServlet() {

-		super();

+	@Inject

+	public BranchGraphServlet(

+			IStoredSettings settings,

+			IRepositoryManager repositoryManager) {

+

+		this.settings = settings;

+		this.repositoryManager = repositoryManager;

+

 		strokeCache = new Stroke[4];

 		for (int i = 1; i < strokeCache.length; i++) {

 			strokeCache[i] = new BasicStroke(i);

 		}

 	}

 

-	@Override

-	protected void inject(ObjectGraph dagger) {

-		this.settings = dagger.get(IStoredSettings.class);

-		this.repositoryManager = dagger.get(IRepositoryManager.class);

-	}

-

 	/**

 	 * Returns an url to this servlet for the specified parameters.

 	 *