Migrate NetconfHelloMessage's use of Optional

[netconf.git] / netconf / netconf-client / src / test / java / org / opendaylight / netconf / client / NetconfReconnectingClientConfigurationTest.java

diff --git a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java
index be654a340ce3c98fc84d81c84b2c67423b5b9529..ec09f88efaf1998597f385cac4f56ae1dc811915 100644 (file)
--- a/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java
+++ b/netconf/netconf-client/src/test/java/org/opendaylight/netconf/client/NetconfReconnectingClientConfigurationTest.java
@@ -8,8 +8,8 @@
 
 package org.opendaylight.netconf.client;
 
-import com.google.common.base.Optional;
 import java.net.InetSocketAddress;
+import java.util.Optional;
 import org.junit.Assert;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -44,7 +44,7 @@ public class NetconfReconnectingClientConfigurationTest {
                 .withAuthHandler(handler).build();
 
         Assert.assertEquals(timeout, cfg.getConnectionTimeoutMillis());
-        Assert.assertEquals(Optional.fromNullable(header), cfg.getAdditionalHeader());
+        Assert.assertEquals(Optional.of(header), cfg.getAdditionalHeader());
         Assert.assertEquals(listener, cfg.getSessionListener());
         Assert.assertEquals(handler, cfg.getAuthHandler());
         Assert.assertEquals(strategy, cfg.getConnectStrategyFactory());
@@ -64,7 +64,7 @@ public class NetconfReconnectingClientConfigurationTest {
                 .withSslHandlerFactory(sslHandlerFactory).build();
 
         Assert.assertEquals(timeout, cfg2.getConnectionTimeoutMillis());
-        Assert.assertEquals(Optional.fromNullable(header), cfg2.getAdditionalHeader());
+        Assert.assertEquals(Optional.of(header), cfg2.getAdditionalHeader());
         Assert.assertEquals(listener, cfg2.getSessionListener());
         Assert.assertEquals(sslHandlerFactory, cfg2.getSslHandlerFactory());
         Assert.assertEquals(strategy, cfg2.getConnectStrategyFactory());