diff options
Diffstat (limited to 'policy-utils/src/main/java/org/onap')
3 files changed, 4 insertions, 36 deletions
diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransaction.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransaction.java index d56e63e6..a2cf07fb 100644 --- a/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransaction.java +++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransaction.java @@ -187,11 +187,6 @@ public interface MdcTransaction { MdcTransaction setProcessKey(String processKey); /** - * sets alert severity. - */ - MdcTransaction setAlertSeverity(String alertSeverity); - - /** * sets client ip address. */ MdcTransaction setClientIpAddress(String clientIpAddress); @@ -232,11 +227,6 @@ public interface MdcTransaction { String getClientIpAddress(); /** - * get alert severity. - */ - String getAlertSeverity(); - - /** * get process key. */ String getProcessKey(); diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransactionConstants.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransactionConstants.java index ba335958..eb37d0c7 100644 --- a/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransactionConstants.java +++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransactionConstants.java @@ -139,11 +139,6 @@ public class MdcTransactionConstants { public static final String REMOTE_HOST = "RemoteHost"; /** - * Alert Severity Both transactions and subtransactions will have its own copy. - */ - public static final String ALERT_SEVERITY = "AlertSeverity"; - - /** * Target Virtual Entity Both transactions and subtransactions will have its own copy. */ public static final String TARGET_VIRTUAL_ENTITY = "TargetVirtualEntity"; diff --git a/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransactionImpl.java b/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransactionImpl.java index ac90ab96..4e1690ba 100644 --- a/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransactionImpl.java +++ b/policy-utils/src/main/java/org/onap/policy/drools/utils/logging/MdcTransactionImpl.java @@ -20,7 +20,6 @@ package org.onap.policy.drools.utils.logging; -import static org.onap.policy.drools.utils.logging.MdcTransactionConstants.ALERT_SEVERITY; import static org.onap.policy.drools.utils.logging.MdcTransactionConstants.BEGIN_TIMESTAMP; import static org.onap.policy.drools.utils.logging.MdcTransactionConstants.CLIENT_IP_ADDRESS; import static org.onap.policy.drools.utils.logging.MdcTransactionConstants.DEFAULT_HOSTIP; @@ -94,7 +93,6 @@ class MdcTransactionImpl implements MdcTransaction { private String statusCode; private String responseCode; private String responseDescription; - private String theSeverity; private String alertSeverity; private String targetEntity; @@ -158,7 +156,6 @@ class MdcTransactionImpl implements MdcTransaction { */ public MdcTransactionImpl(MdcTransaction transaction) { MDC.clear(); - this.setAlertSeverity(transaction.getAlertSeverity()); this.setClientIpAddress(transaction.getClientIpAddress()); this.setElapsedTime(transaction.getElapsedTime()); this.setEndTime(transaction.getEndTime()); @@ -205,7 +202,6 @@ class MdcTransactionImpl implements MdcTransaction { MDC.remove(PROCESS_KEY); MDC.remove(CLIENT_IP_ADDRESS); MDC.remove(REMOTE_HOST); - MDC.remove(ALERT_SEVERITY); MDC.remove(TARGET_VIRTUAL_ENTITY); return this; @@ -246,8 +242,7 @@ class MdcTransactionImpl implements MdcTransaction { setMdc(STATUS_CODE, this.statusCode); setMdc(RESPONSE_CODE, this.responseCode); setMdc(RESPONSE_DESCRIPTION, this.responseDescription); - setMdc(SEVERITY, this.theSeverity); - setMdc(ALERT_SEVERITY, this.alertSeverity); + setMdc(SEVERITY, this.alertSeverity); setMdc(TARGET_ENTITY, this.targetEntity); setMdc(TARGET_SERVICE_NAME, this.targetServiceName); setMdc(TARGET_VIRTUAL_ENTITY, this.targetVirtualEntity); @@ -306,12 +301,6 @@ class MdcTransactionImpl implements MdcTransaction { } @Override - public MdcTransaction setAlertSeverity(String alertSeverity) { - this.alertSeverity = alertSeverity; - return this; - } - - @Override public MdcTransaction setClientIpAddress(String clientIpAddress) { this.clientIpAddress = clientIpAddress; return this; @@ -354,11 +343,6 @@ class MdcTransactionImpl implements MdcTransaction { } @Override - public String getAlertSeverity() { - return this.alertSeverity; - } - - @Override public String getProcessKey() { return this.processKey; } @@ -451,7 +435,7 @@ class MdcTransactionImpl implements MdcTransaction { @Override public MdcTransaction setSeverity(String severity) { - this.theSeverity = severity; + this.alertSeverity = severity; return this; } @@ -500,7 +484,7 @@ class MdcTransactionImpl implements MdcTransaction { @Override public String getSeverity() { - return theSeverity; + return alertSeverity; } @Override @@ -651,8 +635,7 @@ class MdcTransactionImpl implements MdcTransaction { sb.append(", statusCode='").append(statusCode).append('\''); sb.append(", responseCode='").append(responseCode).append('\''); sb.append(", responseDescription='").append(responseDescription).append('\''); - sb.append(", severity='").append(theSeverity).append('\''); - sb.append(", alertSeverity='").append(alertSeverity).append('\''); + sb.append(", severity='").append(alertSeverity).append('\''); sb.append(", targetEntity='").append(targetEntity).append('\''); sb.append(", targetServiceName='").append(targetServiceName).append('\''); sb.append(", targetVirtualEntity='").append(targetVirtualEntity).append('\''); |