Inline onCloseHandler

There is no point to keep the callback an explicit member: inline the
lambda in its sole caller.

JIRA: NETCONF-949
Change-Id: I0b2b82cce4d567de3c90590a00651628c08989a0
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountDispatcher.java b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountDispatcher.java
index b5ef8397c0e5eadf2938d720de1c0053d012c1a0..bf1f556cd48b9a7b2485b528e2b17714b308dfbb 100644 (file)
--- a/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountDispatcher.java
+++ b/apps/callhome-provider/src/main/java/org/opendaylight/netconf/callhome/mount/CallHomeMountDispatcher.java
@@ -19,7 +19,6 @@ import org.opendaylight.controller.config.threadpool.ScheduledThreadPool;
 import org.opendaylight.controller.config.threadpool.ThreadPool;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.dom.api.DOMMountPointService;
-import org.opendaylight.netconf.callhome.mount.CallHomeMountSessionContext.CloseCallback;
 import org.opendaylight.netconf.callhome.protocol.CallHomeChannelActivator;
 import org.opendaylight.netconf.callhome.protocol.CallHomeNetconfSubsystemListener;
 import org.opendaylight.netconf.callhome.protocol.CallHomeProtocolSessionContext;
@@ -52,12 +51,6 @@ public class CallHomeMountDispatcher implements NetconfClientDispatcher, CallHom
 
     protected CallHomeTopology topology;
 
-    private final CloseCallback onCloseHandler = deviceContext -> {
-        final var nodeId = deviceContext.getId();
-        LOG.info("Removing {} from Netconf Topology.", nodeId);
-        topology.disconnectNode(nodeId);
-    };
-
     private final DeviceActionFactory deviceActionFactory;
     private final BaseNetconfSchemas baseSchemas;
 
@@ -109,7 +102,11 @@ public class CallHomeMountDispatcher implements NetconfClientDispatcher, CallHom
     @Override
     public void onNetconfSubsystemOpened(final CallHomeProtocolSessionContext session,
                                          final CallHomeChannelActivator activator) {
-        final var deviceContext = sessionManager().createSession(session, activator, onCloseHandler);
+        final var deviceContext = sessionManager().createSession(session, activator, device -> {
+            final var nodeId = device.getId();
+            LOG.info("Removing {} from Netconf Topology.", nodeId);
+            topology.disconnectNode(nodeId);
+        });
         if (deviceContext != null) {
             final NodeId nodeId = deviceContext.getId();
             final Node configNode = deviceContext.getConfigNode();