Bump upstreams

[netconf.git] / netconf / netconf-client / src / main / java / org / opendaylight / netconf / client / conf / NetconfReconnectingClientConfiguration.java

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 dcb9ec310dd623813779820c306801e38a22d044..d6d7d586d183e0fcec495b104699c38acb2e9ea3 100644 (file)
--- 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,25 +7,36 @@
  */
 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 {
 
     private final ReconnectStrategyFactory connectStrategyFactory;
 
     NetconfReconnectingClientConfiguration(final NetconfClientProtocol clientProtocol, final InetSocketAddress address,
-            final Long connectionTimeoutMillis, final NetconfHelloMessageAdditionalHeader additionalHeader,
-            final NetconfClientSessionListener sessionListener, final ReconnectStrategy reconnectStrategy,
-            final ReconnectStrategyFactory connectStrategyFactory, final AuthenticationHandler authHandler) {
+                                           final Long connectionTimeoutMillis,
+                                           final NetconfHelloMessageAdditionalHeader additionalHeader,
+                                           final NetconfClientSessionListener sessionListener,
+                                           final ReconnectStrategy reconnectStrategy,
+                                           final ReconnectStrategyFactory connectStrategyFactory,
+                                           final AuthenticationHandler authHandler,
+                                           final SslHandlerFactory sslHandlerFactory,
+                                           final NetconfSshClient sshClient,
+                                           final List<Uri> odlHelloCapabilities) {
         super(clientProtocol, address, connectionTimeoutMillis, additionalHeader, sessionListener, reconnectStrategy,
-                authHandler);
+                authHandler, sslHandlerFactory, sshClient, odlHelloCapabilities);
         this.connectStrategyFactory = connectStrategyFactory;
         validateReconnectConfiguration();
     }
@@ -35,7 +46,7 @@ public final class NetconfReconnectingClientConfiguration extends NetconfClientC
     }
 
     private void validateReconnectConfiguration() {
-        Preconditions.checkNotNull(connectStrategyFactory);
+        requireNonNull(connectStrategyFactory);
     }
 
     @Override