From 0e6eea5708e58733299d94a180b99f9aa748280c Mon Sep 17 00:00:00 2001
From: Qingtian Wang <wqt.net@gmail.com>
Date: Mon, 15 Apr 2024 23:54:20 -0500
Subject: [PATCH] + using String instead of CharSequence in JSON bean to avoid
 dsljson issue with allowing unknown properties

---
 pom.xml                                                  | 8 +-------
 .../java/elf4j/engine/service/pattern/JsonElement.java   | 9 +++++----
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pom.xml b/pom.xml
index 0dcb3d3..4c54026 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>io.github.elf4j</groupId>
     <artifactId>elf4j-engine</artifactId>
-    <version>15.2.0</version>
+    <version>15.2.1</version>
     <packaging>jar</packaging>
     <name>elf4j-engine</name>
     <description>A stand-alone Java log engine implementing the ELF4J (Easy Logging Facade for Java) API</description>
@@ -153,12 +153,6 @@
                         <annotationProcessor>com.dslplatform.json.processor.CompiledJsonAnnotationProcessor
                         </annotationProcessor>
                     </annotationProcessors>
-                    <compilerArguments>
-                        <!--                        <Adsljson.loglevel>DEBUG</Adsljson.loglevel>-->
-                        <!--                        <Adsljson.annotation>EXPLICIT</Adsljson.annotation>-->
-                        <Adsljson.unknown>ALLOW</Adsljson.unknown>
-                        <!--                        <Adsljson.configuration>com.dslplatform.maven.DslJsonConfiguration</Adsljson.configuration>-->
-                    </compilerArguments>
                 </configuration>
                 <dependencies>
                     <dependency>
diff --git a/src/main/java/elf4j/engine/service/pattern/JsonElement.java b/src/main/java/elf4j/engine/service/pattern/JsonElement.java
index b643e36..e8d8d8a 100644
--- a/src/main/java/elf4j/engine/service/pattern/JsonElement.java
+++ b/src/main/java/elf4j/engine/service/pattern/JsonElement.java
@@ -117,8 +117,8 @@ static class JsonLogEntry {
         String callerClass;
         LogEvent.StackFrameValue callerDetail;
         Map<String, String> context;
-        CharSequence message;
-        CharSequence exception;
+        String message;
+        String exception;
 
         static JsonLogEntry from(@NonNull LogEvent logEvent, @NonNull JsonElement jsonPattern) {
             return JsonLogEntry.builder()
@@ -128,12 +128,13 @@ static JsonLogEntry from(@NonNull LogEvent logEvent, @NonNull JsonElement jsonPa
                     .callerThread(jsonPattern.includeCallerThread ? logEvent.getCallerThread() : null)
                     .callerDetail(
                             jsonPattern.includeCallerDetail ? Objects.requireNonNull(logEvent.getCallerFrame()) : null)
-                    .message(logEvent.getResolvedMessage())
+                    .message(logEvent.getResolvedMessage().toString())
                     .context(MDC.getCopyOfContextMap())
                     .exception(
                             logEvent.getThrowable() == null
                                     ? null
-                                    : StackTraces.getTraceAsBuffer(logEvent.getThrowable()))
+                                    : StackTraces.getTraceAsBuffer(logEvent.getThrowable())
+                                            .toString())
                     .build();
         }
     }