Cleanup deprecation warnings in bgp/rib-spi

Eliminate some leftovers from codegen change.

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

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
index 744a8d6e3d6eb47167b887412741a5bb6af7a8ef..48443dc447719918f818f517ef1f1e17ffae7250 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupportTest.java
@@ -196,7 +196,7 @@ public abstract class AbstractRIBSupportTest<C extends Routes & DataObject & Cho
 
     private QName getRouteListQname() {
         return BindingReflections.findQName(this.abstractRIBSupport.routesListClass())
-                .withModule(BindingReflections.getQNameModule(this.abstractRIBSupport.routesCaseClass()));
+                .bindTo(BindingReflections.getQNameModule(this.abstractRIBSupport.routesCaseClass()));
     }
 
     protected final NodeIdentifierWithPredicates createRouteNIWP(final S routes) {

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java
index 5ef587438fbe7db277c1f782d7ad0d261bf45fae..c65883c1841e40a972a007237592f3824cf2f984 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTest.java
@@ -34,9 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.UpdateBuilder;
 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.destination.DestinationType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlri;
@@ -246,8 +244,8 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest {
                 .setSafi(UnicastSubsequentAddressFamily.class)
                 .setCNextHop(nextHop).setAdvertizedRoutes(new AdvertizedRoutesBuilder().build()).build();
 
-        final Attributes attMpR = new AttributesBuilder().addAugmentation(Attributes1.class,
-                new Attributes1Builder().setMpReachNlri(mpReach).build()).build();
+        final Attributes attMpR = new AttributesBuilder().addAugmentation(
+            new Attributes1Builder().setMpReachNlri(mpReach).build()).build();
         assertEquals(new UpdateBuilder().setAttributes(attMpR).build(),
                this.ribSupportTestImp.buildUpdate(routes, Collections.emptySet(), attr));
 
@@ -255,7 +253,7 @@ public class RIBSupportTest extends AbstractConcurrentDataBrokerTest {
                 .setSafi(UnicastSubsequentAddressFamily.class)
                 .setWithdrawnRoutes(new WithdrawnRoutesBuilder().build()).build();
 
-        final Attributes attMpU = new AttributesBuilder().addAugmentation(Attributes2.class,
+        final Attributes attMpU = new AttributesBuilder().addAugmentation(
                 new Attributes2Builder().setMpUnreachNlri(mpUnreach).build()).build();
         assertEquals(new UpdateBuilder().setAttributes(attMpU).build(),
                this.ribSupportTestImp.buildUpdate(Collections.emptySet(), routes, attr));

diff --git a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTestImp.java b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTestImp.java
index 0ccfc1b562d6a775ab7d0133498c8abdcd37d3f6..cd681f385ee2f66da1717375cb26c27fd2f40e16 100644 (file)
--- a/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTestImp.java
+++ b/bgp/rib-spi/src/test/java/org/opendaylight/protocol/bgp/rib/spi/RIBSupportTestImp.java
@@ -69,7 +69,7 @@ public final class RIBSupportTestImp extends AbstractRIBSupport<Ipv4RoutesCase,
 
     @Override
     public Ipv4Routes emptyRoutesContainer() {
-        return new Ipv4RoutesBuilder().setIpv4Route(Collections.emptyList()).build();
+        return new Ipv4RoutesBuilder().build();
     }
 
     @Override