*/
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;
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() {
}
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() {