fix SLF4J-485, LoggingEventBuilder addArgument() should take Supplier…

…<?>, not Supplier<Object>
qos-ch · Jun 15, 2021 · 5fb5ecb · 5fb5ecb
1 parent a405c8d
commit 5fb5ecb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git 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<Object> 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
@@ -19,7 +19,7 @@ public interface LoggingEventBuilder {
 
     LoggingEventBuilder addArgument(Object p);
 
-    LoggingEventBuilder addArgument(Supplier<Object> 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
@@ -31,7 +31,7 @@ public LoggingEventBuilder addArgument(Object p) {
 	}
 
 	@Override
-	public LoggingEventBuilder addArgument(Supplier<Object> 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
@@ -86,11 +86,12 @@ public void messageWithTwoArguments() {
             assertLogMessage("Temperature set to 16. Old temperature was 15.", 0);
         }
     }
-
+
+    @Test
     public void supplierArguments() {
-        Supplier<String> stringSupplier = () -> "String";
-        logger.atDebug().addArgument(stringSupplier).log("hello");
-
+        Supplier<String> stringSupplier = () -> "world";
+        logger.atInfo().addArgument(stringSupplier).log("hello {}");
+        assertLogMessage("hello world", 0);
     }
 
     public int t16() {