Merge "Logging changes and unit tests"

diff --combined datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/NodeConfigManager.java
index 786befc,90aaf0a..be77d24
--- 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
@@@ -109,7 -109,7 +109,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) {
@@@ -142,7 -142,7 +142,7 @@@
              eelfLogger.error(EelfMsgs.MESSAGE_BAD_PROV_URL, e, provurl);
              System.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"));
@@@ -183,7 -183,7 +183,7 @@@
              eelfLogger.error("NODE0309 Unable to fetch canonical name from keystore file " + ksfile);
              System.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 -193,7 +193,7 @@@
                  fetchconfig();
              }
          };
-         eelfLogger.info("NODE0305 Attempting to fetch configuration at " + provurl);
+         eelfLogger.debug("NODE0305 Attempting to fetch configuration at " + provurl);
          pfetcher.request();
      }
  
@@@ -284,7 -284,7 +284,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 -316,10 +316,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);
          }
      }
  
@@@ -496,6 -496,13 +496,6 @@@
          return (purl + "/" + fileid);
      }
  
 -    /**
 -     * Is a destination redirected.
 -     */
 -    public boolean isDestRedirected(DestInfo destinfo) {
 -        return (followredirects && rdmgr.isRedirected(destinfo.getSubId()));
 -    }
 -
      /**
       * Set up redirection on receipt of a 3XX from a target URL.
       */
@@@ -513,6 -520,23 +513,6 @@@
          return (false);
      }
  
 -    /**
 -     * Set up redirection on receipt of a 3XX from a target URL.
 -     */
 -    public boolean handleRedirectionSubLevel(DeliveryTask task, DestInfo destinfo, String redirto, String fileid) {
 -        fileid = "/" + fileid;
 -        String subid = destinfo.getSubId();
 -        String purl = destinfo.getURL();
 -        if (task.getFollowRedirects() && subid != null && redirto.endsWith(fileid)) {
 -            redirto = redirto.substring(0, redirto.length() - fileid.length());
 -            if (!redirto.equals(purl)) {
 -                rdmgr.redirect(subid, purl, redirto);
 -                return true;
 -            }
 -        }
 -        return false;
 -    }
 -
      /**
       * Handle unreachable target URL.
       */
@@@ -582,6 -606,16 +582,6 @@@
          return (config.getTargets(feedid));
      }
  
 -    /**
 -     * Get the creation date for a feed.
 -     *
 -     * @param feedid The feed ID
 -     * @return the timestamp of creation date of feed id passed
 -     */
 -    public String getCreatedDate(String feedid) {
 -        return (config.getCreatedDate(feedid));
 -    }
 -
      /**
       * Get the spool directory for temporary files.
       */
@@@ -596,15 -630,15 +596,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);
          }
      }
@@@ -777,14 -811,30 +777,14 @@@
          return enabledprotocols;
      }
  
 -    public void setEnabledprotocols(String[] enabledprotocols) {
 -        this.enabledprotocols = enabledprotocols.clone();
 -    }
 -
      public String getAafType() {
          return aafType;
      }
  
 -    public void setAafType(String aafType) {
 -        this.aafType = aafType;
 -    }
 -
 -    public void setAafInstance(String aafInstance) {
 -        this.aafInstance = aafInstance;
 -    }
 -
      public String getAafAction() {
          return aafAction;
      }
  
 -    public void setAafAction(String aafAction) {
 -        this.aafAction = aafAction;
 -    }
 -
      /*
       * Get aafURL from SWM variable
       * */
@@@ -792,10 -842,18 +792,10 @@@
          return aafURL;
      }
  
 -    public void setAafURL(String aafURL) {
 -        this.aafURL = aafURL;
 -    }
 -
      public boolean getCadiEnabled() {
          return cadiEnabled;
      }
  
 -    public void setCadiEnabled(boolean cadiEnabled) {
 -        this.cadiEnabled = cadiEnabled;
 -    }
 -
      /**
       * Builds the permissions string to be verified.
       *

diff --combined datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/JettyFilter.java
index 69f51d8,8b5f2a6..d5e520e
--- 1/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/JettyFilter.java
--- 2/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/JettyFilter.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/JettyFilter.java
@@@ -17,7 -17,6 +17,7 @@@
   * SPDX-License-Identifier: Apache-2.0
   * ============LICENSE_END=========================================================
   */
 +
  package org.onap.dmaap.datarouter.node.eelf;
  
  import ch.qos.logback.classic.spi.ILoggingEvent;
@@@ -28,7 -27,7 +28,7 @@@ import ch.qos.logback.core.spi.FilterRe
  public class JettyFilter extends Filter<ILoggingEvent> {
      @Override
      public FilterReply decide(ILoggingEvent event) {
-         if (event.getMessage().contains("org.eclipse.jetty")) {
+         if (event.getMessage().contains("org.eclipse.jetty") || event.getLoggerName().contains("org.eclipse.jetty")) {
              return FilterReply.ACCEPT;
          } else {
              return FilterReply.DENY;

diff --combined datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/MetricsFilter.java
index 0fa57d4,890d56b..f3e27fe
--- 1/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/MetricsFilter.java
--- 2/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/MetricsFilter.java
+++ b/datarouter-node/src/main/java/org/onap/dmaap/datarouter/node/eelf/MetricsFilter.java
@@@ -17,7 -17,6 +17,7 @@@
   * SPDX-License-Identifier: Apache-2.0
   * ============LICENSE_END=========================================================
   */
 +
  package org.onap.dmaap.datarouter.node.eelf;
  
  import ch.qos.logback.classic.Level;
@@@ -29,7 -28,7 +29,7 @@@ import ch.qos.logback.core.spi.FilterRe
  public class MetricsFilter extends Filter<ILoggingEvent> {
      @Override
      public FilterReply decide(ILoggingEvent event) {
-         if (event.getLevel().equals(Level.INFO) && !event.getMessage().contains("jetty")) {
+         if (event.getLevel().equals(Level.INFO) && !event.getMessage().contains("org.eclipse.jetty") && !event.getLoggerName().contains("org.eclipse.jetty")) {
              if (!event.getMessage().contains("DEL|") && !event.getMessage().contains("PUB|") && !event.getMessage().contains(
                      "PBF|") && !event.getMessage().contains("EXP|") && !event.getMessage().contains("DLX|")) {
                  return FilterReply.ACCEPT;