X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openflowjava%2Fopenflow-protocol-impl%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fopenflowjava%2Fprotocol%2Fimpl%2Fdeserialization%2Ffactories%2FGetAsyncReplyMessageFactoryTest.java;h=361b7a6781baa4ba218273bfe04281c119ee7b07;hb=777c94332871b8c34f56f7f2010de1536cb759ba;hp=f61805431f1ebccad165badc9452cf53fa1d0415;hpb=ed4d25aecaabfe181dbb114d4666f3a05f3531fb;p=openflowplugin.git

diff --git a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java
index f61805431f..361b7a6781 100644
--- a/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java
+++ b/openflowjava/openflow-protocol-impl/src/test/java/org/opendaylight/openflowjava/protocol/impl/deserialization/factories/GetAsyncReplyMessageFactoryTest.java
@@ -8,8 +8,8 @@
 package org.opendaylight.openflowjava.protocol.impl.deserialization.factories;
 
 import io.netty.buffer.ByteBuf;
-import java.util.ArrayList;
 import java.util.List;
+import java.util.Set;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -60,65 +60,42 @@ public class GetAsyncReplyMessageFactoryTest {
         GetAsyncOutput builtByFactory = BufferHelper.deserialize(asyncFactory, bb);
 
         BufferHelper.checkHeaderV13(builtByFactory);
-        Assert.assertEquals("Wrong packetInMask",createPacketInMask(), builtByFactory.getPacketInMask());
-        Assert.assertEquals("Wrong portStatusMask",createPortStatusMask(), builtByFactory.getPortStatusMask());
-        Assert.assertEquals("Wrong flowRemovedMask",createFlowRemovedMask(), builtByFactory.getFlowRemovedMask());
+        Assert.assertEquals("Wrong packetInMask", createPacketInMask(), builtByFactory.getPacketInMask());
+        Assert.assertEquals("Wrong portStatusMask", createPortStatusMask(), builtByFactory.getPortStatusMask());
+        Assert.assertEquals("Wrong flowRemovedMask", createFlowRemovedMask(), builtByFactory.getFlowRemovedMask());
     }
 
     private static List<PacketInMask> createPacketInMask() {
-        final List<PacketInMask> inMasks = new ArrayList<>();
-        PacketInMaskBuilder maskBuilder;
-        // OFPCR_ROLE_EQUAL or OFPCR_ROLE_MASTER
-        maskBuilder = new PacketInMaskBuilder();
-        List<PacketInReason> reasons = new ArrayList<>();
-        reasons.add(PacketInReason.OFPRNOMATCH);
-        reasons.add(PacketInReason.OFPRACTION);
-        reasons.add(PacketInReason.OFPRINVALIDTTL);
-        maskBuilder.setMask(reasons);
-        inMasks.add(maskBuilder.build());
-        // OFPCR_ROLE_SLAVE
-        maskBuilder = new PacketInMaskBuilder();
-        reasons = new ArrayList<>();
-        maskBuilder.setMask(reasons);
-        inMasks.add(maskBuilder.build());
-        return inMasks;
+        return List.of(
+            // OFPCR_ROLE_EQUAL or OFPCR_ROLE_MASTER
+            new PacketInMaskBuilder()
+                .setMask(Set.of(PacketInReason.OFPRNOMATCH, PacketInReason.OFPRACTION, PacketInReason.OFPRINVALIDTTL))
+                .build(),
+            // OFPCR_ROLE_SLAVE
+            new PacketInMaskBuilder().setMask(Set.of()).build());
     }
 
     private static List<PortStatusMask> createPortStatusMask() {
-        final List<PortStatusMask> inMasks = new ArrayList<>();
-        PortStatusMaskBuilder maskBuilder;
-        // OFPCR_ROLE_EQUAL or OFPCR_ROLE_MASTER
-        maskBuilder = new PortStatusMaskBuilder();
-        List<PortReason> reasons = new ArrayList<>();
-        reasons.add(PortReason.OFPPRADD);
-        reasons.add(PortReason.OFPPRDELETE);
-        reasons.add(PortReason.OFPPRMODIFY);
-        inMasks.add(maskBuilder.setMask(reasons).build());
-        // OFPCR_ROLE_SLAVE
-        maskBuilder = new PortStatusMaskBuilder();
-        reasons = new ArrayList<>();
-        maskBuilder.setMask(reasons);
-        inMasks.add(maskBuilder.build());
-        return inMasks;
+        return List.of(
+            // OFPCR_ROLE_EQUAL or OFPCR_ROLE_MASTER
+            new PortStatusMaskBuilder()
+                .setMask(Set.of(PortReason.OFPPRADD, PortReason.OFPPRDELETE, PortReason.OFPPRMODIFY))
+                .build(),
+            // OFPCR_ROLE_SLAVE
+            new PortStatusMaskBuilder().setMask(Set.of()).build());
     }
 
     private static List<FlowRemovedMask> createFlowRemovedMask() {
-        final List<FlowRemovedMask> inMasks = new ArrayList<>();
-        FlowRemovedMaskBuilder maskBuilder;
-        // OFPCR_ROLE_EQUAL or OFPCR_ROLE_MASTER
-        maskBuilder = new FlowRemovedMaskBuilder();
-        List<FlowRemovedReason> reasons = new ArrayList<>();
-        reasons.add(FlowRemovedReason.OFPRRIDLETIMEOUT);
-        reasons.add(FlowRemovedReason.OFPRRHARDTIMEOUT);
-        reasons.add(FlowRemovedReason.OFPRRDELETE);
-        reasons.add(FlowRemovedReason.OFPRRGROUPDELETE);
-        maskBuilder.setMask(reasons);
-        inMasks.add(maskBuilder.build());
-        // OFPCR_ROLE_SLAVE
-        maskBuilder = new FlowRemovedMaskBuilder();
-        reasons = new ArrayList<>();
-        maskBuilder.setMask(reasons);
-        inMasks.add(maskBuilder.build());
-        return inMasks;
+        return List.of(
+            // OFPCR_ROLE_EQUAL or OFPCR_ROLE_MASTER
+            new FlowRemovedMaskBuilder()
+                .setMask(Set.of(
+                    FlowRemovedReason.OFPRRIDLETIMEOUT,
+                    FlowRemovedReason.OFPRRHARDTIMEOUT,
+                    FlowRemovedReason.OFPRRDELETE,
+                    FlowRemovedReason.OFPRRGROUPDELETE))
+                .build(),
+            // OFPCR_ROLE_SLAVE
+            new FlowRemovedMaskBuilder().setMask(Set.of()).build());
     }
 }