Merge pull request #66 from avaje/feature/update-json-core

Update to avaje-json-core 3.0

Author: rbygrave

pom.xml

@@ -11,7 +11,7 @@
 
   <groupId>io.avaje</groupId>
   <artifactId>avaje-logback-encoder</artifactId>
-  <version>0.10</version>
+  <version>0.11</version>
 
   <properties>
     <surefire.useModulePath>false</surefire.useModulePath>
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>io.avaje</groupId>
       <artifactId>avaje-json-core</artifactId>
-      <version>3.0-RC6</version>
+      <version>3.0</version>
     </dependency>
     <dependency>
       <groupId>io.avaje</groupId>

src/main/java/io/avaje/logback/encoder/JsonEncoder.java

@@ -13,7 +13,7 @@
 import ch.qos.logback.classic.spi.ThrowableProxy;
 import ch.qos.logback.core.encoder.EncoderBase;
 import io.avaje.json.PropertyNames;
-import io.avaje.json.simple.SimpleMapper;
+import io.avaje.json.mapper.JsonMapper;
 import io.avaje.json.stream.JsonStream;
 
 public final class JsonEncoder extends EncoderBase<ILoggingEvent> {
@@ -146,7 +146,7 @@ public void setCustomFields(String customFields) {
     if (customFields == null || customFields.isBlank()) {
       return;
     }
-    var mapper = SimpleMapper.builder().jsonStream(json).build();
+    var mapper = JsonMapper.builder().jsonStream(json).build();
     mapper.map().fromJson(customFields).forEach((key, value) -> {
       if (value instanceof String) {
         value = Eval.eval((String) value);

src/test/java/io/avaje/logback/encoder/JsonEncoderTest.java

@@ -2,7 +2,7 @@
 
 import ch.qos.logback.classic.spi.ILoggingEvent;
 import ch.qos.logback.classic.spi.LoggingEvent;
-import io.avaje.json.simple.SimpleMapper;
+import io.avaje.json.mapper.JsonMapper;
 import io.avaje.logback.encoder.abbreviator.TrimPackageAbbreviator;
 import org.junit.jupiter.api.Test;
 import ch.qos.logback.classic.Logger;
@@ -34,8 +34,8 @@ void encode() {
         encoder.start();
         byte[] bytes = encoder.encode(event);
 
-        SimpleMapper simpleMapper = SimpleMapper.builder().build();
-        Map<String, Object> asMap = simpleMapper.map().fromJson(bytes);
+        JsonMapper mapper = JsonMapper.builder().build();
+        Map<String, Object> asMap = mapper.map().fromJson(bytes);
 
         assertThat((String)asMap.get("component")).isNull();
         assertThat((String)asMap.get("env")).isNull();
@@ -55,8 +55,8 @@ void encode_component() {
 
         byte[] bytes = encoder.encode(createLogEvent());
 
-        SimpleMapper simpleMapper = SimpleMapper.builder().build();
-        Map<String, Object> asMap = simpleMapper.map().fromJson(bytes);
+        JsonMapper mapper = JsonMapper.builder().build();
+        Map<String, Object> asMap = mapper.map().fromJson(bytes);
 
         assertThat((String)asMap.get("component")).isEqualTo("my-component");
         assertThat((String)asMap.get("env")).isEqualTo("dev");
@@ -75,7 +75,7 @@ void customFieldsEval() {
         encoder.start();
 
         byte[] bytes = encoder.encode(createLogEvent(createThrowable()));
-        SimpleMapper simpleMapper = SimpleMapper.builder().build();
+        JsonMapper simpleMapper = JsonMapper.builder().build();
         Map<String, Object> asMap = simpleMapper.map().fromJson(bytes);
 
         assertThat((String)asMap.get("my-custom")).isEqualTo("Hi!");
@@ -89,7 +89,7 @@ void throwable_usingDefault() {
     encoder.start();
 
     byte[] bytes = encoder.encode(createLogEvent(createThrowable()));
-    SimpleMapper simpleMapper = SimpleMapper.builder().build();
+    JsonMapper simpleMapper = JsonMapper.builder().build();
     Map<String, Object> asMap = simpleMapper.map().fromJson(bytes);
 
     assertThat((String)asMap.get("stacktrace")).startsWith("java.lang.NullPointerException: ");
@@ -110,7 +110,7 @@ void throwable_usingConverter() {
         encoder.start();
 
         byte[] bytes = encoder.encode(createLogEvent(createThrowable()));
-        SimpleMapper simpleMapper = SimpleMapper.builder().build();
+        JsonMapper simpleMapper = JsonMapper.builder().build();
         Map<String, Object> asMap = simpleMapper.map().fromJson(bytes);
 
         assertThat((String)asMap.get("stacktrace")).startsWith("j.l.NullPointerException: ");
@@ -132,7 +132,7 @@ void throwable_usingConverter_includeStackHash() {
         encoder.start();
 
         byte[] bytes = encoder.encode(createLogEvent(createThrowable()));
-        SimpleMapper simpleMapper = SimpleMapper.builder().build();
+        JsonMapper simpleMapper = JsonMapper.builder().build();
         Map<String, Object> asMap = simpleMapper.map().fromJson(bytes);
 
         assertThat((String)asMap.get("stacktrace")).startsWith("j.l.NullPointerException: ");