From 4b441d259cbb76c1136e3e8899ebc4e35ab7de2e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 02 Jul 2014 17:45:43 -0400
Subject: [PATCH] Merged #124 "Update to Freemarker 2.3.20"
---
src/main/java/com/gitblit/servlet/SyndicationFilter.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/SyndicationFilter.java b/src/main/java/com/gitblit/servlet/SyndicationFilter.java
index adf9ba9..78da47e 100644
--- a/src/main/java/com/gitblit/servlet/SyndicationFilter.java
+++ b/src/main/java/com/gitblit/servlet/SyndicationFilter.java
@@ -18,9 +18,8 @@
import java.io.IOException;
import java.text.MessageFormat;
-import javax.inject.Inject;
-import javax.inject.Singleton;
import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
import javax.servlet.ServletException;
import javax.servlet.ServletRequest;
import javax.servlet.ServletResponse;
@@ -31,10 +30,11 @@
import com.gitblit.manager.IProjectManager;
import com.gitblit.manager.IRepositoryManager;
import com.gitblit.manager.IRuntimeManager;
-import com.gitblit.manager.ISessionManager;
import com.gitblit.models.ProjectModel;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
+
+import dagger.ObjectGraph;
/**
* The SyndicationFilter is an AuthenticationFilter which ensures that feed
@@ -44,24 +44,18 @@
* @author James Moger
*
*/
-@Singleton
public class SyndicationFilter extends AuthenticationFilter {
- private final IRuntimeManager runtimeManager;
- private final IRepositoryManager repositoryManager;
- private final IProjectManager projectManager;
+ private IRuntimeManager runtimeManager;
+ private IRepositoryManager repositoryManager;
+ private IProjectManager projectManager;
- @Inject
- public SyndicationFilter(
- IRuntimeManager runtimeManager,
- ISessionManager sessionManager,
- IRepositoryManager repositoryManager,
- IProjectManager projectManager) {
-
- super(sessionManager);
- this.runtimeManager = runtimeManager;
- this.repositoryManager = repositoryManager;
- this.projectManager = projectManager;
+ @Override
+ protected void inject(ObjectGraph dagger, FilterConfig filterConfig) {
+ super.inject(dagger, filterConfig);
+ this.runtimeManager = dagger.get(IRuntimeManager.class);
+ this.repositoryManager = dagger.get(IRepositoryManager.class);
+ this.projectManager = dagger.get(IProjectManager.class);
}
/**
--
Gitblit v1.9.1