Use Dagger to inject managers into all filters and servlets

Change-Id: I9bb2cc0cbfac9841b13bed15a474fefb24355cd4

1 files changed, 12 insertions, 8 deletions

diff --git a/src/main/java/com/gitblit/git/GitblitReceivePack.java b/src/main/java/com/gitblit/git/GitblitReceivePack.java
index 8da603ac..44e2bef5 100644
--- a/src/main/java/com/gitblit/git/GitblitReceivePack.java
+++ b/src/main/java/com/gitblit/git/GitblitReceivePack.java
@@ -91,11 +91,20 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P
 

 	protected GroovyScriptEngine gse;

 

-	public GitblitReceivePack(Repository db, RepositoryModel repository, UserModel user) {

-		super(db);

+	private final IStoredSettings settings;

+

+	private final IRepositoryManager repositoryManager;

 

-		IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

+	public GitblitReceivePack(

+			IRuntimeManager runtimeManager,

+			IRepositoryManager repositoryManager,

+			Repository db,

+			RepositoryModel repository,

+			UserModel user) {

 

+		super(db);

+		this.settings = runtimeManager.getSettings();

+		this.repositoryManager = repositoryManager;

 		this.repository = repository;

 		this.user = user == null ? UserModel.ANONYMOUS : user;

 		this.groovyDir = repositoryManager.getHooksFolder();

@@ -239,7 +248,6 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P
 			}

 		}

 

-		IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

 		Set<String> scripts = new LinkedHashSet<String>();

 		scripts.addAll(repositoryManager.getPreReceiveScriptsInherited(repository));

 		if (!ArrayUtils.isEmpty(repository.preReceiveScripts)) {

@@ -266,8 +274,6 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P
 			return;

 		}

 

-		IStoredSettings settings = GitBlit.getManager(IRuntimeManager.class).getSettings();

-

 		// log ref changes

 		for (ReceiveCommand cmd : commands) {

 

@@ -336,8 +342,6 @@ public class GitblitReceivePack extends ReceivePack implements PreReceiveHook, P
 			LOGGER.error(MessageFormat.format("Failed to update {0} pushlog", repository.name), e);

 		}

 

-		IRepositoryManager repositoryManager = GitBlit.getManager(IRepositoryManager.class);

-

 		// run Groovy hook scripts

 		Set<String> scripts = new LinkedHashSet<String>();

 		scripts.addAll(repositoryManager.getPostReceiveScriptsInherited(repository));