From 65d5bb3f1cbfb42be5a3c4aa077b7ab2504082af Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 Dec 2013 23:12:12 -0500
Subject: [PATCH] Rollback to Servlet 2.5
---
src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java | 32 ++++++++++++++------------------
1 files changed, 14 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
index 709e22e..d7f00c6 100644
--- a/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
+++ b/src/main/java/com/gitblit/servlet/SparkleShareInviteServlet.java
@@ -19,20 +19,21 @@
import java.text.MessageFormat;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.gitblit.Constants;
import com.gitblit.IStoredSettings;
import com.gitblit.Keys;
+import com.gitblit.dagger.DaggerServlet;
import com.gitblit.manager.IAuthenticationManager;
import com.gitblit.manager.IRepositoryManager;
-import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.IUserManager;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
+
+import dagger.ObjectGraph;
/**
* Handles requests for Sparkleshare Invites
@@ -40,29 +41,24 @@
* @author James Moger
*
*/
-public class SparkleShareInviteServlet extends HttpServlet {
+public class SparkleShareInviteServlet extends DaggerServlet {
private static final long serialVersionUID = 1L;
- private final IStoredSettings settings;
+ private IStoredSettings settings;
- private final IUserManager userManager;
+ private IUserManager userManager;
- private final IAuthenticationManager authenticationManager;
+ private IAuthenticationManager authenticationManager;
- private final IRepositoryManager repositoryManager;
+ private IRepositoryManager repositoryManager;
- public SparkleShareInviteServlet(
- IRuntimeManager runtimeManager,
- IUserManager userManager,
- IAuthenticationManager authenticationManager,
- IRepositoryManager repositoryManager) {
-
- super();
- this.settings = runtimeManager.getSettings();
- this.userManager = userManager;
- this.authenticationManager = authenticationManager;
- this.repositoryManager = repositoryManager;
+ @Override
+ protected void inject(ObjectGraph dagger) {
+ this.settings = dagger.get(IStoredSettings.class);
+ this.userManager = dagger.get(IUserManager.class);
+ this.authenticationManager = dagger.get(IAuthenticationManager.class);
+ this.repositoryManager = dagger.get(IRepositoryManager.class);
}
@Override
--
Gitblit v1.9.1