Update Logging

[so.git] / common / src / main / java / org / onap / so / logging / jaxrs / filter / MDCTaskDecorator.java

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/SDNCClientLogResponseTest.java b/common/src/main/java/org/onap/so/logging/jaxrs/filter/MDCTaskDecorator.java
similarity index 59%
rename from bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/SDNCClientLogResponseTest.java
rename to common/src/main/java/org/onap/so/logging/jaxrs/filter/MDCTaskDecorator.java
index e28c465..cc2ccb5 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/sdnc/SDNCClientLogResponseTest.java
+++ b/common/src/main/java/org/onap/so/logging/jaxrs/filter/MDCTaskDecorator.java
@@ -18,26 +18,25 @@
  * ============LICENSE_END=========================================================
  */
 
-package org.onap.so.client.sdnc;
+package org.onap.so.logging.jaxrs.filter;
 
-import static org.junit.Assert.*;
+import java.util.Map;
 
-import java.util.LinkedHashMap;
-import java.util.Optional;
+import org.slf4j.MDC;
+import org.springframework.core.task.TaskDecorator;
 
-import org.junit.Test;
-
-public class SDNCClientLogResponseTest {
-
-       private SDNCClient sdncClient = new SDNCClient();
-
-    @Test
-    public void logSDNCResponseTest() {
-       LinkedHashMap<String, String> output = new LinkedHashMap<>();
-       output.put("response-code", "404");
-       output.put("response-message", "not found");
-       Optional<String> response = sdncClient.logSDNCResponse(output);
-       assertEquals(true, response.isPresent());
-       assertEquals("{\"response-code\":\"404\",\"response-message\":\"not found\"}",response.get());
-    }
-}
+public class MDCTaskDecorator implements TaskDecorator {
+ 
+  @Override
+  public Runnable decorate(Runnable runnable) {
+    Map<String, String> contextMap = MDC.getCopyOfContextMap();
+    return () -> {
+      try {
+        MDC.setContextMap(contextMap);
+        runnable.run();
+      } finally {
+        MDC.clear();
+      }
+    };
+  }
+}
\ No newline at end of file