Bug 2756 - Match model update

[openflowjava.git] / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / serialization / match / AbstractOxmIpv4AddressSerializer.java

diff --git a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv4AddressSerializer.java b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv4AddressSerializer.java
index 4ce543e66b28028e99b7cb41d6ba0ba1d347f29f..ea9d0a5c3bad82fbfa27410d87782c0fee0f94f7 100644 (file)
--- a/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv4AddressSerializer.java
+++ b/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/serialization/match/AbstractOxmIpv4AddressSerializer.java
@@ -10,8 +10,6 @@ package org.opendaylight.openflowjava.protocol.impl.serialization.match;
 import io.netty.buffer.ByteBuf;
 
 import org.opendaylight.openflowjava.util.ByteBufUtils;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.augments.rev131002.Ipv4AddressMatchEntry;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.fields.grouping.MatchEntries;
 
 /**
  * Parent for Ipv4 address based match entry serializers
@@ -19,16 +17,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.oxm.rev130731.oxm.
  */
 public abstract class AbstractOxmIpv4AddressSerializer extends AbstractOxmMatchEntrySerializer {
 
-    @Override
-    public void serialize(final MatchEntries entry, final ByteBuf outBuffer) {
-        super.serialize(entry, outBuffer);
-        writeIpv4Address(entry, outBuffer);
-        writeMask(entry, outBuffer, getValueLength());
-    }
-
-    private static void writeIpv4Address(final MatchEntries entry, final ByteBuf out) {
-        Iterable<String> addressGroups = ByteBufUtils.DOT_SPLITTER
-                .split(entry.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address().getValue());
+    protected static void writeIpv4Address(String address, final ByteBuf out) {
+        Iterable<String> addressGroups = ByteBufUtils.DOT_SPLITTER.split(address);
         for (String group : addressGroups) {
             out.writeByte(Short.parseShort(group));
         }