From 7d2e71bba52ba720c7add5a589c269f564bbe5bf Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Fri, 6 Sep 2019 08:47:50 +0200 Subject: [PATCH] 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 --- .../opendaylight/protocol/bgp/rib/spi/IdentifierUtils.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 6b4decc5c9..9fa0051b1b 100644 --- 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 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 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()); } } -- 2.36.6