From f9987d78b18a28511c126631796746bd9049a4fb Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 27 Jun 2020 11:21:28 +0200
Subject: [PATCH] Cleanup deprecation warnings in bgp/extensions/inet

Eliminate some leftovers from codegen change.

Change-Id: I3bc180b1f965f9a5854e2d8b6454ed315cca72c8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 .../bgp/inet/AbstractIPRibSupport.java        |  3 +--
 .../protocol/bgp/inet/IPv4RIBSupport.java     |  4 +---
 .../protocol/bgp/inet/IPv6RIBSupport.java     |  4 +---
 .../protocol/bgp/inet/IPv6RIBSupportTest.java |  6 ++---
 .../bgp/inet/codec/BGPParserTest.java         | 23 ++++++++++---------
 .../bgp/inet/codec/Ipv4NlriParserTest.java    | 12 +++++-----
 6 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java
index b6dd248587..a8c2ff3386 100644
--- a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java
+++ b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/AbstractIPRibSupport.java
@@ -102,9 +102,8 @@ abstract class AbstractIPRibSupport<
                         keys.add(routeKey);
                     }
                     return keys;
-                } else {
-                    LOG.warn("Routes {} are not a map", routes);
                 }
+                LOG.warn("Routes {} are not a map", routes);
             }
         }
         return Collections.emptyList();
diff --git a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/IPv4RIBSupport.java b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/IPv4RIBSupport.java
index 02ea19bca1..32956f8435 100644
--- a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/IPv4RIBSupport.java
+++ b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/IPv4RIBSupport.java
@@ -11,7 +11,6 @@ import static com.google.common.base.Verify.verify;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
@@ -42,8 +41,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
  */
 final class IPv4RIBSupport extends AbstractIPRibSupport<Ipv4RoutesCase, Ipv4Routes, Ipv4Route, Ipv4RouteKey> {
 
-    private static final Ipv4Routes EMPTY_CONTAINER
-            = new Ipv4RoutesBuilder().setIpv4Route(Collections.emptyList()).build();
+    private static final Ipv4Routes EMPTY_CONTAINER = new Ipv4RoutesBuilder().build();
     private static IPv4RIBSupport SINGLETON = null;
 
     private IPv4RIBSupport(final BindingNormalizedNodeSerializer mappingService) {
diff --git a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/IPv6RIBSupport.java b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/IPv6RIBSupport.java
index e825ad6f92..032986ab59 100644
--- a/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/IPv6RIBSupport.java
+++ b/bgp/extensions/inet/src/main/java/org/opendaylight/protocol/bgp/inet/IPv6RIBSupport.java
@@ -11,7 +11,6 @@ import static com.google.common.base.Verify.verify;
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
@@ -41,8 +40,7 @@ import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
  */
 final class IPv6RIBSupport extends AbstractIPRibSupport<Ipv6RoutesCase, Ipv6Routes, Ipv6Route, Ipv6RouteKey> {
 
-    private static final Ipv6Routes EMPTY_CONTAINER
-            = new Ipv6RoutesBuilder().setIpv6Route(Collections.emptyList()).build();
+    private static final Ipv6Routes EMPTY_CONTAINER = new Ipv6RoutesBuilder().build();
     private static IPv6RIBSupport SINGLETON;
 
     private IPv6RIBSupport(final BindingNormalizedNodeSerializer mappingService) {
diff --git a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/IPv6RIBSupportTest.java b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/IPv6RIBSupportTest.java
index bfd0c36fc0..5947a242e0 100644
--- a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/IPv6RIBSupportTest.java
+++ b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/IPv6RIBSupportTest.java
@@ -5,7 +5,6 @@
  * 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.inet;
 
 import static org.junit.Assert.assertEquals;
@@ -15,6 +14,7 @@ import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 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.rib.spi.AbstractRIBSupportTest;
@@ -69,9 +69,7 @@ public final class IPv6RIBSupportTest extends AbstractRIBSupportTest<Ipv6RoutesC
             .setAttributes(ATTRIBUTES)
             .setPathId(PATH_ID)
             .setPrefix(PREFIX).build();
-    private static final Ipv6Routes ROUTES = new Ipv6RoutesBuilder()
-            .setIpv6Route(Collections.singletonList(ROUTE)).build();
-    private static final Ipv6Routes EMPTY_ROUTES = new Ipv6RoutesBuilder().build();
+    private static final Ipv6Routes ROUTES = new Ipv6RoutesBuilder().setIpv6Route(Map.of(ROUTE.key(), ROUTE)).build();
 
     @Override
     public void setUp() throws Exception {
diff --git a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java
index fb7eed3800..04f1380b8c 100644
--- a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java
+++ b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/BGPParserTest.java
@@ -204,19 +204,20 @@ public class BGPParserTest {
         paBuilder.setClusterId(new ClusterIdBuilder().setCluster(clusters).build());
         assertEquals(paBuilder.getClusterId(), attrs.getClusterId());
 
-        final MpReachNlriBuilder mpBuilder = new MpReachNlriBuilder();
-        mpBuilder.setAfi(Ipv6AddressFamily.class);
-        mpBuilder.setSafi(UnicastSubsequentAddressFamily.class);
-        mpBuilder.setCNextHop(nextHop);
-        mpBuilder.setAdvertizedRoutes(new AdvertizedRoutesBuilder().setDestinationType(
-                new DestinationIpv6CaseBuilder().setDestinationIpv6(new DestinationIpv6Builder()
-                        .setIpv6Prefixes(prefs).build()).build()).build());
-
-        paBuilder.addAugmentation(Attributes1.class, new Attributes1Builder()
-                .setMpReachNlri(mpBuilder.build()).build());
+        final MpReachNlriBuilder mpBuilder = new MpReachNlriBuilder()
+                .setAfi(Ipv6AddressFamily.class)
+                .setSafi(UnicastSubsequentAddressFamily.class)
+                .setCNextHop(nextHop)
+                .setAdvertizedRoutes(new AdvertizedRoutesBuilder()
+                    .setDestinationType(new DestinationIpv6CaseBuilder()
+                        .setDestinationIpv6(new DestinationIpv6Builder().setIpv6Prefixes(prefs).build())
+                        .build())
+                    .build());
+
+        paBuilder.addAugmentation(new Attributes1Builder().setMpReachNlri(mpBuilder.build()).build());
         assertEquals(paBuilder.augmentation(Attributes1.class).getMpReachNlri(),
                 attrs.augmentation(Attributes1.class).getMpReachNlri());
-        paBuilder.setUnrecognizedAttributes(Collections.emptyList());
+        paBuilder.setUnrecognizedAttributes(Collections.emptyMap());
         // check API message
 
         builder.setAttributes(paBuilder.build());
diff --git a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/Ipv4NlriParserTest.java b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/Ipv4NlriParserTest.java
index c1a9dc76f0..c32c2fbd88 100644
--- a/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/Ipv4NlriParserTest.java
+++ b/bgp/extensions/inet/src/test/java/org/opendaylight/protocol/bgp/inet/codec/Ipv4NlriParserTest.java
@@ -36,9 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.inet
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.message.rev200120.PathId;
 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.MpReachNlri;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev180329.update.attributes.MpReachNlriBuilder;
@@ -168,8 +166,9 @@ public class Ipv4NlriParserTest {
 
         final Ipv4NlriParser serializer = new Ipv4NlriParser();
         final ByteBuf output = Unpooled.buffer(MP_NLRI_BYTES.length);
-        final Attributes attributes = new AttributesBuilder().addAugmentation(Attributes1.class,
-                new Attributes1Builder().setMpReachNlri(mpReachNlri).build()).build();
+        final Attributes attributes = new AttributesBuilder()
+                .addAugmentation(new Attributes1Builder().setMpReachNlri(mpReachNlri).build())
+                .build();
         serializer.serializeAttribute(attributes, output);
         Assert.assertArrayEquals(MP_NLRI_BYTES, output.array());
     }
@@ -190,8 +189,9 @@ public class Ipv4NlriParserTest {
 
         final Ipv4NlriParser serializer = new Ipv4NlriParser();
         final ByteBuf output = Unpooled.buffer(MP_NLRI_BYTES.length);
-        final Attributes attributes = new AttributesBuilder().addAugmentation(Attributes2.class,
-                new Attributes2Builder().setMpUnreachNlri(mpUnreachNlri).build()).build();
+        final Attributes attributes = new AttributesBuilder()
+                .addAugmentation(new Attributes2Builder().setMpUnreachNlri(mpUnreachNlri).build())
+                .build();
         serializer.serializeAttribute(attributes, output);
         Assert.assertArrayEquals(MP_NLRI_BYTES, output.array());
     }
-- 
2.36.6