Eliminate use of Dagger and do not create inner classes

James Moger

2014-02-22 924c9b28edfda6582a5480a7c1a2dd5b3ce89d92

 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,25 +113,31 @@
       // TODO Auto-generated method stub
       }

       @Override
       public void setInputStream(final InputStream in) {
         this.in = in;
       }

       @Override
       public void setOutputStream(final OutputStream out) {
         this.out = out;
       }

       @Override
       public void setErrorStream(final OutputStream err) {
         this.err = err;
       }

       @Override
       public void setExitCallback(final ExitCallback callback) {
         this.exit = callback;
       }

       @Override
       public void start(final Environment env) throws IOException {
         this.env = env;
         task.set(startExecutor.submit(new Runnable() {
           @Override
           public void run() {
             try {
               onStart();
@@ -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);