+ elf4j-engine version bump

elf4j · Nov 10, 2023 · 47f6f95 · 47f6f95
1 parent 49fa170
commit 47f6f95
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 20 deletions.
diff --git a/pom.xml b/pom.xml
@@ -31,7 +31,7 @@
 
     <groupId>io.github.elf4j</groupId>
     <artifactId>slf4j-elf4j</artifactId>
-    <version>6.0.8</version>
+    <version>6.0.9</version>
     <packaging>jar</packaging>
     <name>slf4j-elf4j</name>
     <description>SLF4J binding to use ELF4J native logging implementation</description>
@@ -72,7 +72,7 @@
         <dependency>
             <groupId>io.github.elf4j</groupId>
             <artifactId>elf4j-engine</artifactId>
-            <version>13.0.5</version>
+            <version>15.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>
@@ -141,6 +141,28 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.40.0</version>
+                <executions>
+                    <execution>
+                        <id>spotless-apply-id</id>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>apply</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                    <java>
+                        <palantirJavaFormat>
+                            <version>2.38.0</version>
+                        </palantirJavaFormat>
+                        <formatAnnotations/>
+                    </java>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/src/main/java/elf4j/engine/slf4/Elf4jLogger.java b/src/main/java/elf4j/engine/slf4/Elf4jLogger.java
@@ -27,14 +27,13 @@
 
 import elf4j.Level;
 import elf4j.engine.NativeLogger;
+import java.util.EnumMap;
 import org.slf4j.Logger;
 import org.slf4j.Marker;
 import org.slf4j.event.LoggingEvent;
 import org.slf4j.spi.DefaultLoggingEventBuilder;
 import org.slf4j.spi.LoggingEventAware;
 
-import java.util.EnumMap;
-
 /**
  *
  */
@@ -55,8 +54,7 @@ public class Elf4jLogger implements Logger, LoggingEventAware {
     private final NativeLogger nativeLogger;
 
     /**
-     * @param nativeLogger
-     *         wrapped elf4j-impl logger
+     * @param nativeLogger wrapped elf4j-impl logger
      */
     public Elf4jLogger(NativeLogger nativeLogger) {
         this.nativeLogger = nativeLogger;
@@ -68,7 +66,7 @@ private static Level translate(org.slf4j.event.Level slf4jEventLevel) {
 
     @Override
     public String getName() {
-        return nativeLogger.getOwnerClassName();
+        return nativeLogger.getDeclaringClassName();
     }
 
     @Override
@@ -373,7 +371,8 @@ public void error(Marker marker, String msg, Throwable t) {
 
     @Override
     public void log(LoggingEvent event) {
-        service(nativeLogger.atLevel(translate(event.getLevel())),
+        service(
+                nativeLogger.atLevel(translate(event.getLevel())),
                 LOGGING_SERVICE_CLASS_SLF4J_FLUENT_API,
                 event.getThrowable(),
                 event.getMessage(),
@@ -388,11 +387,8 @@ private boolean isEnabled(Level elf4jLevel) {
         return nativeLogger.atLevel(elf4jLevel).isEnabled();
     }
 
-    private void service(NativeLogger delegate,
-            Class<?> loggingServiceInterface,
-            Throwable t,
-            String msg,
-            Object... args) {
+    private void service(
+            NativeLogger delegate, Class<?> loggingServiceInterface, Throwable t, String msg, Object... args) {
         delegate.getLogService().log(delegate, loggingServiceInterface, t, msg, args);
     }
 }
diff --git a/src/main/java/elf4j/engine/slf4/Elf4jLoggerFactory.java b/src/main/java/elf4j/engine/slf4/Elf4jLoggerFactory.java
@@ -25,28 +25,27 @@
 
 package elf4j.engine.slf4;
 
-import elf4j.engine.NativeLoggerFactory;
+import elf4j.engine.NativeLogServiceProvider;
+import java.util.HashMap;
+import java.util.Map;
 import org.slf4j.ILoggerFactory;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  *
  */
 public class Elf4jLoggerFactory implements ILoggerFactory {
     private static final Class<LoggerFactory> LOGGING_SERVICE_ACCESS_CLASS = LoggerFactory.class;
-    private final NativeLoggerFactory nativeLoggerFactory;
+    private final NativeLogServiceProvider nativeLogServiceProvider;
     private final Map<String, Elf4jLogger> elf4jLoggerMap = new HashMap<>();
 
     Elf4jLoggerFactory() {
-        nativeLoggerFactory = new NativeLoggerFactory(LOGGING_SERVICE_ACCESS_CLASS);
+        nativeLogServiceProvider = new NativeLogServiceProvider(LOGGING_SERVICE_ACCESS_CLASS);
     }
 
     @Override
     public Logger getLogger(String name) {
-        return elf4jLoggerMap.computeIfAbsent(name, k -> new Elf4jLogger(nativeLoggerFactory.logger()));
+        return elf4jLoggerMap.computeIfAbsent(name, k -> new Elf4jLogger(nativeLogServiceProvider.logger()));
     }
 }