Update MRI upstreams for Phosphorus

[openflowplugin.git] / openflowplugin-impl / src / main / java / org / opendaylight / openflowplugin / impl / protocol / deserialization / multipart / MultipartReplyMessageDeserializer.java

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializer.java
index 0a7d63d58c52c1d4c11f83d6b43469bcc11d88da..0d968adff2e1f84b5836588f9f5cfea96bc69f1f 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyMessageDeserializer.java
@@ -5,9 +5,10 @@
  * 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.deserialization.multipart;
 
+import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint32;
+
 import com.google.common.base.Preconditions;
 import io.netty.buffer.ByteBuf;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
@@ -18,7 +19,7 @@ import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartReply;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.MultipartReplyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.reply.MultipartReplyBody;
-
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class MultipartReplyMessageDeserializer implements OFDeserializer<MultipartReply>, DeserializerRegistryInjector {
 
@@ -27,15 +28,14 @@ public class MultipartReplyMessageDeserializer implements OFDeserializer<Multipa
     private DeserializerRegistry registry;
 
     @Override
-    public MultipartReply deserialize(ByteBuf message) {
-        final long xid = message.readUnsignedInt();
+    public MultipartReply deserialize(final ByteBuf message) {
+        final Uint32 xid = readUint32(message);
         final int type = message.readUnsignedShort();
         final boolean reqMore = (message.readUnsignedShort() & 0x01) != 0;
         message.skipBytes(PADDING_IN_MULTIPART_REPLY_HEADER);
 
         final OFDeserializer<MultipartReplyBody> deserializer = Preconditions.checkNotNull(registry)
-            .getDeserializer(new MessageCodeKey(EncodeConstants.OF13_VERSION_ID,
-                        type, MultipartReplyBody.class));
+            .getDeserializer(new MessageCodeKey(EncodeConstants.OF_VERSION_1_3, type, MultipartReplyBody.class));
 
         return new MultipartReplyBuilder()
             .setVersion(EncodeConstants.OF_VERSION_1_3)
@@ -46,7 +46,7 @@ public class MultipartReplyMessageDeserializer implements OFDeserializer<Multipa
     }
 
     @Override
-    public void injectDeserializerRegistry(DeserializerRegistry deserializerRegistry) {
+    public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) {
         registry = deserializerRegistry;
     }