X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fcallhome-protocol%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fcallhome%2Fprotocol%2FNetconfCallHomeServerBuilder.java;h=136adf351a6c388ed855679e8b4fe22f81ab40f9;hb=e3ad7c25673e9c59e750612c83adf73fdb1576a4;hp=73d4c5b473538ad46a58aa4d6bcf7e5c40c7e066;hpb=af2124dc59e2a6402108c7603245eb575858a5b0;p=netconf.git

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 73d4c5b473..136adf351a 100644
--- 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
@@ -7,21 +7,20 @@
  */
 package org.opendaylight.netconf.callhome.protocol;
 
-import com.google.common.base.Optional;
 import io.netty.channel.DefaultEventLoopGroup;
 import io.netty.channel.EventLoopGroup;
 import io.netty.util.HashedWheelTimer;
 import java.net.InetSocketAddress;
+import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import org.apache.sshd.client.SshClient;
-import org.opendaylight.netconf.callhome.protocol.CallHomeSessionContext.Factory;
+import org.eclipse.jdt.annotation.NonNull;
 import org.opendaylight.netconf.client.NetconfClientSessionNegotiatorFactory;
-import org.opendaylight.yangtools.concepts.Builder;
-
-public class NetconfCallHomeServerBuilder implements Builder<NetconfCallHomeServer> {
+import org.opendaylight.netconf.nettyutil.handler.ssh.client.NetconfClientBuilder;
+import org.opendaylight.netconf.shaded.sshd.client.SshClient;
 
+public class NetconfCallHomeServerBuilder {
     private static final long DEFAULT_SESSION_TIMEOUT_MILLIS = TimeUnit.SECONDS.toMillis(5);
-    private static final int DEFAULT_CALL_HOME_PORT = 6666;
+    private static final int DEFAULT_CALL_HOME_PORT = 4334;
 
     private SshClient sshClient;
     private EventLoopGroup nettyGroup;
@@ -39,11 +38,10 @@ public class NetconfCallHomeServerBuilder implements Builder<NetconfCallHomeServ
         this.recorder = recorder;
     }
 
-    @Override
-    public NetconfCallHomeServer build() {
-        Factory factory =
-                new CallHomeSessionContext.Factory(nettyGroup(), negotiatorFactory(), subsystemListener());
-        return new NetconfCallHomeServer(sshClient(), authProvider(), factory, bindAddress(), this.recorder);
+    public @NonNull NetconfCallHomeServer build() {
+        return new NetconfCallHomeServer(sshClient(), authProvider(),
+            new CallHomeSessionContext.Factory(nettyGroup(), negotiatorFactory(), subsystemListener()),
+            bindAddress(), recorder);
     }
 
     public SshClient getSshClient() {
@@ -107,12 +105,12 @@ public class NetconfCallHomeServerBuilder implements Builder<NetconfCallHomeServ
     }
 
     private static SshClient defaultSshClient() {
-        return SshClient.setUpDefaultClient();
+        return new NetconfClientBuilder().build();
     }
 
     private static NetconfClientSessionNegotiatorFactory defaultNegotiationFactory() {
         return new NetconfClientSessionNegotiatorFactory(new HashedWheelTimer(),
-                                                         Optional.absent(), DEFAULT_SESSION_TIMEOUT_MILLIS);
+                                                         Optional.empty(), DEFAULT_SESSION_TIMEOUT_MILLIS);
     }
 
     private static EventLoopGroup defaultNettyGroup() {