diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java index 170244b9c68..c1f67d81ea7 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java @@ -60,7 +60,7 @@ public final class LoggerConfiguration { public LoggerConfiguration(String name, LevelConfiguration levelConfiguration, LevelConfiguration inheritedLevelConfiguration) { Assert.notNull(name, "Name must not be null"); - Assert.notNull(inheritedLevelConfiguration, "EffectiveLevelConfiguration must not be null"); + Assert.notNull(inheritedLevelConfiguration, "InheritedLevelConfiguration must not be null"); this.name = name; this.levelConfiguration = levelConfiguration; this.inheritedLevelConfiguration = inheritedLevelConfiguration; @@ -140,15 +140,15 @@ public final class LoggerConfiguration { } /** - * Supported logger configurations scopes. + * Supported logger configuration scopes. * * @since 2.7.13 */ public enum ConfigurationScope { /** - * Only return configuration that has been applied directly applied. Often - * referred to as 'configured' or 'assigned' configuration. + * Only return configuration that has been applied directly. Often referred to as + * 'configured' or 'assigned' configuration. */ DIRECT, diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggerConfigurationTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggerConfigurationTests.java index 425e3bc0a67..d6bc631d96e 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggerConfigurationTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggerConfigurationTests.java @@ -53,10 +53,10 @@ class LoggerConfigurationTests { } @Test - void createWithLevelConfigurationWhenEffectiveLevelIsNullThrowsException() { + void createWithLevelConfigurationWhenInheritedLevelConfigurationIsNullThrowsException() { assertThatIllegalArgumentException() .isThrownBy(() -> new LoggerConfiguration("test", null, (LevelConfiguration) null)) - .withMessage("EffectiveLevelConfiguration must not be null"); + .withMessage("InheritedLevelConfiguration must not be null"); } @Test diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java index c13156c843d..31802e0eab6 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java @@ -166,7 +166,7 @@ class JavaLoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurations() { + void getLoggerConfigurations() { this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(null, null, null); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); @@ -176,7 +176,7 @@ class JavaLoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfiguration() { + void getLoggerConfiguration() { this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(null, null, null); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java index fdd2add6889..308d29d99e7 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java @@ -206,7 +206,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurations() { + void getLoggerConfigurations() { this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); @@ -216,7 +216,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurationsShouldReturnAllLoggers() { + void getLoggerConfigurationsShouldReturnAllLoggers() { LogManager.getLogger("org.springframework.boot.logging.log4j2.Log4J2LoggingSystemTests$Nested"); this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(this.initializationContext, null, null); @@ -233,7 +233,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { } @Test // gh-35227 - void getLoggingConfigurationsWhenHasCustomLevel() { + void getLoggerConfigurationWhenHasCustomLevel() { this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(this.initializationContext, null, null); LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false); @@ -250,7 +250,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfiguration() { + void getLoggerConfiguration() { this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); @@ -260,7 +260,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurationShouldReturnLoggerWithNullConfiguredLevel() { + void getLoggerConfigurationShouldReturnLoggerWithNullConfiguredLevel() { this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); @@ -269,7 +269,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurationForNonExistentLoggerShouldReturnNull() { + void getLoggerConfigurationForNonExistentLoggerShouldReturnNull() { this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); @@ -404,7 +404,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurationWithResetLevelReturnsNull() { + void getLoggerConfigurationWithResetLevelReturnsNull() { this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.setLogLevel("com.example", LogLevel.WARN); @@ -418,7 +418,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurationWithResetLevelWhenAlreadyConfiguredReturnsParentConfiguredLevel() { + void getLoggerConfigurationWithResetLevelWhenAlreadyConfiguredReturnsParentConfiguredLevel() { LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false); this.loggingSystem.beforeInitialize(); this.loggingSystem.initialize(this.initializationContext, null, null); diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java index 1baa8800121..5cd15d8ba44 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java @@ -239,7 +239,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurations() { + void getLoggerConfigurations() { this.loggingSystem.beforeInitialize(); initialize(this.initializationContext, null, null); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); @@ -249,7 +249,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfiguration() { + void getLoggerConfiguration() { this.loggingSystem.beforeInitialize(); initialize(this.initializationContext, null, null); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); @@ -259,7 +259,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurationForLoggerThatDoesNotExistShouldReturnNull() { + void getLoggerConfigurationForLoggerThatDoesNotExistShouldReturnNull() { this.loggingSystem.beforeInitialize(); initialize(this.initializationContext, null, null); LoggerConfiguration configuration = this.loggingSystem.getLoggerConfiguration("doesnotexist"); @@ -267,7 +267,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurationForALL() { + void getLoggerConfigurationForALL() { this.loggingSystem.beforeInitialize(); initialize(this.initializationContext, null, null); Logger logger = (Logger) LoggerFactory.getILoggerFactory().getLogger(getClass().getName());