From: Robert Varga Date: Sat, 31 Dec 2022 17:01:57 +0000 (+0100) Subject: Integrate createTopologyListPath() X-Git-Tag: v5.0.0~41 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F43%2F103843%2F1;p=netconf.git Integrate createTopologyListPath() This is a single-user private method, just inline it to its sole caller. Change-Id: I998bd1548e4f8e125d429f708b398c691c33c4de Signed-off-by: Robert Varga --- diff --git a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacade.java b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacade.java index ebcd601159..8703b14ed4 100644 --- a/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacade.java +++ b/netconf/sal-netconf-connector/src/main/java/org/opendaylight/netconf/sal/connect/netconf/sal/NetconfDeviceSalFacade.java @@ -118,15 +118,11 @@ public final class NetconfDeviceSalFacade implements RemoteDeviceHandler, AutoCl private void registerLockListener(final NetconfDeviceDataBroker netconfDeviceDataBroker, final NetconfDataTreeService netconfDataTreeService) { listenerRegistration = dataBroker.registerDataTreeChangeListener( - DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, createTopologyListPath()), - new LockChangeListener(netconfDeviceDataBroker, netconfDataTreeService)); - } - - private InstanceIdentifier createTopologyListPath() { - return InstanceIdentifier.create(NetconfNodeFieldsOptional.class) + DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION, + InstanceIdentifier.create(NetconfNodeFieldsOptional.class) .child(Topology.class, new TopologyKey(new TopologyId(topologyId))) .child(Node.class, new NodeKey(new NodeId(id.getName()))) - .child(DatastoreLock.class); - + .child(DatastoreLock.class)), + new LockChangeListener(netconfDeviceDataBroker, netconfDataTreeService)); } }