App initialization convenience methods

1 files changed, 8 insertions, 11 deletions

diff --git a/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala b/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala
index 9f8db3e..f39f31d 100644
--- a/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala
+++ b/src/main/scala/xyz/driver/core/logging/MdcExecutionContext.scala
@@ -13,17 +13,14 @@ import scala.concurrent.ExecutionContext
 class MdcExecutionContext(executionContext: ExecutionContext) extends ExecutionContext {
   override def execute(runnable: Runnable): Unit = {
     val callerMdc = MDC.getCopyOfContextMap
-    executionContext.execute(new Runnable {
-      def run(): Unit = {
-        // copy caller thread diagnostic context to execution thread
-        // scalastyle:off
-        if (callerMdc != null) MDC.setContextMap(callerMdc)
-        try {
-          runnable.run()
-        } finally {
-          // the thread might be reused, so we clean up for the next use
-          MDC.clear()
-        }
+    executionContext.execute(() => {
+      // copy caller thread diagnostic context to execution thread
+      Option(callerMdc).foreach(MDC.setContextMap)
+      try {
+        runnable.run()
+      } finally {
+        // the thread might be reused, so we clean up for the next use
+        MDC.clear()
       }
     })
   }