Merge "FINAL unit test covergae commit"

diff --combined datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
index be77d24,00922e0..15672ee
--- 1/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
--- 2/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
@@@ -24,13 -24,18 +24,18 @@@
  
  package org.onap.dmaap.datarouter.node;
  
+ import static java.lang.System.exit;
+ 
  import com.att.eelf.configuration.EELFLogger;
  import com.att.eelf.configuration.EELFManager;
  import java.io.File;
  import java.io.FileInputStream;
+ import java.io.IOException;
  import java.io.InputStreamReader;
  import java.io.Reader;
  import java.net.URL;
+ import java.nio.file.Files;
+ import java.util.Objects;
  import java.util.Properties;
  import java.util.Timer;
  import org.onap.dmaap.datarouter.node.eelf.EelfMsgs;
@@@ -109,7 -114,7 +114,7 @@@ public class NodeConfigManager implemen
  
          Properties drNodeProperties = new Properties();
          try {
 -            eelfLogger.info("NODE0301 Loading local config file node.properties");
 +            eelfLogger.debug("NODE0301 Loading local config file node.properties");
              drNodeProperties.load(new FileInputStream(System
                      .getProperty("org.onap.dmaap.datarouter.node.properties", "/opt/app/datartr/etc/node.properties")));
          } catch (Exception e) {
@@@ -134,15 -139,14 +139,14 @@@
           */
          //Disable and enable protocols*/
          enabledprotocols = ((drNodeProperties.getProperty("NodeHttpsProtocols")).trim()).split("\\|");
- 
          try {
              provhost = (new URL(provurl)).getHost();
          } catch (Exception e) {
              NodeUtils.setIpAndFqdnForEelf(NODE_CONFIG_MANAGER);
              eelfLogger.error(EelfMsgs.MESSAGE_BAD_PROV_URL, e, provurl);
-             System.exit(1);
+             exit(1);
          }
 -        eelfLogger.info("NODE0303 Provisioning server is " + provhost);
 +        eelfLogger.debug("NODE0303 Provisioning server is " + provhost);
          eventlogurl = drNodeProperties.getProperty("LogUploadURL", "https://feeds-drtr.web.att.com/internal/logs");
          provcheck = new IsFrom(provhost);
          gfport = Integer.parseInt(drNodeProperties.getProperty("IntHttpPort", "8080"));
@@@ -151,9 -155,11 +155,11 @@@
          spooldir = drNodeProperties.getProperty("SpoolDir", "spool");
          File fdir = new File(spooldir + "/f");
          fdir.mkdirs();
-         for (File junk : fdir.listFiles()) {
-             if (junk.isFile()) {
-                 junk.delete();
+         for (File junk : Objects.requireNonNull(fdir.listFiles())) {
+             try {
+                 Files.deleteIfExists(junk.toPath());
+             } catch (IOException e) {
+                 eelfLogger.error("NODE0313 Failed to clear junk files from " + fdir.getPath());
              }
          }
          logdir = drNodeProperties.getProperty("LogDir", "logs");
@@@ -181,9 -187,9 +187,9 @@@
              NodeUtils.setIpAndFqdnForEelf(NODE_CONFIG_MANAGER);
              eelfLogger.error(EelfMsgs.MESSAGE_KEYSTORE_FETCH_ERROR, ksfile);
              eelfLogger.error("NODE0309 Unable to fetch canonical name from keystore file " + ksfile);
-             System.exit(1);
+             exit(1);
          }
 -        eelfLogger.info("NODE0304 My certificate says my name is " + myname);
 +        eelfLogger.debug("NODE0304 My certificate says my name is " + myname);
          pid = new PublishId(myname);
          long minrsinterval = Long.parseLong(drNodeProperties.getProperty("MinRedirSaveInterval", "10000"));
          long minpfinterval = Long.parseLong(drNodeProperties.getProperty("MinProvFetchInterval", "10000"));
@@@ -193,7 -199,7 +199,7 @@@
                  fetchconfig();
              }
          };
 -        eelfLogger.info("NODE0305 Attempting to fetch configuration at " + provurl);
 +        eelfLogger.debug("NODE0305 Attempting to fetch configuration at " + provurl);
          pfetcher.request();
      }
  
@@@ -284,7 -290,7 +290,7 @@@
  
      private void fetchconfig() {
          try {
 -            eelfLogger.info("NodeConfigMan.fetchConfig: provurl:: " + provurl);
 +            eelfLogger.debug("NodeConfigMan.fetchConfig: provurl:: " + provurl);
              Reader reader = new InputStreamReader((new URL(provurl)).openStream());
              config = new NodeConfig(new ProvData(reader), myname, spooldir, port, nak);
              localconfig();
@@@ -316,10 -322,10 +322,10 @@@
       */
      public synchronized void gofetch(String remoteAddr) {
          if (provcheck.isReachable(remoteAddr)) {
 -            eelfLogger.info("NODE0307 Received configuration fetch request from provisioning server " + remoteAddr);
 +            eelfLogger.debug("NODE0307 Received configuration fetch request from provisioning server " + remoteAddr);
              pfetcher.request();
          } else {
 -            eelfLogger.info("NODE0308 Received configuration fetch request from unexpected server " + remoteAddr);
 +            eelfLogger.debug("NODE0308 Received configuration fetch request from unexpected server " + remoteAddr);
          }
      }
  
@@@ -596,15 -602,15 +602,15 @@@
          if (provcheck.isFrom(remoteaddr)) {
              String sdir = config.getSpoolDir(subid);
              if (sdir != null) {
 -                eelfLogger.info("NODE0310 Received subscription reset request for subscription " + subid
 +                eelfLogger.debug("NODE0310 Received subscription reset request for subscription " + subid
                          + " from provisioning server " + remoteaddr);
              } else {
 -                eelfLogger.info("NODE0311 Received subscription reset request for unknown subscription " + subid
 +                eelfLogger.debug("NODE0311 Received subscription reset request for unknown subscription " + subid
                          + " from provisioning server " + remoteaddr);
              }
              return (sdir);
          } else {
 -            eelfLogger.info("NODE0312 Received subscription reset request from unexpected server " + remoteaddr);
 +            eelfLogger.debug("NODE0312 Received subscription reset request from unexpected server " + remoteaddr);
              return (null);
          }
      }