+ elf4j-engine version bump

elf4j · Apr 13, 2024 · 5451904 · 5451904
1 parent 1fbb797
commit 5451904
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>io.github.elf4j</groupId>
     <artifactId>slf4j-elf4j</artifactId>
-    <version>6.1.0</version>
+    <version>6.2.0</version>
     <packaging>jar</packaging>
     <name>slf4j-elf4j</name>
     <description>SLF4J binding to use ELF4J native logging implementation</description>
@@ -67,13 +67,12 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>2.0.12</version>
+            <version>2.0.13</version>
         </dependency>
         <dependency>
             <groupId>io.github.elf4j</groupId>
             <artifactId>elf4j-engine</artifactId>
             <version>15.2.0</version>
-            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
@@ -163,7 +162,7 @@
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.40.0</version>                     <!-- optional -->
+                            <version>2.43.0</version>                     <!-- optional -->
                             <style>PALANTIR</style>                       <!-- or AOSP/GOOGLE (optional) -->
                             <formatJavadoc>true
                             </formatJavadoc>          <!-- defaults to false (optional, requires at least Palantir 2.39.0) -->

diff --git a/src/main/java/elf4j/engine/slf4/Elf4jLogger.java b/src/main/java/elf4j/engine/slf4/Elf4jLogger.java
@@ -28,13 +28,14 @@
 import elf4j.Level;
 import elf4j.engine.NativeLogger;
 import java.util.EnumMap;
+import lombok.NonNull;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
 import org.slf4j.event.LoggingEvent;
 import org.slf4j.spi.DefaultLoggingEventBuilder;
 import org.slf4j.spi.LoggingEventAware;
 
-/** */
+/** A SLF4J Logger implemented via the elf4j-engine */
 public class Elf4jLogger implements Logger, LoggingEventAware {
     private static final Class<?> LOGGING_SERVICE_CLASS_SLF4J_FLUENT_API = DefaultLoggingEventBuilder.class;
     private static final Class<?> LOGGING_SERVICE_CLASS_SLF4J_LEGACY_API = Elf4jLogger.class;
@@ -51,7 +52,11 @@ public class Elf4jLogger implements Logger, LoggingEventAware {
 
     private final NativeLogger nativeLogger;
 
-    /** @param nativeLogger wrapped elf4j-impl logger */
+    /**
+     * Wraps a delegate of elf4j-engine Logger
+     *
+     * @param nativeLogger wrapped elf4j-impl logger
+     */
     public Elf4jLogger(NativeLogger nativeLogger) {
         this.nativeLogger = nativeLogger;
     }
@@ -366,7 +371,7 @@ public void error(Marker marker, String msg, Throwable t) {
     }
 
     @Override
-    public void log(LoggingEvent event) {
+    public void log(@NonNull LoggingEvent event) {
         service(
                 nativeLogger.atLevel(translate(event.getLevel())),
                 LOGGING_SERVICE_CLASS_SLF4J_FLUENT_API,

diff --git a/src/main/java/elf4j/engine/slf4/Elf4jLoggerFactory.java b/src/main/java/elf4j/engine/slf4/Elf4jLoggerFactory.java
@@ -32,7 +32,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-/** */
+/** Produces SLF4J Logger instances implemented via the elf4j-engine */
 public class Elf4jLoggerFactory implements ILoggerFactory {
     private static final Class<LoggerFactory> LOGGING_SERVICE_ACCESS_CLASS = LoggerFactory.class;
     private final NativeLogServiceProvider nativeLogServiceProvider;

diff --git a/src/main/java/elf4j/engine/slf4/Elf4jServiceProvider.java b/src/main/java/elf4j/engine/slf4/Elf4jServiceProvider.java
@@ -27,18 +27,22 @@
 
 import org.slf4j.ILoggerFactory;
 import org.slf4j.IMarkerFactory;
+import org.slf4j.helpers.BasicMDCAdapter;
 import org.slf4j.helpers.BasicMarkerFactory;
-import org.slf4j.helpers.NOPMDCAdapter;
 import org.slf4j.spi.MDCAdapter;
 import org.slf4j.spi.SLF4JServiceProvider;
 
-/** */
+/** Provides SLF4J utils implemented via elf4j-engine */
 public class Elf4jServiceProvider implements SLF4JServiceProvider {
     private static final String REQUESTED_API_VERSION = "2.0.99";
     private ILoggerFactory loggerFactory;
     private IMarkerFactory markerFactory;
     private MDCAdapter mdcAdapter;
 
+    /** A default constructor is required by the JDK Service Loader framework */
+    public Elf4jServiceProvider() {}
+
+    @Override
     public ILoggerFactory getLoggerFactory() {
         return loggerFactory;
     }
@@ -62,6 +66,6 @@ public String getRequestedApiVersion() {
     public void initialize() {
         loggerFactory = new Elf4jLoggerFactory();
         markerFactory = new BasicMarkerFactory();
-        mdcAdapter = new NOPMDCAdapter();
+        mdcAdapter = new BasicMDCAdapter();
     }
 }