Clean up version setters

[openflowplugin.git] / openflowjava / openflow-protocol-impl / src / main / java / org / opendaylight / openflowjava / protocol / impl / deserialization / factories / TableModInputMessageFactory.java

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/TableModInputMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/TableModInputMessageFactory.java
index 2660260184bde55cda4fc67fccdcdc448ee8c000..019ff3e85ed3be31eecba1c3ecbf3f602bde7098 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/TableModInputMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/TableModInputMessageFactory.java
@@ -7,6 +7,9 @@
  */
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
+import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint32;
+import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint8;
+
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
@@ -26,10 +29,10 @@ public class TableModInputMessageFactory implements OFDeserializer<TableModInput
 
     @Override
     public TableModInput deserialize(ByteBuf rawMessage) {
-        TableModInputBuilder builder = new TableModInputBuilder();
-        builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
-        builder.setXid(rawMessage.readUnsignedInt());
-        builder.setTableId(new TableId((long) rawMessage.readUnsignedByte()));
+        TableModInputBuilder builder = new TableModInputBuilder()
+                .setVersion(EncodeConstants.OF_VERSION_1_3)
+                .setXid(readUint32(rawMessage))
+                .setTableId(new TableId(readUint8(rawMessage).toUint32()));
         rawMessage.skipBytes(PADDING_IN_TABLE_MOD_MESSAGE);
         builder.setConfig(createTableConfig(rawMessage.readUnsignedInt()));
         return builder.build();