Use singleton NodeIdentifierWithPredicates

We do not need to go through SharedSingletonMapTemplate anymore,
as there is a specialized singleton class, which is more efficient.

Change-Id: I21149ec7480a9540d217905a5f65db3b096bbbc6
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/IdentifierUtils.java b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/IdentifierUtils.java
index 6b4decc5c92f3dcaf11fdfb58af8f18bd7af68b5..9fa0051b1b474b7ed06b5ae79de2849d9499beea 100644 (file)
--- a/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/IdentifierUtils.java
+++ b/bgp/rib-spi/src/main/java/org/opendaylight/protocol/bgp/rib/spi/IdentifierUtils.java
@@ -13,7 +13,6 @@ import com.google.common.collect.Iterables;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.PeerId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.bgp.rib.rib.Peer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev180329.rib.Tables;
-import org.opendaylight.yangtools.util.SharedSingletonMapTemplate;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates;
@@ -25,8 +24,6 @@ public final class IdentifierUtils {
     private static final Predicate<PathArgument> IS_TABLES = input -> input
             instanceof NodeIdentifierWithPredicates && Tables.QNAME.equals(input.getNodeType());
     private static final QName PEER_ID = QName.create(Peer.QNAME, "peer-id").intern();
-    private static final SharedSingletonMapTemplate<QName> PEER_ID_TEMPLATE =
-            SharedSingletonMapTemplate.ordered(PEER_ID);
 
     private IdentifierUtils() {
         throw new UnsupportedOperationException();
@@ -72,6 +69,6 @@ public final class IdentifierUtils {
     }
 
     public static NodeIdentifierWithPredicates domPeerId(final PeerId peer) {
-        return NodeIdentifierWithPredicates.of(Peer.QNAME, PEER_ID_TEMPLATE.instantiateWithValue(peer.getValue()));
+        return NodeIdentifierWithPredicates.of(Peer.QNAME, PEER_ID, peer.getValue());
     }
 }