Invoke CapabilityChangeNotificationProducer.close on shutdown

Also fixes Sonar warning regarding
useless CapabilityChangeNotificationProducer instantiation.

Change-Id: I376b834618d34f13615051abf622e6b12e031050
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

diff --git a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java
index 49e94bb..f64e4b0 100644 (file)
--- a/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java
+++ b/infra/northbound/netconf/src/main/java/io/fd/honeycomb/northbound/netconf/NetconfNotificationMapperProvider.java
@@ -64,13 +64,16 @@ public class NetconfNotificationMapperProvider extends ProviderTrait<NetconfOper
         writer.start();
 
         LOG.trace("Initializing CapabilityChangeNotificationProducer");
-        new CapabilityChangeNotificationProducer(notificationCollector, dataBroker);
+        final CapabilityChangeNotificationProducer capabilityChangeNotificationProducer =
+            new CapabilityChangeNotificationProducer(notificationCollector, dataBroker);
 
         LOG.trace("Providing NetconfNotificationOperationServiceFactory");
-        NetconfNotificationOperationServiceFactory netconfNotificationOperationServiceFactory =
+        final NetconfNotificationOperationServiceFactory netconfNotificationOperationServiceFactory =
             new NetconfNotificationOperationServiceFactory(notificationRegistry, aggregator);
 
         shutdownHandler.register("netconf-notification-service-factory", netconfNotificationOperationServiceFactory);
+        shutdownHandler.register("capability-change-notification-producer",
+            capabilityChangeNotificationProducer::close);
         shutdownHandler.register("notification-to-mdsal-writer", writer);
         return netconfNotificationOperationServiceFactory;
     }