Update MRI projects for Aluminium

[openflowplugin.git] / openflowplugin / src / main / java / org / opendaylight / openflowplugin / openflow / md / core / extension / MatchExtensionHelper.java

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelper.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelper.java
index 46ff894ff83927616612dbb42c84017cbab35bbc..afc7db0ca7a19c3f291408fb0dcdbd71abbc346f 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelper.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/extension/MatchExtensionHelper.java
@@ -9,6 +9,7 @@ package org.opendaylight.openflowplugin.openflow.md.core.extension;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 import org.opendaylight.openflowjava.protocol.api.keys.MatchEntrySerializerKey;
@@ -68,13 +69,15 @@ public final class MatchExtensionHelper {
 
         final ExtensionListBuilder extBuilder = processExtension(matchEntry, ofVersion, matchPath);
 
+        // TODO: remove the Optional.ofNullable() here, which will result more performant and easier to understand code
         final GeneralAugMatchNodesNodeTableFlowBuilder builder = Optional
                 .ofNullable(matchBuilder.augmentation(GeneralAugMatchNodesNodeTableFlow.class))
                 .map(GeneralAugMatchNodesNodeTableFlowBuilder::new)
-                .orElse(new GeneralAugMatchNodesNodeTableFlowBuilder().setExtensionList(new ArrayList<>()));
+                .orElse(new GeneralAugMatchNodesNodeTableFlowBuilder().setExtensionList(new HashMap<>()));
 
         if (extBuilder != null) {
-            builder.getExtensionList().add(extBuilder.build());
+            final ExtensionList ext = extBuilder.build();
+            builder.getExtensionList().put(ext.key(), ext);
         } else {
             LOG.warn("Convertor for {} for version {} with match path {} not found.",
                     matchEntry, ofVersion, matchPath.name());
@@ -97,13 +100,15 @@ public final class MatchExtensionHelper {
             final Collection<MatchEntry> matchEntries, final OpenflowVersion ofVersion, final MatchPath matchPath) {
         List<ExtensionList> extensionsList = new ArrayList<>();
 
-        for (MatchEntry matchEntry : matchEntries) {
-            ExtensionListBuilder extensionListBld = processExtension(matchEntry, ofVersion.getVersion(), matchPath);
-            if (extensionListBld == null) {
-                continue;
-            }
+        if (matchEntries != null) {
+            for (MatchEntry matchEntry : matchEntries) {
+                ExtensionListBuilder extensionListBld = processExtension(matchEntry, ofVersion.getVersion(), matchPath);
+                if (extensionListBld == null) {
+                    continue;
+                }
 
-            extensionsList.add(extensionListBld.build());
+                extensionsList.add(extensionListBld.build());
+            }
         }
 
         AugmentTuple<E> augmentTuple = null;