From 8f1c9fd7e0f7ea3d7d0b87788eb92ba2f0f09d59 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 29 Nov 2013 11:05:51 -0500
Subject: [PATCH] Extract UserManager from GitBlit singleton
---
src/main/java/com/gitblit/DaggerModule.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/DaggerModule.java b/src/main/java/com/gitblit/DaggerModule.java
index 7ee8ecd..7f12fca 100644
--- a/src/main/java/com/gitblit/DaggerModule.java
+++ b/src/main/java/com/gitblit/DaggerModule.java
@@ -28,6 +28,9 @@
import com.gitblit.manager.IRuntimeManager;
import com.gitblit.manager.ISessionManager;
import com.gitblit.manager.IUserManager;
+import com.gitblit.manager.NotificationManager;
+import com.gitblit.manager.RuntimeManager;
+import com.gitblit.manager.UserManager;
import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitblitWicketFilter;
@@ -42,6 +45,8 @@
*/
@Module(
injects = {
+ IStoredSettings.class,
+
// core managers
IRuntimeManager.class,
INotificationManager.class,
@@ -51,6 +56,9 @@
IProjectManager.class,
IGitblitManager.class,
IFederationManager.class,
+
+ // the monolithic manager
+ Gitblit.class,
// filters & servlets
GitServlet.class,
@@ -81,16 +89,20 @@
this.gitblit = gitblit;
}
- @Provides @Singleton IRuntimeManager provideRuntimeManager() {
- return gitblit;
+ @Provides @Singleton IStoredSettings provideSettings() {
+ return new FileSettings();
}
- @Provides @Singleton INotificationManager provideNotificationManager() {
- return gitblit;
+ @Provides @Singleton IRuntimeManager provideRuntimeManager(IStoredSettings settings) {
+ return new RuntimeManager(settings);
}
- @Provides @Singleton IUserManager provideUserManager() {
- return gitblit;
+ @Provides @Singleton INotificationManager provideNotificationManager(IStoredSettings settings) {
+ return new NotificationManager(settings);
+ }
+
+ @Provides @Singleton IUserManager provideUserManager(IRuntimeManager runtimeManager) {
+ return new UserManager(runtimeManager);
}
@Provides @Singleton ISessionManager provideSessionManager() {
@@ -113,6 +125,27 @@
return gitblit;
}
+ @Provides @Singleton Gitblit provideGitblit(
+ IRuntimeManager runtimeManager,
+ INotificationManager notificationManager,
+ IUserManager userManager,
+ ISessionManager sessionManager,
+ IRepositoryManager repositoryManager,
+ IProjectManager projectManager,
+ IGitblitManager gitblitManager,
+ IFederationManager federationManager) {
+
+ return new Gitblit(
+ runtimeManager,
+ notificationManager,
+ userManager,
+ sessionManager,
+ repositoryManager,
+ projectManager,
+ federationManager,
+ gitblitManager);
+ }
+
@Provides @Singleton WebApplication provideWebApplication(
IRuntimeManager runtimeManager,
INotificationManager notificationManager,
--
Gitblit v1.9.1