Merge "datarouter node updates to address sonar issues"

diff --combined datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
index c6b1682,e0f6b7f..b8c06f1
--- 1/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
--- 2/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeMain.java
@@@ -23,13 -23,19 +23,19 @@@
  
  package org.onap.dmaap.datarouter.node;
  
- import org.eclipse.jetty.http.HttpVersion;
- import org.eclipse.jetty.servlet.*;
- import org.eclipse.jetty.util.ssl.*;
- import org.eclipse.jetty.server.*;
- import org.apache.log4j.Logger;
- 
  import java.util.Arrays;
+ import org.apache.log4j.Logger;
+ import org.eclipse.jetty.http.HttpVersion;
+ import org.eclipse.jetty.server.Connector;
+ import org.eclipse.jetty.server.HttpConfiguration;
+ import org.eclipse.jetty.server.HttpConnectionFactory;
+ import org.eclipse.jetty.server.SecureRequestCustomizer;
+ import org.eclipse.jetty.server.Server;
+ import org.eclipse.jetty.server.ServerConnector;
+ import org.eclipse.jetty.server.SslConnectionFactory;
+ import org.eclipse.jetty.servlet.ServletContextHandler;
+ import org.eclipse.jetty.servlet.ServletHolder;
+ import org.eclipse.jetty.util.ssl.SslContextFactory;
  
  /**
   * The main starting point for the Data Router node
@@@ -60,7 -66,9 +66,9 @@@ public class NodeMain 
                  try {
                      wait();
                  } catch (Exception exception) {
-                     nodeMainLogger.debug("NodeMain: waitForConfig exception. Exception Message:- " + exception.toString(), exception);
+                     nodeMainLogger
+                         .debug("NodeMain: waitForConfig exception. Exception Message:- " + exception.toString(),
+                             exception);
                  }
              }
              localNodeConfigManager.deregisterConfigTask(this);
@@@ -94,6 -102,7 +102,6 @@@
          Server server = new Server();
          // HTTP configuration
          HttpConfiguration httpConfiguration = new HttpConfiguration();
 -        httpConfiguration.setIdleTimeout(2000);
          httpConfiguration.setRequestHeaderSize(2048);
  
          // HTTP connector
@@@ -101,7 -110,6 +109,7 @@@
          try (ServerConnector httpServerConnector = new ServerConnector(server,
              new HttpConnectionFactory(httpConfiguration))) {
              httpServerConnector.setPort(nodeConfigManager.getHttpPort());
 +            httpServerConnector.setIdleTimeout(2000);
  
              // HTTPS configuration
              SslContextFactory sslContextFactory = new SslContextFactory();
@@@ -123,14 -131,15 +131,15 @@@
              httpsConfiguration.addCustomizer(secureRequestCustomizer);
  
              // HTTPS connector
-             ServerConnector httpsServerConnector = new ServerConnector(server,
+             try (ServerConnector httpsServerConnector = new ServerConnector(server,
                  new SslConnectionFactory(sslContextFactory, HttpVersion.HTTP_1_1.asString()),
-                 new HttpConnectionFactory(httpsConfiguration));
-             httpsServerConnector.setPort(nodeConfigManager.getHttpsPort());
-             httpsServerConnector.setIdleTimeout(500000);
-             httpsServerConnector.setAcceptQueueSize(2);
+                 new HttpConnectionFactory(httpsConfiguration))) {
+                 httpsServerConnector.setPort(nodeConfigManager.getHttpsPort());
+                 httpsServerConnector.setIdleTimeout(500000);
+                 httpsServerConnector.setAcceptQueueSize(2);
  
-             server.setConnectors(new Connector[]{httpServerConnector, httpsServerConnector});
+                 server.setConnectors(new Connector[]{httpServerConnector, httpsServerConnector});
+             }
          }
          ctxt = new ServletContextHandler(0);
          ctxt.setContextPath("/");