make MDCHelper more testing friendly

Signed-off-by: Ceki Gulcu <ceki@qos.ch>
qos-ch · Dec 6, 2023 · 2597366 · 2597366
1 parent ff981fd
commit 2597366
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/slf4j-api/src/main/java/org/slf4j/MDCHelper.java b/slf4j-api/src/main/java/org/slf4j/MDCHelper.java
@@ -24,6 +24,8 @@
  */
 package org.slf4j;
 
+import org.slf4j.spi.MDCAdapter;
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -40,7 +42,14 @@ public class MDCHelper  {
      */
     Set<String> keySet = new HashSet();
 
+    MDCAdapter mdcAdapter;
+
     public MDCHelper() {
+        mdcAdapter = MDC.getMDCAdapter();
+    }
+
+    MDCHelper(MDCAdapter mdcAdapter) {
+        this.mdcAdapter = mdcAdapter;
     }
 
     /**
@@ -52,7 +61,7 @@ public MDCHelper() {
      * @return  this instance
      */
     public MDCHelper put(String key, String value) {
-        MDC.put(key, value);
+        mdcAdapter.put(key, value);
         keySet.add(key);
         return this;
     }
@@ -94,7 +103,7 @@ public MDCHelper addKeys(String... keys) {
      */
     public void removeSet() {
         for(String key: keySet) {
-            MDC.remove(key);
+            mdcAdapter.remove(key);
         }
         keySet.clear();
     }