Embrace @Inject for Managers, Servlets, and Filters

1 files changed, 15 insertions, 9 deletions

diff --git a/src/main/java/com/gitblit/servlet/SyndicationServlet.java b/src/main/java/com/gitblit/servlet/SyndicationServlet.java
index 631df781..c48f25f9 100644
--- a/src/main/java/com/gitblit/servlet/SyndicationServlet.java
+++ b/src/main/java/com/gitblit/servlet/SyndicationServlet.java
@@ -22,6 +22,10 @@ import java.util.Collections;
 import java.util.List;

 import java.util.Map;

 

+import javax.inject.Inject;

+import javax.inject.Singleton;

+import javax.servlet.http.HttpServlet;

+

 import org.eclipse.jgit.lib.ObjectId;

 import org.eclipse.jgit.lib.Repository;

 import org.eclipse.jgit.revwalk.RevCommit;

@@ -31,7 +35,6 @@ import org.slf4j.LoggerFactory;
 import com.gitblit.Constants;

 import com.gitblit.IStoredSettings;

 import com.gitblit.Keys;

-import com.gitblit.dagger.DaggerServlet;

 import com.gitblit.manager.IProjectManager;

 import com.gitblit.manager.IRepositoryManager;

 import com.gitblit.models.FeedEntryModel;

@@ -46,8 +49,6 @@ import com.gitblit.utils.JGitUtils;
 import com.gitblit.utils.StringUtils;

 import com.gitblit.utils.SyndicationUtils;

 

-import dagger.ObjectGraph;

-

 /**

  * SyndicationServlet generates RSS 2.0 feeds and feed links.

  *

@@ -56,7 +57,8 @@ import dagger.ObjectGraph;
  * @author James Moger

  *

  */

-public class SyndicationServlet extends DaggerServlet {

+@Singleton

+public class SyndicationServlet extends HttpServlet {

 

 	private static final long serialVersionUID = 1L;

 

@@ -68,11 +70,15 @@ public class SyndicationServlet extends DaggerServlet {
 

 	private IProjectManager projectManager;

 

-	@Override

-	protected void inject(ObjectGraph dagger) {

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

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

-		this.projectManager = dagger.get(IProjectManager.class);

+	@Inject

+	public SyndicationServlet(

+			IStoredSettings settings,

+			IRepositoryManager repositoryManager,

+			IProjectManager projectManager) {

+

+		this.settings = settings;

+		this.repositoryManager = repositoryManager;

+		this.projectManager = projectManager;

 	}

 

 	/**