From 25b428cb04f7f1a986465dc6ed1d1fe652bdb7c0 Mon Sep 17 00:00:00 2001
From: Collin Smith <collinsmith70@gmail.com>
Date: Sun, 26 Jul 2020 02:12:51 -0700
Subject: [PATCH] Rolled CTX functions into Log

---
 core/src/com/riiablo/log/CTX.java | 33 -------------------------------
 core/src/com/riiablo/log/Log.java | 13 ++++++++++++
 2 files changed, 13 insertions(+), 33 deletions(-)
 delete mode 100644 core/src/com/riiablo/log/CTX.java

diff --git a/core/src/com/riiablo/log/CTX.java b/core/src/com/riiablo/log/CTX.java
deleted file mode 100644
index 438d30bb..00000000
--- a/core/src/com/riiablo/log/CTX.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.riiablo.log;
-
-import org.apache.logging.log4j.ThreadContext;
-
-import com.badlogic.gdx.utils.OrderedMap;
-
-// TODO: support ThreadLocal or convert into ThreadContextMap impl
-public enum CTX {
-  INSTANCE;
-
-  public static void put(String key, String value) {
-    ThreadContext.put(key, value);
-//    INSTANCE.map.put(key, value);
-  }
-
-  public static void remove(String key) {
-    ThreadContext.remove(key);
-//    INSTANCE.map.remove(key);
-  }
-
-  public static void clear() {
-    ThreadContext.clearMap();
-//    INSTANCE.map.clear();
-  }
-
-  @Deprecated
-  public static OrderedMap<String, String> map() {
-    return null;
-//    return INSTANCE.map;
-  }
-
-//  final OrderedMap<String, String> map = new OrderedMap<>();
-}
diff --git a/core/src/com/riiablo/log/Log.java b/core/src/com/riiablo/log/Log.java
index 3a77109c..5fbf0a4d 100644
--- a/core/src/com/riiablo/log/Log.java
+++ b/core/src/com/riiablo/log/Log.java
@@ -1,6 +1,7 @@
 package com.riiablo.log;
 
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.ThreadContext;
 import org.apache.logging.log4j.message.Message;
 import org.apache.logging.log4j.message.MessageFactory;
 import org.apache.logging.log4j.message.StringFormatterMessageFactory;
@@ -31,4 +32,16 @@ public class Log {
   public static void errorf(Logger logger, Throwable t, String format, Object... args) {
     logger.error(createMessage(format, args), t);
   }
+
+  public static void put(String key, String value) {
+    ThreadContext.put(key, value);
+  }
+
+  public static void remove(String key) {
+    ThreadContext.remove(key);
+  }
+
+  public static void clearMap() {
+    ThreadContext.clearMap();
+  }
 }