X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=netconf%2Fnetconf-client%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fnetconf%2Fclient%2Fconf%2FNetconfReconnectingClientConfiguration.java;h=d6d7d586d183e0fcec495b104699c38acb2e9ea3;hb=134a5dfe40fa01ebb879bd9f5d0bfa119650ef6a;hp=a2512687e4ad569a35adc5bfd5f91472edc62797;hpb=9cc422be10034f5f3cfa401fc20539c560aa7fe3;p=netconf.git diff --git a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfiguration.java b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfiguration.java index a2512687e4..d6d7d586d1 100644 --- a/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfiguration.java +++ b/netconf/netconf-client/src/main/java/org/opendaylight/netconf/client/conf/NetconfReconnectingClientConfiguration.java @@ -7,14 +7,19 @@ */ package org.opendaylight.netconf.client.conf; +import static java.util.Objects.requireNonNull; + import com.google.common.base.MoreObjects.ToStringHelper; -import com.google.common.base.Preconditions; import java.net.InetSocketAddress; +import java.util.List; import org.opendaylight.netconf.api.messages.NetconfHelloMessageAdditionalHeader; import org.opendaylight.netconf.client.NetconfClientSessionListener; +import org.opendaylight.netconf.client.SslHandlerFactory; +import org.opendaylight.netconf.nettyutil.ReconnectStrategy; +import org.opendaylight.netconf.nettyutil.ReconnectStrategyFactory; import org.opendaylight.netconf.nettyutil.handler.ssh.authentication.AuthenticationHandler; -import org.opendaylight.protocol.framework.ReconnectStrategy; -import org.opendaylight.protocol.framework.ReconnectStrategyFactory; +import org.opendaylight.netconf.nettyutil.handler.ssh.client.NetconfSshClient; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; public final class NetconfReconnectingClientConfiguration extends NetconfClientConfiguration { @@ -26,9 +31,12 @@ public final class NetconfReconnectingClientConfiguration extends NetconfClientC final NetconfClientSessionListener sessionListener, final ReconnectStrategy reconnectStrategy, final ReconnectStrategyFactory connectStrategyFactory, - final AuthenticationHandler authHandler) { + final AuthenticationHandler authHandler, + final SslHandlerFactory sslHandlerFactory, + final NetconfSshClient sshClient, + final List odlHelloCapabilities) { super(clientProtocol, address, connectionTimeoutMillis, additionalHeader, sessionListener, reconnectStrategy, - authHandler); + authHandler, sslHandlerFactory, sshClient, odlHelloCapabilities); this.connectStrategyFactory = connectStrategyFactory; validateReconnectConfiguration(); } @@ -38,7 +46,7 @@ public final class NetconfReconnectingClientConfiguration extends NetconfClientC } private void validateReconnectConfiguration() { - Preconditions.checkNotNull(connectStrategyFactory); + requireNonNull(connectStrategyFactory); } @Override