Further warning removal

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/EthernetDestinationEntrySerializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/EthernetDestinationEntrySerializer.java
index c3182a311bdcdcd3e9efb421747483cb9f89da19..9d47034ab52128382101f4776b96f6c6815b6dfb 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/EthernetDestinationEntrySerializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/serialization/match/EthernetDestinationEntrySerializer.java
@@ -7,49 +7,19 @@
  */
 package org.opendaylight.openflowplugin.impl.protocol.serialization.match;
 
-import io.netty.buffer.ByteBuf;
-import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
-import org.opendaylight.openflowjava.util.ByteBufUtils;
 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.ethernet.match.fields.EthernetDestination;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.EthernetMatch;
 
-public class EthernetDestinationEntrySerializer extends AbstractMatchEntrySerializer {
-
-    @Override
-    public void serialize(Match match, ByteBuf outBuffer) {
-        super.serialize(match, outBuffer);
-        writeMacAddress(match.getEthernetMatch().getEthernetDestination().getAddress(), outBuffer);
-
-        if (getHasMask(match)) {
-            writeMask(ByteBufUtils.macAddressToBytes(
-                    match.getEthernetMatch().getEthernetDestination().getMask().getValue()),
-                    outBuffer,
-                    getValueLength());
-        }
-    }
-
-    @Override
-    public boolean matchTypeCheck(Match match) {
-        return match.getEthernetMatch() != null && match.getEthernetMatch().getEthernetDestination() != null;
-    }
-
-    @Override
-    protected boolean getHasMask(Match match) {
-        return match.getEthernetMatch().getEthernetDestination().getMask() != null;
-    }
-
-    @Override
-    protected int getOxmFieldCode() {
-        return OxmMatchConstants.ETH_DST;
-    }
-
-    @Override
-    protected int getOxmClassCode() {
-        return OxmMatchConstants.OPENFLOW_BASIC_CLASS;
+public class EthernetDestinationEntrySerializer extends AbstractMacAddressFilterEntrySerializer<EthernetDestination> {
+    public EthernetDestinationEntrySerializer() {
+        super(OxmMatchConstants.OPENFLOW_BASIC_CLASS, OxmMatchConstants.ETH_DST);
     }
 
     @Override
-    protected int getValueLength() {
-        return EncodeConstants.MAC_ADDRESS_LENGTH;
+    protected EthernetDestination extractEntry(final Match match) {
+        final EthernetMatch ethMatch = match.getEthernetMatch();
+        return ethMatch == null ? null : ethMatch.getEthernetDestination();
     }
 }