Modernize codebase a bit

[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 91cd860fe95e824d37e6dc7d85b1175338c35b72..aa041d8111767a5e95ed9d9d8026e38c9602083e 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
@@ -41,10 +41,9 @@ 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)));
     }
 
     /**
@@ -60,10 +59,9 @@ public final class TablesUtil {
             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);
+        return NodeIdentifierWithPredicates.of(nodeName, ImmutableMap.of(
+            afiQname, BindingReflections.findQName(afi),
+            safiQname, BindingReflections.findQName(safi)));
     }
 
     /**