Update MRI projects for Aluminium

[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 e51c96651498b097a6d2df66dc17b9c9c5ae90fd..43c1e2998f74726996cf3eabf95db6de1e9f5322 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
@@ -8,7 +8,6 @@
 package org.opendaylight.openflowplugin.extension.api;
 
 import java.util.Collections;
-
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.flow.Match;
@@ -23,38 +22,43 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ge
 import org.opendaylight.yangtools.yang.binding.Augmentable;
 
 /**
- *  Test of {@link GroupingResolver}
+ *  Test of {@link GroupingResolver}.
  */
 public class GroupingResolverTest {
 
     /**
-     * test of method {@link GroupingResolver#getExtension(Augmentable)}
+     * test of method {@link GroupingResolver#getExtension(Augmentable)}.
      */
     @Test
     public void testGetExtension() {
-        GroupingResolver<GeneralExtensionListGrouping, Match> eqGroup = new GroupingResolver<>(GeneralExtensionListGrouping.class);
+        GroupingResolver<GeneralExtensionListGrouping, Match> eqGroup =
+                new GroupingResolver<>(GeneralExtensionListGrouping.class);
         eqGroup.add(GeneralAugMatchNodesNodeTableFlow.class);
         eqGroup.add(GeneralAugMatchRpcAddFlow.class);
 
         MatchBuilder mb1 = new MatchBuilder();
         ExtensionList extension1 = new ExtensionListBuilder().setExtensionKey(JoachimTheBig.class).build();
-        GeneralAugMatchNodesNodeTableFlow odlxxx1 = new GeneralAugMatchNodesNodeTableFlowBuilder().setExtensionList(Collections.singletonList(extension1)).build();
+        GeneralAugMatchNodesNodeTableFlow odlxxx1 = new GeneralAugMatchNodesNodeTableFlowBuilder()
+                .setExtensionList(Collections.singletonList(extension1)).build();
         Match match1 = mb1.addAugmentation(GeneralAugMatchNodesNodeTableFlow.class, odlxxx1).build();
 
         MatchBuilder mb2 = new MatchBuilder();
         ExtensionList extension2 = new ExtensionListBuilder().setExtensionKey(JoachimTheTiny.class).build();
-        GeneralAugMatchNodesNodeTableFlow odlxxx2 = new GeneralAugMatchNodesNodeTableFlowBuilder().setExtensionList(Collections.singletonList(extension2)).build();
+        GeneralAugMatchNodesNodeTableFlow odlxxx2 = new GeneralAugMatchNodesNodeTableFlowBuilder()
+                .setExtensionList(Collections.singletonList(extension2)).build();
         Match match2 = mb2.addAugmentation(GeneralAugMatchNodesNodeTableFlow.class, odlxxx2).build();
 
-        Assert.assertEquals(JoachimTheBig.class, eqGroup.getExtension(match1).get().getExtensionList().get(0).getExtensionKey());
-        Assert.assertEquals(JoachimTheTiny.class, eqGroup.getExtension(match2).get().getExtensionList().get(0).getExtensionKey());
+        Assert.assertEquals(JoachimTheBig.class,
+                eqGroup.getExtension(match1).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
+        Assert.assertEquals(JoachimTheTiny.class,
+                eqGroup.getExtension(match2).get().nonnullExtensionList().values().iterator().next().getExtensionKey());
     }
-    
-    private static class JoachimTheBig extends ExtensionKey {
+
+    private interface JoachimTheBig extends ExtensionKey {
         // nobody
     }
-    
-    private static class JoachimTheTiny extends ExtensionKey {
+
+    private interface JoachimTheTiny extends ExtensionKey {
         // nobody
     }
 }