feat!: switch to slf4j v2

BREAKING CHANGE: requires a baseline of JDK 11
netmikey · Apr 20, 2023 · 0d0bc58 · 0d0bc58
1 parent 9f1ba5a
commit 0d0bc58
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,13 +8,13 @@ subprojects {
 
     apply plugin: 'java-library'
 
-    java.toolchain.languageVersion = JavaLanguageVersion.of(8)
+    java.toolchain.languageVersion = JavaLanguageVersion.of(11)
 
     ext {
-        junitVersion   = '5.8.2'  // https://search.maven.org/artifact/org.junit.jupiter/junit-jupiter-api
-        logbackVersion = '1.2.10' // https://search.maven.org/artifact/ch.qos.logback/logback-core
-        log4j2Version  = '2.17.1' // https://search.maven.org/artifact/org.apache.logging.log4j/log4j-core
-        slf4jVersion   = '1.7.32' // https://search.maven.org/artifact/org.slf4j/slf4j-api
+        junitVersion   = '5.9.2'  // https://search.maven.org/artifact/org.junit.jupiter/junit-jupiter-api
+        logbackVersion = '1.4.7'  // https://search.maven.org/artifact/ch.qos.logback/logback-core
+        log4j2Version  = '2.20.0' // https://search.maven.org/artifact/org.apache.logging.log4j/log4j-core
+        slf4jVersion   = '2.0.7'  // https://search.maven.org/artifact/org.slf4j/slf4j-api
     }
 
     repositories {

diff --git a/logunit-jul/src/main/java/io/github/netmikey/logunit/jul/JulLogProvider.java b/logunit-jul/src/main/java/io/github/netmikey/logunit/jul/JulLogProvider.java
@@ -1,5 +1,7 @@
 package io.github.netmikey.logunit.jul;
 
+import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -11,6 +13,7 @@
 
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.Marker;
+import org.slf4j.event.KeyValuePair;
 import org.slf4j.event.LoggingEvent;
 
 import io.github.netmikey.logunit.api.LogCapturer;
@@ -114,8 +117,8 @@ public String getMessage() {
             }
 
             @Override
-            public Marker getMarker() {
-                return null;
+            public List<Marker> getMarkers() {
+                return Collections.emptyList();
             }
 
             @Override
@@ -132,6 +135,16 @@ public org.slf4j.event.Level getLevel() {
             public Object[] getArgumentArray() {
                 return record.getParameters();
             }
+
+            @Override
+            public List<Object> getArguments() {
+                return Arrays.asList(record.getParameters());
+            }
+
+            @Override
+            public List<KeyValuePair> getKeyValuePairs() {
+                return Collections.emptyList();
+            }
         };
     }
 }
diff --git a/logunit-log4j2/build.gradle b/logunit-log4j2/build.gradle
@@ -10,5 +10,5 @@ dependencies {
     implementation("org.apache.logging.log4j:log4j-core:${log4j2Version}")
 
     testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${junitVersion}")
-    testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j-impl:${log4j2Version}")
+    testRuntimeOnly("org.apache.logging.log4j:log4j-slf4j2-impl:${log4j2Version}")
 }
diff --git a/logunit-log4j2/src/main/java/io/github/netmikey/logunit/log4j2/Log4j2LogProvider.java b/logunit-log4j2/src/main/java/io/github/netmikey/logunit/log4j2/Log4j2LogProvider.java
@@ -81,7 +81,14 @@ private void createLoggerAndAddAppender(String loggerName, Level level) {
         Configuration cfg = ctx.getConfiguration();
         AppenderRef ref = AppenderRef.createAppenderRef(listAppender.getName(), null, null);
         AppenderRef[] refs = new AppenderRef[] { ref };
-        LoggerConfig loggerConfig = LoggerConfig.createLogger(true, level, loggerName, "true", refs, null, cfg, null);
+
+        LoggerConfig loggerConfig = LoggerConfig.newBuilder()
+            .withLoggerName(loggerName)
+            .withLevel(level)
+            .withAdditivity(true)
+            .withRefs(refs)
+            .withConfig(cfg)
+            .build();
         loggerConfig.addAppender(listAppender, level, null);
         cfg.addLogger(loggerConfig.getName(), loggerConfig);
     }

diff --git a/logunit-logback/src/main/java/io/github/netmikey/logunit/logback/LogbackLogProvider.java b/logunit-logback/src/main/java/io/github/netmikey/logunit/logback/LogbackLogProvider.java
@@ -1,5 +1,6 @@
 package io.github.netmikey.logunit.logback;
 
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -9,6 +10,7 @@
 import org.junit.jupiter.api.extension.ExtensionContext;
 import org.slf4j.LoggerFactory;
 import org.slf4j.Marker;
+import org.slf4j.event.KeyValuePair;
 import org.slf4j.event.LoggingEvent;
 
 import ch.qos.logback.classic.Level;
@@ -127,8 +129,8 @@ public String getMessage() {
             }
 
             @Override
-            public Marker getMarker() {
-                return iEvent.getMarker();
+            public List<Marker> getMarkers() {
+                return iEvent.getMarkerList();
             }
 
             @Override
@@ -145,6 +147,16 @@ public org.slf4j.event.Level getLevel() {
             public Object[] getArgumentArray() {
                 return iEvent.getArgumentArray();
             }
+
+            @Override
+            public List<Object> getArguments() {
+                return Arrays.asList(iEvent.getArgumentArray());
+            }
+
+            @Override
+            public List<KeyValuePair> getKeyValuePairs() {
+                return iEvent.getKeyValuePairs();
+            }
         };
     }
 }