Adjust to yangtools-2.0.0/odlparent-3.0.0 changes

[netconf.git] / netconf / callhome-protocol / src / test / java / org / opendaylight / netconf / callhome / protocol / NetconfCallHomeServerTest.java

diff --git a/netconf/callhome-protocol/src/test/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerTest.java b/netconf/callhome-protocol/src/test/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerTest.java
index d96f17a1f4f44b0b06c38e81e398383248496ac2..373a79f7dea47753a69638a472b5433d1eed230d 100644 (file)
--- a/netconf/callhome-protocol/src/test/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerTest.java
+++ b/netconf/callhome-protocol/src/test/java/org/opendaylight/netconf/callhome/protocol/NetconfCallHomeServerTest.java
@@ -20,16 +20,16 @@ import java.net.SocketAddress;
 import java.security.PublicKey;
 import java.util.HashMap;
 import java.util.Map;
-import org.apache.sshd.ClientSession;
-import org.apache.sshd.SshClient;
+import org.apache.sshd.client.SshClient;
 import org.apache.sshd.client.future.AuthFuture;
+import org.apache.sshd.client.session.ClientSession;
 import org.apache.sshd.client.session.ClientSessionImpl;
-import org.apache.sshd.common.Session;
-import org.apache.sshd.common.SessionListener;
 import org.apache.sshd.common.future.SshFutureListener;
 import org.apache.sshd.common.io.IoAcceptor;
 import org.apache.sshd.common.io.IoHandler;
 import org.apache.sshd.common.io.IoServiceFactory;
+import org.apache.sshd.common.session.Session;
+import org.apache.sshd.common.session.SessionListener;
 import org.junit.Before;
 import org.junit.Test;
 import org.mockito.Mockito;
@@ -105,7 +105,6 @@ public class NetconfCallHomeServerTest {
         Mockito.doReturn("testAddr").when(mockSocketAddr).toString();
         PublicKey mockPublicKey = mock(PublicKey.class);
 
-        CallHomeAuthorization mockAuth = mock(CallHomeAuthorization.class);
         Mockito.doReturn("test").when(mockAuth).toString();
         Mockito.doReturn(true).when(mockAuth).isServerAllowed();
         Mockito.doReturn("some-session-name").when(mockAuth).getSessionName();
@@ -137,22 +136,22 @@ public class NetconfCallHomeServerTest {
     static class TestableCallHomeServer extends NetconfCallHomeServer {
         static IoServiceFactory minaServiceFactory;
 
-        static SshClient factoryHook(SshClient client, IoServiceFactory minaFactory) {
+        static SshClient factoryHook(final SshClient client, final IoServiceFactory minaFactory) {
             minaServiceFactory = minaFactory;
             return client;
         }
 
         SshClient client;
 
-        TestableCallHomeServer(SshClient sshClient, CallHomeAuthorizationProvider authProvider,
-                               CallHomeSessionContext.Factory factory, InetSocketAddress socketAddress,
-                               IoServiceFactory minaFactory, StatusRecorder recorder) {
+        TestableCallHomeServer(final SshClient sshClient, final CallHomeAuthorizationProvider authProvider,
+                               final CallHomeSessionContext.Factory factory, final InetSocketAddress socketAddress,
+                               final IoServiceFactory minaFactory, final StatusRecorder recorder) {
             super(factoryHook(sshClient, minaFactory), authProvider, factory, socketAddress, recorder);
             client = sshClient;
         }
 
         @Override
-        protected IoServiceFactory createMinaServiceFactory(SshClient sshClient) {
+        protected IoServiceFactory createMinaServiceFactory(final SshClient sshClient) {
             return minaServiceFactory;
         }
     }