Fix Mockito Generics

[openflowplugin.git] / openflowplugin / src / test / java / org / opendaylight / openflowplugin / openflow / md / core / session / SessionManagerOFImplTest.java

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImplTest.java
index f26afc70d45a47497db1073ed55e27524b23662c..4deaf1281279a7fb70bc5fbf42767eace2ab5590 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImplTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImplTest.java
@@ -7,15 +7,14 @@
  */
 package org.opendaylight.openflowplugin.openflow.md.core.session;
 
+import static org.mockito.Matchers.any;
 import com.google.common.util.concurrent.ListeningExecutorService;
 import java.math.BigInteger;
 import java.net.InetSocketAddress;
 import org.junit.After;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
 import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.mockito.Mockito;
@@ -29,22 +28,15 @@ import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter;
 import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor;
 import org.opendaylight.openflowplugin.api.openflow.md.core.NotificationEnqueuer;
-import org.opendaylight.openflowplugin.api.openflow.md.core.NotificationQueueWrapper;
 import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext;
 import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionManager;
 import org.opendaylight.openflowplugin.api.openflow.md.core.session.SwitchSessionKeyOF;
 import org.opendaylight.openflowplugin.openflow.md.core.role.OfEntityManager;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.ModelDrivenSwitchImpl;
 import org.opendaylight.openflowplugin.openflow.md.core.sal.SalRegistrationManager;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeUpdated;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeUpdated;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutputBuilder;
-import org.opendaylight.yangtools.yang.binding.Notification;
 import org.opendaylight.yangtools.yang.binding.RpcService;
 
-import static org.mockito.Matchers.any;
-
 /**
  * test of {@link SessionManagerOFImpl}
  */
@@ -87,19 +79,19 @@ public class SessionManagerOFImplTest {
         Mockito.when(context.getNotificationEnqueuer()).thenReturn(notificationEnqueuer);
 
         // provider context - registration responder
-        Mockito.when(rpcProviderRegistry.addRoutedRpcImplementation(any(Class.class), any(RpcService.class)))
+        Mockito.when(rpcProviderRegistry.addRoutedRpcImplementation(Matchers.<Class<RpcService>> any(), any(RpcService.class)))
         .then(new Answer<RoutedRpcRegistration<?>>() {
             @Override
-            public RoutedRpcRegistration<?> answer(InvocationOnMock invocation) {
-                Object[] args = invocation.getArguments();
-                RoutedRpcRegistration<RpcService> registration = Mockito.mock(RoutedRpcRegistration.class);
+            public RoutedRpcRegistration<?> answer(final InvocationOnMock invocation) {
+                final Object[] args = invocation.getArguments();
+                final RoutedRpcRegistration<RpcService> registration = Mockito.mock(RoutedRpcRegistration.class);
                 Mockito.when(registration.getInstance()).thenReturn((RpcService) args[1]);
                 return registration;
             }
         });
 
         // session listener - prepare registration and notification mockery
-        SalRegistrationManager sessionListener = new SalRegistrationManager();
+        final SalRegistrationManager sessionListener = new SalRegistrationManager();
         sessionListener.setPublishService(notificationProviderService);
         sessionListener.setRpcProviderRegistry(rpcProviderRegistry);
         sessionListener.setDataService(dataService);
@@ -131,7 +123,7 @@ public class SessionManagerOFImplTest {
     @Test
     public void testAddSessionContext() {
         // prepare mocks and values
-        GetFeaturesOutputBuilder featuresBld = new GetFeaturesOutputBuilder().setDatapathId(BigInteger.valueOf(42));
+        final GetFeaturesOutputBuilder featuresBld = new GetFeaturesOutputBuilder().setDatapathId(BigInteger.valueOf(42));
         featuresBld.setVersion((short) 123);
         Mockito.when(context.getFeatures()).thenReturn(featuresBld.build());
         Mockito.when(primaryConductor.getConnectionAdapter()).thenReturn(connectionAdapter);