From 1555ac0bd52eada1438d095f66fc5a67adccc5f2 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sat, 27 Jun 2020 15:39:42 +0200 Subject: [PATCH] Cleanup deprecation warnings in bgp/extensions/linkstate Eliminate some leftovers from codegen change. Change-Id: I4cf923b1e5c538f445892c68b46e78a12794daf4 Signed-off-by: Robert Varga --- .../linkstate/impl/LinkstateRIBSupport.java | 10 +-- .../attribute/LinkstateAttributeParser.java | 6 +- .../LinkstateAttributeParserTest.java | 80 ++++++++++++------- .../linkstate/LinkstateNlriParserTest.java | 18 +++-- .../linkstate/LinkstateRIBSupportTest.java | 3 +- .../protocol/bgp/linkstate/ParserTest.java | 12 ++- 6 files changed, 74 insertions(+), 55 deletions(-) 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 335a4d9f17..c3eac78545 100644 --- 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 { 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> 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 aac7fdeedd..ff879bf271 100644 --- 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 27ab4e728d..c3040bc78b 100644 --- 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 6f0c2808c9..3b04a14978 100644 --- 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 5a97f23847..9bc4cdabca 100644 --- 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