root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '5.2.x'

This commit is contained in:
Juergen Hoeller 2020-09-08 17:09:58 +02:00
parent f7a014d7dc ed3b7cd10f
commit a958633b7a
2 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -67,7 +67,7 @@ configure(allprojects) { project ->
dependency "com.caucho:hessian:4.0.63"
dependency "com.fasterxml:aalto-xml:1.2.2"
dependency("com.fasterxml.woodstox:woodstox-core:6.1.1") {
dependency("com.fasterxml.woodstox:woodstox-core:6.2.1") {
exclude group: "stax", name: "stax-api"
}
dependency "com.google.code.gson:gson:2.8.6"

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

@ -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);
}
}
}