From 7f582b0445b92cc15ffe3d0fe5205760eac034f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Kolo=C5=A1njaji?= Date: Wed, 7 Aug 2024 17:46:14 +0200 Subject: [PATCH 1/2] Harmonize use of StructuredLogEncoder See gh-41712 --- .../boot/logging/logback/structured-console-appender.xml | 2 +- .../boot/logging/logback/structured-file-appender.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-console-appender.xml b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-console-appender.xml index 9117c360a2..c89f545dad 100644 --- a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-console-appender.xml +++ b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-console-appender.xml @@ -10,7 +10,7 @@ equivalent to the programmatic initialization performed by Boot ${CONSOLE_LOG_THRESHOLD} - + ${CONSOLE_LOG_STRUCTURED_FORMAT} ${CONSOLE_LOG_CHARSET} diff --git a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-file-appender.xml b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-file-appender.xml index 76d45b4a92..80377634bb 100644 --- a/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-file-appender.xml +++ b/spring-boot-project/spring-boot/src/main/resources/org/springframework/boot/logging/logback/structured-file-appender.xml @@ -10,7 +10,7 @@ equivalent to the programmatic initialization performed by Boot ${FILE_LOG_THRESHOLD} - + ${FILE_LOG_STRUCTURED_FORMAT} ${FILE_LOG_CHARSET} From 33711828f984f23897775e4ec0441b5720be792f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Wed, 7 Aug 2024 20:12:27 +0200 Subject: [PATCH 2/2] Polish "Harmonize use of StructuredLogEncoder" See gh-41712 --- .../boot/logging/logback/DefaultLogbackConfiguration.java | 4 ++-- ...oggingEncoderTests.java => StructuredLogEncoderTests.java} | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/{StructuredLoggingEncoderTests.java => StructuredLogEncoderTests.java} (98%) diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java index 9112fa750b..2c52e5dcd1 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/logback/DefaultLogbackConfiguration.java @@ -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; diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLoggingEncoderTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLogEncoderTests.java similarity index 98% rename from spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLoggingEncoderTests.java rename to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLogEncoderTests.java index 7015ec3bae..3928f7e952 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLoggingEncoderTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLogEncoderTests.java @@ -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;