Close RESTCONF server

Close RESTCONF server in Community Restconf stop procedure.

Signed-off-by: Ivan Hrasko <[email protected]>

Author: ihrasko

lighty-modules/lighty-restconf-nb-community/src/main/java/io/lighty/modules/northbound/restconf/community/impl/CommunityRestConf.java

@@ -36,7 +36,6 @@
 import org.slf4j.LoggerFactory;
 
 public class CommunityRestConf extends AbstractLightyModule {
-
     private static final Logger LOG = LoggerFactory.getLogger(CommunityRestConf.class);
 
     private final DOMDataBroker domDataBroker;
@@ -47,12 +46,13 @@ public class CommunityRestConf extends AbstractLightyModule {
     private final DOMSchemaService domSchemaService;
     private final InetAddress inetAddress;
     private final String restconfServletContextPath;
+    private final WebContextSecurer webContextSecurer;
     private final int httpPort;
     private AbstractLightyWebServer jettyServer;
     private LightyJettyServerProvider lightyServerBuilder;
     private JaxRsEndpoint jaxRsEndpoint;
-    private WebContextSecurer webContextSecurer;
     private MdsalRestconfStreamRegistry mdsalRestconfStreamRegistry;
+    private MdsalRestconfServer server;
 
     public CommunityRestConf(final DOMDataBroker domDataBroker, final DOMRpcService domRpcService,
             final DOMNotificationService domNotificationService,
@@ -100,7 +100,7 @@ protected boolean initProcedure() throws ServletException {
         }
 
         final MdsalDatabindProvider databindProvider = new MdsalDatabindProvider(domSchemaService);
-        final var server = new MdsalRestconfServer(databindProvider, domDataBroker, domRpcService,
+        this.server = new MdsalRestconfServer(databindProvider, domDataBroker, domRpcService,
             domActionService, domMountPointService);
 
         this.jettyServer = this.lightyServerBuilder.getServer();
@@ -152,6 +152,15 @@ protected boolean stopProcedure() {
                 stopFailed = true;
             }
         }
+        if (server != null) {
+            try {
+                server.close();
+                LOG.info("MDSAL RESTCONF server stopped");
+            } catch (final Exception e) {
+                LOG.error("{} failed to stop!", this.server.getClass(), e);
+                stopFailed = true;
+            }
+        }
         if (this.lightyServerBuilder != null) {
             this.lightyServerBuilder = null;
         }