Merge pull request #41712 from nkolosnjaji

* pr/41712:
  Polish "Harmonize use of StructuredLogEncoder"
  Harmonize use of StructuredLogEncoder

Closes gh-41712

Author: snicoll

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

@@ -161,7 +161,7 @@ private Encoder<ILoggingEvent> createEncoder(LogbackConfigurator config, String
 		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 @@ private Encoder<ILoggingEvent> createEncoder(LogbackConfigurator config, String
 		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;

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
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>${CONSOLE_LOG_THRESHOLD}</level>
 		</filter>
-		<encoder class="org.springframework.boot.logging.logback.StructuredLoggingEncoder">
+		<encoder class="org.springframework.boot.logging.logback.StructuredLogEncoder">
 			<format>${CONSOLE_LOG_STRUCTURED_FORMAT}</format>
 			<charset>${CONSOLE_LOG_CHARSET}</charset>
 		</encoder>

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
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 			<level>${FILE_LOG_THRESHOLD}</level>
 		</filter>
-		<encoder class="org.springframework.boot.logging.logback.StructuredLoggingEncoder">
+		<encoder class="org.springframework.boot.logging.logback.StructuredLogEncoder">
 			<format>${FILE_LOG_STRUCTURED_FORMAT}</format>
 			<charset>${FILE_LOG_CHARSET}</charset>
 		</encoder>

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLoggingEncoderTests.java renamed to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/StructuredLogEncoderTests.java

@@ -42,7 +42,7 @@
  * @author Moritz Halbritter
  * @author Phillip Webb
  */
-class StructuredLoggingEncoderTests extends AbstractStructuredLoggingTests {
+class StructuredLogEncoderTests extends AbstractStructuredLoggingTests {
 
 	private StructuredLogEncoder encoder;