Clean up List-related warnings in bgp-parser-impl tests

Use BindingMap to fix deprecation warnings.

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

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java
index 895d7551f0eef4e60842379d2080b4b76e940e19..6a5226621d58588542acaf2a66abe99338ba791f 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/ComplementaryTest.java
@@ -12,9 +12,7 @@ import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotSame;
 
-import com.google.common.collect.Maps;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Map;
 import org.junit.Test;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone;
@@ -30,10 +28,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.MultiprotocolCapabilityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.graceful.restart.capability.Tables;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.graceful.restart.capability.TablesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.graceful.restart.capability.TablesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.BgpAggregator;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv4AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv6AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.UnicastSubsequentAddressFamily;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
@@ -51,14 +51,12 @@ public class ComplementaryTest {
         final CParameters tlv2 = new CParametersBuilder().addAugmentation(new CParameters1Builder()
             .setMultiprotocolCapability(cap1).build()).build();
 
-        final List<Tables> tt = new ArrayList<>();
-        tt.add(new TablesBuilder().setAfi(Ipv6AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class)
-            .build());
-        tt.add(new TablesBuilder().setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class)
-            .build());
+        final Map<TablesKey, Tables> tt = BindingMap.of(
+            new TablesBuilder().setAfi(Ipv6AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class).build(),
+            new TablesBuilder().setAfi(Ipv4AddressFamily.class).setSafi(UnicastSubsequentAddressFamily.class).build());
 
-        final GracefulRestartCapability tlv3 = new GracefulRestartCapabilityBuilder().setRestartFlags(
-            new RestartFlags(Boolean.FALSE)).setRestartTime(Uint16.ZERO).setTables(tt).build();
+        final GracefulRestartCapability tlv3 = new GracefulRestartCapabilityBuilder()
+            .setRestartFlags(new RestartFlags(Boolean.FALSE)).setRestartTime(Uint16.ZERO).setTables(tt).build();
 
         final CParameters tlv4 = new CParametersBuilder().setAs4BytesCapability(
             new As4BytesCapabilityBuilder().setAsNumber(new AsNumber(Uint32.valueOf(40))).build()).build();
@@ -73,7 +71,7 @@ public class ComplementaryTest {
 
         assertNotSame(tlv2.toString(), tlv3.toString());
 
-        assertEquals(Maps.uniqueIndex(tt, Tables::key), tlv3.getTables());
+        assertEquals(tt, tlv3.getTables());
 
         assertEquals(cap.getSafi(), cap1.getSafi());
 

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java
index d275adbbf4628ec1e7568e60a4dddc60f9e0f843..73f2af147a2fdba19b85c33c59ab3a92d2b2c62d 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/GracefulCapabilityHandlerTest.java
@@ -10,7 +10,6 @@ package org.opendaylight.protocol.bgp.parser.impl;
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
-import com.google.common.collect.Lists;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.Collections;
@@ -31,6 +30,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv4AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.SubsequentAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.UnicastSubsequentAddressFamily;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint16;
 
 public class GracefulCapabilityHandlerTest {
@@ -59,7 +59,7 @@ public class GracefulCapabilityHandlerTest {
                 .setAfiFlags(new AfiFlags(true))
                 .setAfi(Ipv4AddressFamily.class)
                 .setSafi(UnicastSubsequentAddressFamily.class);
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
 
         final ByteBuf buffer = Unpooled.buffer(capaBytes.length);
         handler.serializeCapability(new CParametersBuilder()
@@ -78,7 +78,7 @@ public class GracefulCapabilityHandlerTest {
         capaBuilder.setRestartFlags(new RestartFlags(false));
         capaBuilder.setRestartTime(Uint16.ZERO);
         tablesBuilder.setAfiFlags(new AfiFlags(false));
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
         buffer.clear();
         handler.serializeCapability(new CParametersBuilder()
             .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
@@ -91,7 +91,7 @@ public class GracefulCapabilityHandlerTest {
         capaBuilder.setRestartFlags(null);
         tablesBuilder.setAfiFlags(null);
         capaBuilder.setRestartTime((Uint16) null);
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
         buffer.clear();
         handler.serializeCapability(new CParametersBuilder()
             .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
@@ -104,7 +104,7 @@ public class GracefulCapabilityHandlerTest {
         };
         capaBuilder.setRestartFlags(new RestartFlags(false));
         capaBuilder.setRestartTime(Uint16.ZERO);
-        capaBuilder.setTables(Collections.emptyList());
+        capaBuilder.setTables(Collections.emptyMap());
         assertEquals(new CParametersBuilder()
             .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
             .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes3).slice(2, capaBytes3.length - 2)));
@@ -150,7 +150,7 @@ public class GracefulCapabilityHandlerTest {
 
         tablesBuilder.setAfi(AddressFamily.class);
         tablesBuilder.setSafi(UnicastSubsequentAddressFamily.class);
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
 
         final ByteBuf buffer = Unpooled.buffer();
         handler.serializeCapability(new CParametersBuilder()
@@ -170,7 +170,7 @@ public class GracefulCapabilityHandlerTest {
         tablesBuilder.setAfiFlags(new AfiFlags(true));
         tablesBuilder.setAfi(Ipv4AddressFamily.class);
         tablesBuilder.setSafi(SubsequentAddressFamily.class);
-        capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
+        capaBuilder.setTables(BindingMap.of(tablesBuilder.build()));
 
         final ByteBuf buffer = Unpooled.buffer();
         handler.serializeCapability(new CParametersBuilder()
@@ -187,7 +187,7 @@ public class GracefulCapabilityHandlerTest {
                 .setRestartFlags(new RestartFlags(true))
                 // FIXME: this is throwing IAE, why is the rest of the test even here?
                 .setRestartTime(Uint16.MAX_VALUE)
-                .setTables(Lists.newArrayList(new TablesBuilder()
+                .setTables(BindingMap.of(new TablesBuilder()
                     .setAfiFlags(new AfiFlags(true))
                     .setAfi(Ipv4AddressFamily.class)
                     .setSafi(UnicastSubsequentAddressFamily.class)
@@ -208,7 +208,7 @@ public class GracefulCapabilityHandlerTest {
                 .setRestartFlags(new RestartFlags(true))
                 .setRestartTime(Uint16.valueOf(50000));
 
-        capaBuilder.setTables(Lists.newArrayList(new TablesBuilder()
+        capaBuilder.setTables(BindingMap.of(new TablesBuilder()
             .setAfiFlags(new AfiFlags(true))
             .setAfi(Ipv4AddressFamily.class)
             .setSafi(UnicastSubsequentAddressFamily.class)

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java
index 6d07e9ae85b882c6154099432b280cdc733d57e0..263c8528cfdb34794c886dbd6dc11b7eee655e90 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/LlGracefulCapabilityHandlerTest.java
@@ -9,7 +9,6 @@ package org.opendaylight.protocol.bgp.parser.impl;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import java.util.Arrays;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,6 +35,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.type
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.Ipv6AddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.SubsequentAddressFamily;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.UnicastSubsequentAddressFamily;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
 public class LlGracefulCapabilityHandlerTest {
@@ -78,7 +78,7 @@ public class LlGracefulCapabilityHandlerTest {
         };
 
         final LlGracefulRestartCapability capability = new LlGracefulRestartCapabilityBuilder()
-                .setTables(Arrays.asList(new TablesBuilder()
+                .setTables(BindingMap.of(new TablesBuilder()
                                 .setAfi(Ipv4AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                 .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))
@@ -106,7 +106,7 @@ public class LlGracefulCapabilityHandlerTest {
     @Test(expected = IllegalArgumentException.class)
     public void testUnsupportedAfi() {
         final LlGracefulRestartCapability capability = new LlGracefulRestartCapabilityBuilder()
-                .setTables(Arrays.asList(new TablesBuilder()
+                .setTables(BindingMap.of(new TablesBuilder()
                                 .setAfi(AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                 .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))
@@ -136,7 +136,7 @@ public class LlGracefulCapabilityHandlerTest {
             (byte) 0x00, (byte) 0x00, (byte) 0x00, (byte) 0xa0
         };
         final LlGracefulRestartCapability capability = new LlGracefulRestartCapabilityBuilder()
-                .setTables(Arrays.asList(new TablesBuilder()
+                .setTables(BindingMap.of(new TablesBuilder()
                                 .setAfi(Ipv4AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                 .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))
@@ -161,7 +161,7 @@ public class LlGracefulCapabilityHandlerTest {
     @Test(expected = IllegalArgumentException.class)
     public void testUnsupportedSafi() {
         final LlGracefulRestartCapability capability = new LlGracefulRestartCapabilityBuilder()
-                .setTables(Arrays.asList(new TablesBuilder()
+                .setTables(BindingMap.of(new TablesBuilder()
                         .setAfi(Ipv4AddressFamily.class)
                         .setSafi(SubsequentAddressFamily.class)
                         .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))
@@ -192,7 +192,7 @@ public class LlGracefulCapabilityHandlerTest {
         };
 
         final LlGracefulRestartCapability capability = new LlGracefulRestartCapabilityBuilder()
-                .setTables(Arrays.asList(new TablesBuilder()
+                .setTables(BindingMap.of(new TablesBuilder()
                                 .setAfi(Ipv4AddressFamily.class)
                                 .setSafi(UnicastSubsequentAddressFamily.class)
                                 .setAfiFlags(new Tables.AfiFlags(Boolean.FALSE))

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java
index f5a9000d038dc5c8be662b0c124809bbc497d363..0d8c17cfb50590f21b91a541e56b623a62f40683 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/OpenTest.java
@@ -10,6 +10,7 @@ package org.opendaylight.protocol.bgp.parser.impl;
 import static org.junit.Assert.assertEquals;
 
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.ArrayList;
@@ -55,7 +56,7 @@ public class OpenTest {
                                 .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
                                     .setRestartFlags(new GracefulRestartCapability.RestartFlags(false))
                                     .setRestartTime(Uint16.ZERO)
-                                    .setTables(ImmutableList.of()).build())
+                                    .setTables(ImmutableMap.of()).build())
                                 .build())
                             .build())
                         .build())).build()))