From 924c9b28edfda6582a5480a7c1a2dd5b3ce89d92 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 10 Apr 2014 18:58:07 -0400
Subject: [PATCH] Eliminate use of Dagger and do not create inner classes
---
src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java | 27 +++++++++++++++------------
1 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java b/src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java
index 85c503d..056938e 100644
--- a/src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java
+++ b/src/main/java/com/gitblit/transport/ssh/SshCommandFactory.java
@@ -25,8 +25,6 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
-import javax.inject.Inject;
-
import org.apache.sshd.server.Command;
import org.apache.sshd.server.CommandFactory;
import org.apache.sshd.server.Environment;
@@ -66,14 +64,13 @@
private ReceivePackFactory<SshSession> receivePackFactory;
private final ScheduledExecutorService startExecutor;
- private CommandDispatcher dispatcher;
+ private DispatchCommand dispatcher;
- @Inject
public SshCommandFactory(RepositoryResolver<SshSession> repositoryResolver,
UploadPackFactory<SshSession> uploadPackFactory,
ReceivePackFactory<SshSession> receivePackFactory,
WorkQueue workQueue,
- CommandDispatcher d) {
+ DispatchCommand d) {
this.repositoryResolver = repositoryResolver;
this.uploadPackFactory = uploadPackFactory;
this.receivePackFactory = receivePackFactory;
@@ -116,26 +113,32 @@
// TODO Auto-generated method stub
}
- public void setInputStream(final InputStream in) {
+ @Override
+ public void setInputStream(final InputStream in) {
this.in = in;
}
- public void setOutputStream(final OutputStream out) {
+ @Override
+ public void setOutputStream(final OutputStream out) {
this.out = out;
}
- public void setErrorStream(final OutputStream err) {
+ @Override
+ public void setErrorStream(final OutputStream err) {
this.err = err;
}
- public void setExitCallback(final ExitCallback callback) {
+ @Override
+ public void setExitCallback(final ExitCallback callback) {
this.exit = callback;
}
- public void start(final Environment env) throws IOException {
+ @Override
+ public void start(final Environment env) throws IOException {
this.env = env;
task.set(startExecutor.submit(new Runnable() {
- public void run() {
+ @Override
+ public void run() {
try {
onStart();
} catch (Exception e) {
@@ -155,7 +158,7 @@
synchronized (this) {
//final Context old = sshScope.set(ctx);
try {
- cmd = dispatcher.get();
+ cmd = dispatcher;
cmd.setArguments(argv);
cmd.setInputStream(in);
cmd.setOutputStream(out);
--
Gitblit v1.9.1