From ee882a4293d92a3d4e623a433a221917ba04fbb9 Mon Sep 17 00:00:00 2001 From: Robert Varga Date: Sun, 1 Jan 2023 19:23:17 +0100 Subject: [PATCH 1/1] Remove RemoteDeviceId.getBindingKey() We expose this as the instance identifier already and there are no users anyway. JIRA: NETCONF-913 Change-Id: I38ad921fb321014167d59fe1f2a7932fcdc06087 Signed-off-by: Robert Varga --- .../netconf/sal/connect/util/RemoteDeviceId.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java index 8b40fc08f5..6c60bfdacb 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/util/RemoteDeviceId.java @@ -45,7 +45,6 @@ public final class RemoteDeviceId { .child(Topology.class, new TopologyKey(new TopologyId(DEFAULT_TOPOLOGY_NAME))); private final String name; - private final NodeKey key; private final YangInstanceIdentifier topologyPath; private final KeyedInstanceIdentifier topologyBindingPath; private InetSocketAddress address; @@ -54,8 +53,7 @@ public final class RemoteDeviceId { private RemoteDeviceId(final String name) { this.name = requireNonNull(name); topologyPath = DEFAULT_TOPOLOGY_NODE.node(NodeIdentifierWithPredicates.of(Node.QNAME, NODE_ID_QNAME, name)); - key = new NodeKey(new NodeId(name)); - topologyBindingPath = DEFAULT_TOPOLOGY_IID.child(Node.class, key); + topologyBindingPath = DEFAULT_TOPOLOGY_IID.child(Node.class, new NodeKey(new NodeId(name))); } public RemoteDeviceId(final String name, final InetSocketAddress address) { @@ -74,11 +72,7 @@ public final class RemoteDeviceId { return name; } - public NodeKey getBindingKey() { - return key; - } - - public InstanceIdentifier getTopologyBindingPath() { + public KeyedInstanceIdentifier getTopologyBindingPath() { return topologyBindingPath; } -- 2.36.6