Update MRI upstreams for Phosphorus

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

diff --git a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactory.java b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactory.java
index 8ff1403c0906dce9798122fd16df320968e927c8..b0f15f0472467603485685b913f2f737cde2a107 100644 (file)
--- a/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactory.java
+++ b/openflowjava/openflow-protocol-impl/src/main/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/QueueGetConfigReplyMessageFactory.java
@@ -30,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.get.config.reply.QueuesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueueProperty;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.queue.property.header.QueuePropertyBuilder;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 /**
  * Translates QueueGetConfigReply messages.
@@ -49,24 +50,24 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer<GetQueu
     private DeserializerRegistry registry;
 
     @Override
-    public GetQueueConfigOutput deserialize(ByteBuf rawMessage) {
+    public GetQueueConfigOutput deserialize(final ByteBuf rawMessage) {
         Objects.requireNonNull(registry);
 
-        GetQueueConfigOutputBuilder builder = new GetQueueConfigOutputBuilder();
-        builder.setVersion((short) EncodeConstants.OF13_VERSION_ID);
-        builder.setXid(readUint32(rawMessage));
-        builder.setPort(new PortNumber(readUint32(rawMessage)));
+        GetQueueConfigOutputBuilder builder = new GetQueueConfigOutputBuilder()
+                .setVersion(EncodeConstants.OF_VERSION_1_3)
+                .setXid(readUint32(rawMessage))
+                .setPort(new PortNumber(readUint32(rawMessage)));
         rawMessage.skipBytes(PADDING_IN_QUEUE_GET_CONFIG_REPLY_HEADER);
         builder.setQueues(createQueuesList(rawMessage));
         return builder.build();
     }
 
-    private List<Queues> createQueuesList(ByteBuf input) {
+    private List<Queues> createQueuesList(final ByteBuf input) {
         List<Queues> queuesList = new ArrayList<>();
         while (input.readableBytes() > 0) {
-            QueuesBuilder queueBuilder = new QueuesBuilder();
-            queueBuilder.setQueueId(new QueueId(readUint32(input)));
-            queueBuilder.setPort(new PortNumber(readUint32(input)));
+            QueuesBuilder queueBuilder = new QueuesBuilder()
+                    .setQueueId(new QueueId(readUint32(input)))
+                    .setPort(new PortNumber(readUint32(input)));
             int length = input.readUnsignedShort();
             input.skipBytes(PADDING_IN_PACKET_QUEUE_HEADER);
             queueBuilder.setQueueProperty(createPropertiesList(input, length - PACKET_QUEUE_LENGTH));
@@ -75,7 +76,7 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer<GetQueu
         return queuesList;
     }
 
-    private List<QueueProperty> createPropertiesList(ByteBuf input, int length) {
+    private List<QueueProperty> createPropertiesList(final ByteBuf input, final int length) {
         int propertiesLength = length;
         List<QueueProperty> propertiesList = new ArrayList<>();
         while (propertiesLength > 0) {
@@ -92,11 +93,11 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer<GetQueu
                     .build());
                 input.skipBytes(PADDING_IN_RATE_QUEUE_PROPERTY);
             } else if (property.equals(QueueProperties.OFPQTEXPERIMENTER)) {
-                long expId = input.readUnsignedInt();
+                final Uint32 expId = readUint32(input);
                 input.readerIndex(propertyStartIndex);
                 OFDeserializer<QueueProperty> deserializer = registry.getDeserializer(
                         ExperimenterDeserializerKeyFactory.createQueuePropertyDeserializerKey(
-                                EncodeConstants.OF13_VERSION_ID, expId));
+                                EncodeConstants.OF_VERSION_1_3, expId));
                 propertiesList.add(deserializer.deserialize(input));
                 continue;
             }
@@ -106,7 +107,7 @@ public class QueueGetConfigReplyMessageFactory implements OFDeserializer<GetQueu
     }
 
     @Override
-    public void injectDeserializerRegistry(DeserializerRegistry deserializerRegistry) {
+    public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) {
         this.registry = deserializerRegistry;
     }
 }