Fix codestyle

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / statistics / services / OpendaylightFlowStatisticsServiceImpl2Test.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java
index 8c3d71dbb6debce9ebdcba942fc22549578c7f6b..50fdfc0989123a25cfdbe6b26a659b0197b79472 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/OpendaylightFlowStatisticsServiceImpl2Test.java
@@ -26,6 +26,8 @@ import org.opendaylight.openflowplugin.api.openflow.device.MessageTranslator;
 import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey;
 import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.EventIdentifier;
 import org.opendaylight.openflowplugin.impl.rpc.AbstractRequestContext;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorManagerFactory;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForGivenMatchInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.GetAggregateFlowStatisticsFromFlowTableForGivenMatchOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.get.aggregate.flow.statistics.from.flow.table._for.given.match.output.AggregatedFlowStatistics;
@@ -38,7 +40,7 @@ import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 
 /**
- * Test for {@link OpendaylightFlowStatisticsServiceImpl} - only not delegated method
+ * Test for {@link OpendaylightFlowStatisticsServiceImpl} - only not delegated method.
  */
 public class OpendaylightFlowStatisticsServiceImpl2Test extends AbstractStatsServiceTest {
 
@@ -53,7 +55,10 @@ public class OpendaylightFlowStatisticsServiceImpl2Test extends AbstractStatsSer
 
 
     public void setUp() {
-        flowStatisticsService = OpendaylightFlowStatisticsServiceImpl.createWithOook(rqContextStack, deviceContext);
+        final ConvertorManager convertorManager = ConvertorManagerFactory.createDefaultManager();
+        flowStatisticsService = OpendaylightFlowStatisticsServiceImpl.createWithOook(rqContextStack,
+                                                                                     deviceContext,
+                                                                                     convertorManager);
 
         rqContextMp = new AbstractRequestContext<List<MultipartReply>>(42L) {
             @Override
@@ -62,7 +67,8 @@ public class OpendaylightFlowStatisticsServiceImpl2Test extends AbstractStatsSer
             }
         };
         Mockito.when(rqContextStack.<List<MultipartReply>>createRequestContext()).thenReturn(rqContextMp);
-        Mockito.when(translatorLibrary.<MultipartReply, AggregatedFlowStatistics>lookupTranslator(Matchers.any(TranslatorKey.class)))
+        Mockito.when(translatorLibrary
+                .<MultipartReply, AggregatedFlowStatistics>lookupTranslator(Matchers.any(TranslatorKey.class)))
                 .thenReturn(translator);
     }
 
@@ -70,22 +76,19 @@ public class OpendaylightFlowStatisticsServiceImpl2Test extends AbstractStatsSer
     public void testGetAggregateFlowStatisticsFromFlowTableForGivenMatch() throws Exception {
         Mockito.doAnswer(answerVoidToCallback).when(outboundQueueProvider)
                 .commitEntry(Matchers.eq(42L), requestInput.capture(), Matchers.any(FutureCallback.class));
-        Mockito.doAnswer(new Answer<Void>() {
-                             @Override
-                             public Void answer(InvocationOnMock invocation) throws Throwable {
-                                 final MultipartReplyMessageBuilder messageBuilder = new MultipartReplyMessageBuilder()
-                                         .setVersion(OFConstants.OFP_VERSION_1_3);
-                                 rqContextMp.setResult(RpcResultBuilder.success(
-                                         Collections.<MultipartReply>singletonList(messageBuilder.build())).build());
-                                 return null;
-                             }
-                         }
-        ).when(multiMsgCollector).endCollecting(Matchers.any(EventIdentifier.class));
+        Mockito.doAnswer((Answer<Void>) invocation -> {
+            final MultipartReplyMessageBuilder messageBuilder = new MultipartReplyMessageBuilder()
+                    .setVersion(OFConstants.OFP_VERSION_1_3);
+
+            rqContextMp.setResult(RpcResultBuilder
+                    .success(Collections.<MultipartReply>singletonList(messageBuilder.build()))
+                    .build());
+            return null;
+        }).when(multiMsgCollector).endCollecting(Matchers.any(EventIdentifier.class));
         Mockito.when(translator.translate(
                         Matchers.any(MultipartReply.class), Matchers.same(deviceInfo), Matchers.isNull())
         ).thenReturn(new AggregatedFlowStatisticsBuilder().build());
 
-
         GetAggregateFlowStatisticsFromFlowTableForGivenMatchInputBuilder input =
                 new GetAggregateFlowStatisticsFromFlowTableForGivenMatchInputBuilder()
                         .setNode(createNodeRef("unitProt:123"))
@@ -101,6 +104,4 @@ public class OpendaylightFlowStatisticsServiceImpl2Test extends AbstractStatsSer
         Assert.assertEquals(1, rpcResult.getResult().getAggregatedFlowStatistics().size());
         Assert.assertEquals(MultipartType.OFPMPAGGREGATE, requestInput.getValue().getType());
     }
-
-
 }
\ No newline at end of file