From 8ba29c4639995f8911ef4f10ac5c5047d0cc8bfc Mon Sep 17 00:00:00 2001 From: vempo Date: Wed, 10 Jan 2018 10:01:27 +0200 Subject: Merged two MDC related classes Change-Id: I0efda7c99972ce133e2a4045b1ac07fe062d6445 Issue-ID: SDC-772 Signed-off-by: vempo --- .../logging/context/impl/MdcDataErrorMessage.java | 24 ++++++++++++---------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core') diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/context/impl/MdcDataErrorMessage.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/context/impl/MdcDataErrorMessage.java index cdaf597aa2..a9244e3772 100644 --- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/context/impl/MdcDataErrorMessage.java +++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/context/impl/MdcDataErrorMessage.java @@ -16,15 +16,17 @@ package org.openecomp.sdc.logging.context.impl; -import org.openecomp.sdc.logging.context.MdcData; import org.openecomp.sdc.logging.types.LoggerConstants; import org.slf4j.MDC; -public class MdcDataErrorMessage extends MdcData { - private String targetEntity; - private String targetServiceName; - private String errorDescription; +public class MdcDataErrorMessage { + + private final String targetEntity; + private final String targetServiceName; + private final String errorDescription; + private final String level; + private final String errorCode; /** * Instantiates a new Mdc data error message. @@ -37,7 +39,8 @@ public class MdcDataErrorMessage extends MdcData { */ public MdcDataErrorMessage(String targetEntity, String targetServiceName, String errorCategory, String errorCode, String errorDescription) { - super(errorCategory, errorCode); + this.level = errorCategory; + this.errorCode = errorCode; this.targetEntity = targetEntity; this.targetServiceName = targetServiceName; this.errorDescription = errorDescription; @@ -57,14 +60,13 @@ public class MdcDataErrorMessage extends MdcData { public static void createErrorMessageAndUpdateMdc(String targetEntity, String targetServiceName, String level, String errorCode, String errorDescription) { - MdcDataErrorMessage mdcDataErrorMessage = - new MdcDataErrorMessage(targetEntity, targetServiceName, level, errorCode, - errorDescription); + // don't remove this line although it seems useless + new MdcDataErrorMessage(targetEntity, targetServiceName, level, errorCode, errorDescription); } - @Override public void setMdcValues() { - super.setMdcValues(); + MDC.put(LoggerConstants.ERROR_CATEGORY, this.level); + MDC.put(LoggerConstants.ERROR_CODE, this.errorCode); MDC.put(LoggerConstants.TARGET_ENTITY, this.targetEntity); MDC.put(LoggerConstants.TARGET_SERVICE_NAME, this.targetServiceName); MDC.put(LoggerConstants.ERROR_DESCRIPTION, this.errorDescription); -- cgit 1.2.3-korg