Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Harmonize use of StructuredLogEncoder"

Browse Source 
See gh-41712
This commit is contained in:
Stéphane Nicoll
2024-08-07 20:12:27 +02:00
parent 7f582b0445
commit 33711828f9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java
View File

@@ -161,7 +161,7 @@ class DefaultLogbackConfiguration {
Charset charset = resolveCharset(config, "${" + type + "_LOG_CHARSET}");
String structuredLogFormat = resolve(config, "${" + type + "_LOG_STRUCTURED_FORMAT}");
if (StringUtils.hasLength(structuredLogFormat)) {
StructuredLogEncoder encoder = createStructuredLoggingEncoder(config, structuredLogFormat);
StructuredLogEncoder encoder = createStructuredLogEncoder(config, structuredLogFormat);
encoder.setCharset(charset);
return encoder;
}
@@ -171,7 +171,7 @@ class DefaultLogbackConfiguration {
return encoder;
}
private StructuredLogEncoder createStructuredLoggingEncoder(LogbackConfigurator config, String format) {
private StructuredLogEncoder createStructuredLogEncoder(LogbackConfigurator config, String format) {
StructuredLogEncoder encoder = new StructuredLogEncoder();
encoder.setFormat(format);
return encoder;

2
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLoggingEncoderTests.java → spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLogEncoderTests.java
View File

@@ -42,7 +42,7 @@ import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException
* @author Moritz Halbritter
* @author Phillip Webb
*/
class StructuredLoggingEncoderTests extends AbstractStructuredLoggingTests {
class StructuredLogEncoderTests extends AbstractStructuredLoggingTests {
private StructuredLogEncoder encoder;