Cleanup deprecation warnings in bmp

Eliminate some leftovers from codegen change.

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

diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java
index cb1095648ec3c47182909eeb706aabbadf4ebedf..6dcb5fb0f89c4e9f2a92f3b52ce4817e990f891a 100644 (file)
--- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java
+++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TableContext.java
@@ -123,8 +123,8 @@ final class TableContext {
     private ContainerNode serializeAttributes(final Attributes pathAttr) {
         Preconditions.checkState(this.attributesCodec != null, "Attributes codec not available");
         final AttributesBuilder a = new AttributesBuilder(pathAttr);
-        a.addAugmentation(Attributes1.class, null);
-        a.addAugmentation(Attributes2.class, null);
+        a.removeAugmentation(Attributes1.class);
+        a.removeAugmentation(Attributes2.class);
         return (ContainerNode) this.attributesCodec.serialize(a.build());
     }
 }

diff --git a/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java b/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java
index b89d9e5c02b2cd9c3eba261cb832b42c284cfc1a..a31f8cf91c3a39d7cfa20612589ce72bd1862b88 100644 (file)
--- a/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java
+++ b/bmp/bmp-parser-impl/src/test/java/org/opendaylight/protocol/bmp/parser/message/TestUtil.java
@@ -46,7 +46,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.update.message.NlriBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.update.message.WithdrawnRoutes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.update.message.WithdrawnRoutesBuilder;
-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.MultiprotocolCapabilityBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.BgpOrigin;
@@ -232,11 +231,12 @@ public final class TestUtil {
                     .setAsNumber(new AsNumber(Uint32.valueOf(70))).build()).build());
         final CParametersBuilder paramsBuilder = new CParametersBuilder();
         if (multiprotocol) {
-            final CParameters1Builder params1Builder = new CParameters1Builder();
-            params1Builder.setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
-                .setAfi(Ipv4AddressFamily.class)
-                .setSafi(UnicastSubsequentAddressFamily.class).build());
-            paramsBuilder.addAugmentation(CParameters1.class, params1Builder.build());
+            paramsBuilder.addAugmentation(new CParameters1Builder()
+                .setMultiprotocolCapability(new MultiprotocolCapabilityBuilder()
+                    .setAfi(Ipv4AddressFamily.class)
+                    .setSafi(UnicastSubsequentAddressFamily.class)
+                    .build())
+                .build());
         }
         final OptionalCapabilitiesBuilder optCapabilitiesBuilder2 = new OptionalCapabilitiesBuilder()
             .setCParameters(paramsBuilder
@@ -303,7 +303,7 @@ public final class TestUtil {
         final SegmentsBuilder segmentsBuild = new SegmentsBuilder();
         segmentsBuild.setAsSequence(asSequences).build();
 
-        final AttributesBuilder attribBuilder = new AttributesBuilder()
+        return new AttributesBuilder()
             .setAggregator(new AggregatorBuilder().setAsNumber(new AsNumber(Uint32.valueOf(72)))
                     .setNetworkAddress(IPV4_ADDRESS_20).build())
             .setAigp(new AigpBuilder().setAigpTlv(new AigpTlvBuilder()
@@ -319,8 +319,7 @@ public final class TestUtil {
             .setMultiExitDisc(new MultiExitDiscBuilder().setMed(Uint32.valueOf(123)).build())
             .setOrigin(new OriginBuilder().setValue(BgpOrigin.Igp).build())
             .setOriginatorId(new OriginatorIdBuilder().setOriginator(IPV4_ADDRESS_12).build())
-            .setUnrecognizedAttributes(new ArrayList<>());
-        return attribBuilder.build();
+            .build();
     }
 
     private static List<Communities> createCommunities() {