summaryrefslogtreecommitdiffstats
path: root/common-logging/src/main
diff options
context:
space:
mode:
authormmis <michael.morris@ericsson.com>2018-02-23 11:32:19 +0000
committermmis <michael.morris@ericsson.com>2018-02-23 16:32:22 +0000
commitcfb9b5f1cfe7d5c319312d8d067ae4c2a8d8d93c (patch)
tree2336575dec468b49d8dcb34f4bf719c6b03a7566 /common-logging/src/main
parent8de76c909737ba1b59526f96610f961f380ddc1f (diff)
Added junit tests in ONAP-Logging
Added junit tests to org.onap.policy.common.logging.eelf package in ONAP-Logging Issue-ID: POLICY-582 Change-Id: Ifca9c38d8b8703b183c25d891d6ed257eb21c91b Signed-off-by: mmis <michael.morris@ericsson.com>
Diffstat (limited to 'common-logging/src/main')
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/ErrorCodeMap.java18
-rw-r--r--common-logging/src/main/java/org/onap/policy/common/logging/eelf/PolicyLogger.java102
2 files changed, 48 insertions, 72 deletions
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 4df86a4d..845c5caf 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
@@ -28,9 +28,8 @@ import java.util.EnumMap;
*
*/
public class ErrorCodeMap {
-
- protected static final EnumMap<MessageCodes, ErrorCodeInfo> hm = new EnumMap<>(MessageCodes.class);
+ private 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";
@@ -79,7 +78,12 @@ public class ErrorCodeMap {
hm.put(MessageCodes.ERROR_UNKNOWN, new ErrorCodeInfo(ERROR_UNKNOWN, ERROR_UNKNOWN_DESCRIPTION));
hm.put(MessageCodes.ERROR_AUDIT, new ErrorCodeInfo(ERROR_AUDIT, ERROR_AUDIT_DESCRIPTION));
}
- private ErrorCodeMap() {};
+ private ErrorCodeMap() {}
+
+ public static ErrorCodeInfo getErrorCodeInfo(MessageCodes messageCode) {
+ return hm.get(messageCode);
+ }
+
static class ErrorCodeInfo {
private String errorCode;
@@ -94,17 +98,9 @@ public class ErrorCodeMap {
return errorCode;
}
- public void setErrorCode(String errorCode) {
- this.errorCode = errorCode;
- }
-
public String getErrorDesc() {
return errorDesc;
}
-
- public void setErrorDesc(String errorDesc) {
- this.errorDesc = errorDesc;
- }
}
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 58db1da4..3d351722 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
@@ -361,16 +361,6 @@ public class PolicyLogger {
/**
* Records the Info event with String [] arguments
* @param msg
- * @param arguments
- */
- public static void info(MessageCodes msg, String... arguments) {
- MDC.put(classNameProp, "");
- debugLogger.info(msg, arguments);
- }
-
- /**
- * Records the Info event with String [] arguments
- * @param msg
* @param className
* @param arguments
*/
@@ -453,16 +443,6 @@ public class PolicyLogger {
MDC.put(classNameProp, "");
debugLogger.warn(MessageCodes.GENERAL_WARNING, arg0);
}
-
- /**
- * Records a message with passed in message code and a list of string values
- * @param msg
- * @param arguments
- */
- public static void warn(MessageCodes msg, String... arguments) {
- MDC.put(classNameProp, "");
- debugLogger.warn(msg, arguments);
- }
/**
* Records a message with passed in message code, class name and a list of string values
@@ -509,9 +489,9 @@ public class PolicyLogger {
*/
public static void error( String className, String arg0) {
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());
+ if(ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorDesc());
}
errorLogger.error(MessageCodes.GENERAL_ERROR, arg0);
@@ -525,9 +505,9 @@ public class PolicyLogger {
MDC.put(classNameProp, "");
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- 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());
+ if(ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorDesc());
}
errorLogger.error(MessageCodes.GENERAL_ERROR, arg0);
@@ -541,9 +521,9 @@ public class PolicyLogger {
MDC.put(classNameProp, "");
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- 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());
+ if(ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorDesc());
}
errorLogger.error(MessageCodes.GENERAL_ERROR, "" + arg0);
@@ -560,9 +540,9 @@ public class PolicyLogger {
MDC.put(classNameProp, "");
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- if(ErrorCodeMap.hm.get(msg) != null){
- MDC.put(ERROR_CODE, ErrorCodeMap.hm.get(msg).getErrorCode());
- MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.hm.get(msg).getErrorDesc());
+ if(ErrorCodeMap.getErrorCodeInfo(msg) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(msg).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(msg).getErrorDesc());
}
String arguments2 = getNormalizedStackTrace(arg0, arguments);
@@ -581,9 +561,9 @@ public class PolicyLogger {
MDC.put(classNameProp, className);
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- if(ErrorCodeMap.hm.get(msg) != null){
- MDC.put(ERROR_CODE, ErrorCodeMap.hm.get(msg).getErrorCode());
- MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.hm.get(msg).getErrorDesc());
+ if(ErrorCodeMap.getErrorCodeInfo(msg) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(msg).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(msg).getErrorDesc());
}
String arguments2 = getNormalizedStackTrace(arg0, arguments);
@@ -599,9 +579,9 @@ public class PolicyLogger {
MDC.put(classNameProp, "");
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- if(ErrorCodeMap.hm.get(msg) != null){
- MDC.put(ERROR_CODE, ErrorCodeMap.hm.get(msg).getErrorCode());
- MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.hm.get(msg).getErrorDesc());
+ if(ErrorCodeMap.getErrorCodeInfo(msg) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(msg).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(msg).getErrorDesc());
}
errorLogger.error(msg, arguments);
@@ -677,7 +657,7 @@ public class PolicyLogger {
String... arguments) {
MDC.put(classNameProp, "");
String arguments2 = getNormalizedStackTrace(arg0, arguments);
- errorLogger.error(msg, arguments2);
+ debugLogger.debug(msg, arguments2);
}
/**
@@ -691,7 +671,7 @@ public class PolicyLogger {
String... arguments) {
MDC.put(classNameProp, className);
String arguments2 = getNormalizedStackTrace(arg0, arguments);
- errorLogger.error(msg, arguments2);
+ debugLogger.debug(msg, arguments2);
}
/**
* returns true for enabled, false for not enabled
@@ -748,7 +728,7 @@ public class PolicyLogger {
*/
public static void trace( String className, String arg0) {
MDC.put(classNameProp, className);
- errorLogger.info(MessageCodes.GENERAL_INFO, arg0);
+ debugLogger.trace(MessageCodes.GENERAL_INFO, arg0);
}
/**
@@ -1172,8 +1152,8 @@ public class PolicyLogger {
String debugLevelProp = loggerProperties.getProperty("debugLogger.level","INFO");
String metricsLevelProp = loggerProperties.getProperty("metricsLogger.level","ON");
- String auditLevelProp = loggerProperties.getProperty("error.level","ON");
- String errorLevelProp = loggerProperties.getProperty("audit.level","ON");
+ String auditLevelProp = loggerProperties.getProperty("audit.level","ON");
+ String errorLevelProp = loggerProperties.getProperty("error.level","ON");
component = loggerProperties.getProperty("policy.component","DROOLS");
String overrideLogbackLevel = loggerProperties.getProperty("override.logback.level.setup");
@@ -1240,9 +1220,9 @@ public class PolicyLogger {
}else {
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- 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());
+ if(ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorDesc());
}
errorLogger.error("failed to get the timer.delay.time, so use its default value: " + timerDelayTime);
@@ -1254,9 +1234,9 @@ public class PolicyLogger {
}else {
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- 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());
+ if(ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorDesc());
}
errorLogger.error("failed to get the check.interval, so use its default value: " + checkInterval);
@@ -1269,9 +1249,9 @@ public class PolicyLogger {
}else {
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- 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());
+ if(ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorDesc());
}
errorLogger.error("failed to get the event.expired.time, so use its default value: " + expiredTime);
@@ -1283,9 +1263,9 @@ public class PolicyLogger {
}else {
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- 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());
+ if(ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorDesc());
}
errorLogger.error("failed to get the concurrentHashMap.limit, so use its default value: " + concurrentHashMapLimit);
@@ -1297,9 +1277,9 @@ public class PolicyLogger {
}else {
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- 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());
+ if(ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorDesc());
}
errorLogger.error("failed to get the stop.check.point, so use its default value: " + stopCheckPoint);
@@ -1350,9 +1330,9 @@ public class PolicyLogger {
}catch(Exception e){
MDC.put(ERROR_CATEGORY, ERROR_CATEGORY_VALUE);
- 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());
+ if(ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR) != null){
+ MDC.put(ERROR_CODE, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorCode());
+ MDC.put(ERROR_DESCRIPTION, ErrorCodeMap.getErrorCodeInfo(MessageCodes.GENERAL_ERROR).getErrorDesc());
}
errorLogger.error("failed to get the policyLogger.properties, so use their default values",e);