aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be/lib
diff options
context:
space:
mode:
authorvempo <vitaliy.emporopulo@amdocs.com>2018-01-10 10:01:27 +0200
committerAvi Gaffa <avi.gaffa@amdocs.com>2018-01-10 11:58:40 +0000
commit8ba29c4639995f8911ef4f10ac5c5047d0cc8bfc (patch)
treeeb328f4a2a4b0b9e811a42096b29e12780675818 /openecomp-be/lib
parent93a3d55ec5529a3f3950b92e3a78125928f60379 (diff)
Merged two MDC related classes
Change-Id: I0efda7c99972ce133e2a4045b1ac07fe062d6445 Issue-ID: SDC-772 Signed-off-by: vempo <vitaliy.emporopulo@amdocs.com>
Diffstat (limited to 'openecomp-be/lib')
-rw-r--r--openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/context/MdcData.java55
-rw-r--r--openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/context/impl/MdcDataErrorMessage.java24
2 files changed, 13 insertions, 66 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/context/MdcData.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/context/MdcData.java
deleted file mode 100644
index c88eb54439..0000000000
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-api/src/main/java/org/openecomp/sdc/logging/context/MdcData.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright © 2016-2017 European Support Limited
- *
- * 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.
- */
-
-package org.openecomp.sdc.logging.context;
-
-import org.openecomp.sdc.logging.types.LoggerConstants;
-import org.slf4j.MDC;
-
-
-public abstract class MdcData {
- private String level;
- private String errorCode;
-
- MdcData() {
- }
-
- public MdcData(String level, String errorCode) {
- this.level = level;
- this.errorCode = errorCode;
- }
-
- public void setMdcValues() {
- MDC.put(LoggerConstants.ERROR_CATEGORY, this.level);
- MDC.put(LoggerConstants.ERROR_CODE, this.errorCode);
- }
-
- public String getLevel() {
- return level;
- }
-
- public void setLevel(String level) {
- this.level = level;
- }
-
- public String getErrorCode() {
- return errorCode;
- }
-
- public void setErrorCode(String errorCode) {
- this.errorCode = errorCode;
- }
-}
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);