1 files changed, 7 insertions, 41 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggingServiceProvider.java b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggingServiceProvider.java
index 6f69aae1b6..1a5d6facc2 100644
--- a/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggingServiceProvider.java
+++ b/openecomp-be/lib/openecomp-sdc-logging-lib/openecomp-sdc-logging-core/src/main/java/org/openecomp/sdc/logging/slf4j/SLF4JLoggingServiceProvider.java
@@ -16,39 +16,20 @@
 
 package org.openecomp.sdc.logging.slf4j;
 
-import static org.openecomp.sdc.logging.slf4j.SLF4JLoggingServiceProvider.ContextField.PARTNER_NAME;
-import static org.openecomp.sdc.logging.slf4j.SLF4JLoggingServiceProvider.ContextField.REQUEST_ID;
-import static org.openecomp.sdc.logging.slf4j.SLF4JLoggingServiceProvider.ContextField.SERVICE_NAME;
-
 import java.util.Objects;
 import java.util.concurrent.Callable;
+import org.openecomp.sdc.logging.api.ContextData;
 import org.openecomp.sdc.logging.api.Logger;
 import org.openecomp.sdc.logging.spi.LoggingServiceProvider;
-import org.slf4j.MDC;
 
 /**
+ * Uses SLF4J as backend for logging service.
+ *
  * @author evitaliy
  * @since 13 Sep 2016
  */
 public class SLF4JLoggingServiceProvider implements LoggingServiceProvider {
 
-    enum ContextField {
-
-        REQUEST_ID("RequestId"),
-        SERVICE_NAME("ServiceName"),
-        PARTNER_NAME("PartnerName");
-
-        private final String key;
-
-        ContextField(String key) {
-            this.key = key;
-        }
-
-        String asKey() {
-            return key;
-        }
-    }
-
     @Override
     public Logger getLogger(String className) {
         Objects.requireNonNull(className, "Name cannot be null");
@@ -62,29 +43,14 @@ public class SLF4JLoggingServiceProvider implements LoggingServiceProvider {
     }
 
     @Override
-    public void putRequestId(String requestId) {
-        put(REQUEST_ID.key, requestId);
-    }
-
-    @Override
-    public void putServiceName(String serviceName) {
-        put(SERVICE_NAME.key, serviceName);
-    }
-
-    @Override
-    public void putPartnerName(String partnerName) {
-        put(PARTNER_NAME.key, partnerName);
+    public void put(ContextData contextData) {
+        Objects.requireNonNull(contextData, "Context data cannot be null");
+        MDCDelegate.put(new RequestContextProvider(contextData), new GlobalContextProvider());
     }
 
     @Override
     public void clear() {
-        for (ContextField s : ContextField.values()) {
-            MDC.remove(s.key);
-        }
-    }
-
-    private void put(String key, String value) {
-        MDC.put(key, Objects.requireNonNull(value, key));
+        MDCDelegate.clear();
     }
 
     @Override