diff --git a/slf4j-api/src/main/java/org/slf4j/spi/DefaultLoggingEventBuilder.java b/slf4j-api/src/main/java/org/slf4j/spi/DefaultLoggingEventBuilder.java index 597eed456..b6b579be5 100755 --- a/slf4j-api/src/main/java/org/slf4j/spi/DefaultLoggingEventBuilder.java +++ b/slf4j-api/src/main/java/org/slf4j/spi/DefaultLoggingEventBuilder.java @@ -45,7 +45,7 @@ public LoggingEventBuilder addArgument(Object p) { } @Override - public LoggingEventBuilder addArgument(Supplier objectSupplier) { + public LoggingEventBuilder addArgument(Supplier objectSupplier) { loggingEvent.addArgument(objectSupplier.get()); return this; } diff --git a/slf4j-api/src/main/java/org/slf4j/spi/LoggingEventBuilder.java b/slf4j-api/src/main/java/org/slf4j/spi/LoggingEventBuilder.java index b44e5102c..0c0f70249 100755 --- a/slf4j-api/src/main/java/org/slf4j/spi/LoggingEventBuilder.java +++ b/slf4j-api/src/main/java/org/slf4j/spi/LoggingEventBuilder.java @@ -19,7 +19,7 @@ public interface LoggingEventBuilder { LoggingEventBuilder addArgument(Object p); - LoggingEventBuilder addArgument(Supplier objectSupplier); + LoggingEventBuilder addArgument(Supplier objectSupplier); LoggingEventBuilder addKeyValue(String key, Object value); diff --git a/slf4j-api/src/main/java/org/slf4j/spi/NOPLoggingEventBuilder.java b/slf4j-api/src/main/java/org/slf4j/spi/NOPLoggingEventBuilder.java index 1cd7138be..553d633b4 100755 --- a/slf4j-api/src/main/java/org/slf4j/spi/NOPLoggingEventBuilder.java +++ b/slf4j-api/src/main/java/org/slf4j/spi/NOPLoggingEventBuilder.java @@ -31,7 +31,7 @@ public LoggingEventBuilder addArgument(Object p) { } @Override - public LoggingEventBuilder addArgument(Supplier objectSupplier) { + public LoggingEventBuilder addArgument(Supplier objectSupplier) { return singleton(); } diff --git a/slf4j-jdk14/src/test/java/org/slf4j/jul/FluentApiInvocationTest.java b/slf4j-jdk14/src/test/java/org/slf4j/jul/FluentApiInvocationTest.java index 5fb5d36ab..2d7e6ea2d 100755 --- a/slf4j-jdk14/src/test/java/org/slf4j/jul/FluentApiInvocationTest.java +++ b/slf4j-jdk14/src/test/java/org/slf4j/jul/FluentApiInvocationTest.java @@ -86,11 +86,12 @@ public void messageWithTwoArguments() { assertLogMessage("Temperature set to 16. Old temperature was 15.", 0); } } - + + @Test public void supplierArguments() { - Supplier stringSupplier = () -> "String"; - logger.atDebug().addArgument(stringSupplier).log("hello"); - + Supplier stringSupplier = () -> "world"; + logger.atInfo().addArgument(stringSupplier).log("hello {}"); + assertLogMessage("hello world", 0); } public int t16() {