This is an automated email from the ASF dual-hosted git repository. lgoldstein pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/mina-sshd.git
commit 36cddc41e8c1bfc2665685fb1072757ed78cc580 Author: Lyor Goldstein <[email protected]> AuthorDate: Thu Aug 20 15:10:39 2020 +0300 [SSHD-1056] Modified ClientFactoryManager hierarchy to include ClientSessionCreator --- .../main/java/org/apache/sshd/cli/client/SshClientCliSupport.java | 3 ++- .../src/main/java/org/apache/sshd/client/ClientFactoryManager.java | 2 ++ sshd-core/src/main/java/org/apache/sshd/client/SshClient.java | 7 +++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sshd-cli/src/main/java/org/apache/sshd/cli/client/SshClientCliSupport.java b/sshd-cli/src/main/java/org/apache/sshd/cli/client/SshClientCliSupport.java index fca0403..6b17d17 100644 --- a/sshd-cli/src/main/java/org/apache/sshd/cli/client/SshClientCliSupport.java +++ b/sshd-cli/src/main/java/org/apache/sshd/cli/client/SshClientCliSupport.java @@ -278,7 +278,8 @@ public abstract class SshClientCliSupport extends CliSupport { } // CHECKSTYLE:ON - public static HostConfigEntry resolveHost(SshClient client, String username, String host, int port, String proxyJump) + public static HostConfigEntry resolveHost( + ClientFactoryManager client, String username, String host, int port, String proxyJump) throws IOException { HostConfigEntryResolver resolver = client.getHostConfigEntryResolver(); HostConfigEntry entry = resolver.resolveEffectiveHost(host, port, null, username, proxyJump, null); diff --git a/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java b/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java index 727e31b..95139d8 100644 --- a/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java +++ b/sshd-core/src/main/java/org/apache/sshd/client/ClientFactoryManager.java @@ -21,6 +21,7 @@ package org.apache.sshd.client; import org.apache.sshd.client.config.hosts.HostConfigEntryResolver; import org.apache.sshd.client.config.keys.ClientIdentityLoaderManager; import org.apache.sshd.client.session.ClientProxyConnectorHolder; +import org.apache.sshd.client.session.ClientSessionCreator; import org.apache.sshd.common.FactoryManager; import org.apache.sshd.common.config.keys.FilePasswordProviderManager; @@ -32,6 +33,7 @@ import org.apache.sshd.common.config.keys.FilePasswordProviderManager; */ public interface ClientFactoryManager extends FactoryManager, + ClientSessionCreator, ClientProxyConnectorHolder, FilePasswordProviderManager, ClientIdentityLoaderManager, 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 724018a..d5873eb 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 @@ -62,7 +62,6 @@ import org.apache.sshd.client.session.AbstractClientSession; import org.apache.sshd.client.session.ClientConnectionServiceFactory; import org.apache.sshd.client.session.ClientProxyConnector; import org.apache.sshd.client.session.ClientSession; -import org.apache.sshd.client.session.ClientSessionCreator; import org.apache.sshd.client.session.ClientUserAuthServiceFactory; import org.apache.sshd.client.session.SessionFactory; import org.apache.sshd.client.session.forward.ExplicitPortForwardingTracker; @@ -148,15 +147,15 @@ import org.apache.sshd.core.CoreModuleProperties; * one instance of {@code SshClient} for the application and then use throughout - including for multi-threading. As * long as the {@code SshClient} is not re-configured it should be multi-thread safe regardless of the target session * being created. - * + * * @author <a href="mailto:[email protected]";>Apache MINA SSHD Project</a> */ -public class SshClient extends AbstractFactoryManager implements ClientFactoryManager, ClientSessionCreator, Closeable { +public class SshClient extends AbstractFactoryManager implements ClientFactoryManager, Closeable { public static final Factory<SshClient> DEFAULT_SSH_CLIENT_FACTORY = SshClient::new; /** * Default user authentication preferences if not set - * + * * @see <A HREF="http://linux.die.net/man/5/ssh_config";>ssh_config(5) - PreferredAuthentications</A> */ public static final List<UserAuthFactory> DEFAULT_USER_AUTH_FACTORIES = Collections.unmodifiableList(
