From c00120a1fcc240269885276e7811a4f9b7972a6a Mon Sep 17 00:00:00 2001
From: Darin Kelkhoff <darin.kelkhoff@gmail.com>
Date: Tue, 24 Jan 2023 11:59:17 -0600
Subject: [PATCH] add overloads that take 'String message, LogPair... logPairs'

---
 .../qqq/backend/core/logging/QLogger.java     | 66 ++++++++++++++++++-
 .../kingsrook/qqq/backend/core/BaseTest.java  |  5 ++
 2 files changed, 70 insertions(+), 1 deletion(-)

diff --git a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/logging/QLogger.java b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/logging/QLogger.java
index 880f1929..798246c6 100755
--- a/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/logging/QLogger.java
+++ b/qqq-backend-core/src/main/java/com/kingsrook/qqq/backend/core/logging/QLogger.java
@@ -123,6 +123,16 @@ public class QLogger
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   public void trace(String message, LogPair... logPairs)
+   {
+      logger.trace(makeJsonString(message, null, logPairs));
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -163,6 +173,16 @@ public class QLogger
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   public void debug(String message, LogPair... logPairs)
+   {
+      logger.debug(makeJsonString(message, null, logPairs));
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -223,6 +243,16 @@ public class QLogger
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   public void info(String message, LogPair... logPairs)
+   {
+      logger.info(makeJsonString(message, null, logPairs));
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -263,6 +293,16 @@ public class QLogger
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   public void warn(String message, LogPair... logPairs)
+   {
+      logger.warn(makeJsonString(message, null, logPairs));
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -303,6 +343,16 @@ public class QLogger
 
 
 
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   public void error(String message, LogPair... logPairs)
+   {
+      logger.error(makeJsonString(message, null, logPairs));
+   }
+
+
+
    /*******************************************************************************
     **
     *******************************************************************************/
@@ -347,12 +397,26 @@ public class QLogger
     **
     *******************************************************************************/
    private String makeJsonString(String message, Throwable t)
+   {
+      return (makeJsonString(message, t, null));
+   }
+
+
+
+   /*******************************************************************************
+    **
+    *******************************************************************************/
+   private String makeJsonString(String message, Throwable t, LogPair[] logPairs)
    {
       List<LogPair> logPairList = new ArrayList<>();
+      if(logPairs != null)
+      {
+         logPairList.addAll(Arrays.stream(logPairs).toList());
+      }
 
       if(StringUtils.hasContent(message))
       {
-         logPairList.add(logPair("message", message));
+         logPairList.add(0, logPair("message", message));
       }
 
       addSessionLogPair(logPairList);
diff --git a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/BaseTest.java b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/BaseTest.java
index f3fca722..64c552b6 100644
--- a/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/BaseTest.java
+++ b/qqq-backend-core/src/test/java/com/kingsrook/qqq/backend/core/BaseTest.java
@@ -9,6 +9,7 @@ import com.kingsrook.qqq.backend.core.context.QContext;
 import com.kingsrook.qqq.backend.core.logging.QLogger;
 import com.kingsrook.qqq.backend.core.model.metadata.QInstance;
 import com.kingsrook.qqq.backend.core.model.session.QSession;
+import com.kingsrook.qqq.backend.core.modules.backend.implementations.memory.MemoryRecordStore;
 import com.kingsrook.qqq.backend.core.utils.TestUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
@@ -30,6 +31,8 @@ public class BaseTest
    void baseBeforeEach()
    {
       QContext.init(TestUtils.defineInstance(), new QSession());
+      MemoryRecordStore.getInstance().reset();
+      MemoryRecordStore.resetStatistics();
    }
 
 
@@ -41,6 +44,8 @@ public class BaseTest
    void baseAfterEach()
    {
       QContext.clear();
+      MemoryRecordStore.getInstance().reset();
+      MemoryRecordStore.resetStatistics();
    }