Skip to content

Commit

Permalink
+ elf4j-engine version bump
Browse files Browse the repository at this point in the history
  • Loading branch information
q3769 committed Feb 19, 2024
1 parent 2c363e4 commit 52ac9fc
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 16 deletions.
15 changes: 12 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,18 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.9</version>
<version>2.0.12</version>
</dependency>
<dependency>
<groupId>io.github.elf4j</groupId>
<artifactId>elf4j-engine</artifactId>
<version>15.0.0</version>
<version>15.1.2</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
Expand Down Expand Up @@ -157,7 +163,10 @@
<configuration>
<java>
<palantirJavaFormat>
<version>2.39.0</version>
<version>2.40.0</version> <!-- optional -->
<style>PALANTIR</style> <!-- or AOSP/GOOGLE (optional) -->
<formatJavadoc>true
</formatJavadoc> <!-- defaults to false (optional, requires at least Palantir 2.39.0) -->
</palantirJavaFormat>
<formatAnnotations/>
</java>
Expand Down
14 changes: 7 additions & 7 deletions src/main/java/elf4j/engine/slf4/Elf4jLogger.java
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@
import org.slf4j.spi.DefaultLoggingEventBuilder;
import org.slf4j.spi.LoggingEventAware;

/**
*
*/
/** */
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;
Expand All @@ -53,9 +51,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;
}
Expand Down Expand Up @@ -388,7 +384,11 @@ private boolean isEnabled(Level elf4jLevel) {
}

private void service(
NativeLogger delegate, Class<?> loggingServiceInterface, Throwable t, String msg, Object... args) {
@lombok.NonNull NativeLogger delegate,
Class<?> loggingServiceInterface,
Throwable t,
String msg,
Object... args) {
delegate.getLogService().log(delegate, loggingServiceInterface, t, msg, args);
}
}
4 changes: 1 addition & 3 deletions src/main/java/elf4j/engine/slf4/Elf4jLoggerFactory.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
/** */
public class Elf4jLoggerFactory implements ILoggerFactory {
private static final Class<LoggerFactory> LOGGING_SERVICE_ACCESS_CLASS = LoggerFactory.class;
private final NativeLogServiceProvider nativeLogServiceProvider;
Expand Down
4 changes: 1 addition & 3 deletions src/main/java/elf4j/engine/slf4/Elf4jServiceProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@
import org.slf4j.spi.MDCAdapter;
import org.slf4j.spi.SLF4JServiceProvider;

/**
*
*/
/** */
public class Elf4jServiceProvider implements SLF4JServiceProvider {
private static final String REQUESTED_API_VERSION = "2.0.99";
private ILoggerFactory loggerFactory;
Expand Down

0 comments on commit 52ac9fc

Please sign in to comment.