Migrate users of Optional.get()

[openflowplugin.git] / extension / openflowplugin-extension-api / src / test / java / org / opendaylight / openflowplugin / extension / api / GroupingResolverTest.java

diff --git a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java
index bdee555be45e61febcbdbc58ef4b85947658fab6..d4b8b79ab6d7d54e0e7d80302ee2e933cb336233 100644 (file)
--- a/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java
+++ b/extension/openflowplugin-extension-api/src/test/java/org/opendaylight/openflowplugin/extension/api/GroupingResolverTest.java
@@ -7,8 +7,8 @@
  */
 package org.opendaylight.openflowplugin.extension.api;
 
-import java.util.Collections;
-import org.junit.Assert;
+import static org.junit.Assert.assertEquals;
+
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.MatchBuilder;
@@ -20,6 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ge
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionList;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.general.rev140714.general.extension.list.grouping.ExtensionListBuilder;
 import org.opendaylight.yangtools.yang.binding.Augmentable;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 /**
  *  Test of {@link GroupingResolver}.
@@ -38,22 +39,22 @@ public class GroupingResolverTest {
 
         ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.VALUE).build();
         Match match1 = new MatchBuilder()
-                .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
-                    .setExtensionList(Collections.singletonMap(extension1.key(), extension1))
-                    .build())
-                .build();
+            .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
+                .setExtensionList(BindingMap.of(extension1))
+                .build())
+            .build();
 
         ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.VALUE).build();
         Match match2 = new MatchBuilder()
-                .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
-                    .setExtensionList(Collections.singletonMap(extension2.key(), extension2))
-                    .build())
-                .build();
+            .addAugmentation(new GeneralAugMatchNodesNodeTableFlowBuilder()
+                .setExtensionList(BindingMap.of(extension2))
+                .build())
+            .build();
 
-        Assert.assertEquals(JoachimTheBig.VALUE,
-                eqGroup.getExtension(match1).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
-        Assert.assertEquals(JoachimTheTiny.VALUE,
-                eqGroup.getExtension(match2).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
+        assertEquals(JoachimTheBig.VALUE, eqGroup.getExtension(match1).orElseThrow()
+            .nonnullExtensionList().values().iterator().next().getExtensionKey());
+        assertEquals(JoachimTheTiny.VALUE, eqGroup.getExtension(match2).orElseThrow()
+            .nonnullExtensionList().values().iterator().next().getExtensionKey());
     }
 
     private interface JoachimTheBig extends ExtensionKey {