Eliminate AsyncSshHandlerReader in call home

[netconf.git] / netconf / callhome-protocol / src / main / java / org / opendaylight / netconf / callhome / protocol / NetconfCallHomeServerBuilder.java

diff --git a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java
index 136adf351a6c388ed855679e8b4fe22f81ab40f9..9f1718ad361fd0ce04999043acfc6a4c182d5599 100644 (file)
--- a/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java
+++ b/netconf/callhome-protocol/src/main/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerBuilder.java
@@ -16,13 +16,13 @@ import java.util.concurrent.TimeUnit;
 import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;
 import org.opendaylight.netconf.nettyutil.handler.ssh.client.NetconfClientBuilder;
-import org.opendaylight.netconf.shaded.sshd.client.SshClient;
+import org.opendaylight.netconf.nettyutil.handler.ssh.client.NetconfSshClient;
 
 public class NetconfCallHomeServerBuilder {
     private static final long DEFAULT_SESSION_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(5);
     private static final int DEFAULT_CALL_HOME_PORT = 4334;
 
-    private SshClient sshClient;
+    private NetconfSshClient sshClient;
     private EventLoopGroup nettyGroup;
     private NetconfClientSessionNegotiatorFactory negotiationFactory;
     private InetSocketAddress bindAddress;
@@ -44,11 +44,11 @@ public class NetconfCallHomeServerBuilder {
             bindAddress(), recorder);
     }
 
-    public SshClient getSshClient() {
+    public NetconfSshClient getSshClient() {
         return sshClient;
     }
 
-    public void setSshClient(final SshClient sshClient) {
+    public void setSshClient(final NetconfSshClient sshClient) {
         this.sshClient = sshClient;
     }
 
@@ -100,11 +100,11 @@ public class NetconfCallHomeServerBuilder {
         return authProvider;
     }
 
-    private SshClient sshClient() {
+    private NetconfSshClient sshClient() {
         return sshClient != null ? sshClient : defaultSshClient();
     }
 
-    private static SshClient defaultSshClient() {
+    private static NetconfSshClient defaultSshClient() {
         return new NetconfClientBuilder().build();
     }