Update MRI upstreams for Phosphorus

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

diff --git a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializer.java b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializer.java
index 330c672a4b421900d67bec1d576a8d053c477ee4..3eb83aa41a87921ddad8d65aaa08b9d780ee3759 100644 (file)
--- a/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializer.java
+++ b/openflowplugin-impl/src/main/java/org/opendaylight/openflowplugin/impl/protocol/deserialization/multipart/MultipartReplyGroupDescDeserializer.java
@@ -5,18 +5,19 @@
  * 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.readUint16;
+import static org.opendaylight.yangtools.yang.common.netty.ByteBufUtils.readUint32;
+
 import io.netty.buffer.ByteBuf;
-import java.util.ArrayList;
-import java.util.List;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistry;
 import org.opendaylight.openflowjava.protocol.api.extensibility.DeserializerRegistryInjector;
 import org.opendaylight.openflowjava.protocol.api.extensibility.OFDeserializer;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
 import org.opendaylight.openflowplugin.extension.api.path.ActionPath;
 import org.opendaylight.openflowplugin.impl.protocol.deserialization.util.ActionUtil;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.Action;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list.ActionKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.statistics.rev131111.multipart.reply.multipart.reply.body.MultipartReplyGroupDescBuilder;
@@ -31,6 +32,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStatsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.desc.stats.reply.GroupDescStatsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.multipart.types.rev170112.multipart.reply.MultipartReplyBody;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class MultipartReplyGroupDescDeserializer implements OFDeserializer<MultipartReplyBody>,
         DeserializerRegistryInjector {
@@ -42,9 +45,9 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer<Multi
     private DeserializerRegistry registry;
 
     @Override
-    public MultipartReplyBody deserialize(ByteBuf message) {
+    public MultipartReplyBody deserialize(final ByteBuf message) {
         final MultipartReplyGroupDescBuilder builder = new MultipartReplyGroupDescBuilder();
-        final List<GroupDescStats> items = new ArrayList<>();
+        final var items =  BindingMap.<GroupDescStatsKey, GroupDescStats>orderedBuilder();
 
         while (message.readableBytes() > 0) {
             final int itemLength = message.readUnsignedShort();
@@ -53,10 +56,9 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer<Multi
                     .setGroupType(GroupTypes.forValue(message.readUnsignedByte()));
 
             message.skipBytes(PADDING_IN_GROUP_DESC_HEADER);
-            itemBuilder.setGroupId(new GroupId(message.readUnsignedInt()));
-            itemBuilder.setKey(new GroupDescStatsKey(itemBuilder.getGroupId()));
+            itemBuilder.setGroupId(new GroupId(readUint32(message)));
 
-            final List<Bucket> subItems = new ArrayList<>();
+            final var subItems = BindingMap.<BucketKey, Bucket>orderedBuilder();
             int actualLength = GROUP_DESC_HEADER_LENGTH;
 
             long bucketKey = 0;
@@ -64,50 +66,41 @@ public class MultipartReplyGroupDescDeserializer implements OFDeserializer<Multi
                 final int bucketsLength = message.readUnsignedShort();
 
                 final BucketBuilder bucketBuilder = new BucketBuilder()
-                        .setBucketId(new BucketId(bucketKey))
-                        .setKey(new BucketKey(new BucketId(bucketKey)))
-                        .setWeight(message.readUnsignedShort())
-                        .setWatchPort(message.readUnsignedInt())
-                        .setWatchGroup(message.readUnsignedInt());
+                        .setBucketId(new BucketId(Uint32.valueOf(bucketKey)))
+                        .setWeight(readUint16(message))
+                        .setWatchPort(readUint32(message))
+                        .setWatchGroup(readUint32(message));
 
                 message.skipBytes(PADDING_IN_BUCKETS_HEADER);
-                final List<org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.list
-                        .Action> actions = new ArrayList<>();
+                final var actions = BindingMap.<ActionKey, Action>orderedBuilder();
                 final int startIndex = message.readerIndex();
                 final int bucketLength = bucketsLength - BUCKETS_HEADER_LENGTH;
                 int offset = 0;
 
-                while ((message.readerIndex() - startIndex) < bucketLength) {
+                while (message.readerIndex() - startIndex < bucketLength) {
                     actions.add(new ActionBuilder()
-                            .setKey(new ActionKey(offset))
+                            .withKey(new ActionKey(offset))
                             .setOrder(offset)
-                            .setAction(ActionUtil.readAction(EncodeConstants.OF13_VERSION_ID, message, registry,
-                                    ActionPath.GROUPDESCSTATSUPDATED_GROUPDESCSTATS_BUCKETS_BUCKET_ACTION))
+                            .setAction(ActionUtil.readAction(EncodeConstants.OF_VERSION_1_3, message, registry,
+                                    ActionPath.GROUP_DESC_STATS_UPDATED_BUCKET_ACTION))
                             .build());
 
                     offset++;
                 }
 
-                bucketBuilder.setAction(actions);
-                subItems.add(bucketBuilder.build());
+                subItems.add(bucketBuilder.setAction(actions.build()).build());
                 bucketKey++;
                 actualLength += bucketsLength;
             }
 
-            items.add(itemBuilder
-                    .setBuckets(new BucketsBuilder()
-                            .setBucket(subItems)
-                            .build())
-                    .build());
+            items.add(itemBuilder.setBuckets(new BucketsBuilder().setBucket(subItems.build()).build()).build());
         }
 
-        return builder
-                .setGroupDescStats(items)
-                .build();
+        return builder.setGroupDescStats(items.build()).build();
     }
 
     @Override
-    public void injectDeserializerRegistry(DeserializerRegistry deserializerRegistry) {
+    public void injectDeserializerRegistry(final DeserializerRegistry deserializerRegistry) {
         registry = deserializerRegistry;
     }