You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mina.apache.org by lg...@apache.org on 2018/10/23 12:21:02 UTC

mina-sshd git commit: Removed some superfluous extra spaces in comments

Repository: mina-sshd
Updated Branches:
  refs/heads/master f8ae0a295 -> 5bb1b1643


Removed some superfluous extra spaces in comments


Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo
Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/5bb1b164
Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/5bb1b164
Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/5bb1b164

Branch: refs/heads/master
Commit: 5bb1b1643ede79ebc26b33be184f5e46167e7f4d
Parents: f8ae0a2
Author: Lyor Goldstein <lg...@apache.org>
Authored: Tue Oct 23 15:20:38 2018 +0300
Committer: Lyor Goldstein <lg...@apache.org>
Committed: Tue Oct 23 15:20:55 2018 +0300

----------------------------------------------------------------------
 .../java/org/apache/sshd/common/future/CloseFuture.java |  2 +-
 .../apache/sshd/common/keyprovider/KeyPairProvider.java |  2 +-
 .../apache/sshd/common/util/io/DirectoryScanner.java    |  2 +-
 .../apache/sshd/agent/local/ChannelAgentForwarding.java |  2 +-
 .../apache/sshd/agent/unix/ChannelAgentForwarding.java  |  2 +-
 .../src/main/java/org/apache/sshd/client/SshClient.java |  4 ++--
 .../auth/keyboard/UserAuthKeyboardInteractive.java      | 10 +++++-----
 .../org/apache/sshd/client/channel/ChannelSession.java  |  2 +-
 .../org/apache/sshd/client/channel/ClientChannel.java   |  6 +++---
 .../java/org/apache/sshd/client/future/AuthFuture.java  |  6 +++---
 .../org/apache/sshd/client/future/ConnectFuture.java    |  6 +++---
 .../java/org/apache/sshd/client/future/OpenFuture.java  |  6 +++---
 .../org/apache/sshd/client/session/ClientSession.java   |  2 +-
 .../apache/sshd/client/session/ClientSessionImpl.java   |  4 ++--
 .../sshd/client/session/ClientUserAuthService.java      |  2 +-
 .../java/org/apache/sshd/common/FactoryManager.java     |  2 +-
 .../src/main/java/org/apache/sshd/common/Service.java   |  2 +-
 .../apache/sshd/common/channel/ChannelOutputStream.java |  2 +-
 .../java/org/apache/sshd/common/channel/PtyMode.java    |  2 +-
 .../java/org/apache/sshd/common/channel/Window.java     |  4 ++--
 .../java/org/apache/sshd/common/io/IoConnectFuture.java |  6 +++---
 .../main/java/org/apache/sshd/common/io/IoService.java  |  2 +-
 .../java/org/apache/sshd/common/io/IoWriteFuture.java   |  2 +-
 .../sshd/common/session/helpers/AbstractSession.java    |  4 ++--
 .../src/main/java/org/apache/sshd/server/SshServer.java |  4 ++--
 .../apache/sshd/server/auth/gss/CredentialHelper.java   |  2 +-
 .../apache/sshd/server/auth/gss/GSSAuthenticator.java   | 12 ++++++------
 .../org/apache/sshd/server/auth/gss/UserAuthGSS.java    |  2 +-
 .../java/org/apache/sshd/server/command/Command.java    |  2 +-
 .../apache/sshd/server/forward/TcpForwardingFilter.java |  4 ++--
 .../org/apache/sshd/server/shell/InvertedShell.java     |  2 +-
 .../apache/sshd/server/shell/InvertedShellWrapper.java  |  4 ++--
 .../sshd/deprecated/ClientUserAuthServiceOld.java       |  4 ++--
 .../test/java/org/apache/sshd/server/ServerTest.java    |  2 +-
 .../subsystem/sftp/AbstractSftpSubsystemHelper.java     |  2 +-
 35 files changed, 62 insertions(+), 62 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-common/src/main/java/org/apache/sshd/common/future/CloseFuture.java
----------------------------------------------------------------------
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/future/CloseFuture.java b/sshd-common/src/main/java/org/apache/sshd/common/future/CloseFuture.java
index 808716d..eb7893c 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/future/CloseFuture.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/future/CloseFuture.java
@@ -32,7 +32,7 @@ public interface CloseFuture extends SshFuture<CloseFuture> {
 
     /**
      * Marks this future as closed and notifies all threads waiting for this
-     * future.  This method is invoked by SSHD internally.  Please do not call
+     * future. This method is invoked by SSHD internally. Please do not call
      * this method directly.
      */
     void setClosed();

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-common/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java
----------------------------------------------------------------------
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java b/sshd-common/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java
index a816304..3ef9b0f 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/keyprovider/KeyPairProvider.java
@@ -32,7 +32,7 @@ import org.apache.sshd.common.util.GenericUtils;
 import org.apache.sshd.common.util.ValidateUtils;
 
 /**
- * Provider for key pairs.  This provider is used on the server side to provide
+ * Provider for key pairs. This provider is used on the server side to provide
  * the host key, or on the client side to provide the user key.
  *
  * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-common/src/main/java/org/apache/sshd/common/util/io/DirectoryScanner.java
----------------------------------------------------------------------
diff --git a/sshd-common/src/main/java/org/apache/sshd/common/util/io/DirectoryScanner.java b/sshd-common/src/main/java/org/apache/sshd/common/util/io/DirectoryScanner.java
index 8b4e9ba..5ba7f75 100644
--- a/sshd-common/src/main/java/org/apache/sshd/common/util/io/DirectoryScanner.java
+++ b/sshd-common/src/main/java/org/apache/sshd/common/util/io/DirectoryScanner.java
@@ -241,7 +241,7 @@ public class DirectoryScanner {
     /**
      * Scans the given directory for files and directories. Found files and
      * directories are placed in their respective collections, based on the
-     * matching of includes, excludes, and the selectors.  When a directory
+     * matching of includes, excludes, and the selectors. When a directory
      * is found, it is scanned recursively.
      *
      * @param dir   The directory to scan. Must not be {@code null}.

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/agent/local/ChannelAgentForwarding.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/local/ChannelAgentForwarding.java b/sshd-core/src/main/java/org/apache/sshd/agent/local/ChannelAgentForwarding.java
index f2f9715..1b43902 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/local/ChannelAgentForwarding.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/local/ChannelAgentForwarding.java
@@ -93,7 +93,7 @@ public class ChannelAgentForwarding extends AbstractServerChannel {
     private void closeImmediately0() {
         // We need to close the channel immediately to remove it from the
         // server session's channel table and *not* send a packet to the
-        // client.  A notification was already sent by our caller, or will
+        // client. A notification was already sent by our caller, or will
         // be sent after we return.
         try {
             if ((agent != null) && agent.isOpen()) {

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/agent/unix/ChannelAgentForwarding.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/agent/unix/ChannelAgentForwarding.java b/sshd-core/src/main/java/org/apache/sshd/agent/unix/ChannelAgentForwarding.java
index c2d3f01..f51fa19 100644
--- a/sshd-core/src/main/java/org/apache/sshd/agent/unix/ChannelAgentForwarding.java
+++ b/sshd-core/src/main/java/org/apache/sshd/agent/unix/ChannelAgentForwarding.java
@@ -120,7 +120,7 @@ public class ChannelAgentForwarding extends AbstractServerChannel {
     private void closeImmediately0() {
         // We need to close the channel immediately to remove it from the
         // server session's channel table and *not* send a packet to the
-        // client.  A notification was already sent by our caller, or will
+        // client. A notification was already sent by our caller, or will
         // be sent after we return.
         //
         super.close(true);

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
index cf160d5..33ea4d2 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/SshClient.java
@@ -90,7 +90,7 @@ import org.apache.sshd.common.util.net.SshdSocketAddress;
  *
  * <P>
  * The default configured client can be created using
- * the {@link #setUpDefaultClient()}.  The next step is to
+ * the {@link #setUpDefaultClient()}. The next step is to
  * start the client using the {@link #start()} method.
  * </P>
  *
@@ -765,7 +765,7 @@ public class SshClient extends AbstractFactoryManager implements ClientFactoryMa
     }
 
     /**
-     * Setup a default client.  The client does not require any additional setup.
+     * Setup a default client. The client does not require any additional setup.
      *
      * @return a newly create {@link SshClient} with default configurations
      */

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/auth/keyboard/UserAuthKeyboardInteractive.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/auth/keyboard/UserAuthKeyboardInteractive.java b/sshd-core/src/main/java/org/apache/sshd/client/auth/keyboard/UserAuthKeyboardInteractive.java
index 479e5bc..3622a93 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/auth/keyboard/UserAuthKeyboardInteractive.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/auth/keyboard/UserAuthKeyboardInteractive.java
@@ -46,8 +46,8 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth {
     /*
      * As per RFC-4256:
      *
-     *      The language tag is deprecated and SHOULD be the empty string.  It
-     *      may be removed in a future revision of this specification.  Instead,
+     *      The language tag is deprecated and SHOULD be the empty string. It
+     *      may be removed in a future revision of this specification. Instead,
      *      the server SHOULD select the language to be used based on the tags
      *      communicated during key exchange
      */
@@ -59,11 +59,11 @@ public class UserAuthKeyboardInteractive extends AbstractUserAuth {
      * As per RFC-4256:
      *
      *      The submethods field is included so the user can give a hint of which
-     *      actual methods he wants to use.  It is a comma-separated list of
+     *      actual methods he wants to use. It is a comma-separated list of
      *      authentication submethods (software or hardware) that the user
-     *      prefers.  If the client has knowledge of the submethods preferred by
+     *      prefers. If the client has knowledge of the submethods preferred by
      *      the user, presumably through a configuration setting, it MAY use the
-     *      submethods field to pass this information to the server.  Otherwise,
+     *      submethods field to pass this information to the server. Otherwise,
      *      it MUST send the empty string.
      *
      *      The actual names of the submethods is something the user and the

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java b/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java
index f30784e..c7ba086 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/channel/ChannelSession.java
@@ -97,7 +97,7 @@ public class ChannelSession extends AbstractClientChannel {
                 }
 
                 // Interrupt does not really work and the thread will only exit when
-                // the call to read() will return.  So ensure this thread is a daemon
+                // the call to read() will return. So ensure this thread is a daemon
                 // to avoid blocking the whole app
                 pumper = pumperService.submit(this::pumpInputStream);
             }

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannel.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannel.java b/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannel.java
index 286baeb..426a0da 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannel.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/channel/ClientChannel.java
@@ -32,7 +32,7 @@ import org.apache.sshd.common.io.IoInputStream;
 import org.apache.sshd.common.io.IoOutputStream;
 
 /**
- * A client channel used to communicate with the SSH server.  Client channels can be shells,
+ * A client channel used to communicate with the SSH server. Client channels can be shells,
  * simple commands or subsystems. <B>Note:</B> client channels may be associated with a
  * <U>server</U> session if they are opened by the server - e.g., for agent proxy, port
  * forwarding, etc..
@@ -75,9 +75,9 @@ public interface ClientChannel extends Channel {
 
     /**
      * Set an input stream that will be read by this channel and forwarded to
-     * the remote channel.  Note that using such a stream will create an additional
+     * the remote channel. Note that using such a stream will create an additional
      * thread for pumping the stream which will only be able to end when that stream
-     * is actually closed or some data is read.  It is recommended to use the
+     * is actually closed or some data is read. It is recommended to use the
      * {@link #getInvertedIn()} method instead and write data directly.
      *
      * @param in an InputStream to be polled and forwarded

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/future/AuthFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/future/AuthFuture.java b/sshd-core/src/main/java/org/apache/sshd/client/future/AuthFuture.java
index b5fa1cd..d9ec149 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/future/AuthFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/future/AuthFuture.java
@@ -61,7 +61,7 @@ public interface AuthFuture extends SshFuture<AuthFuture>, VerifiableFuture<Auth
 
     /**
      * Notifies that the session has been authenticated.
-     * This method is invoked by SSHD internally.  Please do not
+     * This method is invoked by SSHD internally. Please do not
      * call this method directly.
      *
      * @param authed Authentication success state
@@ -70,8 +70,8 @@ public interface AuthFuture extends SshFuture<AuthFuture>, VerifiableFuture<Auth
 
     /**
      * Sets the exception caught due to connection failure and notifies all
-     * threads waiting for this future.  This method is invoked by SSHD
-     * internally.  Please do not call this method directly.
+     * threads waiting for this future. This method is invoked by SSHD
+     * internally. Please do not call this method directly.
      *
      * @param exception The caught {@link Throwable}
      */

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/future/ConnectFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/future/ConnectFuture.java b/sshd-core/src/main/java/org/apache/sshd/client/future/ConnectFuture.java
index a69095d..47d4fa9 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/future/ConnectFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/future/ConnectFuture.java
@@ -46,7 +46,7 @@ public interface ConnectFuture extends SshFuture<ConnectFuture>, VerifiableFutur
 
     /**
      * Sets the newly connected session and notifies all threads waiting for
-     * this future.  This method is invoked by SSHD internally.  Please do not
+     * this future. This method is invoked by SSHD internally. Please do not
      * call this method directly.
      *
      * @param session The {@link ClientSession}
@@ -64,8 +64,8 @@ public interface ConnectFuture extends SshFuture<ConnectFuture>, VerifiableFutur
 
     /**
      * Sets the exception caught due to connection failure and notifies all
-     * threads waiting for this future.  This method is invoked by SSHD
-     * internally.  Please do not call this method directly.
+     * threads waiting for this future. This method is invoked by SSHD
+     * internally. Please do not call this method directly.
      *
      * @param exception The caught {@link Throwable}
      */

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java b/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java
index 587354f..b595a53 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/future/OpenFuture.java
@@ -49,15 +49,15 @@ public interface OpenFuture extends SshFuture<OpenFuture>, VerifiableFuture<Open
 
     /**
      * Sets the newly connected session and notifies all threads waiting for
-     * this future.  This method is invoked by SSHD internally.  Please do not
+     * this future. This method is invoked by SSHD internally. Please do not
      * call this method directly.
      */
     void setOpened();
 
     /**
      * Sets the exception caught due to connection failure and notifies all
-     * threads waiting for this future.  This method is invoked by SSHD
-     * internally.  Please do not call this method directly.
+     * threads waiting for this future. This method is invoked by SSHD
+     * internally. Please do not call this method directly.
      *
      * @param exception The caught {@link Throwable}
      */

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java
index 31202bb..4a72296 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSession.java
@@ -68,7 +68,7 @@ import org.apache.sshd.common.util.net.SshdSocketAddress;
  *
  * <P>
  * From this session, channels can be created using the
- * {@link #createChannel(String)} method.  Multiple channels can
+ * {@link #createChannel(String)} method. Multiple channels can
  * be created on a given session concurrently.
  * </P>
  *

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
index 4bcb3eb..caab2f7 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientSessionImpl.java
@@ -68,7 +68,7 @@ public class ClientSessionImpl extends AbstractClientSession {
             log.debug("Client session created: {}", ioSession);
         }
         // Need to set the initial service early as calling code likes to start trying to
-        // manipulate it before the connection has even been established.  For instance, to
+        // manipulate it before the connection has even been established. For instance, to
         // set the authPassword.
         List<ServiceFactory> factories = client.getServiceFactories();
         int numFactories = GenericUtils.size(factories);
@@ -194,7 +194,7 @@ public class ClientSessionImpl extends AbstractClientSession {
         // Assuming that MINA-SSHD only implements "explicit server authentication" it is permissible
         // for the client's service to start sending data before the service-accept has been received.
         // If "implicit authentication" were to ever be supported, then this would need to be
-        // called after service-accept comes back.  See SSH-TRANSPORT.
+        // called after service-accept comes back. See SSH-TRANSPORT.
         currentService.start();
     }
 

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java
index 59c7a8e..96460d8 100644
--- a/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java
+++ b/sshd-core/src/main/java/org/apache/sshd/client/session/ClientUserAuthService.java
@@ -54,7 +54,7 @@ public class ClientUserAuthService
         implements Service, SessionHolder<ClientSession>, ClientSessionHolder {
 
     /**
-     * The AuthFuture that is being used by the current auth request.  This encodes the state.
+     * The AuthFuture that is being used by the current auth request. This encodes the state.
      * isSuccess -> authenticated, else if isDone -> server waiting for user auth, else authenticating.
      */
     private final AtomicReference<AuthFuture> authFutureHolder = new AtomicReference<>();

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java b/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
index 22c7d49..cc04275 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/FactoryManager.java
@@ -174,7 +174,7 @@ public interface FactoryManager
 
     /**
      * Key used to retrieve the value of the disconnect timeout which
-     * is used when a disconnection is attempted.  If the disconnect
+     * is used when a disconnection is attempted. If the disconnect
      * message has not been sent before the timeout, the underlying socket
      * will be forcibly closed - in milliseconds.
      * @see #DEFAULT_DISCONNECT_TIMEOUT

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/common/Service.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/Service.java b/sshd-core/src/main/java/org/apache/sshd/common/Service.java
index 8807c87..f6caeb0 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/Service.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/Service.java
@@ -22,7 +22,7 @@ import org.apache.sshd.common.session.Session;
 import org.apache.sshd.common.util.buffer.Buffer;
 
 /**
- * See RFC 4253 [SSH-TRANS] and the SSH_MSG_SERVICE_REQUEST packet.  Examples include ssh-userauth
+ * See RFC 4253 [SSH-TRANS] and the SSH_MSG_SERVICE_REQUEST packet. Examples include ssh-userauth
  * and ssh-connection but developers are also free to implement their own custom service.
  *
  * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
index 24c0fa0..7457359 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/ChannelOutputStream.java
@@ -117,7 +117,7 @@ public class ChannelOutputStream extends OutputStream implements java.nio.channe
         while (l > 0) {
             // The maximum amount we should admit without flushing again
             // is enough to make up one full packet within our allowed
-            // window size.  We give ourselves a credit equal to the last
+            // window size. We give ourselves a credit equal to the last
             // packet we sent to allow the producer to race ahead and fill
             // out the next packet before we block and wait for space to
             // become available again.

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java
index 9dac896..827a877 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/PtyMode.java
@@ -116,7 +116,7 @@ public enum PtyMode {
     ///////////////////////////////// I-flags ////////////////////////////////
 
     /**
-     * The ignore parity flag.  The parameter SHOULD be 0 if this flag
+     * The ignore parity flag. The parameter SHOULD be 0 if this flag
      * is FALSE, and 1 if it is TRUE.
      */
     IGNPAR(30),

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java b/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
index 4f6d318..579e361 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/channel/Window.java
@@ -36,7 +36,7 @@ import org.apache.sshd.common.util.logging.AbstractLoggingBean;
  * A Window for a given channel.
  * Windows are used to not overflow the client or server when sending datas.
  * Both clients and servers have a local and remote window and won't send
- * anymore data until the window has been expanded.  When the local window
+ * anymore data until the window has been expanded. When the local window
  * is
  *
  * @author <a href="mailto:dev@mina.apache.org">Apache MINA SSHD Project</a>
@@ -128,7 +128,7 @@ public class Window extends AbstractLoggingBean implements java.nio.channels.Cha
              * See RFC-4254 section 5.2:
              *
              *      "Implementations MUST correctly handle window sizes
-             *      of up to 2^32 - 1 bytes.  The window MUST NOT be increased above
+             *      of up to 2^32 - 1 bytes. The window MUST NOT be increased above
              *      2^32 - 1 bytes.
              */
             expandedSize = size + window;

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/common/io/IoConnectFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/io/IoConnectFuture.java b/sshd-core/src/main/java/org/apache/sshd/common/io/IoConnectFuture.java
index 0f946b3..4358ecb 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/IoConnectFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/IoConnectFuture.java
@@ -51,7 +51,7 @@ public interface IoConnectFuture extends SshFuture<IoConnectFuture> {
 
     /**
      * Sets the newly connected session and notifies all threads waiting for
-     * this future.  This method is invoked by SSHD internally.  Please do not
+     * this future. This method is invoked by SSHD internally. Please do not
      * call this method directly.
      *
      * @param session The connected {@link IoSession}
@@ -60,8 +60,8 @@ public interface IoConnectFuture extends SshFuture<IoConnectFuture> {
 
     /**
      * Sets the exception caught due to connection failure and notifies all
-     * threads waiting for this future.  This method is invoked by SSHD
-     * internally.  Please do not call this method directly.
+     * threads waiting for this future. This method is invoked by SSHD
+     * internally. Please do not call this method directly.
      *
      * @param exception The caught {@link Throwable}
      */

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/common/io/IoService.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/io/IoService.java b/sshd-core/src/main/java/org/apache/sshd/common/io/IoService.java
index d6fcef3..453e625 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/IoService.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/IoService.java
@@ -34,7 +34,7 @@ public interface IoService extends Closeable, IoServiceEventListenerManager {
 
     /**
      * Returns the map of all sessions which are currently managed by this
-     * service.  The key of map is the {@link IoSession#getId() ID} of the
+     * service. The key of map is the {@link IoSession#getId() ID} of the
      * session.
      *
      * @return the sessions. An empty collection if there's no session.

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/common/io/IoWriteFuture.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/io/IoWriteFuture.java b/sshd-core/src/main/java/org/apache/sshd/common/io/IoWriteFuture.java
index 543f285..fa56044 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/io/IoWriteFuture.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/io/IoWriteFuture.java
@@ -29,7 +29,7 @@ public interface IoWriteFuture extends SshFuture<IoWriteFuture>, VerifiableFutur
 
     /**
      * @return the cause of the write failure if and only if the write
-     * operation has failed due to an {@link Exception}.  Otherwise,
+     * operation has failed due to an {@link Exception}. Otherwise,
      * {@code null} is returned (use {@link #isDone()} to distinguish
      * between the two.
      */

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
index ce4c3fe..3a55e21 100644
--- a/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
+++ b/sshd-core/src/main/java/org/apache/sshd/common/session/helpers/AbstractSession.java
@@ -1608,7 +1608,7 @@ public abstract class AbstractSession extends AbstractKexFactoryManager implemen
     /**
      * Read the remote identification from this buffer.
      * If more data is needed, the buffer will be reset to its original state
-     * and a {@code null} value will be returned.  Else the identification
+     * and a {@code null} value will be returned. Else the identification
      * string will be returned and the data read will be consumed from the buffer.
      *
      * @param buffer the buffer containing the identification string
@@ -2039,7 +2039,7 @@ public abstract class AbstractSession extends AbstractKexFactoryManager implemen
     }
 
     /**
-     * Send a {@code SSH_MSG_UNIMPLEMENTED} packet.  This packet should
+     * Send a {@code SSH_MSG_UNIMPLEMENTED} packet. This packet should
      * contain the sequence id of the unsupported packet: this number
      * is assumed to be the last packet received.
      *

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java b/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
index 60e5a4d..f648eb1 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/SshServer.java
@@ -62,7 +62,7 @@ import org.apache.sshd.server.session.SessionFactory;
  * </p>
  *
  * <p>
- * The SshServer has to be configured before being started.  Such configuration can be
+ * The SshServer has to be configured before being started. Such configuration can be
  * done either using a dependency injection mechanism (such as the Spring framework)
  * or programmatically. Basic setup is usually done using the {@link #setUpDefaultServer()}
  * method, which will known ciphers, macs, channels, etc...
@@ -325,7 +325,7 @@ public class SshServer extends AbstractFactoryManager implements ServerFactoryMa
     }
 
     /**
-     * Stop the SSH server.  This method will block until all resources are actually disposed.
+     * Stop the SSH server. This method will block until all resources are actually disposed.
      * @throws IOException if stopping failed somehow
      */
     public void stop() throws IOException {

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/CredentialHelper.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/CredentialHelper.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/CredentialHelper.java
index f8a9038..b70a41e 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/CredentialHelper.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/CredentialHelper.java
@@ -34,7 +34,7 @@ import org.ietf.jgss.GSSException;
 import org.ietf.jgss.GSSManager;
 
 /**
- * Simple helper class which gets GSS credential using a fixed Krb5 login configuration.  May need generalizing to deal
+ * Simple helper class which gets GSS credential using a fixed Krb5 login configuration. May need generalizing to deal
  * with non-Sun JREs.
  */
 public final class CredentialHelper {

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/GSSAuthenticator.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/GSSAuthenticator.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/GSSAuthenticator.java
index f9540f8..eb77af4 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/GSSAuthenticator.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/GSSAuthenticator.java
@@ -29,7 +29,7 @@ import org.ietf.jgss.GSSException;
 import org.ietf.jgss.GSSManager;
 
 /**
- * Class providing basic GSS authentication services.  Can be used as-is, but is often extended to provide environment
+ * Class providing basic GSS authentication services. Can be used as-is, but is often extended to provide environment
  * specific implementations.
  *
  * @author Richard Evans
@@ -58,7 +58,7 @@ public class GSSAuthenticator {
     }
 
     /**
-     * Overridable method to get GSS accept credential suitable for the current environment.  The default
+     * Overridable method to get GSS accept credential suitable for the current environment. The default
      * implementation uses a Kerberos key table.
      *
      * @param mgr The GSS manager
@@ -77,8 +77,8 @@ public class GSSAuthenticator {
     }
 
     /**
-     * Validate the user name passed in the initial SSH_MSG_USERAUTH_REQUEST message.  This is sort of mandated by RFC 4462, but it
-     * may be more useful to wait for the GSS negotiation to complete.  The default implementation here always succeeds.
+     * Validate the user name passed in the initial SSH_MSG_USERAUTH_REQUEST message. This is sort of mandated by RFC 4462, but it
+     * may be more useful to wait for the GSS negotiation to complete. The default implementation here always succeeds.
      *
      * @param session The current session
      * @param user    The user name from the initial request
@@ -101,7 +101,7 @@ public class GSSAuthenticator {
     }
 
     /**
-     * Set the service principal name to be used.  The default is host/hostname.
+     * Set the service principal name to be used. The default is host/hostname.
      *
      * @param servicePrincipalName The principal name
      */
@@ -110,7 +110,7 @@ public class GSSAuthenticator {
     }
 
     /**
-     * Set the location of the Kerberos keytab.  The default is defined by the JRE.
+     * Set the location of the Kerberos keytab. The default is defined by the JRE.
      *
      * @param keytabFile The location of the keytab
      */

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
index 988e829..db1256f 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/auth/gss/UserAuthGSS.java
@@ -36,7 +36,7 @@ import org.ietf.jgss.MessageProp;
 import org.ietf.jgss.Oid;
 
 /**
- * <p>Prototype user authentication handling gssapi-with-mic.  Implements <code>HandshakingUserAuth</code> because
+ * <p>Prototype user authentication handling gssapi-with-mic. Implements <code>HandshakingUserAuth</code> because
  * the process involves several steps.</p>
  *
  * <p>Several methods are available for overriding in specific circumstances.</p>

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/server/command/Command.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/command/Command.java b/sshd-core/src/main/java/org/apache/sshd/server/command/Command.java
index 5425d3a..cfc1c51 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/command/Command.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/command/Command.java
@@ -31,7 +31,7 @@ import org.apache.sshd.server.ExitCallback;
  * <p>
  * This command have direct streams, meaning those streams will be provided by the ssh server
  * for the shell to use directly. This interface is suitable for implementing commands in java,
- * rather than using external processes.  For wrapping such processes or using inverted streams,
+ * rather than using external processes. For wrapping such processes or using inverted streams,
  * </p>
  * see {@link org.apache.sshd.server.shell.InvertedShellWrapper}.
  */

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpForwardingFilter.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpForwardingFilter.java b/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpForwardingFilter.java
index 715190a..3f0aaa7 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpForwardingFilter.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/forward/TcpForwardingFilter.java
@@ -56,7 +56,7 @@ public interface TcpForwardingFilter {
      *
      * <p>
      * This server process will open a new listen socket on the address given
-     * by the client (usually 127.0.0.1 but may be any address).  Any inbound
+     * by the client (usually 127.0.0.1 but may be any address). Any inbound
      * connections to this socket will be tunneled over the session to the
      * client, which the client will then forward the connection to another
      * host on the client's side of the network.
@@ -147,7 +147,7 @@ public interface TcpForwardingFilter {
      *
      * <p>
      * This server process will connect to another server listening on the
-     * address specified by the client.  Usually this is to another port on
+     * address specified by the client. Usually this is to another port on
      * the same host (127.0.0.1) but may be to any other system this server
      * can reach on the server's side of the network.
      * </p>

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShell.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShell.java b/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShell.java
index 3abc523..7035e89 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShell.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShell.java
@@ -26,7 +26,7 @@ import org.apache.sshd.server.command.CommandLifecycle;
 
 /**
  * This shell have inverted streams, such as the one obtained when launching a
- * new {@link Process} from java.  This interface is meant to be used with
+ * new {@link Process} from java. This interface is meant to be used with
  * {@link InvertedShellWrapper} class as an implementation of
  * {@link org.apache.sshd.common.Factory}.
  *

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java b/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java
index 3c19e2c..dee1371 100644
--- a/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java
+++ b/sshd-core/src/main/java/org/apache/sshd/server/shell/InvertedShellWrapper.java
@@ -39,7 +39,7 @@ import org.apache.sshd.server.session.ServerSession;
 
 /**
  * A shell implementation that wraps an instance of {@link InvertedShell}
- * as a {@link Command}.  This is useful when using external
+ * as a {@link Command}. This is useful when using external
  * processes.
  * When starting the shell, this wrapper will also create a thread used
  * to pump the streams and also to check if the shell is alive.
@@ -215,7 +215,7 @@ public class InvertedShellWrapper extends AbstractLoggingBean implements Command
                     return;
                 }
 
-                // Sleep a bit.  This is not very good, as it consumes CPU, but the
+                // Sleep a bit. This is not very good, as it consumes CPU, but the
                 // input streams are not selectable for nio, and any other blocking
                 // method would consume at least two threads
                 Thread.sleep(pumpSleepTime);

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java b/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
index 3224913..44d8c70 100644
--- a/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
+++ b/sshd-core/src/test/java/org/apache/sshd/deprecated/ClientUserAuthServiceOld.java
@@ -60,7 +60,7 @@ public class ClientUserAuthServiceOld extends AbstractCloseable implements Servi
     private UserAuth userAuth;
 
     /**
-     * The AuthFuture that is being used by the current auth request.  This encodes the state.
+     * The AuthFuture that is being used by the current auth request. This encodes the state.
      * isSuccess -> authenticated, else if isDone -> server waiting for user auth, else authenticating.
      */
     private volatile AuthFuture authFuture;
@@ -147,7 +147,7 @@ public class ClientUserAuthServiceOld extends AbstractCloseable implements Servi
             log.debug("authentication already in progress");
             throw new IllegalStateException("Authentication already in progress?");
         }
-        // Set up the next round of authentication.  Each round gets a new lock.
+        // Set up the next round of authentication. Each round gets a new lock.
         this.userAuth = userAuth;
         // The new future !isDone() - i.e., in progress blocking out other waits.
         this.authFuture = new DefaultAuthFuture(getClass().getSimpleName(), lock);

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java
----------------------------------------------------------------------
diff --git a/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java b/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java
index 3bbcbc2..ca4e282 100644
--- a/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java
+++ b/sshd-core/src/test/java/org/apache/sshd/server/ServerTest.java
@@ -127,7 +127,7 @@ public class ServerTest extends BaseTestSupport {
     }
 
     /*
-     * Send bad password.  The server should disconnect after a few attempts
+     * Send bad password. The server should disconnect after a few attempts
      */
     @Test
     public void testFailAuthenticationWithWaitFor() throws Exception {

http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/5bb1b164/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpSubsystemHelper.java
----------------------------------------------------------------------
diff --git a/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpSubsystemHelper.java b/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpSubsystemHelper.java
index 86dc171..f731904 100644
--- a/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpSubsystemHelper.java
+++ b/sshd-sftp/src/main/java/org/apache/sshd/server/subsystem/sftp/AbstractSftpSubsystemHelper.java
@@ -1011,7 +1011,7 @@ public abstract class AbstractSftpSubsystemHelper
              *
              *      If this is a zero length string, the client does not have the
              *      data, and is requesting the hash for reasons other than comparing
-             *      with a local file.  The server MAY return SSH_FX_OP_UNSUPPORTED in
+             *      with a local file. The server MAY return SSH_FX_OP_UNSUPPORTED in
              *      this case.
              */
             if (NumberUtils.length(quickCheckHash) <= 0) {