Merge "Increase junit coverage in ONAP-logging"

13 files changed, 565 insertions, 92 deletions

diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfo.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfo.java
index c1e99822..ae4cc929 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfo.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfo.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,6 +21,7 @@
 package org.onap.policy.common.logging.eelf;
 
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 public class DroolsPDPMDCInfo implements MDCInfo {
 
@@ -43,7 +44,7 @@ public class DroolsPDPMDCInfo implements MDCInfo {
      * @return the instance of ConcurrentHashMap
      */
     @Override
-    public ConcurrentHashMap<String, String> getMDCInfo() {
+    public ConcurrentMap<String, String> getMDCInfo() {
         return mdcMap;
     }
 }
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/ErrorCodeMap.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/ErrorCodeMap.java
index 6d347c9c..4df86a4d 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/ErrorCodeMap.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/ErrorCodeMap.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 package org.onap.policy.common.logging.eelf;
 
-import java.util.HashMap;
+import java.util.EnumMap;
 
 /**
  * 
@@ -30,7 +30,7 @@ import java.util.HashMap;
 public class ErrorCodeMap {
 	
 
-    protected static final HashMap<MessageCodes, ErrorCodeInfo> hm = new HashMap<>();
+    protected static final EnumMap<MessageCodes, ErrorCodeInfo> hm = new EnumMap<>(MessageCodes.class);
     
     private static final String ERROR_PERMISSIONS = "POLICY-100E";
 	private static final String ERROR_PERMISSIONS_DESCRIPTION = "This is a Permissions Error. Please check the error message for detail information";
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfo.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfo.java
index 6c31a990..077a5a70 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfo.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfo.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -21,13 +21,14 @@
 package org.onap.policy.common.logging.eelf;
 
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 /**
  * EventTrackInfo contains a ConcurrentHashMap of EventData.
  */
 public class EventTrackInfo {
 
-    private ConcurrentHashMap<String, EventData> eventInfo = null;
+    private final ConcurrentMap<String, EventData> eventInfo;
 
     public EventTrackInfo() {
         /*
@@ -78,7 +79,7 @@ public class EventTrackInfo {
     /**
      * Returns a ConcurrentHashMap of EventData
      */
-    public ConcurrentHashMap<String, EventData> getEventInfo() {
+    public ConcurrentMap<String, EventData> getEventInfo() {
         return eventInfo;
     }
 }
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java
index 12f1af61..a79ab521 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandler.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@ import java.time.Instant;
 import java.util.ArrayList;
 import java.util.TimerTask;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 /**
  *
@@ -54,7 +55,7 @@ public class EventTrackInfoHandler extends TimerTask {
         if (eventTrackInfo == null) {
             return;
         }
-        ConcurrentHashMap<String, EventData> eventInfo = eventTrackInfo.getEventInfo();
+        ConcurrentMap<String, EventData> eventInfo = eventTrackInfo.getEventInfo();
         if (eventInfo == null || eventInfo.isEmpty()) {
             return;
         }
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MDCInfo.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MDCInfo.java
index 0d0b5dff..f49b34a7 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MDCInfo.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/MDCInfo.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,7 +20,7 @@
 
 package org.onap.policy.common.logging.eelf;
 
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 
 /**
  *
@@ -34,5 +34,5 @@ public interface MDCInfo {
      * Returns MDC info.
      * @return MDC info
      */
-    ConcurrentHashMap<String, String> getMDCInfo();
+    ConcurrentMap<String, String> getMDCInfo();
 }
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java
index b43dca45..58db1da4 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,12 +20,9 @@
 
 package org.onap.policy.common.logging.eelf;
 
-import org.slf4j.MDC;
-
 import static org.onap.policy.common.logging.eelf.Configuration.*;
 
 import org.onap.policy.common.logging.flexlogger.LoggerType;
-import org.onap.policy.common.logging.eelf.PolicyLogger;
 import com.att.eelf.configuration.EELFLogger;
 import com.att.eelf.configuration.EELFLogger.Level;
 import com.att.eelf.configuration.EELFManager;
@@ -43,7 +40,9 @@ import java.util.Properties;
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.UUID;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import org.slf4j.MDC;
 
 /**
  * 
@@ -63,6 +62,8 @@ public class PolicyLogger {
 
 	private static EELFLogger debugLogger = EELFManager.getInstance()
 			.getDebugLogger();
+
+	private static final String POLICY_LOGGER = "PolicyLogger";
 	
 	private static EventTrackInfo eventTracker = new EventTrackInfo();
 	
@@ -95,7 +96,7 @@ public class PolicyLogger {
 	private static Level auditLevel = Level.INFO;
 	private static Level metricsLevel = Level.INFO;
 	private static Level errorLevel = Level.ERROR;
-	private static String CLASS_NAME = "ClassName";
+	private static String classNameProp = "ClassName";
 	
 	private static final String DATE_FORMAT = "yyyy-MM-dd'T'HH:mm:ss.SSS+00:00";
 	private static final String COMPLETE_STATUS = "COMPLETE";
@@ -107,7 +108,7 @@ public class PolicyLogger {
 				hostName = InetAddress.getLocalHost().getHostName();
 				hostAddress = InetAddress.getLocalHost().getHostAddress();
 			} catch (UnknownHostException e) {
-				PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyLogger", "UnknownHostException");
+				PolicyLogger.error(MessageCodes.EXCEPTION_ERROR, e, POLICY_LOGGER, "UnknownHostException");
 			}
 		}
 	}
@@ -145,11 +146,11 @@ public class PolicyLogger {
 	}
 	
 	public static String getClassname() {
-		return CLASS_NAME;
+		return classNameProp;
 	}
 	
 	public static synchronized void setClassname(String name) {
-		CLASS_NAME = name;
+		classNameProp = name;
 	}
 	
 	/**
@@ -184,7 +185,7 @@ public class PolicyLogger {
 			MDC.put(MDC_SERVER_FQDN, hostName);
 			MDC.put(MDC_SERVER_IP_ADDRESS, hostAddress);
 		} catch (Exception e) {
-			errorLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyLogger");
+			errorLogger.error(MessageCodes.EXCEPTION_ERROR, e, POLICY_LOGGER);
 		}
 		Instant startTime = Instant.now();
 		Instant endTime = Instant.now();
@@ -225,7 +226,7 @@ public class PolicyLogger {
 		MDC.put(MDC_KEY_REQUEST_ID, transId);
 		if(mdcInfo != null && mdcInfo.getMDCInfo() != null && !mdcInfo.getMDCInfo().isEmpty()){
 			
-			ConcurrentHashMap<String, String> mdcMap = mdcInfo.getMDCInfo();
+			ConcurrentMap<String, String> mdcMap = mdcInfo.getMDCInfo();
 		    Iterator<String> keyIterator = mdcMap.keySet().iterator();
 		    String key;
 		    
@@ -239,7 +240,7 @@ public class PolicyLogger {
 			MDC.put(MDC_SERVER_FQDN, hostName);
 			MDC.put(MDC_SERVER_IP_ADDRESS, hostAddress);
 		} catch (Exception e) {
-			errorLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyLogger");
+			errorLogger.error(MessageCodes.EXCEPTION_ERROR, e, POLICY_LOGGER);
 		}
 		Instant startTime = Instant.now();
 		Instant endTime = Instant.now();
@@ -336,7 +337,7 @@ public class PolicyLogger {
 			MDC.put(MDC_SERVER_FQDN, hostName);
 			MDC.put(MDC_SERVER_IP_ADDRESS, hostAddress);
 		} catch (Exception e) {
-			errorLogger.error(MessageCodes.EXCEPTION_ERROR, e, "PolicyLogger");
+			errorLogger.error(MessageCodes.EXCEPTION_ERROR, e, POLICY_LOGGER);
 		}
 		MDC.put(MDC_INSTANCE_UUID, "");
 		MDC.put(MDC_ALERT_SEVERITY, "");
@@ -363,7 +364,7 @@ public class PolicyLogger {
 	 * @param arguments
 	 */
 	public static void info(MessageCodes msg, String... arguments) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		debugLogger.info(msg, arguments);
 	}
 	
@@ -374,7 +375,7 @@ public class PolicyLogger {
 	 * @param arguments
 	 */
 	public static void info(MessageCodes msg, String className, String... arguments) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		debugLogger.info(msg, arguments);
 	}
 	
@@ -384,7 +385,7 @@ public class PolicyLogger {
 	 * @param arg0
 	 */
 	public static void info( String className, String arg0) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		debugLogger.info(MessageCodes.GENERAL_INFO, arg0);
 	}
 
@@ -394,7 +395,7 @@ public class PolicyLogger {
 	 * @param arg0
 	 */
 	public static void info(Object arg0) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		debugLogger.info(MessageCodes.GENERAL_INFO, String.valueOf(arg0));
 	}
 
@@ -406,7 +407,7 @@ public class PolicyLogger {
 	 */
 	public static void info(MessageCodes msg, Throwable arg0,
 			String... arguments) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 	    String arguments2 = getNormalizedStackTrace(arg0, arguments);
 	    debugLogger.info(msg, arguments2);
 	}
@@ -420,7 +421,7 @@ public class PolicyLogger {
 	 */
 	public static void info(MessageCodes msg, String className, Throwable arg0,
 			String... arguments) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 	    String arguments2 = getNormalizedStackTrace(arg0, arguments);
 	    debugLogger.info(msg, arguments2);
 	}
@@ -431,7 +432,7 @@ public class PolicyLogger {
 	 * @param className class name
 	 */
 	public static void warn( String className, String arg0) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		debugLogger.warn(MessageCodes.GENERAL_INFO, arg0);
 	}
 
@@ -440,7 +441,7 @@ public class PolicyLogger {
 	 * @param arg0
 	 */
 	public static void warn(Object arg0) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		debugLogger.warn(MessageCodes.GENERAL_WARNING, "" + arg0);
 	}
 	
@@ -449,7 +450,7 @@ public class PolicyLogger {
 	 * @param arg0
 	 */
 	public static void warn(String arg0) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		debugLogger.warn(MessageCodes.GENERAL_WARNING, arg0);
 	}
 
@@ -459,7 +460,7 @@ public class PolicyLogger {
 	 * @param arguments
 	 */
 	public static void warn(MessageCodes msg, String... arguments) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		debugLogger.warn(msg, arguments);
 	}
 	
@@ -470,7 +471,7 @@ public class PolicyLogger {
 	 * @param arguments
 	 */	
 	public static void warn(MessageCodes msg, String className, String... arguments) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		debugLogger.warn(msg, arguments);
 	}
 
@@ -482,7 +483,7 @@ public class PolicyLogger {
 	 */
 	public static void warn(MessageCodes msg, Throwable arg0,
 			String... arguments) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 	    String arguments2 = getNormalizedStackTrace(arg0, arguments);
 	    debugLogger.warn(msg, arguments2);
 	}
@@ -496,7 +497,7 @@ public class PolicyLogger {
 	 */
 	public static void warn(MessageCodes msg, String className, Throwable arg0,
 			String... arguments) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 	    String arguments2 = getNormalizedStackTrace(arg0, arguments);
 	    debugLogger.warn(msg, arguments2);
 	}
@@ -507,7 +508,7 @@ public class PolicyLogger {
 	 * @param arg0 log message
 	 */
 	public static void error( String className, String arg0) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		if(ErrorCodeMap.hm.get(MessageCodes.GENERAL_ERROR) != null){
 		    MDC.put(ERROR_CODE, ErrorCodeMap.hm.get(MessageCodes.GENERAL_ERROR).getErrorCode());
 			MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.hm.get(MessageCodes.GENERAL_ERROR).getErrorDesc());
@@ -521,7 +522,7 @@ public class PolicyLogger {
 	 * @param arg0
 	 */
 	public static void error(String arg0) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
 		
 		if(ErrorCodeMap.hm.get(MessageCodes.GENERAL_ERROR) != null){
@@ -537,7 +538,7 @@ public class PolicyLogger {
 	 * @param arg0
 	 */
 	public static void error(Object arg0) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
 		
 		if(ErrorCodeMap.hm.get(MessageCodes.GENERAL_ERROR) != null){
@@ -556,7 +557,7 @@ public class PolicyLogger {
 	 */
 	public static void error(MessageCodes msg, Throwable arg0,
 			String... arguments) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
 		
 		if(ErrorCodeMap.hm.get(msg) != null){
@@ -577,7 +578,7 @@ public class PolicyLogger {
 	 */
 	public static void error(MessageCodes msg, String className, Throwable arg0,
 			String... arguments) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
 		
 		if(ErrorCodeMap.hm.get(msg) != null){
@@ -595,7 +596,7 @@ public class PolicyLogger {
 	 * @param arguments
 	 */
 	public static void error(MessageCodes msg, String... arguments) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
 		
 		if(ErrorCodeMap.hm.get(msg) != null){
@@ -612,7 +613,7 @@ public class PolicyLogger {
 	 * @param arguments
 	 */
 	public static void debug(MessageCodes msg, String... arguments) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		debugLogger.debug(msg, arguments);
 	}
 	
@@ -622,7 +623,7 @@ public class PolicyLogger {
 	 * @param arg0
 	 */
 	public static void debug( String className, String arg0) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		debugLogger.debug(MessageCodes.GENERAL_INFO, arg0);
 	}
 
@@ -631,7 +632,7 @@ public class PolicyLogger {
 	 * @param arg0
 	 */
 	public static void debug(String arg0) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		debugLogger.debug(arg0);
 	}
 	
@@ -641,7 +642,7 @@ public class PolicyLogger {
 	 */
 	public static void debug(Object arg0) {
 
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		debugLogger.debug("" + arg0);
 	}
 	
@@ -652,7 +653,7 @@ public class PolicyLogger {
 	 */
 	public static void audit(String className, Object arg0) {
 		MDC.put(STATUS_CODE, COMPLETE_STATUS);
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		auditLogger.info("" + arg0);
 	}
 
@@ -662,7 +663,7 @@ public class PolicyLogger {
 	 */
 	public static void audit(Object arg0) {
 		MDC.put(STATUS_CODE, COMPLETE_STATUS);
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		auditLogger.info("" + arg0);
 	}
 	
@@ -674,7 +675,7 @@ public class PolicyLogger {
 	 */
 	public static void debug(MessageCodes msg, Throwable arg0,
 			String... arguments) {
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 	    String arguments2 = getNormalizedStackTrace(arg0, arguments);
 		errorLogger.error(msg, arguments2);
 	}
@@ -688,7 +689,7 @@ public class PolicyLogger {
 	 */
 	public static void debug(MessageCodes msg, String className, Throwable arg0,
 			String... arguments) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 	    String arguments2 = getNormalizedStackTrace(arg0, arguments);
 		errorLogger.error(msg, arguments2);
 	}
@@ -746,7 +747,7 @@ public class PolicyLogger {
 	 * @param arg0
 	 */
 	public static void trace( String className, String arg0) {
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		errorLogger.info(MessageCodes.GENERAL_INFO, arg0);
 	}
 		
@@ -756,7 +757,7 @@ public class PolicyLogger {
 	 */
 	public static void trace(Object arg0){
 		
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		 debugLogger.trace(""+arg0);
 	}	
 	/**
@@ -1012,7 +1013,7 @@ public class PolicyLogger {
 		
 		seTimeStamps();
 		
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		String serviceName = MDC.get(MDC_SERVICE_NAME);
 		MDC.put(MDC_KEY_REQUEST_ID, eventId);
 		metricsLogger.info(MessageCodes.RULE_AUDIT_END_INFO,
@@ -1063,7 +1064,7 @@ public class PolicyLogger {
 	 */
 	public static void metrics(String className, Object arg0) {
 		seTimeStamps();
-		MDC.put(CLASS_NAME, className);
+		MDC.put(classNameProp, className);
 		String serviceName = MDC.get(MDC_SERVICE_NAME);
 		metricsLogger.info(MessageCodes.RULE_METRICS_INFO,
 				serviceName, ""+arg0);
@@ -1075,7 +1076,7 @@ public class PolicyLogger {
 	 */
 	public static void metrics(Object arg0) {
 		seTimeStamps();
-		MDC.put(CLASS_NAME, "");
+		MDC.put(classNameProp, "");
 		String serviceName = MDC.get(MDC_SERVICE_NAME);
 		metricsLogger.info(MessageCodes.RULE_METRICS_INFO,
 				serviceName, ""+arg0);
@@ -1101,7 +1102,7 @@ public class PolicyLogger {
         t.printStackTrace(pw);
         String newStValue = sw.toString().replace ('|', '!').replace ("\n", " - ");
         int curSize = arguments == null ? 0 : arguments.length;
-        StringBuffer newArgument = new StringBuffer();
+        StringBuilder newArgument = new StringBuilder();
         for(int i=0; i<curSize; i++) {
         	newArgument.append(arguments[i]);
         	newArgument.append(":");
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java
index cc3dba30..ff097edf 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/EelfLogger.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -226,12 +226,8 @@ public class EelfLogger implements Logger, Serializable {
 	 * @return boolean
 	 */
 	@Override
-	public boolean isAuditEnabled(){		
-		if(PolicyLogger.getAuditLevel() != null && PolicyLogger.getAuditLevel().toString().equals(Level.OFF.toString())){
-			return false;
-		}else {
-			return true;
-		}
+	public boolean isAuditEnabled(){
+		return(PolicyLogger.getAuditLevel() != Level.OFF);
 	}
 	
 	/**
@@ -239,12 +235,8 @@ public class EelfLogger implements Logger, Serializable {
 	 * @return boolean
 	 */
 	@Override
-	public boolean isMetricsEnabled(){			
-		if(PolicyLogger.getMetricsLevel() != null && PolicyLogger.getMetricsLevel().toString().equals(Level.OFF.toString())){
-			return false;
-		}else {
-			return true;
-		}
+	public boolean isMetricsEnabled(){
+		return(PolicyLogger.getMetricsLevel() != Level.OFF);
 	}
 	
 	/**
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java
index 746012d1..30349d5c 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/Logger4J.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -183,7 +183,7 @@ public class Logger4J implements org.onap.policy.common.logging.flexlogger.Logge
 	 */
 	@Override
 	public boolean isAuditEnabled(){
-		return !(PolicyLogger.getAuditLevel() != null && PolicyLogger.getAuditLevel().toString().equals(Level.OFF.toString()));
+		return(PolicyLogger.getAuditLevel() != Level.OFF);
 	}
 	
 	/**
@@ -191,8 +191,8 @@ public class Logger4J implements org.onap.policy.common.logging.flexlogger.Logge
 	 * @return boolean
 	 */
 	@Override
-	public boolean isMetricsEnabled(){			
-		return !(PolicyLogger.getMetricsLevel() != null && PolicyLogger.getMetricsLevel().toString().equals(Level.OFF.toString()));
+	public boolean isMetricsEnabled(){
+		return(PolicyLogger.getMetricsLevel() != Level.OFF);
 	}
 
 	/**
diff --git a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java
index 295e259a..cb005c13 100644
--- a/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java
+++ b/common-logging/src/main/java/org/onap/policy/common/logging/flexlogger/SystemOutLogger.java
@@ -1,8 +1,8 @@
-/*-
+/*
  * ============LICENSE_START=======================================================
  * ONAP-Logging
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,7 +76,7 @@ public class SystemOutLogger implements Logger, Serializable {
 	 */
 	private void initLevel(){
 		
-		if(PolicyLogger.getDebugLevel() != null && PolicyLogger.getDebugLevel().toString().equals(Level.DEBUG.toString())){
+		if(PolicyLogger.getDebugLevel() == Level.DEBUG){
 			isDebugEnabled = true;
 			isInfoEnabled = true;
 			isWarnEnabled = true;
@@ -84,27 +84,27 @@ public class SystemOutLogger implements Logger, Serializable {
 			isDebugEnabled = false;
 		}
 		
-		if(PolicyLogger.getDebugLevel() != null && PolicyLogger.getDebugLevel().toString().equals(Level.INFO.toString())){
+		if(PolicyLogger.getDebugLevel() == Level.INFO){
 			isInfoEnabled = true;
 			isWarnEnabled = true;
 			isDebugEnabled = false;
 		}
 		
-		if(PolicyLogger.getDebugLevel() != null && PolicyLogger.getDebugLevel().toString().equals(Level.OFF.toString())){
+		if(PolicyLogger.getDebugLevel() == Level.OFF){
 			isInfoEnabled = false;
 			isWarnEnabled = false;
 			isDebugEnabled = false;
 		}
 		
-		if(PolicyLogger.getErrorLevel() != null && PolicyLogger.getErrorLevel().toString().equals(Level.OFF.toString())){
+		if(PolicyLogger.getErrorLevel() == Level.OFF){
 			isErrorEnabled = false;
 		}
 
-		if(PolicyLogger.getAuditLevel() != null && PolicyLogger.getAuditLevel().toString().equals(Level.OFF.toString())){
+		if(PolicyLogger.getAuditLevel() == Level.OFF){
 			isAuditEnabled = false;
 		}
 		
-		if(PolicyLogger.getMetricsLevel() != null && PolicyLogger.getMetricsLevel().toString().equals(Level.OFF.toString())){
+		if(PolicyLogger.getMetricsLevel() == Level.OFF){
 			isMetricsEnabled = false;
 		}
 	}
diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfoTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfoTest.java
new file mode 100644
index 00000000..1be10dae
--- /dev/null
+++ b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/DroolsPDPMDCInfoTest.java
@@ -0,0 +1,43 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine - Common Modules
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.common.logging.eelf;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class DroolsPDPMDCInfoTest {
+
+	/**
+	 * Test method for {@link org.onap.policy.common.logging.eelf.DroolsPDPMDCInfo#getMDCInfo()}.
+	 */
+	@Test
+	public void testGetMDCInfo() {
+		DroolsPDPMDCInfo di = new DroolsPDPMDCInfo();
+		
+		assertNotNull(di.getMDCInfo());
+		assertEquals("Policy.droolsPdp", di.getMDCInfo().get(Configuration.MDC_SERVICE_NAME));
+	}
+
+}
diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/eelf/EventDataTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/EventDataTest.java
new file mode 100644
index 00000000..edd57ee1
--- /dev/null
+++ b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/EventDataTest.java
@@ -0,0 +1,174 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine - Common Modules
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.common.logging.eelf;
+
+import static org.junit.Assert.*;
+
+import java.time.Instant;
+
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class EventDataTest {
+	private static final Instant istart = Instant.ofEpochMilli(100000l);
+	private static final Instant iend = Instant.ofEpochMilli(200000l);
+
+	/**
+	 * Test method for {@link EventData#EventData()}.
+	 */
+	@Test
+	public void testEventData() {
+		EventData d = new EventData();
+
+		assertNull(d.getEndTime());
+		assertNull(d.getRequestID());
+		assertNull(d.getStartTime());
+	}
+
+	/**
+	 * Test method for {@link EventData#EventData(String, Instant, Instant)}.
+	 */
+	@Test
+	public void testEventDataStringInstantInstant() {
+		EventData d = new EventData("myreq", istart, iend);
+
+		assertEquals("myreq", d.getRequestID());
+		assertEquals(istart, d.getStartTime());
+		assertEquals(iend, d.getEndTime());
+	}
+
+	/**
+	 * Test method for {@link EventData#getRequestID()} and
+	 * {@link EventData#setRequestID(String)}.
+	 */
+	@Test
+	public void testGetSetRequestID() {
+		EventData d = new EventData();
+		assertNull(d.getRequestID());
+
+		d.setRequestID("abc");
+		assertEquals("abc", d.getRequestID());
+
+		d.setRequestID("def");
+		assertEquals("def", d.getRequestID());
+	}
+
+	/**
+	 * Test method for {@link EventData#getStartTime()} and
+	 * {@link EventData#setStartTime(Instant)}.
+	 */
+	@Test
+	public void testGetSetStartTime() {
+		EventData d = new EventData();
+		assertNull(d.getStartTime());
+
+		d.setStartTime(istart);
+		assertEquals(istart, d.getStartTime());
+
+		d.setStartTime(iend);
+		assertEquals(iend, d.getStartTime());
+
+		// setting end-time should not effect start-time
+		d.setEndTime(istart);
+		assertEquals(iend, d.getStartTime());
+	}
+
+	/**
+	 * Test method for {@link EventData#getEndTime()} and
+	 * {@link EventData#setEndTime(Instant)}.
+	 */
+	@Test
+	public void testGetSetEndTime() {
+		EventData d = new EventData();
+		assertNull(d.getEndTime());
+
+		d.setEndTime(iend);
+		assertEquals(iend, d.getEndTime());
+
+		d.setEndTime(istart);
+		assertEquals(istart, d.getEndTime());
+
+		// setting start-time should not effect end-time
+		d.setStartTime(iend);
+		assertEquals(istart, d.getEndTime());
+	}
+
+	/**
+	 * Test method for {@link EventData#toString()}.
+	 */
+	@Test
+	public void testToString() {
+		EventData d = new EventData("myreq", istart, iend);
+		assertEquals("myreq Starting Time : 1970-01-01T00:01:40Z Ending Time : 1970-01-01T00:03:20Z", d.toString());
+	}
+
+	/**
+	 * Test method for {@link EventData#hashCode()}.
+	 */
+	@Test
+	public void testHashCode() {
+		int hc1 = new EventData("abc", istart, iend).hashCode();
+		
+		assertNotEquals(hc1, new EventData("abd", istart, iend).hashCode());
+		assertEquals(hc1, new EventData("abc", iend, istart).hashCode());
+	}
+
+	/**
+	 * Test method for {@link EventData#equals(Object)}.
+	 */
+	@Test
+	public void testEqualsObject() {
+		EventData d1 = new EventData("abc", istart, iend);
+		EventData d2 = new EventData("abd", istart, iend);
+		EventData d3 = new EventData("abc", iend, istart);
+
+		// same object
+		assertTrue(d1.equals(d1));
+		
+		// compare with null
+		assertFalse(d1.equals(null));
+		
+		// compare with request id
+		assertTrue(d1.equals("abc"));
+		assertFalse(d1.equals("abd"));
+
+		// compare with int - different class type
+		assertFalse(d1.equals(10));
+		
+		// "this" has null request id
+		assertFalse(new EventData().equals(d1));
+
+		// both null
+		assertTrue(new EventData().equals(new EventData()));
+		
+		// this request id is not null, other is null
+		assertFalse(d1.equals(new EventData()));
+		
+		// neither null, same
+		assertTrue(d1.equals(d3));
+		
+		// neither null, diff
+		assertFalse(d1.equals(d2));
+	}
+
+}
diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandlerTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandlerTest.java
new file mode 100644
index 00000000..68fd52de
--- /dev/null
+++ b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/EventTrackInfoHandlerTest.java
@@ -0,0 +1,130 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine - Common Modules
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.common.logging.eelf;
+
+import static org.junit.Assert.*;
+
+import java.time.Instant;
+import java.util.concurrent.ConcurrentMap;
+
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class EventTrackInfoHandlerTest {
+	
+	private static final Instant inow = Instant.now();
+	private static final Instant iexpired = Instant.ofEpochMilli(10000l);
+	
+	private static final EventData data1 = new EventData("abc", inow, inow);
+	private static final EventData data2 = new EventData("def", inow, inow);
+	
+	private static EventTrackInfo tracker;
+	private static ConcurrentMap<String, EventData> info;
+	
+	private EventTrackInfoHandler hdlr;
+	
+	@BeforeClass
+	public static void setUpBeforeClass() {
+		tracker = PolicyLogger.getEventTracker();
+		info = tracker.getEventInfo();
+	}
+
+	@Before
+	public void setUp() {
+		info.clear();
+		
+		hdlr = new EventTrackInfoHandler();
+	}
+
+	@Test
+	public void testNoEvents() {
+		hdlr.run();
+		assertEquals(0, info.size());
+	}
+
+	@Test
+	public void testNothingExpired() {
+		tracker.storeEventData(data1);
+		tracker.storeEventData(data2);
+		
+		hdlr.run();
+		assertEquals(2, info.size());
+	}
+	
+	@Test
+	public void testSomeExpired() {
+		// not expired
+		tracker.storeEventData(data1);
+		tracker.storeEventData(data2);
+		
+		// start time is expired
+		tracker.storeEventData(new EventData("expiredA", iexpired, inow));
+		tracker.storeEventData(new EventData("expiredB", iexpired, inow));
+		
+		// end time is expired, but that has no impact - these should be retained
+		EventData oka = new EventData("okA", inow, iexpired);
+		EventData okb = new EventData("okB", inow, iexpired);
+		
+		tracker.storeEventData(oka);
+		tracker.storeEventData(okb);
+		
+		hdlr.run();
+		assertEquals(4, info.size());
+		
+		assertEquals(data1, info.get("abc"));
+		assertEquals(data2, info.get("def"));
+		assertEquals(oka, info.get("okA"));
+		assertEquals(okb, info.get("okB"));
+	}
+	
+	@Test
+	public void testMultipleRuns() {
+		
+		hdlr.run();
+		assertEquals(0, info.size());
+		
+		// not expired
+		tracker.storeEventData(data1);
+		tracker.storeEventData(data2);
+		
+		hdlr.run();
+		assertEquals(2, info.size());
+		
+		// start time is expired
+		tracker.storeEventData(new EventData("expiredA", iexpired, inow));
+		tracker.storeEventData(new EventData("expiredB", iexpired, inow));
+		
+		// end time is expired, but that has no impact - these should be retained
+		tracker.storeEventData(new EventData("okA", inow, iexpired));
+		tracker.storeEventData(new EventData("okB", inow, iexpired));
+		
+		hdlr.run();
+		assertEquals(4, info.size());
+		
+		hdlr.run();
+		assertEquals(4, info.size());
+	}
+
+}
diff --git a/common-logging/src/test/java/org/onap/policy/common/logging/eelf/EventTrackInfoTest.java b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/EventTrackInfoTest.java
new file mode 100644
index 00000000..3690bc5c
--- /dev/null
+++ b/common-logging/src/test/java/org/onap/policy/common/logging/eelf/EventTrackInfoTest.java
@@ -0,0 +1,130 @@
+/*
+ * ============LICENSE_START=======================================================
+ * ONAP Policy Engine - Common Modules
+ * ================================================================================
+ * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.common.logging.eelf;
+
+import static org.junit.Assert.*;
+
+import java.time.Instant;
+
+import org.junit.Before;
+import org.junit.Test;
+
+/**
+ * 
+ */
+public class EventTrackInfoTest {
+	
+	private static final Instant istart = Instant.ofEpochMilli(100000l);
+	private static final Instant iend = Instant.ofEpochMilli(200000l);
+	
+	private static final EventData data1 = new EventData("abc", istart, iend);
+	private static final EventData data2 = new EventData("def", iend, istart);
+	
+	private EventTrackInfo info;
+	
+	@Before
+	public void setUp() {
+		info = new EventTrackInfo();
+		
+	}
+
+	/**
+	 * Test method for {@link EventTrackInfo#EventTrackInfo()}.
+	 */
+	@Test
+	public void testEventTrackInfo() {
+		assertNotNull(info.getEventInfo());
+	}
+
+	/**
+	 * Test method for {@link EventTrackInfo#getEventDataByRequestID(String)}.
+	 */
+	@Test
+	public void testGetEventDataByRequestID() {
+		info.storeEventData(data1);
+		info.storeEventData(data2);
+
+		assertTrue(data1 == info.getEventDataByRequestID("abc"));
+		assertTrue(data2 == info.getEventDataByRequestID("def"));
+		assertNull(info.getEventDataByRequestID("hello"));
+	}
+
+	/**
+	 * Test method for {@link EventTrackInfo#storeEventData(EventData)}.
+	 */
+	@Test
+	public void testStoreEventData() {
+		// should ignore null
+		info.storeEventData(null);
+		assertTrue(info.getEventInfo().isEmpty());
+		
+		// should ignore if request id is null or empty
+		info.storeEventData(new EventData());
+		info.storeEventData(new EventData("", istart, iend));
+		assertTrue(info.getEventInfo().isEmpty());
+		
+		info.storeEventData(data1);
+		info.storeEventData(data2);
+		assertEquals(2, info.getEventInfo().size());
+
+		// look-up by request id
+		assertTrue(data1 == info.getEventDataByRequestID("abc"));
+		assertTrue(data2 == info.getEventDataByRequestID("def"));
+		
+		// doesn't replace existing value
+		info.storeEventData(new EventData("abc", iend, istart));
+		assertEquals(2, info.getEventInfo().size());
+		assertTrue(data1 == info.getEventDataByRequestID("abc"));
+		assertTrue(data2 == info.getEventDataByRequestID("def"));
+	}
+
+	/**
+	 * Test method for {@link EventTrackInfo#remove(String)}.
+	 */
+	@Test
+	public void testRemove() {
+		info.storeEventData(data1);
+		info.storeEventData(data2);
+		
+		info.remove("abc");
+		
+		// ensure only that item was removed
+		assertEquals(1, info.getEventInfo().size());
+
+		// look-up by request id
+		assertNull(info.getEventDataByRequestID("abc"));
+		assertTrue(data2 == info.getEventDataByRequestID("def"));
+	}
+
+	/**
+	 * Test method for {@link EventTrackInfo#getEventInfo()}.
+	 */
+	@Test
+	public void testGetEventInfo() {		
+		info.storeEventData(data1);
+		info.storeEventData(data2);
+		
+		assertEquals(2, info.getEventInfo().size());
+		assertTrue(data1 == info.getEventInfo().get("abc"));
+		assertTrue(data2 == info.getEventInfo().get("def"));
+	}
+
+}