Check log level before delegating Supplier-based message to target Log

Closes gh-25741

spring-core/src/main/java/org/springframework/core/log/LogAccessor.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2019 the original author or authors.
+ * Copyright 2002-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -225,7 +225,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void fatal(Supplier<? extends CharSequence> messageSupplier) {
-		this.log.fatal(LogMessage.of(messageSupplier));
+		if (this.log.isFatalEnabled()) {
+			this.log.fatal(LogMessage.of(messageSupplier));
+		}
 	}
 
 	/**
@@ -234,7 +236,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void fatal(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
-		this.log.fatal(LogMessage.of(messageSupplier), cause);
+		if (this.log.isFatalEnabled()) {
+			this.log.fatal(LogMessage.of(messageSupplier), cause);
+		}
 	}
 
 	/**
@@ -242,7 +246,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void error(Supplier<? extends CharSequence> messageSupplier) {
-		this.log.error(LogMessage.of(messageSupplier));
+		if (this.log.isErrorEnabled()) {
+			this.log.error(LogMessage.of(messageSupplier));
+		}
 	}
 
 	/**
@@ -251,7 +257,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void error(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
-		this.log.error(LogMessage.of(messageSupplier), cause);
+		if (this.log.isErrorEnabled()) {
+			this.log.error(LogMessage.of(messageSupplier), cause);
+		}
 	}
 
 	/**
@@ -259,7 +267,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void warn(Supplier<? extends CharSequence> messageSupplier) {
-		this.log.warn(LogMessage.of(messageSupplier));
+		if (this.log.isWarnEnabled()) {
+			this.log.warn(LogMessage.of(messageSupplier));
+		}
 	}
 
 	/**
@@ -268,7 +278,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void warn(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
-		this.log.warn(LogMessage.of(messageSupplier), cause);
+		if (this.log.isWarnEnabled()) {
+			this.log.warn(LogMessage.of(messageSupplier), cause);
+		}
 	}
 
 	/**
@@ -276,7 +288,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void info(Supplier<? extends CharSequence> messageSupplier) {
-		this.log.info(LogMessage.of(messageSupplier));
+		if (this.log.isInfoEnabled()) {
+			this.log.info(LogMessage.of(messageSupplier));
+		}
 	}
 
 	/**
@@ -285,7 +299,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void info(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
-		this.log.info(LogMessage.of(messageSupplier), cause);
+		if (this.log.isInfoEnabled()) {
+			this.log.info(LogMessage.of(messageSupplier), cause);
+		}
 	}
 
 	/**
@@ -293,7 +309,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void debug(Supplier<? extends CharSequence> messageSupplier) {
-		this.log.debug(LogMessage.of(messageSupplier));
+		if (this.log.isDebugEnabled()) {
+			this.log.debug(LogMessage.of(messageSupplier));
+		}
 	}
 
 	/**
@@ -302,7 +320,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void debug(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
-		this.log.debug(LogMessage.of(messageSupplier), cause);
+		if (this.log.isDebugEnabled()) {
+			this.log.debug(LogMessage.of(messageSupplier), cause);
+		}
 	}
 
 	/**
@@ -310,7 +330,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void trace(Supplier<? extends CharSequence> messageSupplier) {
-		this.log.trace(LogMessage.of(messageSupplier));
+		if (this.log.isTraceEnabled()) {
+			this.log.trace(LogMessage.of(messageSupplier));
+		}
 	}
 
 	/**
@@ -319,7 +341,9 @@ public class LogAccessor {
 	 * @param messageSupplier a lazy supplier for the message to log
 	 */
 	public void trace(Throwable cause, Supplier<? extends CharSequence> messageSupplier) {
-		this.log.trace(LogMessage.of(messageSupplier), cause);
+		if (this.log.isTraceEnabled()) {
+			this.log.trace(LogMessage.of(messageSupplier), cause);
+		}
 	}
 
 }