Bump mdsal to 5.0.2

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / protocol / serialization / match / IpProtoEntrySerializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/IpProtoEntrySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/IpProtoEntrySerializer.java
index 6f84e123edf74dc7ddd3ef07108f773d09ef1dcd..18c9b99e253b1ca90f1dc8a83efe9969e7e535b9 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/IpProtoEntrySerializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/IpProtoEntrySerializer.java
@@ -5,11 +5,9 @@
  * 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.protocol.serialization.match;
 
 import io.netty.buffer.ByteBuf;
-import java.util.Objects;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match;
@@ -17,20 +15,19 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026
 public class IpProtoEntrySerializer extends AbstractMatchEntrySerializer {
 
     @Override
-    public void serialize(Match match, ByteBuf outBuffer) {
+    public void serialize(final Match match, final ByteBuf outBuffer) {
         super.serialize(match, outBuffer);
         // TODO: What is getIpMatch().getIpProto()? Fix models probably
-        outBuffer.writeByte(match.getIpMatch().getIpProtocol());
+        outBuffer.writeByte(match.getIpMatch().getIpProtocol().toJava());
     }
 
     @Override
-    public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getIpMatch())
-                && Objects.nonNull(match.getIpMatch().getIpProtocol());
+    public boolean matchTypeCheck(final Match match) {
+        return match.getIpMatch() != null && match.getIpMatch().getIpProtocol() != null;
     }
 
     @Override
-    protected boolean getHasMask(Match match) {
+    protected boolean getHasMask(final Match match) {
         return false;
     }
 
@@ -48,5 +45,4 @@ public class IpProtoEntrySerializer extends AbstractMatchEntrySerializer {
     protected int getValueLength() {
         return EncodeConstants.SIZE_OF_BYTE_IN_BYTES;
     }
-
 }