Clean up RibSupport registration

[bgpcep.git] / bgp / rib-spi / src / main / java / org / opendaylight / protocol / bgp / rib / spi / RibSupportUtils.java

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java
index a0d8500e414164b3cfa619a99cfe3667d1bf66a1..db495c3b230734cd5a8a72e8328cd1ac6cd802c8 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/RibSupportUtils.java
@@ -13,8 +13,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.mult
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.peer.SupportedTablesKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev180329.SubsequentAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.SubsequentAddressFamily;
 import org.opendaylight.yangtools.util.ImmutableOffsetMapTemplate;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
@@ -33,15 +33,13 @@ public final class RibSupportUtils {
     }
 
     /**
-     * Creates Yang Instance Identifier path argument from supplied AFI and SAFI.
+     * Creates Yang Instance Identifier path argument from supplied {@link TablesKey}.
      *
-     * @param afi  Class representing AFI
-     * @param safi Class representing SAFI
+     * @param tablesKey Tables key representing table.
      * @return NodeIdentifierWithPredicates of {@link Tables} for specified AFI, SAFI combination.
      */
-    public static NodeIdentifierWithPredicates toYangTablesKey(final Class<? extends AddressFamily> afi,
-            final Class<? extends SubsequentAddressFamily> safi) {
-        return toYangKey(Tables.QNAME, afi, safi);
+    public static NodeIdentifierWithPredicates toYangTablesKey(final TablesKey tablesKey) {
+        return toYangKey(Tables.QNAME, tablesKey.getAfi(), tablesKey.getSafi());
     }
 
     /**
@@ -52,24 +50,10 @@ public final class RibSupportUtils {
      * @param safi Class representing SAFI
      * @return NodeIdentifierWithPredicates of 'id' for specified AFI, SAFI combination.
      */
-    public static NodeIdentifierWithPredicates toYangKey(final QName id, final Class<? extends AddressFamily> afi,
-            final Class<? extends SubsequentAddressFamily> safi) {
+    public static NodeIdentifierWithPredicates toYangKey(final QName id, final AddressFamily afi,
+            final SubsequentAddressFamily safi) {
         return NodeIdentifierWithPredicates.of(id, AFI_SAFI_TEMPLATE.instantiateWithValues(
-            BindingReflections.findQName(afi), BindingReflections.findQName(safi)));
-    }
-
-    /**
-     * Creates Yang Instance Identifier path argument from supplied AFI and SAFI.
-     *
-     * @param id   QNAME representing node
-     * @param afi  Class representing AFI
-     * @param safi Class representing SAFI
-     * @return NodeIdentifierWithPredicates of 'id' for specified AFI, SAFI combination.
-     */
-    public static NodeIdentifierWithPredicates toYangPathKey(final QName id, final Class<? extends AddressFamily> afi,
-            final Class<? extends SubsequentAddressFamily> safi) {
-        return NodeIdentifierWithPredicates.of(id, ADD_PATH_AFI_SAFI_TEMPLATE.instantiateWithValues(
-            BindingReflections.findQName(afi), BindingReflections.findQName(safi)));
+            BindingReflections.getQName(afi), BindingReflections.getQName(safi)));
     }
 
     /**
@@ -79,7 +63,6 @@ public final class RibSupportUtils {
      * @param tablesKey  Tables key representing table.
      * @return NodeIdentifierWithPredicates of 'id' for specified AFI, SAFI combination.
      */
-    @SuppressWarnings("checkstyle:OverloadMethodsDeclarationOrder")
     public static NodeIdentifierWithPredicates toYangKey(final QName id, final TablesKey tablesKey) {
         return toYangKey(id, tablesKey.getAfi(), tablesKey.getSafi());
     }
@@ -96,13 +79,16 @@ public final class RibSupportUtils {
     }
 
     /**
-     * Creates Yang Instance Identifier path argument from supplied {@link TablesKey}.
+     * Creates Yang Instance Identifier path argument from supplied AFI and SAFI.
      *
-     * @param tablesKey Tables key representing table.
-     * @return NodeIdentifierWithPredicates of {@link Tables} for specified AFI, SAFI combination.
+     * @param id   QNAME representing node
+     * @param afi  Class representing AFI
+     * @param safi Class representing SAFI
+     * @return NodeIdentifierWithPredicates of 'id' for specified AFI, SAFI combination.
      */
-    @SuppressWarnings("checkstyle:OverloadMethodsDeclarationOrder")
-    public static NodeIdentifierWithPredicates toYangTablesKey(final TablesKey tablesKey) {
-        return toYangTablesKey(tablesKey.getAfi(), tablesKey.getSafi());
+    public static NodeIdentifierWithPredicates toYangPathKey(final QName id, final AddressFamily afi,
+            final SubsequentAddressFamily safi) {
+        return NodeIdentifierWithPredicates.of(id, ADD_PATH_AFI_SAFI_TEMPLATE.instantiateWithValues(
+            BindingReflections.getQName(afi), BindingReflections.getQName(safi)));
     }
 }