Cleanup deprecation warnings in bgp/parser-impl

Eliminate some leftovers from codegen change.

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

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java
index b69bfe20593761235b2e6bec6891deebdfaa908b..b2cc2f97d044a589cc549ac6e649f396d2a5686f 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/BGPUpdateMessageParser.java
@@ -292,7 +292,10 @@ public final class BGPUpdateMessageParser implements MessageParser, MessageSeria
         final MpReachNlri mpReachNlri = getMpReach(parsed);
         if (mpReachNlri == null) {
             // No MP_REACH attribute, just reuse MP_UNREACH if it is present.
-            builder.addAugmentation(Attributes2.class, parsed.augmentation(Attributes2.class));
+            final Attributes2 attrs2 = parsed.augmentation(Attributes2.class);
+            if (attrs2 != null) {
+                builder.addAugmentation(attrs2);
+            }
             return builder.build();
         }
 
@@ -313,7 +316,7 @@ public final class BGPUpdateMessageParser implements MessageParser, MessageSeria
                     return new BGPDocumentedException(withdrawCause);
                 });
 
-        builder.addAugmentation(Attributes2.class, new Attributes2Builder().setMpUnreachNlri(converted).build());
+        builder.addAugmentation(new Attributes2Builder().setMpUnreachNlri(converted).build());
         return builder.build();
     }
 

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/AddPathCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/AddPathCapabilityHandler.java
index f9471e9c4a020db70595ea306dee6de5af7ad9bf..d689c9e639f2fc72790da2c32e16f480a813013d 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/AddPathCapabilityHandler.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/AddPathCapabilityHandler.java
@@ -97,7 +97,7 @@ public class AddPathCapabilityHandler implements CapabilityParser, CapabilitySer
                     .build());
             }
         }
-        return new CParametersBuilder().addAugmentation(CParameters1.class,new CParameters1Builder()
+        return new CParametersBuilder().addAugmentation(new CParameters1Builder()
             .setAddPathCapability(new AddPathCapabilityBuilder().setAddressFamilies(families).build()).build()).build();
     }
 

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java
index d2c04694f8447ac8daf37550e202338586d4884f..4fe4ecfb7b8ed3d4cb4042e06622257350eccca6 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/GracefulCapabilityHandler.java
@@ -156,7 +156,8 @@ public final class GracefulCapabilityHandler implements CapabilityParser, Capabi
                 .setAfiFlags(new AfiFlags((flags & AFI_FLAG_FORWARDING_STATE) != 0)).build());
         }
         cb.setTables(tables);
-        return new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder()
-            .setGracefulRestartCapability(cb.build()).build()).build();
+        return new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(cb.build()).build())
+                .build();
     }
 }

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/LlGracefulCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/LlGracefulCapabilityHandler.java
index efbf6e6a9d1f9cda9398e1f6d373fe7e3b1ae1eb..307b40ef714b4f2fa66c6084f6cd910b57744217 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/LlGracefulCapabilityHandler.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/LlGracefulCapabilityHandler.java
@@ -93,11 +93,9 @@ public final class LlGracefulCapabilityHandler implements CapabilityParser, Capa
             tables.add(table);
         }
         return new CParametersBuilder()
-                .addAugmentation(CParameters1.class, new CParameters1Builder()
-                        .setLlGracefulRestartCapability(new LlGracefulRestartCapabilityBuilder()
-                                .setTables(tables)
-                                .build())
-                        .build())
+                .addAugmentation(new CParameters1Builder()
+                    .setLlGracefulRestartCapability(new LlGracefulRestartCapabilityBuilder().setTables(tables).build())
+                    .build())
                 .build();
     }
 

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java
index 42160fa03daa9375304390ed23674ca1f513a86f..bd11e4071f831c28487eca71b4e481e9a556ef59 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/open/MultiProtocolCapabilityHandler.java
@@ -46,8 +46,10 @@ public final class MultiProtocolCapabilityHandler implements CapabilityParser, C
         final Optional<BgpTableType> parsedAfiSafiOptional = MultiprotocolCapabilitiesUtil
                 .parseMPAfiSafi(buffer, this.afiReg, this.safiReg);
         return parsedAfiSafiOptional.map(bgpTableType -> new CParametersBuilder()
-                .addAugmentation(CParameters1.class, new CParameters1Builder().setMultiprotocolCapability(
-                new MultiprotocolCapabilityBuilder(bgpTableType).build()).build()).build()).orElse(null);
+                .addAugmentation(new CParameters1Builder()
+                    .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder(bgpTableType).build())
+                    .build())
+                .build()).orElse(null);
     }
 
     @Override

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPReachAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPReachAttributeParser.java
index 6d97ecd1ea821a4282210fd8eaaf4eb167c9df17..2d64b9a5811ab94f44e561af150f932009201b3d 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPReachAttributeParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPReachAttributeParser.java
@@ -38,7 +38,7 @@ public final class MPReachAttributeParser extends ReachAttributeParser {
             final RevisedErrorHandling errorHandling, final PeerSpecificParserConstraint constraint)
                     throws BGPDocumentedException {
         try {
-            builder.addAugmentation(Attributes1.class, new Attributes1Builder()
+            builder.addAugmentation(new Attributes1Builder()
                 .setMpReachNlri(reg.parseMpReach(buffer, constraint))
                 .build());
         } catch (final BGPParsingException e) {

diff --git a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPUnreachAttributeParser.java b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPUnreachAttributeParser.java
index ba62e627823827f008a6c60f944c108112a208b0..fa7d21742b64fdd94ef10f05e197c64f58250bc4 100644 (file)
--- a/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPUnreachAttributeParser.java
+++ b/bgp/parser-impl/src/main/java/org/opendaylight/protocol/bgp/parser/impl/message/update/MPUnreachAttributeParser.java
@@ -38,7 +38,7 @@ public final class MPUnreachAttributeParser extends ReachAttributeParser {
             final RevisedErrorHandling errorHandling, final PeerSpecificParserConstraint constraint)
                     throws BGPDocumentedException {
         try {
-            builder.addAugmentation(Attributes2.class, new Attributes2Builder()
+            builder.addAugmentation(new Attributes2Builder()
                 .setMpUnreachNlri(reg.parseMpUnreach(buffer, constraint))
                 .build());
         } catch (final BGPParsingException e) {

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/AddPathCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/AddPathCapabilityHandlerTest.java
index 6c5a097c1ab27380766ba3cf314c1426b688d85d..143f15d0b6d5f605193afaf7952896686817c2c4 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/AddPathCapabilityHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/AddPathCapabilityHandlerTest.java
@@ -73,9 +73,11 @@ public class AddPathCapabilityHandlerTest {
         family.add(new AddressFamiliesBuilder().setAfi(AddPathCapabilityHandlerTest.AFI)
             .setSafi(AddPathCapabilityHandlerTest.SAFI).setSendReceive(SendReceive.forValue(1)).build());
 
-        final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setAddPathCapability(
-                new AddPathCapabilityBuilder().setAddressFamilies(family).build()).build()).build();
+        final CParameters capabilityToSerialize = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setAddPathCapability(new AddPathCapabilityBuilder().setAddressFamilies(family).build())
+                    .build())
+                .build();
 
         final ByteBuf bytes = Unpooled.buffer(6);
         final AddPathCapabilityHandler handler = new AddPathCapabilityHandler(this.afiRegistry, this.safiRegistry);
@@ -102,9 +104,11 @@ public class AddPathCapabilityHandlerTest {
 
     @Test
     public void testSendReceiveIgnored() throws BGPDocumentedException, BGPParsingException {
-        final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setAddPathCapability(
-                new AddPathCapabilityBuilder().setAddressFamilies(new ArrayList<>()).build()).build()).build();
+        final CParameters capabilityToSerialize = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setAddPathCapability(new AddPathCapabilityBuilder().setAddressFamilies(new ArrayList<>()).build())
+                    .build())
+                .build();
 
         final ByteBuf bytes = this.parseWrongBytes.copy();
         final AddPathCapabilityHandler handler = new AddPathCapabilityHandler(this.afiRegistry, this.safiRegistry);
@@ -118,9 +122,11 @@ public class AddPathCapabilityHandlerTest {
         family.add(new AddressFamiliesBuilder().setAfi(AddPathCapabilityHandlerTest.AFI)
             .setSafi(AddPathCapabilityHandlerTest.SAFI).setSendReceive(SendReceive.forValue(2)).build());
 
-        final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setAddPathCapability(
-                new AddPathCapabilityBuilder().setAddressFamilies(family).build()).build()).build();
+        final CParameters capabilityToSerialize = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setAddPathCapability(new AddPathCapabilityBuilder().setAddressFamilies(family).build())
+                    .build())
+                .build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final AddPathCapabilityHandler handler = new AddPathCapabilityHandler(this.afirExpection, this.safiRegistry);
@@ -133,9 +139,11 @@ public class AddPathCapabilityHandlerTest {
         family.add(new AddressFamiliesBuilder().setAfi(AddPathCapabilityHandlerTest.AFI)
             .setSafi(AddPathCapabilityHandlerTest.SAFI).setSendReceive(SendReceive.forValue(3)).build());
 
-        final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setAddPathCapability(
-                new AddPathCapabilityBuilder().setAddressFamilies(family).build()).build()).build();
+        final CParameters capabilityToSerialize = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setAddPathCapability(new AddPathCapabilityBuilder().setAddressFamilies(family).build())
+                    .build())
+                .build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final AddPathCapabilityHandler handler = new AddPathCapabilityHandler(this.afiRegistry, this.safirException);
@@ -148,9 +156,11 @@ public class AddPathCapabilityHandlerTest {
         family.add(new AddressFamiliesBuilder().setAfi(AddPathCapabilityHandlerTest.AFI)
             .setSafi(AddPathCapabilityHandlerTest.SAFI).setSendReceive(SendReceive.forValue(4)).build());
 
-        final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setAddPathCapability(
-                new AddPathCapabilityBuilder().setAddressFamilies(family).build()).build()).build();
+        final CParameters capabilityToSerialize = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setAddPathCapability(new AddPathCapabilityBuilder().setAddressFamilies(family).build())
+                    .build())
+                .build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final AddPathCapabilityHandler handler = new AddPathCapabilityHandler(this.afiRegistry, this.safiRegistry);
@@ -159,10 +169,10 @@ public class AddPathCapabilityHandlerTest {
 
     @Test
     public void noSerializationTest() {
-        final CParameters capabilityNoAugmentation = new CParametersBuilder().addAugmentation(CParameters1.class, null)
+        final CParameters capabilityNoAugmentation = new CParametersBuilder().removeAugmentation(CParameters1.class)
+                .build();
+        final CParameters capabilityNoMP = new CParametersBuilder().addAugmentation(new CParameters1Builder().build())
                 .build();
-        final CParameters capabilityNoMP = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().build()).build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final AddPathCapabilityHandler handler = new AddPathCapabilityHandler(this.afiRegistry, this.safirException);

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java
index a820409a40916362aac441818e92fd8528e3a383..60be8d9973d8eb338d3cf2baf1f3580da61a2526 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/BGPParserTest.java
@@ -240,7 +240,7 @@ public class BGPParserTest {
         paBuilder.setCommunities(comms);
         assertEquals(paBuilder.getCommunities(), attrs.getCommunities());
 
-        paBuilder.setUnrecognizedAttributes(Collections.emptyList());
+        paBuilder.setUnrecognizedAttributes(Collections.emptyMap());
 
         builder.setAttributes(paBuilder.build());
 
@@ -341,7 +341,7 @@ public class BGPParserTest {
 
         paBuilder.setAggregator(aggregator);
         assertEquals(paBuilder.getAggregator(), attrs.getAggregator());
-        paBuilder.setUnrecognizedAttributes(Collections.emptyList());
+        paBuilder.setUnrecognizedAttributes(Collections.emptyMap());
         builder.setAttributes(paBuilder.build());
 
         assertEquals(builder.build(), message);
@@ -451,7 +451,7 @@ public class BGPParserTest {
         paBuilder.setExtendedCommunities(comms);
         assertEquals(paBuilder.getExtendedCommunities(), attrs.getExtendedCommunities());
 
-        paBuilder.setUnrecognizedAttributes(Collections.emptyList());
+        paBuilder.setUnrecognizedAttributes(Collections.emptyMap());
         // check API message
         builder.setAttributes(paBuilder.build());
         assertEquals(builder.build(), message);
@@ -699,7 +699,7 @@ public class BGPParserTest {
         paBuilder.setCommunities(comms);
         assertEquals(paBuilder.getCommunities(), attrs.getCommunities());
 
-        paBuilder.setUnrecognizedAttributes(Collections.emptyList());
+        paBuilder.setUnrecognizedAttributes(Collections.emptyMap());
 
         builder.setAttributes(paBuilder.build());
 

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 09dea6870b61c5426cedf5713b1dd9e755a8ff66..895d7551f0eef4e60842379d2080b4b76e940e19 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
@@ -22,7 +22,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mess
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.CParametersBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.c.parameters.As4BytesCapabilityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.attributes.AggregatorBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.GracefulRestartCapability;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.GracefulRestartCapability.RestartFlags;
@@ -45,11 +44,11 @@ public class ComplementaryTest {
 
         final MultiprotocolCapability cap = new MultiprotocolCapabilityBuilder().setAfi(Ipv6AddressFamily.class)
                 .setSafi(UnicastSubsequentAddressFamily.class).build();
-        final CParameters tlv1 = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder()
+        final CParameters tlv1 = new CParametersBuilder().addAugmentation(new CParameters1Builder()
             .setMultiprotocolCapability(cap).build()).build();
         final MultiprotocolCapability cap1 = new MultiprotocolCapabilityBuilder().setAfi(Ipv4AddressFamily.class)
                 .setSafi(UnicastSubsequentAddressFamily.class).build();
-        final CParameters tlv2 = new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder()
+        final CParameters tlv2 = new CParametersBuilder().addAugmentation(new CParameters1Builder()
             .setMultiprotocolCapability(cap1).build()).build();
 
         final List<Tables> tt = new ArrayList<>();

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 f2acd25c12eca69b2100964845790123dceff810..d275adbbf4628ec1e7568e60a4dddc60f9e0f843 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
@@ -5,14 +5,15 @@
  * 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.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;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.BGPDocumentedException;
@@ -21,7 +22,6 @@ import org.opendaylight.protocol.bgp.parser.impl.message.open.GracefulCapability
 import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.CParametersBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.GracefulRestartCapability.RestartFlags;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.GracefulRestartCapabilityBuilder;
@@ -62,13 +62,14 @@ public class GracefulCapabilityHandlerTest {
         capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
 
         final ByteBuf buffer = Unpooled.buffer(capaBytes.length);
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
-        Assert.assertArrayEquals(capaBytes, buffer.array());
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
+        assertArrayEquals(capaBytes, buffer.array());
 
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes).slice(2, capaBytes.length - 2)));
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes).slice(2, capaBytes.length - 2)));
 
         final byte[] capaBytes2 = {
             (byte) 0x40, (byte) 0x06, (byte) 0x00, (byte) 0x00,
@@ -79,21 +80,23 @@ public class GracefulCapabilityHandlerTest {
         tablesBuilder.setAfiFlags(new AfiFlags(false));
         capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
         buffer.clear();
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
-        Assert.assertArrayEquals(capaBytes2, buffer.array());
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes2).slice(2, capaBytes2.length - 2)));
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
+        assertArrayEquals(capaBytes2, buffer.array());
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes2).slice(2, capaBytes2.length - 2)));
 
         capaBuilder.setRestartFlags(null);
         tablesBuilder.setAfiFlags(null);
         capaBuilder.setRestartTime((Uint16) null);
         capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
         buffer.clear();
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
-        Assert.assertArrayEquals(capaBytes2, buffer.array());
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
+        assertArrayEquals(capaBytes2, buffer.array());
 
         final byte[] capaBytes3 = {
             (byte) 0x40, (byte) 0x06, (byte) 0x00, (byte) 0x00,
@@ -102,31 +105,36 @@ public class GracefulCapabilityHandlerTest {
         capaBuilder.setRestartFlags(new RestartFlags(false));
         capaBuilder.setRestartTime(Uint16.ZERO);
         capaBuilder.setTables(Collections.emptyList());
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes3).slice(2, capaBytes3.length - 2)));
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes3).slice(2, capaBytes3.length - 2)));
 
         final byte[] capaBytes4 = {
             (byte) 0x40, (byte) 0x06, (byte) 0x00, (byte) 0x00,
             (byte) 0x00, (byte) 0x01, (byte) 0x00, (byte) 0x00
         };
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes4).slice(2, capaBytes4.length - 2)));
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes4).slice(2, capaBytes4.length - 2)));
         final byte[] capaBytes5 = {
             (byte) 0x40, (byte) 0x02, (byte) 0x00, (byte) 0x00
         };
         final ByteBuf b = Unpooled.buffer(capaBytes5.length);
 
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(new GracefulRestartCapabilityBuilder().build())
-            .build()).build(), b);
-        Assert.assertArrayEquals(capaBytes5, b.array());
-        Assert.assertEquals(new CParametersBuilder().addAugmentation(CParameters1.class, new CParameters1Builder()
-            .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
-                .setRestartFlags(new RestartFlags(Boolean.FALSE))
-                .setRestartTime(Uint16.ZERO).setTables(Collections.emptyList()).build()).build()).build(),
-            handler.parseCapability(Unpooled.wrappedBuffer(capaBytes5).slice(2, capaBytes5.length - 2)));
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder()
+                .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder().build())
+                .build())
+            .build(), b);
+        assertArrayEquals(capaBytes5, b.array());
+        assertEquals(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder()
+                .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
+                    .setRestartFlags(new RestartFlags(Boolean.FALSE))
+                    .setRestartTime(Uint16.ZERO)
+                    .build())
+                .build())
+            .build(), handler.parseCapability(Unpooled.wrappedBuffer(capaBytes5).slice(2, capaBytes5.length - 2)));
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -145,8 +153,9 @@ public class GracefulCapabilityHandlerTest {
         capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
 
         final ByteBuf buffer = Unpooled.buffer();
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -164,8 +173,9 @@ public class GracefulCapabilityHandlerTest {
         capaBuilder.setTables(Lists.newArrayList(tablesBuilder.build()));
 
         final ByteBuf buffer = Unpooled.buffer();
-        handler.serializeCapability(new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
+        handler.serializeCapability(new CParametersBuilder()
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -185,8 +195,8 @@ public class GracefulCapabilityHandlerTest {
 
         final ByteBuf buffer = Unpooled.buffer();
         handler.serializeCapability(new CParametersBuilder()
-            .addAugmentation(CParameters1.class, new CParameters1Builder()
-                .setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
     }
 
     @Test(expected = IllegalArgumentException.class)
@@ -206,7 +216,7 @@ public class GracefulCapabilityHandlerTest {
 
         final ByteBuf buffer = Unpooled.buffer();
         handler.serializeCapability(new CParametersBuilder()
-            .addAugmentation(CParameters1.class, new CParameters1Builder()
-                .setGracefulRestartCapability(capaBuilder.build()).build()).build(), buffer);
+            .addAugmentation(new CParameters1Builder().setGracefulRestartCapability(capaBuilder.build()).build())
+            .build(), buffer);
     }
 }

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 59c3ef1e544d3aadf9b0795216262f118ffc6cbf..312e4ddacc102b102f29bb0bc64f4c45c93faf9e 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
@@ -25,7 +25,6 @@ import org.opendaylight.protocol.bgp.parser.spi.SubsequentAddressFamilyRegistry;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.CParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.CParametersBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.LlGracefulRestartCapability;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.LlGracefulRestartCapabilityBuilder;
@@ -93,8 +92,9 @@ public class LlGracefulCapabilityHandlerTest {
                                 .build())
                 ).build();
 
-        final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
-                new CParameters1Builder().setLlGracefulRestartCapability(capability).build()).build();
+        final CParameters cParameters = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder().setLlGracefulRestartCapability(capability).build())
+                .build();
         final ByteBuf buffer = Unpooled.buffer(capaBytes.length);
         this.handler.serializeCapability(cParameters, buffer);
 
@@ -113,8 +113,9 @@ public class LlGracefulCapabilityHandlerTest {
                                 .setLongLivedStaleTime(TEN)
                                 .build())).build();
 
-        final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
-                new CParameters1Builder().setLlGracefulRestartCapability(capability).build()).build();
+        final CParameters cParameters = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder().setLlGracefulRestartCapability(capability).build())
+                .build();
         final ByteBuf buffer = Unpooled.buffer();
         this.handler.serializeCapability(cParameters, buffer);
     }
@@ -148,8 +149,9 @@ public class LlGracefulCapabilityHandlerTest {
                                 .setLongLivedStaleTime(new Uint24(Uint32.valueOf(160)))
                                 .build())).build();
 
-        final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
-                new CParameters1Builder().setLlGracefulRestartCapability(capability).build()).build();
+        final CParameters cParameters = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder().setLlGracefulRestartCapability(capability).build())
+                .build();
         LlGracefulCapabilityHandler handler1 = new LlGracefulCapabilityHandler(
                 afir, safir);
         Assert.assertEquals(cParameters, handler1.parseCapability(Unpooled.wrappedBuffer(capaBytes)
@@ -166,8 +168,9 @@ public class LlGracefulCapabilityHandlerTest {
                         .setLongLivedStaleTime(TEN)
                         .build())).build();
 
-        final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
-                new CParameters1Builder().setLlGracefulRestartCapability(capability).build()).build();
+        final CParameters cParameters = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder().setLlGracefulRestartCapability(capability).build())
+                .build();
         final ByteBuf buffer = Unpooled.buffer();
         this.handler.serializeCapability(cParameters, buffer);
     }
@@ -202,8 +205,9 @@ public class LlGracefulCapabilityHandlerTest {
                                 .setLongLivedStaleTime(new Uint24(Uint32.valueOf(160)))
                                 .build())).build();
 
-        final CParameters cParameters = new CParametersBuilder().addAugmentation(CParameters1.class,
-                new CParameters1Builder().setLlGracefulRestartCapability(capability).build()).build();
+        final CParameters cParameters = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder().setLlGracefulRestartCapability(capability).build())
+                .build();
         LlGracefulCapabilityHandler handler1 = new LlGracefulCapabilityHandler(
                 afir, safir);
         Assert.assertEquals(cParameters, handler1.parseCapability(Unpooled.wrappedBuffer(capaBytes)

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java
index 1310e30fbecde915ff9f48b77f95ddd06e6846a3..32ce9cee309ea30419e72bba341ae39ae4e5c072 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/MultiProtocolCapabilityHandlerTest.java
@@ -60,10 +60,14 @@ public class MultiProtocolCapabilityHandlerTest {
 
     @Test
     public void testCapabilityHandler() throws BGPDocumentedException, BGPParsingException {
-        final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setMultiprotocolCapability(
-            new MultiprotocolCapabilityBuilder().setAfi(MultiProtocolCapabilityHandlerTest.AFI)
-            .setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build()).build()).build();
+        final CParameters capabilityToSerialize = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
+                        .setAfi(MultiProtocolCapabilityHandlerTest.AFI)
+                        .setSafi(MultiProtocolCapabilityHandlerTest.SAFI)
+                        .build())
+                    .build())
+                .build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afir, this.safir);
@@ -75,10 +79,13 @@ public class MultiProtocolCapabilityHandlerTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testUnhandledAfi() {
-        final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setMultiprotocolCapability(
-            new MultiprotocolCapabilityBuilder().setAfi(MultiProtocolCapabilityHandlerTest.AFI)
-            .setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build()).build()).build();
+        final CParameters capabilityToSerialize = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
+                        .setAfi(MultiProtocolCapabilityHandlerTest.AFI)
+                        .setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build())
+                    .build())
+                .build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afirExpection,
@@ -88,10 +95,14 @@ public class MultiProtocolCapabilityHandlerTest {
 
     @Test(expected = IllegalArgumentException.class)
     public void testUnhandledSafi() {
-        final CParameters capabilityToSerialize = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().setMultiprotocolCapability(
-            new MultiprotocolCapabilityBuilder().setAfi(MultiProtocolCapabilityHandlerTest.AFI)
-            .setSafi(MultiProtocolCapabilityHandlerTest.SAFI).build()).build()).build();
+        final CParameters capabilityToSerialize = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
+                        .setAfi(MultiProtocolCapabilityHandlerTest.AFI)
+                        .setSafi(MultiProtocolCapabilityHandlerTest.SAFI)
+                        .build())
+                    .build())
+                .build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afir,
@@ -101,10 +112,10 @@ public class MultiProtocolCapabilityHandlerTest {
 
     @Test
     public void noSerializationTest() {
-        final CParameters capabilityNoAugmentation = new CParametersBuilder().addAugmentation(CParameters1.class, null)
+        final CParameters capabilityNoAugmentation = new CParametersBuilder().removeAugmentation(CParameters1.class)
+                .build();
+        final CParameters capabilityNoMP = new CParametersBuilder().addAugmentation(new CParameters1Builder().build())
                 .build();
-        final CParameters capabilityNoMP = new CParametersBuilder().addAugmentation(CParameters1.class,
-            new CParameters1Builder().build()).build();
 
         final ByteBuf bytes = Unpooled.buffer();
         final MultiProtocolCapabilityHandler handler = new MultiProtocolCapabilityHandler(this.afir,

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 fce70aac1fc1214b16d221abd749d5600659c559..f5a9000d038dc5c8be662b0c124809bbc497d363 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
@@ -51,7 +51,7 @@ public class OpenTest {
                         .setCParameters(new CParametersBuilder()
                             .setAs4BytesCapability(new As4BytesCapabilityBuilder()
                                 .setAsNumber(new AsNumber(Uint32.valueOf(1000))).build())
-                            .addAugmentation(CParameters1.class, new CParameters1Builder()
+                            .addAugmentation(new CParameters1Builder()
                                 .setGracefulRestartCapability(new GracefulRestartCapabilityBuilder()
                                     .setRestartFlags(new GracefulRestartCapability.RestartFlags(false))
                                     .setRestartTime(Uint16.ZERO)

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/RouteRefreshCapabilityHandlerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/RouteRefreshCapabilityHandlerTest.java
index 0a8c4a5a34fed36f941c7d62b71d0aa2a79c1826..a9dbd4137c3564b53931eeadbea770d74d793438 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/RouteRefreshCapabilityHandlerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/RouteRefreshCapabilityHandlerTest.java
@@ -17,7 +17,6 @@ import org.opendaylight.protocol.bgp.parser.BGPParsingException;
 import org.opendaylight.protocol.bgp.parser.impl.message.open.RouteRefreshCapabilityHandler;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.CParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.open.message.bgp.parameters.optional.capabilities.CParametersBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.CParameters1Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.mp.capabilities.RouteRefreshCapabilityBuilder;
 
@@ -31,9 +30,11 @@ public class RouteRefreshCapabilityHandlerTest {
 
     @Test
     public void testRRCapHandler() throws BGPDocumentedException, BGPParsingException {
-        final CParameters expectedParams = new CParametersBuilder().addAugmentation(CParameters1.class,
-                new CParameters1Builder().setRouteRefreshCapability(
-            new RouteRefreshCapabilityBuilder().build()).build()).build();
+        final CParameters expectedParams = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder()
+                    .setRouteRefreshCapability(new RouteRefreshCapabilityBuilder().build())
+                    .build())
+                .build();
         assertEquals(expectedParams, HANDLER.parseCapability(Unpooled.copiedBuffer(OK_BYTES)));
         assertEquals(expectedParams, HANDLER.parseCapability(Unpooled.copiedBuffer(WRONG_BYTES)));
 
@@ -41,9 +42,9 @@ public class RouteRefreshCapabilityHandlerTest {
         HANDLER.serializeCapability(expectedParams, byteAggregator);
         assertEquals(Unpooled.copiedBuffer(CAP_BYTES), byteAggregator);
 
-        final CParameters missingCap = new CParametersBuilder().addAugmentation(CParameters1.class,
-                new CParameters1Builder().setRouteRefreshCapability(
-            null).build()).build();
+        final CParameters missingCap = new CParametersBuilder()
+                .addAugmentation(new CParameters1Builder().setRouteRefreshCapability(null).build())
+                .build();
         final ByteBuf byteAggregator2 = Unpooled.buffer(0);
         HANDLER.serializeCapability(missingCap, byteAggregator2);
         assertEquals(Unpooled.copiedBuffer(new byte[]{}), byteAggregator2);

diff --git a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/UnrecognizedAttributesSerializerTest.java b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/UnrecognizedAttributesSerializerTest.java
index e7f96277c8df5b730f4167baa2077f1d80ec38c6..1a57f4636a0e9a038e4771c78763bf2792cdfe79 100644 (file)
--- a/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/UnrecognizedAttributesSerializerTest.java
+++ b/bgp/parser-impl/src/test/java/org/opendaylight/protocol/bgp/parser/impl/message/update/UnrecognizedAttributesSerializerTest.java
@@ -11,8 +11,7 @@ import static org.junit.Assert.assertArrayEquals;
 
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
-import java.util.ArrayList;
-import java.util.List;
+import java.util.Map;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.parser.spi.pojo.ServiceLoaderBGPExtensionProviderContext;
 import org.opendaylight.protocol.util.ByteArray;
@@ -37,14 +36,13 @@ public class UnrecognizedAttributesSerializerTest {
             (byte)0xd3, 0x5d, 0x35, (byte)0xe0, 0x66, 0x0c, (byte)0xd3, 0x5d, 0x35, (byte)0xd3, 0x5d, 0x35,
             (byte)0xd7, 0x5d, 0x75, (byte)0xd7, 0x5d, 0x75
         };
-        final List<UnrecognizedAttributes> unrecognizedAttrs = new ArrayList<>();
         final UnrecognizedAttributes unrecognizedAttribute1 = new UnrecognizedAttributesBuilder().setPartial(true)
                 .setTransitive(true).setType(Uint8.valueOf(101)).setValue(unrecognizedValue1).build();
-        unrecognizedAttrs.add(unrecognizedAttribute1);
         final UnrecognizedAttributes unrecognizedAttribute2 = new UnrecognizedAttributesBuilder().setPartial(true)
                 .setTransitive(true).setType(Uint8.valueOf(102)).setValue(unrecognizedValue2).build();
-        unrecognizedAttrs.add(unrecognizedAttribute2);
-        final Attributes attrs = new AttributesBuilder().setUnrecognizedAttributes(unrecognizedAttrs).build();
+        final Attributes attrs = new AttributesBuilder()
+                .setUnrecognizedAttributes(Map.of(unrecognizedAttribute1.key(), unrecognizedAttribute1,
+                    unrecognizedAttribute2.key(), unrecognizedAttribute2)).build();
 
         final ByteBuf buffer = Unpooled.buffer();
         ServiceLoaderBGPExtensionProviderContext.getSingletonInstance().getAttributeRegistry().serializeAttribute(attrs,