Cleanup deprecation warnings in bgp/extensions/linkstate

Eliminate some leftovers from codegen change.

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

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/LinkstateRIBSupport.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/LinkstateRIBSupport.java
index 335a4d9f17d1d4a117ff207ae8f4cf4757389eef..c3eac78545133a07f9d1d789e9ea9e893c619fdc 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/LinkstateRIBSupport.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/LinkstateRIBSupport.java
@@ -42,6 +42,7 @@ 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.multiprotocol.rev180329.destination.DestinationType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.tables.Routes;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
+import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;
 import org.opendaylight.yangtools.yang.data.api.schema.ContainerNode;
@@ -55,12 +56,9 @@ import org.slf4j.LoggerFactory;
 public final class LinkstateRIBSupport
         extends AbstractRIBSupport<LinkstateRoutesCase, LinkstateRoutes, LinkstateRoute, LinkstateRouteKey> {
     private static final Logger LOG = LoggerFactory.getLogger(LinkstateRIBSupport.class);
-
-    private static final LinkstateRoutes EMPTY_CONTAINER
-            = new LinkstateRoutesBuilder().setLinkstateRoute(Collections.emptyList()).build();
+    private static final LinkstateRoutes EMPTY_CONTAINER = new LinkstateRoutesBuilder().build();
+    private static final NodeIdentifier NLRI_ROUTES_LIST = NodeIdentifier.create(CLinkstateDestination.QNAME);
     private static LinkstateRIBSupport SINGLETON;
-    private final YangInstanceIdentifier.NodeIdentifier nlriRoutesList
-            = new YangInstanceIdentifier.NodeIdentifier(CLinkstateDestination.QNAME);
 
     private LinkstateRIBSupport(final BindingNormalizedNodeSerializer mappingService) {
         super(
@@ -102,7 +100,7 @@ public final class LinkstateRIBSupport
                                                                           final ApplyRoute function) {
         if (destination != null) {
             final Optional<DataContainerChild<? extends PathArgument, ?>> maybeRoutes
-                    = destination.getChild(this.nlriRoutesList);
+                    = destination.getChild(LinkstateRIBSupport.NLRI_ROUTES_LIST);
             return processRoute(maybeRoutes, routesPath, attributes, function, tx);
         }
         return Collections.emptyList();

diff --git a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkstateAttributeParser.java b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkstateAttributeParser.java
index aac7fdeedde3d1319d4966574f7104193982d82a..ff879bf271e4d27454f8d881586207e7ecc24639 100644 (file)
--- a/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkstateAttributeParser.java
+++ b/bgp/extensions/linkstate/src/main/java/org/opendaylight/protocol/bgp/linkstate/impl/attribute/LinkstateAttributeParser.java
@@ -92,9 +92,9 @@ public final class LinkstateAttributeParser extends AbstractAttributeParser impl
         }
         final ObjectType nlriType = lsDestination.getObjectType();
         final ProtocolId protocolId = lsDestination.getProtocolId();
-        final Attributes1 a = new Attributes1Builder().setLinkStateAttribute(
-            parseLinkState(nlriType, protocolId, buffer)).build();
-        builder.addAugmentation(Attributes1.class, a);
+        builder.addAugmentation(new Attributes1Builder()
+            .setLinkStateAttribute(parseLinkState(nlriType, protocolId, buffer))
+            .build());
     }
 
     private static CLinkstateDestination getNlriType(final AttributesBuilder pab) {

diff --git a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
index 27ab4e728d46e5ab41db657b689221eb4c2cad78..c3040bc78b505d1b6eec99b61d828c6fc93ceb14 100644 (file)
--- a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
+++ b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateAttributeParserTest.java
@@ -56,7 +56,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.update.attributes.mp.reach.nlri.advertized.routes.destination.type.destination.linkstate._case.DestinationLinkstateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.AttributesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlriBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpUnreachNlriBuilder;
@@ -154,31 +153,44 @@ public class LinkstateAttributeParserTest {
     }
 
     private static AttributesBuilder createBuilder(final ObjectType type) {
-        return new AttributesBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
-            .bgp.multiprotocol.rev180329.Attributes1.class, new Attributes1Builder().setMpReachNlri(
-                new MpReachNlriBuilder().setAfi(LinkstateAddressFamily.class)
+        return new AttributesBuilder().addAugmentation(new Attributes1Builder()
+            .setMpReachNlri(new MpReachNlriBuilder()
+                .setAfi(LinkstateAddressFamily.class)
                 .setSafi(LinkstateSubsequentAddressFamily.class)
-                .setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(
-                    new DestinationLinkstateCaseBuilder().setDestinationLinkstate(
-                        new DestinationLinkstateBuilder().setCLinkstateDestination(
-                            Lists.newArrayList(new CLinkstateDestinationBuilder().setObjectType(type)
-                                .setProtocolId(ProtocolId.IsisLevel1).build())).build()).build()).build()).build())
+                .setAdvertizedRoutes(new AdvertizedRoutesBuilder()
+                    .setDestinationType(new DestinationLinkstateCaseBuilder()
+                        .setDestinationLinkstate(new DestinationLinkstateBuilder()
+                            .setCLinkstateDestination(Lists.newArrayList(new CLinkstateDestinationBuilder()
+                                .setObjectType(type)
+                                .setProtocolId(ProtocolId.IsisLevel1)
+                                .build()))
+                            .build())
+                        .build())
+                    .build())
+                .build())
             .build());
     }
 
     private static AttributesBuilder createUnreachBuilder(final ObjectType type) {
-        return new AttributesBuilder().addAugmentation(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
-            .bgp.multiprotocol.rev180329.Attributes2.class, new Attributes2Builder().setMpUnreachNlri(
-                new MpUnreachNlriBuilder().setAfi(LinkstateAddressFamily.class)
+        return new AttributesBuilder().addAugmentation(new Attributes2Builder()
+            .setMpUnreachNlri(new MpUnreachNlriBuilder()
+                .setAfi(LinkstateAddressFamily.class)
                 .setSafi(LinkstateSubsequentAddressFamily.class)
-                .setWithdrawnRoutes(new WithdrawnRoutesBuilder().setDestinationType(
-                    new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.update
-                        .attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationLinkstateCaseBuilder()
-                        .setDestinationLinkstate(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
-                            .bgp.linkstate.rev200120.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type
-                            .destination.linkstate._case.DestinationLinkstateBuilder().setCLinkstateDestination(
-                                Lists.newArrayList(new CLinkstateDestinationBuilder().setObjectType(type)
-                                    .setProtocolId(ProtocolId.IsisLevel1).build())).build()).build()).build()).build())
+                .setWithdrawnRoutes(new WithdrawnRoutesBuilder()
+                    .setDestinationType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp
+                        .linkstate.rev200120.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type
+                        .DestinationLinkstateCaseBuilder()
+                            .setDestinationLinkstate(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns
+                                .yang.bgp.linkstate.rev200120.update.attributes.mp.unreach.nlri.withdrawn.routes
+                                .destination.type.destination.linkstate._case.DestinationLinkstateBuilder()
+                                    .setCLinkstateDestination(Lists.newArrayList(new CLinkstateDestinationBuilder()
+                                        .setObjectType(type)
+                                        .setProtocolId(ProtocolId.IsisLevel1)
+                                        .build()))
+                                    .build())
+                            .build())
+                    .build())
+                .build())
             .build());
     }
 
@@ -191,29 +203,37 @@ public class LinkstateAttributeParserTest {
         builder = new AttributesBuilder();
 
         final Attributes1Builder builder1 = new Attributes1Builder();
-        builder.addAugmentation(Attributes1.class, builder1.build());
+        builder.addAugmentation(builder1.build());
         this.parser.parseAttribute(b, builder, null);
         assertEquals(0, b.readableBytes());
         builder = new AttributesBuilder();
 
-        builder.addAugmentation(Attributes1.class, builder1.setMpReachNlri(
-            new MpReachNlriBuilder().setAdvertizedRoutes(new AdvertizedRoutesBuilder()
-                .setDestinationType(new DestinationIpv4CaseBuilder().build()).build()).build()).build());
+        builder.addAugmentation(builder1
+            .setMpReachNlri(new MpReachNlriBuilder()
+                .setAdvertizedRoutes(new AdvertizedRoutesBuilder()
+                    .setDestinationType(new DestinationIpv4CaseBuilder().build())
+                    .build())
+                .build())
+            .build());
         this.parser.parseAttribute(b, builder, null);
         assertEquals(0, b.readableBytes());
         builder = new AttributesBuilder();
 
         final Attributes2Builder builder2 = new Attributes2Builder();
-        builder.addAugmentation(Attributes2.class, builder2.build());
+        builder.addAugmentation(builder2.build());
         this.parser.parseAttribute(b, builder, null);
         assertEquals(0, b.readableBytes());
         builder = new AttributesBuilder();
 
-        builder.addAugmentation(Attributes2.class, builder2.setMpUnreachNlri(
-            new MpUnreachNlriBuilder().setWithdrawnRoutes(new WithdrawnRoutesBuilder().setDestinationType(
-                new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet.rev180329
-                .update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type.DestinationIpv6CaseBuilder()
-                .build()).build()).build()).build());
+        builder.addAugmentation(builder2
+            .setMpUnreachNlri(new MpUnreachNlriBuilder()
+                .setWithdrawnRoutes(new WithdrawnRoutesBuilder()
+                    .setDestinationType(new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet
+                        .rev180329.update.attributes.mp.unreach.nlri.withdrawn.routes.destination.type
+                        .DestinationIpv6CaseBuilder().build())
+                    .build())
+                .build())
+            .build());
         this.parser.parseAttribute(b, builder, null);
         assertEquals(0, b.readableBytes());
     }

diff --git a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateNlriParserTest.java b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateNlriParserTest.java
index 6f0c2808c90616e3f0073962e30b73e78d2cfba3..3b04a14978e0da2c669105bcc53949f6336bef09 100644 (file)
--- a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateNlriParserTest.java
+++ b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateNlriParserTest.java
@@ -63,9 +63,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.link
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.update.attributes.mp.reach.nlri.advertized.routes.destination.type.destination.linkstate._case.DestinationLinkstateBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.Attributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.path.attributes.AttributesBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes1Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.Attributes2Builder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlriBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpUnreachNlriBuilder;
@@ -603,10 +601,12 @@ public class LinkstateNlriParserTest {
         final DestinationLinkstateCase dlc = new DestinationLinkstateCaseBuilder().setDestinationLinkstate(
             new DestinationLinkstateBuilder().setCLinkstateDestination(dests).build()).build();
         final AdvertizedRoutes aroutes = new AdvertizedRoutesBuilder().setDestinationType(dlc).build();
-        final Attributes1 reach = new Attributes1Builder().setMpReachNlri(new MpReachNlriBuilder()
-            .setAdvertizedRoutes(aroutes).build()).build();
 
-        Attributes pa = new AttributesBuilder().addAugmentation(Attributes1.class, reach).build();
+        Attributes pa = new AttributesBuilder()
+                .addAugmentation(new Attributes1Builder()
+                    .setMpReachNlri(new MpReachNlriBuilder().setAdvertizedRoutes(aroutes).build())
+                    .build())
+                .build();
 
         ByteBuf result = Unpooled.buffer();
         parser.serializeAttribute(pa, result);
@@ -623,10 +623,12 @@ public class LinkstateNlriParserTest {
                         .destination.linkstate._case.DestinationLinkstateBuilder().setCLinkstateDestination(destsU)
                         .build()).build();
         final WithdrawnRoutes wroutes = new WithdrawnRoutesBuilder().setDestinationType(dlcU).build();
-        final Attributes2 unreach = new Attributes2Builder().setMpUnreachNlri(new MpUnreachNlriBuilder()
-            .setWithdrawnRoutes(wroutes).build()).build();
 
-        pa = new AttributesBuilder().addAugmentation(Attributes2.class, unreach).build();
+        pa = new AttributesBuilder()
+                .addAugmentation(new Attributes2Builder()
+                    .setMpUnreachNlri(new MpUnreachNlriBuilder().setWithdrawnRoutes(wroutes).build())
+                    .build())
+                .build();
 
         result = Unpooled.buffer();
         parser.serializeAttribute(pa, result);

diff --git a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateRIBSupportTest.java b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateRIBSupportTest.java
index 5a97f238474ff97d64f01b951be79c7794da527c..9bc4cdabcab9b21df562205c57010c5f8d223b63 100644 (file)
--- a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateRIBSupportTest.java
+++ b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/LinkstateRIBSupportTest.java
@@ -15,6 +15,7 @@ import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import java.util.Collection;
 import java.util.Collections;
+import java.util.Map;
 import org.junit.Assert;
 import org.junit.Test;
 import org.opendaylight.protocol.bgp.linkstate.impl.BGPActivator;
@@ -119,7 +120,7 @@ public final class LinkstateRIBSupportTest extends AbstractRIBSupportTest<Linkst
         ROUTE = new LinkstateRouteBuilder().withKey(ROUTE_KEY).setRouteDistinguisher(RD)
                 .setIdentifier(ID).setObjectType(OBJECT_TYPE2)
                 .setProtocolId(ProtocolId.IsisLevel1).setAttributes(new AttributesBuilder().build()).build();
-        ROUTES = new LinkstateRoutesBuilder().setLinkstateRoute(Collections.singletonList(ROUTE)).build();
+        ROUTES = new LinkstateRoutesBuilder().setLinkstateRoute(Map.of(ROUTE.key(), ROUTE)).build();
     }
 
     @Override

diff --git a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java
index 91d6d045e68aa1057df5aee445c22ad2fec38c68..0ae7f05f7c82dd610e4ff70566725573e136e31e 100644 (file)
--- a/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java
+++ b/bgp/extensions/linkstate/src/test/java/org/opendaylight/protocol/bgp/linkstate/ParserTest.java
@@ -413,7 +413,7 @@ public class ParserTest {
             new DestinationLinkstateCaseBuilder().setDestinationLinkstate(dBuilder.build()).build()).build());
         lsBuilder.setMpReachNlri(mpBuilder.build());
 
-        paBuilder.addAugmentation(Attributes1.class, lsBuilder.build());
+        paBuilder.addAugmentation(lsBuilder.build());
 
         final org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120
             .Attributes1Builder lsAttrBuilder = new org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang
@@ -422,10 +422,8 @@ public class ParserTest {
         lsAttrBuilder.setLinkStateAttribute(
             new LinkAttributesCaseBuilder().setLinkAttributes(new LinkAttributesBuilder()
                 .setMetric(new Metric(Uint32.ONE)).build()).build());
-        paBuilder.addAugmentation(
-            org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.linkstate.rev200120.Attributes1.class,
-            lsAttrBuilder.build());
-        paBuilder.setUnrecognizedAttributes(Collections.emptyList());
+        paBuilder.addAugmentation(lsAttrBuilder.build());
+        paBuilder.setUnrecognizedAttributes(Collections.emptyMap());
 
         assertEquals(
             lsAttrBuilder.build(),
@@ -605,8 +603,8 @@ public class ParserTest {
         paBuilder.setLocalPref(new LocalPrefBuilder().setPref(Uint32.valueOf(100)).build());
         assertEquals(paBuilder.getLocalPref(), attrs.getLocalPref());
 
-        paBuilder.addAugmentation(Attributes1.class, lsBuilder.build());
-        paBuilder.setUnrecognizedAttributes(Collections.emptyList());
+        paBuilder.addAugmentation(lsBuilder.build());
+        paBuilder.setUnrecognizedAttributes(Collections.emptyMap());
 
         final MpReachNlri mp = attrs.augmentation(Attributes1.class).getMpReachNlri();
         assertEquals(mpBuilder.getAfi(), mp.getAfi());