[SSHD-815] Fixed README.md text regarding user-specific SFTP client creation factory
Project: http://git-wip-us.apache.org/repos/asf/mina-sshd/repo Commit: http://git-wip-us.apache.org/repos/asf/mina-sshd/commit/84e009a6 Tree: http://git-wip-us.apache.org/repos/asf/mina-sshd/tree/84e009a6 Diff: http://git-wip-us.apache.org/repos/asf/mina-sshd/diff/84e009a6 Branch: refs/heads/master Commit: 84e009a64a1dedfddcee8f56b11ac415604ae8f1 Parents: 12548b4 Author: Goldstein Lyor <l...@c-b4.com> Authored: Mon Apr 16 16:11:50 2018 +0300 Committer: Goldstein Lyor <l...@c-b4.com> Committed: Tue Apr 17 07:58:21 2018 +0300 ---------------------------------------------------------------------- README.md | 8 +++----- .../org/apache/sshd/client/simple/SimpleSftpClientImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/84e009a6/README.md ---------------------------------------------------------------------- diff --git a/README.md b/README.md index 52c5180..ecf2317 100644 --- a/README.md +++ b/README.md @@ -596,20 +596,18 @@ configuration key. For more advanced restrictions one needs to sub-class `SftpSu The code creates `SftpClient`-s and `SftpFileSystem`-s using a default built-in `SftpClientFactory` instance (see `DefaultSftpClientFactory`). Users may choose to use a custom factory in order to provide their own -implementations - e.g., in order to override some default behavior. The custom factory may be registered either at -the client or session level - e.g.: +implementations - e.g., in order to override some default behavior - e.g.: ```java SshClient client = ... setup client... try (ClientSession session = client.connect(user, host, port).verify(timeout).getSession()) { - // override the default factory with a special one - but only for this session - session.setSftpClientFactory(); session.addPasswordIdentity(password); session.auth.verify(timeout); - try (SftpClient sftp = new SpecialSessionSftpClientFactory().createSftpClient()) { + // User-specific factory + try (SftpClient sftp = MySpecialSessionSftpClientFactory.INSTANCE.createSftpClient(session)) { ... instance created through SpecialSessionSftpClientFactory ... } } http://git-wip-us.apache.org/repos/asf/mina-sshd/blob/84e009a6/sshd-sftp/src/main/java/org/apache/sshd/client/simple/SimpleSftpClientImpl.java ---------------------------------------------------------------------- diff --git a/sshd-sftp/src/main/java/org/apache/sshd/client/simple/SimpleSftpClientImpl.java b/sshd-sftp/src/main/java/org/apache/sshd/client/simple/SimpleSftpClientImpl.java index 09a7007..4f47d8a 100644 --- a/sshd-sftp/src/main/java/org/apache/sshd/client/simple/SimpleSftpClientImpl.java +++ b/sshd-sftp/src/main/java/org/apache/sshd/client/simple/SimpleSftpClientImpl.java @@ -41,7 +41,7 @@ public class SimpleSftpClientImpl extends AbstractLoggingBean implements SimpleS public SimpleSftpClientImpl(SimpleClient client, SftpClientFactory sftpClientFactory) { this.client = client; - this.sftpClientFactory = sftpClientFactory != null ? sftpClientFactory : SftpClientFactory.instance(); + setSftpClientFactory(sftpClientFactory); } public SimpleClient getClient() { @@ -57,7 +57,7 @@ public class SimpleSftpClientImpl extends AbstractLoggingBean implements SimpleS } public void setSftpClientFactory(SftpClientFactory sftpClientFactory) { - this.sftpClientFactory = sftpClientFactory; + this.sftpClientFactory = (sftpClientFactory != null) ? sftpClientFactory : SftpClientFactory.instance(); } @Override
