Use newly-introduced type-safe methods

New methods allow us to precisely target specific case items.

Change-Id: I22c3df0c9bb94767b769020e3d87cad9b4cf7f2d
JIRA: MDSAL-342
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java
index 310a773d4dd03f53f7cb3218a914116c04268da6..eee78d287c8adef8eaa3cc285bbfd8d5ce7b9e98 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/EffectiveRibInWriter.java
@@ -190,8 +190,8 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn
                             tablePath.child(org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp
                                     .rib.rev180329.rib.tables.Attributes.class), after.getAttributes());
 
-                    final DataObjectModification routesChangesContainer =
-                            table.getModifiedChildContainer(ribSupport.routesContainerClass());
+                    final DataObjectModification routesChangesContainer = table.getModifiedChildContainer(
+                        ribSupport.routesCaseClass(), ribSupport.routesContainerClass());
 
                     if (routesChangesContainer == null) {
                         break;
@@ -315,7 +315,7 @@ final class EffectiveRibInWriter implements PrefixesReceivedCounters, PrefixesIn
         }
 
         final DataObjectModification routesChangesContainer =
-                table.getModifiedChildContainer(ribSupport.routesContainerClass());
+                table.getModifiedChildContainer(ribSupport.routesCaseClass(), ribSupport.routesContainerClass());
 
         if (routesChangesContainer == null) {
             return;

diff --git a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java
index 30f89b32f5953596feea192c27cc66b75d2f9d2e..8f80cb871d309d5617c00888b84dd4fdcaa08ad4 100644 (file)
--- a/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java
+++ b/bgp/rib-impl/src/main/java/org/opendaylight/protocol/bgp/rib/impl/LocRibWriter.java
@@ -261,7 +261,6 @@ final class LocRibWriter<C extends Routes & DataObject & ChoiceIn<Tables>, S ext
         return ret;
     }
 
-    @SuppressWarnings("unchecked")
     private void updateNodes(
             final DataObjectModification<Tables> table,
             final UnsignedInteger peerUuid,
@@ -277,8 +276,8 @@ final class LocRibWriter<C extends Routes & DataObject & ChoiceIn<Tables>, S ext
             tx.put(LogicalDatastoreType.OPERATIONAL, this.locRibTableIID.child(Attributes.class), newAttValue);
         }
 
-        final DataObjectModification routesChangesContainer
-                = table.getModifiedChildContainer((Class) this.ribSupport.routesContainerClass());
+        final DataObjectModification<S> routesChangesContainer
+                = table.getModifiedChildContainer(ribSupport.routesCaseClass(), ribSupport.routesContainerClass());
         if (routesChangesContainer == null) {
             return;
         }
@@ -286,11 +285,11 @@ final class LocRibWriter<C extends Routes & DataObject & ChoiceIn<Tables>, S ext
     }
 
     private void updateRoutesEntries(
-            final Collection<DataObjectModification<? extends DataObject>> routeChanges,
+            final Collection<? extends DataObjectModification<? extends DataObject>> collection,
             final UnsignedInteger routerId,
             final Map<RouteUpdateKey, RouteEntry<C,S,R,I>> routes
     ) {
-        for (final DataObjectModification<? extends DataObject> route : routeChanges) {
+        for (final DataObjectModification<? extends DataObject> route : collection) {
             final R newRoute = (R) route.getDataAfter();
             final R oldRoute = (R) route.getDataBefore();
             String routeKey;