Remove EncodeConstants.SIZE_OF_{BYTE,SHORT,INT,LONG}_IN_BYTES

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TunnelIdEntrySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TunnelIdEntrySerializer.java
index dd7a373a4d1181fffd7224961c6f6d02db47dda1..ba57108eb1521b7d12648bf4902683be1b362232 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TunnelIdEntrySerializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/TunnelIdEntrySerializer.java
@@ -5,55 +5,36 @@
  * 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.openflowplugin.openflow.md.util.ByteUtil;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.Match;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.Tunnel;
+import org.opendaylight.yangtools.yang.common.Uint64;
 
-public class TunnelIdEntrySerializer extends AbstractMatchEntrySerializer {
-
-    @Override
-    public void serialize(Match match, ByteBuf outBuffer) {
-        super.serialize(match, outBuffer);
-        outBuffer.writeBytes(ByteUtil.convertBigIntegerToNBytes(match.getTunnel().getTunnelId(), getValueLength()));
-
-        if (getHasMask(match)) {
-            writeMask(ByteUtil.convertBigIntegerToNBytes(
-                    match.getTunnel().getTunnelMask(), getValueLength()),
-                    outBuffer,
-                    getValueLength());
-        }
+public class TunnelIdEntrySerializer extends AbstractMatchEntrySerializer<Tunnel, Uint64> {
+    public TunnelIdEntrySerializer() {
+        super(OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.TUNNEL_ID, Long.BYTES);
     }
 
     @Override
-    public boolean matchTypeCheck(Match match) {
-        return Objects.nonNull(match.getTunnel())
-                && Objects.nonNull(match.getTunnel().getTunnelId());
+    protected Tunnel extractEntry(Match match) {
+        final Tunnel tunnel = match.getTunnel();
+        return tunnel == null || tunnel.getTunnelId() == null ? null : tunnel;
     }
 
     @Override
-    protected boolean getHasMask(Match match) {
-        return Objects.nonNull(match.getTunnel().getTunnelMask());
+    protected Uint64 extractEntryMask(Tunnel entry) {
+        return entry.getTunnelMask();
     }
 
     @Override
-    protected int getOxmFieldCode() {
-        return OxmMatchConstants.TUNNEL_ID;
-    }
-
-    @Override
-    protected int getOxmClassCode() {
-        return OxmMatchConstants.OPENFLOW_BASIC_CLASS;
-    }
-
-    @Override
-    protected int getValueLength() {
-        return EncodeConstants.SIZE_OF_LONG_IN_BYTES;
+    protected void serializeEntry(Tunnel entry, Uint64 mask, ByteBuf outBuffer) {
+        outBuffer.writeBytes(ByteUtil.uint64toBytes(entry.getTunnelId()));
+        if (mask != null) {
+            writeMask(ByteUtil.uint64toBytes(mask), outBuffer, Long.BYTES);
+        }
     }
-
 }