Modernize codebase

[openflowplugin.git] / openflowplugin-impl / src / test / java / org / opendaylight / openflowplugin / impl / statistics / services / direct / singlelayer / QueueDirectStatisticsServiceTest.java

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/QueueDirectStatisticsServiceTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/QueueDirectStatisticsServiceTest.java
index 137d78bd66ec57ede2f9f3d868b4a489e0b69323..f1c7541b2a61a886b2312a48ee36cb51df9f61d8 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/QueueDirectStatisticsServiceTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/statistics/services/direct/singlelayer/QueueDirectStatisticsServiceTest.java
@@ -16,7 +16,6 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.junit.Test;
@@ -37,6 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.queue.id.and.statistics.map.QueueIdAndStatisticsMap;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.queue.id.and.statistics.map.QueueIdAndStatisticsMapBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.queue.statistics.rev131216.queue.id.and.statistics.map.QueueIdAndStatisticsMapKey;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint64;
 
@@ -80,11 +80,11 @@ public class QueueDirectStatisticsServiceTest extends AbstractDirectStatisticsSe
 
         final MultipartReply reply = new MultipartReplyBuilder()
                 .setMultipartReplyBody(new MultipartReplyQueueStatsBuilder()
-                        .setQueueIdAndStatisticsMap(Collections.singletonMap(queueStats.key(), queueStats))
+                        .setQueueIdAndStatisticsMap(BindingMap.of(queueStats))
                         .build())
                 .build();
 
-        final List<MultipartReply> input = Collections.singletonList(reply);
+        final List<MultipartReply> input = List.of(reply);
         final GetQueueStatisticsOutput output = service.buildReply(input, true);
         assertTrue(output.nonnullQueueIdAndStatisticsMap().size() > 0);
 
@@ -102,10 +102,10 @@ public class QueueDirectStatisticsServiceTest extends AbstractDirectStatisticsSe
             new QueueIdAndStatisticsMapKey(new NodeConnectorId("1"), new QueueId(QUEUE_NO)));
 
         final GetQueueStatisticsOutput output = mock(GetQueueStatisticsOutput.class);
-        Map<QueueIdAndStatisticsMapKey, QueueIdAndStatisticsMap> stats = Collections.singletonMap(map.key(), map);
+        Map<QueueIdAndStatisticsMapKey, QueueIdAndStatisticsMap> stats = BindingMap.of(map);
         when(output.nonnullQueueIdAndStatisticsMap()).thenReturn(stats);
 
-        multipartWriterProvider.lookup(MultipartType.OFPMPQUEUE).get().write(output, true);
+        multipartWriterProvider.lookup(MultipartType.OFPMPQUEUE).orElseThrow().write(output, true);
         verify(deviceContext).writeToTransactionWithParentsSlow(eq(LogicalDatastoreType.OPERATIONAL), any(), any());
     }
 
@@ -117,11 +117,11 @@ public class QueueDirectStatisticsServiceTest extends AbstractDirectStatisticsSe
         when(map.key()).thenReturn(
             new QueueIdAndStatisticsMapKey(new NodeConnectorId("openflow:1:1"), new QueueId(QUEUE_NO)));
 
-        final Map<QueueIdAndStatisticsMapKey, QueueIdAndStatisticsMap> maps = Collections.singletonMap(map.key(), map);
+        final Map<QueueIdAndStatisticsMapKey, QueueIdAndStatisticsMap> maps = BindingMap.of(map);
         final GetQueueStatisticsOutput output = mock(GetQueueStatisticsOutput.class);
         when(output.nonnullQueueIdAndStatisticsMap()).thenReturn(maps);
 
-        multipartWriterProvider.lookup(MultipartType.OFPMPQUEUE).get().write(output, true);
+        multipartWriterProvider.lookup(MultipartType.OFPMPQUEUE).orElseThrow().write(output, true);
         verify(deviceContext).writeToTransactionWithParentsSlow(eq(LogicalDatastoreType.OPERATIONAL), any(), any());
     }
 }