From fa226e890b4037e4ebcec2fed0e96f058a57fcd5 Mon Sep 17 00:00:00 2001 From: Now Date: Sat, 19 Jul 2025 00:55:00 +0900 Subject: [PATCH 1/2] Use LogLevel.log() rather than checking the log level manually See gh-46466 Signed-off-by: Now --- .../org/springframework/boot/logging/DeferredLog.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java index 9cdf363b102..6ea676e9f13 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java @@ -246,14 +246,7 @@ public class DeferredLog implements Log { } static void logTo(Log log, LogLevel level, Object message, Throwable throwable) { - switch (level) { - case TRACE -> log.trace(message, throwable); - case DEBUG -> log.debug(message, throwable); - case INFO -> log.info(message, throwable); - case WARN -> log.warn(message, throwable); - case ERROR -> log.error(message, throwable); - case FATAL -> log.fatal(message, throwable); - } + level.log(log, message, throwable); } static class Lines implements Iterable { From 97b8ce79f5fbbdd00e5bdc5e4b026a4643eb5c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 13 Aug 2025 15:00:51 +0200 Subject: [PATCH 2/2] Polish "Use LogLevel.log() rather than checking the log level manually" See gh-46466 --- .../org/springframework/boot/logging/DeferredLog.java | 8 ++------ .../org/springframework/boot/logging/DeferredLogs.java | 2 +- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java index 6ea676e9f13..257e08d9e43 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java @@ -166,7 +166,7 @@ public class DeferredLog implements Log { private void log(LogLevel level, Object message, Throwable t) { synchronized (this.lines) { if (this.destination != null) { - logTo(this.destination, level, message, t); + level.log(this.destination, message, t); } else { this.lines.add(this.destinationSupplier, level, message, t); @@ -216,7 +216,7 @@ public class DeferredLog implements Log { public void replayTo(Log destination) { synchronized (this.lines) { for (Line line : this.lines) { - logTo(destination, line.getLevel(), line.getMessage(), line.getThrowable()); + line.getLevel().log(destination, line.getMessage(), line.getThrowable()); } this.lines.clear(); } @@ -245,10 +245,6 @@ public class DeferredLog implements Log { return destination; } - static void logTo(Log log, LogLevel level, Object message, Throwable throwable) { - level.log(log, message, throwable); - } - static class Lines implements Iterable { private final List lines = new ArrayList<>(); diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLogs.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLogs.java index 60c908a7799..0c41d4bf181 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLogs.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLogs.java @@ -82,7 +82,7 @@ public class DeferredLogs implements DeferredLogFactory { public void switchOverAll() { synchronized (this.lines) { for (Line line : this.lines) { - DeferredLog.logTo(line.getDestination(), line.getLevel(), line.getMessage(), line.getThrowable()); + line.getLevel().log(line.getDestination(), line.getMessage(), line.getThrowable()); } for (DeferredLog logger : this.loggers) { logger.switchOver();