YANG revision dates mass-update

[bgpcep.git] / bmp / bmp-impl / src / main / java / org / opendaylight / protocol / bmp / impl / app / TablesUtil.java

diff --git a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java
index 5e72ba8d12059329601241c172e7ce69c9951ef0..f5c46e5c211bd43d61dc690dcaa9038e1e9a9f15 100644 (file)
--- a/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java
+++ b/bmp/bmp-impl/src/main/java/org/opendaylight/protocol/bmp/impl/app/TablesUtil.java
@@ -8,28 +8,30 @@
 package org.opendaylight.protocol.bmp.impl.app;
 
 import com.google.common.collect.ImmutableMap;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.SubsequentAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.monitor.rev150512.BmpMonitor;
-import org.opendaylight.yangtools.yang.binding.util.BindingReflections;
+import org.opendaylight.mdsal.binding.spec.reflect.BindingReflections;
+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.rev200120.AddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.SubsequentAddressFamily;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bmp.monitor.rev200120.BmpMonitor;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
 
 public final class TablesUtil {
-
-    public static final QName BMP_TABLES_QNAME = QName.create(BmpMonitor.QNAME.getNamespace(), BmpMonitor.QNAME.getRevision(), "tables").intern();
-    public static final QName BMP_ATTRIBUTES_QNAME = QName.create(BmpMonitor.QNAME.getNamespace(), BmpMonitor.QNAME.getRevision(), "attributes").intern();
-    public static final QName BMP_ROUTES_QNAME = QName.create(BmpMonitor.QNAME.getNamespace(), BmpMonitor.QNAME.getRevision(), "routes").intern();
+    public static final QName BMP_TABLES_QNAME = QName.create(BmpMonitor.QNAME, "tables").intern();
+    public static final QName BMP_ATTRIBUTES_QNAME = QName.create(BmpMonitor.QNAME, "attributes").intern();
+    public static final QName BMP_ROUTES_QNAME = QName.create(BmpMonitor.QNAME, "routes").intern();
     public static final QName BMP_AFI_QNAME = QName.create(BMP_TABLES_QNAME, "afi").intern();
     public static final QName BMP_SAFI_QNAME = QName.create(BMP_TABLES_QNAME, "safi").intern();
 
+    private static final String AFI = "afi";
+    private static final String SAFI = "safi";
+
     private TablesUtil() {
-        throw new UnsupportedOperationException("Utility class");
+        // Hidden on purpose
     }
 
     /**
-     * Creates Yang Instance Identifier path argument from supplied AFI and SAFI
+     * Creates Yang Instance Identifier path argument from supplied AFI and SAFI.
      *
      * @param afi Class representing AFI
      * @param safi Class representing SAFI
@@ -37,37 +39,36 @@ public final class TablesUtil {
      */
     public static NodeIdentifierWithPredicates toYangTablesKey(final Class<? extends AddressFamily> afi,
             final Class<? extends SubsequentAddressFamily> safi) {
-        final ImmutableMap<QName, Object> keyValues = ImmutableMap.of(
-                        BMP_AFI_QNAME, BindingReflections.findQName(afi),
-                        BMP_SAFI_QNAME, BindingReflections.findQName(safi));
-        return new NodeIdentifierWithPredicates(BMP_TABLES_QNAME, keyValues);
+        return NodeIdentifierWithPredicates.of(BMP_TABLES_QNAME, ImmutableMap.of(
+            BMP_AFI_QNAME, BindingReflections.findQName(afi),
+            BMP_SAFI_QNAME, BindingReflections.findQName(safi)));
     }
 
     /**
-     * Creates Yang Instance Identifier path argument from supplied QNAMES and AFI and SAFI
+     * Creates Yang Instance Identifier path argument from supplied QNAMES and AFI and SAFI.
      *
      * @param nodeName QName reprenting node
      * @param afi Class representing AFI
      * @param safi Class representing SAFI
      * @return NodeIdentifierWithPredicates for specified AFI, SAFI combination.
      */
-    public static NodeIdentifierWithPredicates toYangTablesKey(final QName nodeName, final Class<? extends AddressFamily> afi,
+    public static NodeIdentifierWithPredicates toYangTablesKey(final QName nodeName,
+            final Class<? extends AddressFamily> afi,
             final Class<? extends SubsequentAddressFamily> safi) {
-        final QName afiQname = QName.create(nodeName, "afi").intern();
-        final QName safiQname = QName.create(nodeName, "safi").intern();
-        final ImmutableMap<QName, Object> keyValues = ImmutableMap.of(
-                        afiQname, BindingReflections.findQName(afi),
-                        safiQname, BindingReflections.findQName(safi));
-        return new NodeIdentifierWithPredicates(nodeName, keyValues);
+        final QName afiQname = QName.create(nodeName, AFI).intern();
+        final QName safiQname = QName.create(nodeName, SAFI).intern();
+        return NodeIdentifierWithPredicates.of(nodeName, ImmutableMap.of(
+            afiQname, BindingReflections.findQName(afi),
+            safiQname, BindingReflections.findQName(safi)));
     }
 
     /**
-     * Creates Yang Instance Identifier path argument from supplied {@link TablesKey}
+     * Creates Yang Instance Identifier path argument from supplied {@link TablesKey}.
      *
-     * @param k Tables key representing table.
+     * @param tablesKey Tables key representing table.
      * @return NodeIdentifierWithPredicates of for specified AFI, SAFI combination.
      */
-    public static NodeIdentifierWithPredicates toYangTablesKey(final TablesKey k) {
-        return toYangTablesKey(k.getAfi(), k.getSafi());
+    public static NodeIdentifierWithPredicates toYangTablesKey(final TablesKey tablesKey) {
+        return toYangTablesKey(tablesKey.getAfi(), tablesKey.getSafi());
     }
 }