Use BindingMap to migrate tests

A number of tests are using Lists, where BindingMap can provide a
nice bridge.

Change-Id: Ib26a3b3a7587afb58f8abb02706dc693d566b920
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/ApplyActionsInstructionSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/ApplyActionsInstructionSerializerTest.java
index d2bd7f0846bba6194d59191980a1e44c0d4b6bc9..76ea051a28b3b54abc2d96d89ea7828f8353e169 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/ApplyActionsInstructionSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/ApplyActionsInstructionSerializerTest.java
@@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.instructions
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collections;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
@@ -25,6 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.apply.actions._case.ApplyActionsBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class ApplyActionsInstructionSerializerTest extends AbstractInstructionSerializerTest {
     @Test
@@ -34,7 +34,7 @@ public class ApplyActionsInstructionSerializerTest extends AbstractInstructionSe
 
         final Instruction instruction = new ApplyActionsCaseBuilder()
                 .setApplyActions(new ApplyActionsBuilder()
-                        .setAction(Collections.singletonList(new ActionBuilder()
+                        .setAction(BindingMap.of(new ActionBuilder()
                                 .setOrder(order)
                                 .withKey(new ActionKey(order))
                                 .setAction(new SetNwSrcActionCaseBuilder()

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/WriteActionsInstructionSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/WriteActionsInstructionSerializerTest.java
index c6a35d15ac11592e80703131e754c1bcc9e8b645..b057354c0c37ed875c08d4f396fa75ace4964ba3 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/WriteActionsInstructionSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/instructions/WriteActionsInstructionSerializerTest.java
@@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.instructions
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collections;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
@@ -25,6 +24,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.WriteActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.write.actions._case.WriteActionsBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class WriteActionsInstructionSerializerTest extends AbstractInstructionSerializerTest {
     @Test
@@ -34,7 +34,7 @@ public class WriteActionsInstructionSerializerTest extends AbstractInstructionSe
 
         final Instruction instruction = new WriteActionsCaseBuilder()
                 .setWriteActions(new WriteActionsBuilder()
-                        .setAction(Collections.singletonList(new ActionBuilder()
+                        .setAction(BindingMap.of(new ActionBuilder()
                                 .setOrder(order)
                                 .withKey(new ActionKey(order))
                                 .setAction(new SetNwSrcActionCaseBuilder()

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java
index dff09b2e8fb3adb3c723cc08bff0da0285e72966..5b62f97174ab18c83c18781f028e14737b20ad61 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/FlowMessageSerializerTest.java
@@ -12,8 +12,6 @@ import static org.junit.Assert.assertEquals;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-import java.util.Arrays;
-import java.util.Collections;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
@@ -46,6 +44,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instru
 import org.opendaylight.yang.gen.v1.urn.opendaylight.l2.types.rev130827.VlanId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.model.match.types.rev131026.match.IpMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.FlowModCommand;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint64;
@@ -91,13 +90,13 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest {
     private static final Uint16 TP_SRC_PORT = Uint16.valueOf(22);
     private static final Uint16 TP_DST_PORT = Uint16.valueOf(23);
     private static final Instructions INSTRUCTIONS = new InstructionsBuilder()
-            .setInstruction(Arrays.asList(
+            .setInstruction(BindingMap.ordered(
                     new InstructionBuilder()
                             .setOrder(0)
                             .withKey(new InstructionKey(0))
                             .setInstruction(new ApplyActionsCaseBuilder()
                                     .setApplyActions(new ApplyActionsBuilder()
-                                            .setAction(Collections.singletonList(new ActionBuilder()
+                                            .setAction(BindingMap.of(new ActionBuilder()
                                                     .setOrder(0)
                                                     .withKey(new ActionKey(0))
                                                     .setAction(new SetVlanIdActionCaseBuilder()
@@ -114,7 +113,7 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest {
                             .withKey(new InstructionKey(2))
                             .setInstruction(new ApplyActionsCaseBuilder()
                                     .setApplyActions(new ApplyActionsBuilder()
-                                            .setAction(Collections.singletonList(new ActionBuilder()
+                                            .setAction(BindingMap.of(new ActionBuilder()
                                                     .setOrder(1)
                                                     .withKey(new ActionKey(1))
                                                     .setAction(new SetTpDstActionCaseBuilder()
@@ -132,7 +131,7 @@ public class FlowMessageSerializerTest extends AbstractSerializerTest {
                             .withKey(new InstructionKey(1))
                             .setInstruction(new ApplyActionsCaseBuilder()
                                     .setApplyActions(new ApplyActionsBuilder()
-                                            .setAction(Collections.singletonList(new ActionBuilder()
+                                            .setAction(BindingMap.of(new ActionBuilder()
                                                     .setOrder(2)
                                                     .withKey(new ActionKey(2))
                                                     .setAction(new SetTpSrcActionCaseBuilder()

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java
index 905caa5ded3854230c39b7f4bbc90141f383ca32..bcf44e38de1b5af30f26ef3d8a17f10598f3fa71 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/GroupMessageSerializerTest.java
@@ -37,6 +37,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.BucketBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.group.buckets.BucketKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.GroupModCommand;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint8;
@@ -78,7 +79,7 @@ public class GroupMessageSerializerTest extends AbstractSerializerTest {
     );
 
     private static final Buckets BUCKETS = new BucketsBuilder()
-            .setBucket(Collections.singletonList(new BucketBuilder()
+            .setBucket(BindingMap.of(new BucketBuilder()
                     .setBucketId(BUCKET_ID)
                     .withKey(BUCKET_KEY)
                     .setWatchGroup(BUCKET_WATCH_GROUP)

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java
index 3e67e276571e90daf35703fd58f38bd187e38db6..db2e6569ea51e6de348ac238e10e48586e7e4235 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/messages/MeterMessageSerializerTest.java
@@ -12,7 +12,6 @@ import static org.junit.Assert.assertEquals;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.UnpooledByteBufAllocator;
-import java.util.Arrays;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.keys.MessageTypeKey;
 import org.opendaylight.openflowjava.protocol.api.util.EncodeConstants;
@@ -31,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meter.types.rev130918.meter.meter.band.headers.meter.band.header.MeterBandTypesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterBandType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.MeterModCommand;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint8;
 
@@ -73,7 +73,7 @@ public class MeterMessageSerializerTest extends AbstractSerializerTest {
             .setVersion(EncodeConstants.OF_VERSION_1_3)
             .setMeterName(METER_NAME)
             .setMeterBandHeaders(new MeterBandHeadersBuilder()
-                    .setMeterBandHeader(Arrays.asList(
+                    .setMeterBandHeader(BindingMap.ordered(
                             new MeterBandHeaderBuilder()
                                     .setMeterBandTypes(new MeterBandTypesBuilder()
                                             .setFlags(new org.opendaylight.yang.gen.v1.urn.opendaylight

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializerTest.java
index 18f74d409de892fe9b7daf2447bb635e9084cd38..8fadd75dda3bf4b37bb81c0b33bb9afdd35d5a3a 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/MultipartRequestTableFeaturesSerializerTest.java
@@ -27,7 +27,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.TableFeaturesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.TablePropertiesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.table.properties.TableFeaturePropertiesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.features.table.features.table.properties.TableFeaturePropertiesKey;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint32;
 import org.opendaylight.yangtools.yang.common.Uint64;
 import org.opendaylight.yangtools.yang.common.Uint8;
@@ -50,7 +50,7 @@ public class MultipartRequestTableFeaturesSerializerTest extends AbstractSeriali
                     .build())
             .build();
     private static final MultipartRequestTableFeatures BODY = new MultipartRequestTableFeaturesBuilder()
-            .setTableFeatures(Collections.singletonList(new TableFeaturesBuilder()
+            .setTableFeatures(BindingMap.of(new TableFeaturesBuilder()
                     .setTableId(TABLE_ID)
                     .setName(NAME)
                     .setMetadataMatch(METADATA_MATCH)
@@ -58,9 +58,8 @@ public class MultipartRequestTableFeaturesSerializerTest extends AbstractSeriali
                     .setConfig(new TableConfig(IS_DEPRECATED_MASK))
                     .setMaxEntries(MAX_ENTRIES)
                     .setTableProperties(new TablePropertiesBuilder()
-                            .setTableFeatureProperties(Collections.singletonList(new TableFeaturePropertiesBuilder()
+                            .setTableFeatureProperties(BindingMap.of(new TableFeaturePropertiesBuilder()
                                     .setOrder(0)
-                                    .withKey(new TableFeaturePropertiesKey(0))
                                     .setTableFeaturePropType(NEXT_TABLE)
                                     .build()))
                             .build())

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializerTest.java
index 23a76a7045d4ebf71c09705c16b0d721baf18cb1..acad9ca37e16fa384fa6082528f136844865517b 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsMissTablePropertySerializerTest.java
@@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.ta
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collections;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwSrcActionCaseBuilder;
@@ -18,6 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActionsMiss;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActionsMissBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class ApplyActionsMissTablePropertySerializerTest extends AbstractTablePropertySerializerTest {
     @Test
@@ -26,10 +26,9 @@ public class ApplyActionsMissTablePropertySerializerTest extends AbstractTablePr
                 .setApplyActionsMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight
                         .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.apply.actions.miss
                         .ApplyActionsMissBuilder()
-                        .setAction(Collections.singletonList(new ActionBuilder()
+                        .setAction(BindingMap.of(new ActionBuilder()
                                 .setOrder(0)
-                                .setAction(new SetNwSrcActionCaseBuilder()
-                                        .build())
+                                .setAction(new SetNwSrcActionCaseBuilder().build())
                                 .build()))
                         .build())
                 .build();

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsTablePropertySerializerTest.java
index b4e6019b82b8defd48d64f67660c0ac062b9e8dd..61212c7e428080281e21d5e82810438e91e500b6 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsTablePropertySerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/ApplyActionsTablePropertySerializerTest.java
@@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.ta
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collections;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.ActionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.SetNwSrcActionCaseBuilder;
@@ -18,6 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActions;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.ApplyActionsBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class ApplyActionsTablePropertySerializerTest extends AbstractTablePropertySerializerTest {
     @Test
@@ -26,10 +26,9 @@ public class ApplyActionsTablePropertySerializerTest extends AbstractTableProper
                 .setApplyActions(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature
                         .prop.type.table.feature.prop.type.apply.actions
                         .ApplyActionsBuilder()
-                        .setAction(Collections.singletonList(new ActionBuilder()
+                        .setAction(BindingMap.of(new ActionBuilder()
                                 .setOrder(0)
-                                .setAction(new SetNwSrcActionCaseBuilder()
-                                        .build())
+                                .setAction(new SetNwSrcActionCaseBuilder().build())
                                 .build()))
                         .build())
                 .build();

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializerTest.java
index 883627d80a65411dd21487129bca05d4d4908020..f25b6cfe6a20e80a0227fb58335f681c62001da2 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsMissTablePropertySerializerTest.java
@@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.ta
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collections;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCaseBuilder;
@@ -18,6 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.InstructionsMiss;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.InstructionsMissBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class InstructionsMissTablePropertySerializerTest extends AbstractTablePropertySerializerTest {
     @Test
@@ -26,10 +26,9 @@ public class InstructionsMissTablePropertySerializerTest extends AbstractTablePr
                 .setInstructionsMiss(new org.opendaylight.yang.gen.v1.urn.opendaylight
                         .table.types.rev131026.table.feature.prop.type.table.feature.prop.type.instructions.miss
                         .InstructionsMissBuilder()
-                        .setInstruction(Collections.singletonList(new InstructionBuilder()
+                        .setInstruction(BindingMap.of(new InstructionBuilder()
                                 .setOrder(0)
-                                .setInstruction(new ApplyActionsCaseBuilder()
-                                        .build())
+                                .setInstruction(new ApplyActionsCaseBuilder().build())
                                 .build()))
                         .build())
                 .build();

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsTablePropertySerializerTest.java
index 16b63828736a9eae4b930020f2185e67f4c065e8..eee26cedf8dcb7c57926386bc874540b8642120a 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsTablePropertySerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/InstructionsTablePropertySerializerTest.java
@@ -9,7 +9,6 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.ta
 
 import static org.junit.Assert.assertEquals;
 
-import java.util.Collections;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.impl.util.InstructionConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.instruction.instruction.ApplyActionsCaseBuilder;
@@ -18,6 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev13
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.Instructions;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.InstructionsBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class InstructionsTablePropertySerializerTest extends AbstractTablePropertySerializerTest {
     @Test
@@ -26,10 +26,9 @@ public class InstructionsTablePropertySerializerTest extends AbstractTableProper
                 .setInstructions(new org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature
                         .prop.type.table.feature.prop.type.instructions
                         .InstructionsBuilder()
-                        .setInstruction(Collections.singletonList(new InstructionBuilder()
+                        .setInstruction(BindingMap.of(new InstructionBuilder()
                                 .setOrder(0)
-                                .setInstruction(new ApplyActionsCaseBuilder()
-                                        .build())
+                                .setInstruction(new ApplyActionsCaseBuilder().build())
                                 .build()))
                         .build())
                 .build();

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializerTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializerTest.java
index f7d25d69844515c919de415993a8c853b35d1bf7..26212125fbbf116f03792c8215b07880412186ae 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializerTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/protocol/serialization/multipart/tablefeatures/WildcardsTablePropertySerializerTest.java
@@ -9,30 +9,24 @@ package org.opendaylight.openflowplugin.impl.protocol.serialization.multipart.ta
 
 import static org.junit.Assert.assertEquals;
 
-import com.google.common.collect.ImmutableList;
 import org.junit.Test;
 import org.opendaylight.openflowjava.protocol.api.util.OxmMatchConstants;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.TableFeaturesPropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.ArpOp;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatch;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.set.field.match.SetFieldMatchBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.TableFeaturePropType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.Wildcards;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.WildcardsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.table.feature.prop.type.table.feature.prop.type.wildcards.WildcardSetfieldBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 public class WildcardsTablePropertySerializerTest extends AbstractTablePropertySerializerTest {
     @Test
     public void testSerialize() {
         final Wildcards property = new WildcardsBuilder()
                 .setWildcardSetfield(new WildcardSetfieldBuilder()
-                        .setSetFieldMatch(ImmutableList
-                                .<SetFieldMatch>builder()
-                                .add(new SetFieldMatchBuilder()
-                                        .setMatchType(ArpOp.class)
-                                        .setHasMask(false)
-                                        .build())
-                                .build())
+                        .setSetFieldMatch(BindingMap.of(
+                                new SetFieldMatchBuilder().setMatchType(ArpOp.class).setHasMask(false).build()))
                         .build())
                 .build();
 

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlatBatchServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlatBatchServiceImplTest.java
index 6f8d986307786d466702c18e109ab0695397de19..f9b2e22953e02aeb7b14868a9d6b7fd7d87d1e19 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlatBatchServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlatBatchServiceImplTest.java
@@ -10,7 +10,6 @@ package org.opendaylight.openflowplugin.impl.services.sal;
 import com.google.common.collect.Lists;
 import com.google.common.util.concurrent.AsyncFunction;
 import com.google.common.util.concurrent.ListenableFuture;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -159,7 +158,7 @@ public class SalFlatBatchServiceImplTest {
 
         ProcessFlatBatchInput batchInput = new ProcessFlatBatchInputBuilder()
                 .setNode(NODE_REF)
-                .setBatch(Lists.newArrayList(
+                .setBatch(BindingMap.ordered(
                         createFlowAddBatch(0, "f1"),
                         createFlowRemoveBatch(1, "f2"),
                         createFlowUpdateBatch(2, "f3"),
@@ -204,7 +203,7 @@ public class SalFlatBatchServiceImplTest {
         int idx = 0;
         ProcessFlatBatchInput batchInput = new ProcessFlatBatchInputBuilder()
                 .setNode(NODE_REF)
-                .setBatch(Lists.newArrayList(
+                .setBatch(BindingMap.ordered(
                         createFlowAddBatch(idx++, "f1", 2),
                         createFlowRemoveBatch(idx++, "f2"),
                         createFlowUpdateBatch(idx++, "f3"),
@@ -290,7 +289,7 @@ public class SalFlatBatchServiceImplTest {
         Mockito.when(salFlowsBatchService.removeFlowsBatch(ArgumentMatchers.any()))
                 .thenReturn(RpcResultBuilder.<RemoveFlowsBatchOutput>failed()
                         .withResult(new RemoveFlowsBatchOutputBuilder()
-                                .setBatchFailedFlowsOutput(Lists.newArrayList(
+                                .setBatchFailedFlowsOutput(BindingMap.ordered(
                                         new BatchFailedFlowsOutputBuilder()
                                                 .setBatchOrder(Uint16.ONE)
                                                 .setFlowId(new FlowId("123"))
@@ -339,14 +338,6 @@ public class SalFlatBatchServiceImplTest {
         return map;
     }
 
-    private static <T> List<T> repeatInList(final T item, final int amount) {
-        final List<T> list = new ArrayList<>();
-        for (int i = 0; i < amount; i++) {
-            list.add(item);
-        }
-        return list;
-    }
-
     private static Batch createFlowRemoveBatch(final int batchOrder, final String flowIdValue) {
         return new BatchBuilder()
                 .setBatchOrder(Uint16.valueOf(batchOrder))
@@ -514,7 +505,7 @@ public class SalFlatBatchServiceImplTest {
 
     private static ProcessFlatBatchOutput createFlatBatchOutput(final BatchFailure... batchFailures) {
         return new ProcessFlatBatchOutputBuilder()
-                .setBatchFailure(Lists.newArrayList(batchFailures))
+                .setBatchFailure(BindingMap.ordered(batchFailures))
                 .build();
     }
 
@@ -575,7 +566,7 @@ public class SalFlatBatchServiceImplTest {
                 .thenReturn(RpcResultBuilder
                         .<AddFlowsBatchOutput>failed()
                         .withResult(new AddFlowsBatchOutputBuilder()
-                                .setBatchFailedFlowsOutput(Lists.newArrayList(
+                                .setBatchFailedFlowsOutput(BindingMap.ordered(
                                         new BatchFailedFlowsOutputBuilder()
                                                 .setBatchOrder(Uint16.ZERO)
                                                 .setFlowId(new FlowId("f1"))

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowsBatchServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowsBatchServiceImplTest.java
index d61d9170ce9b8a37f3094a0ee4f8b2b4498ed38d..09f6c43b3bb7255537a247cc14a790ea2a6a8101 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowsBatchServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalFlowsBatchServiceImplTest.java
@@ -8,7 +8,6 @@
 
 package org.opendaylight.openflowplugin.impl.services.sal;
 
-import com.google.common.collect.Lists;
 import java.util.Iterator;
 import java.util.List;
 import java.util.concurrent.Future;
@@ -62,6 +61,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -125,7 +125,7 @@ public class SalFlowsBatchServiceImplTest {
         final RemoveFlowsBatchInput input = new RemoveFlowsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchRemoveFlows(Lists.newArrayList(batchFlow1, batchFlow2))
+                .setBatchRemoveFlows(BindingMap.ordered(batchFlow1, batchFlow2))
                 .build();
 
         final Future<RpcResult<RemoveFlowsBatchOutput>> resultFuture = salFlowsBatchService.removeFlowsBatch(input);
@@ -160,7 +160,7 @@ public class SalFlowsBatchServiceImplTest {
         final RemoveFlowsBatchInput input = new RemoveFlowsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchRemoveFlows(Lists.newArrayList(batchFlow1, batchFlow2))
+                .setBatchRemoveFlows(BindingMap.ordered(batchFlow1, batchFlow2))
                 .build();
 
         final Future<RpcResult<RemoveFlowsBatchOutput>> resultFuture = salFlowsBatchService.removeFlowsBatch(input);
@@ -221,7 +221,7 @@ public class SalFlowsBatchServiceImplTest {
         final AddFlowsBatchInput input = new AddFlowsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchAddFlows(Lists.newArrayList(
+                .setBatchAddFlows(BindingMap.ordered(
                         createEmptyBatchAddFlow("ut-dummy-flow1", 42),
                         createEmptyBatchAddFlow("ut-dummy-flow2", 43)))
                 .build();
@@ -252,7 +252,7 @@ public class SalFlowsBatchServiceImplTest {
         final AddFlowsBatchInput input = new AddFlowsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchAddFlows(Lists.newArrayList(
+                .setBatchAddFlows(BindingMap.ordered(
                         createEmptyBatchAddFlow(FLOW_ID_VALUE_1, 42),
                         createEmptyBatchAddFlow(FLOW_ID_VALUE_2, 43)))
                 .build();
@@ -287,7 +287,7 @@ public class SalFlowsBatchServiceImplTest {
         final UpdateFlowsBatchInput input = new UpdateFlowsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchUpdateFlows(Lists.newArrayList(
+                .setBatchUpdateFlows(BindingMap.ordered(
                         createEmptyBatchUpdateFlow(FLOW_ID_VALUE_1, 42),
                         createEmptyBatchUpdateFlow(FLOW_ID_VALUE_2, 44)))
                 .build();
@@ -320,7 +320,7 @@ public class SalFlowsBatchServiceImplTest {
         final UpdateFlowsBatchInput input = new UpdateFlowsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchUpdateFlows(Lists.newArrayList(
+                .setBatchUpdateFlows(BindingMap.ordered(
                         createEmptyBatchUpdateFlow(FLOW_ID_VALUE_1, 42),
                         createEmptyBatchUpdateFlow(FLOW_ID_VALUE_2, 44)))
                 .build();

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalGroupsBatchServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalGroupsBatchServiceImplTest.java
index 5aff78ee92a990a6ed7e4a32e8ec757dd9305b94..07787f78bbabb776fe1d8dea41023beb0f064a7a 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalGroupsBatchServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalGroupsBatchServiceImplTest.java
@@ -61,6 +61,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.Nodes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -182,7 +183,7 @@ public class SalGroupsBatchServiceImplTest {
         final AddGroupsBatchInput input = new AddGroupsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchAddGroups(Lists.newArrayList(
+                .setBatchAddGroups(BindingMap.ordered(
                         createEmptyBatchAddGroup(42L),
                         createEmptyBatchAddGroup(43L)))
                 .build();
@@ -212,7 +213,7 @@ public class SalGroupsBatchServiceImplTest {
         final AddGroupsBatchInput input = new AddGroupsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchAddGroups(Lists.newArrayList(
+                .setBatchAddGroups(BindingMap.ordered(
                         createEmptyBatchAddGroup(42L),
                         createEmptyBatchAddGroup(43L)))
                 .build();
@@ -247,7 +248,7 @@ public class SalGroupsBatchServiceImplTest {
         final RemoveGroupsBatchInput input = new RemoveGroupsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchRemoveGroups(Lists.newArrayList(
+                .setBatchRemoveGroups(BindingMap.ordered(
                         createEmptyBatchRemoveGroup(42L),
                         createEmptyBatchRemoveGroup(43L)))
                 .build();
@@ -278,7 +279,7 @@ public class SalGroupsBatchServiceImplTest {
         final RemoveGroupsBatchInput input = new RemoveGroupsBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchRemoveGroups(Lists.newArrayList(
+                .setBatchRemoveGroups(BindingMap.ordered(
                         createEmptyBatchRemoveGroup(42L),
                         createEmptyBatchRemoveGroup(43L)))
                 .build();

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalMetersBatchServiceImplTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalMetersBatchServiceImplTest.java
index 74f7c57fc291fecd0e5b52317b85bed4c6efad7a..216f381a39ec124aac9265afc853a883a218d46e 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalMetersBatchServiceImplTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/services/sal/SalMetersBatchServiceImplTest.java
@@ -63,6 +63,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.re
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.update.meters.batch.input.BatchUpdateMeters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.meters.service.rev160316.update.meters.batch.input.BatchUpdateMetersBuilder;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -183,7 +184,7 @@ public class SalMetersBatchServiceImplTest {
         final AddMetersBatchInput input = new AddMetersBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchAddMeters(Lists.newArrayList(
+                .setBatchAddMeters(BindingMap.ordered(
                         createEmptyBatchAddMeter(42L),
                         createEmptyBatchAddMeter(43L)))
                 .build();
@@ -213,7 +214,7 @@ public class SalMetersBatchServiceImplTest {
         final AddMetersBatchInput input = new AddMetersBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchAddMeters(Lists.newArrayList(
+                .setBatchAddMeters(BindingMap.ordered(
                         createEmptyBatchAddMeter(42L),
                         createEmptyBatchAddMeter(43L)))
                 .build();
@@ -248,7 +249,7 @@ public class SalMetersBatchServiceImplTest {
         final RemoveMetersBatchInput input = new RemoveMetersBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchRemoveMeters(Lists.newArrayList(
+                .setBatchRemoveMeters(BindingMap.ordered(
                         createEmptyBatchRemoveMeter(42L),
                         createEmptyBatchRemoveMeter(43L)))
                 .build();
@@ -279,7 +280,7 @@ public class SalMetersBatchServiceImplTest {
         final RemoveMetersBatchInput input = new RemoveMetersBatchInputBuilder()
                 .setNode(NODE_REF)
                 .setBarrierAfter(true)
-                .setBatchRemoveMeters(Lists.newArrayList(
+                .setBatchRemoveMeters(BindingMap.ordered(
                         createEmptyBatchRemoveMeter(42L),
                         createEmptyBatchRemoveMeter(43L)))
                 .build();

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtilTest.java
index 1d8c382009b135b5234786555784baf361e9b3e9..2dc23437a51bc74af70fb231ee420fc0ee79c3c9 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlatBatchUtilTest.java
@@ -11,6 +11,7 @@ import com.google.common.collect.Lists;
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
+import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.openflowplugin.impl.services.batch.BatchPlanStep;
@@ -61,6 +62,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev16032
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.BatchFailureKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flat.batch.service.rev160321.process.flat.batch.output.batch.failure.batch.item.id.choice.FlatBatchFailureFlowIdCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -279,76 +281,80 @@ public class FlatBatchUtilTest {
                 .build();
     }
 
-    private static List<FlatBatchAddGroup> repeatFlatBatchAddGroupIntoList(final int size) {
-        final List<FlatBatchAddGroup> list = new ArrayList<>();
+    private static Map<FlatBatchAddGroupKey, FlatBatchAddGroup> repeatFlatBatchAddGroupIntoList(final int size) {
+        final var list = BindingMap.<FlatBatchAddGroupKey, FlatBatchAddGroup>orderedBuilder(size);
         for (int i = 0; i < size; i++) {
             list.add(new FlatBatchAddGroupBuilder().withKey(new FlatBatchAddGroupKey(Uint16.valueOf(i))).build());
         }
-        return list;
+        return list.build();
     }
 
-    private static List<FlatBatchUpdateGroup> repeatFlatBatchUpdateGroupIntoList(final int size) {
-        final List<FlatBatchUpdateGroup> list = new ArrayList<>();
+    private static Map<FlatBatchUpdateGroupKey, FlatBatchUpdateGroup> repeatFlatBatchUpdateGroupIntoList(
+            final int size) {
+        final var list = BindingMap.<FlatBatchUpdateGroupKey, FlatBatchUpdateGroup>orderedBuilder(size);
         for (int i = 0; i < size; i++) {
             list.add(new FlatBatchUpdateGroupBuilder().withKey(new FlatBatchUpdateGroupKey(Uint16.valueOf(i))).build());
         }
-        return list;
+        return list.build();
     }
 
-    private static List<FlatBatchRemoveGroup> repeatFlatBatchRemoveGroupIntoList(final int size) {
-        final List<FlatBatchRemoveGroup> list = new ArrayList<>();
+    private static Map<FlatBatchRemoveGroupKey, FlatBatchRemoveGroup> repeatFlatBatchRemoveGroupIntoList(
+            final int size) {
+        final var list = BindingMap.<FlatBatchRemoveGroupKey, FlatBatchRemoveGroup>orderedBuilder(size);
         for (int i = 0; i < size; i++) {
             list.add(new FlatBatchRemoveGroupBuilder().withKey(new FlatBatchRemoveGroupKey(Uint16.valueOf(i))).build());
         }
-        return list;
+        return list.build();
     }
 
-    private static List<FlatBatchAddFlow> repeatFlatBatchAddFlowIntoList(final int size) {
-        final List<FlatBatchAddFlow> list = new ArrayList<>();
+    private static Map<FlatBatchAddFlowKey, FlatBatchAddFlow> repeatFlatBatchAddFlowIntoList(final int size) {
+        final var list = BindingMap.<FlatBatchAddFlowKey, FlatBatchAddFlow>orderedBuilder(size);
         for (int i = 0; i < size; i++) {
             list.add(new FlatBatchAddFlowBuilder().withKey(new FlatBatchAddFlowKey(Uint16.valueOf(i))).build());
         }
-        return list;
+        return list.build();
     }
 
-    private static List<FlatBatchUpdateFlow> repeatFlatBatchUpdateFlowIntoList(final int size) {
-        final List<FlatBatchUpdateFlow> list = new ArrayList<>();
+    private static Map<FlatBatchUpdateFlowKey, FlatBatchUpdateFlow> repeatFlatBatchUpdateFlowIntoList(final int size) {
+        final var list = BindingMap.<FlatBatchUpdateFlowKey, FlatBatchUpdateFlow>orderedBuilder(size);
         for (int i = 0; i < size; i++) {
             list.add(new FlatBatchUpdateFlowBuilder().withKey(new FlatBatchUpdateFlowKey(Uint16.valueOf(i))).build());
         }
-        return list;
+        return list.build();
     }
 
-    private static List<FlatBatchRemoveFlow> repeatFlatBatchRemoveFlowIntoList(final int size) {
-        final List<FlatBatchRemoveFlow> list = new ArrayList<>();
+    private static Map<FlatBatchRemoveFlowKey, FlatBatchRemoveFlow> repeatFlatBatchRemoveFlowIntoList(final int size) {
+        final var list = BindingMap.<FlatBatchRemoveFlowKey, FlatBatchRemoveFlow>orderedBuilder(size);
         for (int i = 0; i < size; i++) {
             list.add(new FlatBatchRemoveFlowBuilder().withKey(new FlatBatchRemoveFlowKey(Uint16.valueOf(i))).build());
         }
-        return list;
+        return list.build();
     }
 
-    private static List<FlatBatchAddMeter> repeatFlatBatchAddMeterIntoList(final int size) {
-        final List<FlatBatchAddMeter> list = new ArrayList<>();
+    private static Map<FlatBatchAddMeterKey, FlatBatchAddMeter> repeatFlatBatchAddMeterIntoList(final int size) {
+        final var list = BindingMap.<FlatBatchAddMeterKey, FlatBatchAddMeter>orderedBuilder(size);
         for (int i = 0; i < size; i++) {
             list.add(new FlatBatchAddMeterBuilder().withKey(new FlatBatchAddMeterKey(Uint16.valueOf(i))).build());
         }
-        return list;
+        return list.build();
     }
 
-    private static List<FlatBatchUpdateMeter> repeatFlatBatchUpdateMeterIntoList(final int size) {
-        final List<FlatBatchUpdateMeter> list = new ArrayList<>();
+    private static Map<FlatBatchUpdateMeterKey, FlatBatchUpdateMeter> repeatFlatBatchUpdateMeterIntoList(
+            final int size) {
+        final var list = BindingMap.<FlatBatchUpdateMeterKey, FlatBatchUpdateMeter>orderedBuilder(size);
         for (int i = 0; i < size; i++) {
             list.add(new FlatBatchUpdateMeterBuilder().withKey(new FlatBatchUpdateMeterKey(Uint16.valueOf(i))).build());
         }
-        return list;
+        return list.build();
     }
 
-    private static List<FlatBatchRemoveMeter> repeatFlatBatchRemoveMeterIntoList(final int size) {
-        final List<FlatBatchRemoveMeter> list = new ArrayList<>();
+    private static Map<FlatBatchRemoveMeterKey, FlatBatchRemoveMeter> repeatFlatBatchRemoveMeterIntoList(
+            final int size) {
+        final var list = BindingMap.<FlatBatchRemoveMeterKey, FlatBatchRemoveMeter>orderedBuilder(size);
         for (int i = 0; i < size; i++) {
             list.add(new FlatBatchRemoveMeterBuilder().withKey(new FlatBatchRemoveMeterKey(Uint16.valueOf(i))).build());
         }
-        return list;
+        return list.build();
     }
 
     @Test
@@ -369,10 +375,10 @@ public class FlatBatchUtilTest {
                 .build();
 
         final ProcessFlatBatchOutput output
-                = new ProcessFlatBatchOutputBuilder().setBatchFailure(Lists.newArrayList(batchFailure)).build();
+                = new ProcessFlatBatchOutputBuilder().setBatchFailure(BindingMap.of(batchFailure)).build();
 
         final ProcessFlatBatchOutput output_1
-                = new ProcessFlatBatchOutputBuilder().setBatchFailure(Lists.newArrayList(batchFailure_1)).build();
+                = new ProcessFlatBatchOutputBuilder().setBatchFailure(BindingMap.of(batchFailure_1)).build();
 
         final RpcResult<ProcessFlatBatchOutput> rpcResultFailed = RpcResultBuilder.<ProcessFlatBatchOutput>failed()
                 .withError(RpcError.ErrorType.APPLICATION, "ut-rpcError")

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java
index 95f066018b0f9ce8b6a06e4a5dd2cc8534ae10a6..2dfcc076c43cf1e438ceea2ef09be976120e3f58 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/FlowUtilTest.java
@@ -231,7 +231,7 @@ public class FlowUtilTest {
     private static RpcResult<AddFlowsBatchOutput> createAddFlowsBatchSuccessOutput() {
         return RpcResultBuilder
                 .success(new AddFlowsBatchOutputBuilder()
-                        .setBatchFailedFlowsOutput(Collections.emptyList())
+                        .setBatchFailedFlowsOutput(Collections.emptyMap())
                         .build())
                 .build();
     }

diff --git a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java
index 4429570d89bf31d3cef10cbbcc3dea7de331ed14..ed9d7f1d4bbe256f6f83eeee35324d924aab2389 100644 (file)
--- a/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java
+++ b/openflowplugin-impl/src/test/java/org/opendaylight/openflowplugin/impl/util/GroupUtilTest.java
@@ -236,7 +236,7 @@ public class GroupUtilTest {
     private static RpcResult<AddGroupsBatchOutput> createAddGroupsBatchSuccessOutput() {
         return RpcResultBuilder
                 .success(new AddGroupsBatchOutputBuilder()
-                        .setBatchFailedGroupsOutput(Collections.emptyList())
+                        .setBatchFailedGroupsOutput(Collections.emptyMap())
                         .build())
                 .build();
     }