From f8f6aa4d07cdfaaf23e24bf9eaf0a5fb9b437dda 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] Update unit tests for refactored architecture

---
 src/main/java/com/gitblit/DaggerModule.java |   88 ++++++++++++++++++++++++++++++++++----------
 1 files changed, 68 insertions(+), 20 deletions(-)

diff --git a/src/main/java/com/gitblit/DaggerModule.java b/src/main/java/com/gitblit/DaggerModule.java
index 0fb8bbf..5e49a97 100644
--- a/src/main/java/com/gitblit/DaggerModule.java
+++ b/src/main/java/com/gitblit/DaggerModule.java
@@ -20,18 +20,39 @@
 import org.apache.wicket.protocol.http.WebApplication;
 
 import com.gitblit.git.GitServlet;
+import com.gitblit.manager.FederationManager;
+import com.gitblit.manager.GitblitManager;
 import com.gitblit.manager.IFederationManager;
 import com.gitblit.manager.IGitblitManager;
 import com.gitblit.manager.INotificationManager;
 import com.gitblit.manager.IProjectManager;
 import com.gitblit.manager.IRepositoryManager;
 import com.gitblit.manager.IRuntimeManager;
+import com.gitblit.manager.IServicesManager;
 import com.gitblit.manager.ISessionManager;
 import com.gitblit.manager.IUserManager;
 import com.gitblit.manager.NotificationManager;
+import com.gitblit.manager.ProjectManager;
+import com.gitblit.manager.RepositoryManager;
 import com.gitblit.manager.RuntimeManager;
+import com.gitblit.manager.ServicesManager;
 import com.gitblit.manager.SessionManager;
 import com.gitblit.manager.UserManager;
+import com.gitblit.servlet.BranchGraphServlet;
+import com.gitblit.servlet.DownloadZipFilter;
+import com.gitblit.servlet.DownloadZipServlet;
+import com.gitblit.servlet.EnforceAuthenticationFilter;
+import com.gitblit.servlet.FederationServlet;
+import com.gitblit.servlet.GitFilter;
+import com.gitblit.servlet.LogoServlet;
+import com.gitblit.servlet.PagesFilter;
+import com.gitblit.servlet.PagesServlet;
+import com.gitblit.servlet.RobotsTxtServlet;
+import com.gitblit.servlet.RpcFilter;
+import com.gitblit.servlet.RpcServlet;
+import com.gitblit.servlet.SparkleShareInviteServlet;
+import com.gitblit.servlet.SyndicationFilter;
+import com.gitblit.servlet.SyndicationServlet;
 import com.gitblit.wicket.GitBlitWebApp;
 import com.gitblit.wicket.GitblitWicketFilter;
 
@@ -45,6 +66,7 @@
  *
  */
 @Module(
+	library = true,
 	injects = {
 			IStoredSettings.class,
 
@@ -57,9 +79,10 @@
 			IProjectManager.class,
 			IGitblitManager.class,
 			IFederationManager.class,
+			IServicesManager.class,
 
 			// the monolithic manager
-			Gitblit.class,
+			GitBlit.class,
 
 			// filters & servlets
 			GitServlet.class,
@@ -82,13 +105,6 @@
 	}
 )
 public class DaggerModule {
-
-	final GitBlit gitblit;
-
-	// HACK but necessary for now
-	public DaggerModule(GitBlit gitblit) {
-		this.gitblit = gitblit;
-	}
 
 	@Provides @Singleton IStoredSettings provideSettings() {
 		return new FileSettings();
@@ -115,23 +131,51 @@
 				userManager);
 	}
 
-	@Provides @Singleton IRepositoryManager provideRepositoryManager() {
-		return gitblit;
+	@Provides @Singleton IRepositoryManager provideRepositoryManager(
+			IRuntimeManager runtimeManager,
+			IUserManager userManager) {
+
+		return new RepositoryManager(
+				runtimeManager,
+				userManager);
 	}
 
-	@Provides @Singleton IProjectManager provideProjectManager() {
-		return gitblit;
+	@Provides @Singleton IProjectManager provideProjectManager(
+			IRuntimeManager runtimeManager,
+			IUserManager userManager,
+			IRepositoryManager repositoryManager) {
+
+		return new ProjectManager(
+				runtimeManager,
+				userManager,
+				repositoryManager);
 	}
 
-	@Provides @Singleton IGitblitManager provideGitblitManager() {
-		return gitblit;
+	@Provides @Singleton IFederationManager provideFederationManager(
+			IRuntimeManager runtimeManager,
+			INotificationManager notificationManager,
+			IUserManager userManager,
+			IRepositoryManager repositoryManager) {
+
+		return new FederationManager(
+				runtimeManager,
+				notificationManager,
+				userManager,
+				repositoryManager);
 	}
 
-	@Provides @Singleton IFederationManager provideFederationManager() {
-		return gitblit;
+	@Provides @Singleton IGitblitManager provideGitblitManager(
+			IRuntimeManager runtimeManager,
+			IUserManager userManager,
+			IRepositoryManager repositoryManager) {
+
+		return new GitblitManager(
+				runtimeManager,
+				userManager,
+				repositoryManager);
 	}
 
-	@Provides @Singleton Gitblit provideGitblit(
+	@Provides @Singleton GitBlit provideGitblit(
 			IRuntimeManager runtimeManager,
 			INotificationManager notificationManager,
 			IUserManager userManager,
@@ -141,15 +185,19 @@
 			IGitblitManager gitblitManager,
 			IFederationManager federationManager) {
 
-		return new Gitblit(
+		return new GitBlit(
 				runtimeManager,
 				notificationManager,
 				userManager,
 				sessionManager,
 				repositoryManager,
 				projectManager,
-				federationManager,
-				gitblitManager);
+				gitblitManager,
+				federationManager);
+	}
+
+	@Provides @Singleton IServicesManager provideServicesManager(GitBlit gitblit) {
+		return new ServicesManager(gitblit);
 	}
 
 	@Provides @Singleton WebApplication provideWebApplication(

--
Gitblit v1.9.1