From a855618c2c7d7b74652920ab35ccb7f04723ec02 Mon Sep 17 00:00:00 2001
From: Robert Varga <robert.varga@pantheon.tech>
Date: Sat, 2 Mar 2024 10:59:23 +0100
Subject: [PATCH] Modernize bgp-rib-spi

Switch to using BuilderFactory instead of deprecated Builders.

Change-Id: I792ef52670934ceec6e87d9b2761b40a4c43de63
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
---
 bgp/rib-spi/pom.xml                               |  4 ----
 .../protocol/bgp/rib/spi/AbstractRIBSupport.java  | 15 +++++++++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/bgp/rib-spi/pom.xml b/bgp/rib-spi/pom.xml
index 7fb1792d6c..9bffdc33e3 100644
--- a/bgp/rib-spi/pom.xml
+++ b/bgp/rib-spi/pom.xml
@@ -69,10 +69,6 @@
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>yang-data-tree-api</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-data-impl</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.yangtools</groupId>
             <artifactId>util</artifactId>
diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java
index 3b30037b91..746cd422bc 100644
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/AbstractRIBSupport.java
@@ -78,10 +78,10 @@ import org.opendaylight.yangtools.yang.data.api.schema.DataContainerChild;
 import org.opendaylight.yangtools.yang.data.api.schema.DataContainerNode;
 import org.opendaylight.yangtools.yang.data.api.schema.MapEntryNode;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode;
+import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode.BuilderFactory;
 import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNodes;
 import org.opendaylight.yangtools.yang.data.api.schema.builder.DataContainerNodeBuilder;
-import org.opendaylight.yangtools.yang.data.impl.schema.Builders;
-import org.opendaylight.yangtools.yang.data.impl.schema.ImmutableNodes;
+import org.opendaylight.yangtools.yang.data.spi.node.ImmutableNodes;
 import org.opendaylight.yangtools.yang.data.tree.api.DataTreeCandidateNode;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -102,6 +102,7 @@ public abstract class AbstractRIBSupport<
     private static final ApplyRoute DELETE_ROUTE = new DeleteRoute();
     private static final ImmutableOffsetMapTemplate<QName> TABLES_KEY_TEMPLATE = ImmutableOffsetMapTemplate.ordered(
         ImmutableList.of(AFI_QNAME, SAFI_QNAME));
+    private static final BuilderFactory BUILDER_FACTORY = ImmutableNodes.builderFactory();
 
     // Instance identifier to table/(choice routes)/(map of route)
     private final LoadingCache<YangInstanceIdentifier, YangInstanceIdentifier> routesPath = CacheBuilder.newBuilder()
@@ -387,9 +388,9 @@ public abstract class AbstractRIBSupport<
             final ContainerNode attributes) {
         final DataContainerNodeBuilder<NodeIdentifierWithPredicates, MapEntryNode> builder;
         if (route != null) {
-            builder = Builders.mapEntryBuilder(route);
+            builder = BUILDER_FACTORY.newMapEntryBuilder(route);
         } else {
-            builder = Builders.mapEntryBuilder();
+            builder = BUILDER_FACTORY.newMapEntryBuilder();
         }
 
         return builder
@@ -493,10 +494,12 @@ public abstract class AbstractRIBSupport<
                 final NodeIdentifierWithPredicates routeKey, final DataContainerNode route,
                 final ContainerNode attributes) {
             // Build the DataContainer data
-            final var b = ImmutableNodes.mapEntryBuilder().withNodeIdentifier(routeKey);
+            final var b = ImmutableNodes.newMapEntryBuilder().withNodeIdentifier(routeKey);
             route.body().forEach(b::withChild);
             // Add attributes
-            b.withChild(Builders.containerBuilder(attributes).withNodeIdentifier(routeAttributesIdentifier()).build());
+            b.withChild(BUILDER_FACTORY.newContainerBuilder(attributes)
+                .withNodeIdentifier(routeAttributesIdentifier())
+                .build());
             tx.put(LogicalDatastoreType.OPERATIONAL, base.node(routeKey), b.build());
         }
     }
-- 
2.36.6