Update MRI projects for Aluminium

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / util / MatchUtil.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchUtil.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchUtil.java
index e4e4ad4da09c47235680ab3adc0395aa1436c7c8..ce4f5b7d93c52cd07503b080a203ff3d753b58c0 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchUtil.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/util/MatchUtil.java
@@ -5,17 +5,16 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-
 package org.opendaylight.openflowplugin.impl.util;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import java.util.Optional;
 import java.util.function.Function;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
+import java.util.stream.Collectors;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionResolvers;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
@@ -119,7 +118,7 @@ public final class MatchUtil {
 
 
     public static MatchV10Builder createEmptyV10Match() {
-        Short zeroShort = Short.valueOf("0");
+        Short zeroShort = 0;
         Integer zeroInteger = 0;
         MatchV10Builder matchV10Builder = new MatchV10Builder();
         matchV10Builder.setDlDst(ZERO_MAC_ADDRESS);
@@ -144,28 +143,25 @@ public final class MatchUtil {
 
     @Nullable
     public static <T extends Match> T transformMatch(@Nullable final Match match,
-                                                     @Nonnull final Class<T> implementedInterface) {
-        if (Objects.isNull(match)) {
+                                                     @NonNull final Class<T> implementedInterface) {
+        if (match == null) {
             return null;
         }
 
-        if (implementedInterface.equals(match.getImplementedInterface())) {
+        if (implementedInterface.equals(match.implementedInterface())) {
             return implementedInterface.cast(match);
         }
 
         final Function<Match, Match> matchMatchFunction = TRANSFORMERS.get(implementedInterface);
-
-        if (Objects.isNull(matchMatchFunction)) {
-            return null;
-        }
-
-        return implementedInterface.cast(matchMatchFunction.apply(match));
+        return matchMatchFunction == null ? null : implementedInterface.cast(matchMatchFunction.apply(match));
     }
 
     private static Optional<List<ExtensionList>> resolveExtensions(final Match match) {
         return ExtensionResolvers
                 .getMatchExtensionResolver()
                 .getExtension(match)
-                .flatMap(matchExtension -> Optional.ofNullable(matchExtension.getExtensionList()));
+                .flatMap(matchExtension ->
+                        Optional.ofNullable(matchExtension.nonnullExtensionList().values()
+                        .stream().collect(Collectors.toList())));
     }
-}
\ No newline at end of file
+}