Merge branch '3.4.x' into 3.5.x

Closes gh-46825

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLog.java

@@ -166,7 +166,7 @@ public void fatal(Object message, Throwable t) {
 	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 void replayTo(Class<?> destination) {
 	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,17 +245,6 @@ public static Log replay(Log source, Log destination) {
 		return destination;
 	}
 
-	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);
-		}
-	}
-
 	static class Lines implements Iterable<Line> {
 
 		private final List<Line> lines = new ArrayList<>();

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/DeferredLogs.java

@@ -82,7 +82,7 @@ public Log getLog(Supplier<Log> destination) {
 	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();