From cacf8bff097fbb66a7be1bfe267b5da2605145f8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 18 Nov 2013 22:31:37 -0500
Subject: Use Dagger to inject managers into all filters and servlets

Change-Id: I9bb2cc0cbfac9841b13bed15a474fefb24355cd4
---
 src/main/java/com/gitblit/BranchGraphServlet.java | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to 'src/main/java/com/gitblit/BranchGraphServlet.java')

diff --git a/src/main/java/com/gitblit/BranchGraphServlet.java b/src/main/java/com/gitblit/BranchGraphServlet.java
index 986560c6..58a57781 100644
--- a/src/main/java/com/gitblit/BranchGraphServlet.java
+++ b/src/main/java/com/gitblit/BranchGraphServlet.java
@@ -36,6 +36,8 @@ 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;
@@ -61,6 +63,7 @@ import com.gitblit.utils.StringUtils;
  * @author James Moger
  *
  */
+@Singleton
 public class BranchGraphServlet extends HttpServlet {
 
 	private static final long serialVersionUID = 1L;
@@ -74,8 +77,18 @@ public class BranchGraphServlet extends HttpServlet {
 
 	private final Stroke[] strokeCache;
 
-	public BranchGraphServlet() {
+	private final IStoredSettings settings;
+
+	private final IRepositoryManager repositoryManager;
+
+	@Inject
+	public BranchGraphServlet(
+			IRuntimeManager runtimeManager,
+			IRepositoryManager repositoryManager) {
+
 		super();
+		this.settings = runtimeManager.getSettings();
+		this.repositoryManager = repositoryManager;
 
 		strokeCache = new Stroke[4];
 		for (int i = 1; i < strokeCache.length; i++)
@@ -104,7 +117,6 @@ public class BranchGraphServlet extends HttpServlet {
 	protected long getLastModified(HttpServletRequest req) {
 		String repository = req.getParameter("r");
 		String objectId = req.getParameter("h");
-		IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);
 		Repository r = null;
 		try {
 			r = repositoryManager.getRepository(repository);
@@ -131,9 +143,6 @@ public class BranchGraphServlet extends HttpServlet {
 			String objectId = request.getParameter("h");
 			String length = request.getParameter("l");
 
-			IStoredSettings settings = GitBlit.getManager(IRuntimeManager.class).getSettings();
-			IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);
-
 			r = repositoryManager.getRepository(repository);
 
 			rw = new PlotWalk(r);
-- 
cgit v1.2.3