diff --git a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LoggersEndpoint.java b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LoggersEndpoint.java index d6790076ba..f0312f346e 100644 --- a/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LoggersEndpoint.java +++ b/spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LoggersEndpoint.java @@ -151,7 +151,7 @@ public class LoggersEndpoint { */ public static class GroupLoggerLevels extends LoggerLevels { - private List members; + private final List members; public GroupLoggerLevels(LogLevel configuredLevel, List members) { super(configuredLevel); @@ -165,7 +165,7 @@ public class LoggersEndpoint { } /** - * Levels configured for single logger group exposed in a JSON friendly way. + * Levels configured for single logger exposed in a JSON friendly way. */ public static class SingleLoggerLevels extends LoggerLevels { diff --git a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/Closures.java b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/Closures.java index 7289aff5f1..3d8f3eccf8 100644 --- a/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/Closures.java +++ b/spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/Closures.java @@ -31,7 +31,7 @@ import org.gradle.util.GradleVersion; *

* To accommodate the differences, we use {@code org.gradle.util.internal.ConfigureUtil} * with Gradle 7.1 and later. With earlier versions, {@code org.gradle.util.ConfigureUtil} - * is used. This avoids users by nagged about deprecated API usage in our plugin. + * is used. This avoids users to be nagged about deprecated API usage in our plugin. * * @author Andy Wilkinson */ 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 170244b9c6..c1f67d81ea 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/env/YamlPropertySourceLoaderSnakeYaml132Tests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml132Tests.java index dc1e8851cb..9733dfcc61 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml132Tests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml132Tests.java @@ -19,7 +19,7 @@ package org.springframework.boot.env; import org.springframework.boot.testsupport.classpath.ClassPathOverrides; /** - * Tests for {@link YamlPropertySourceLoader} with SnakeYAML 1.33. + * Tests for {@link YamlPropertySourceLoader} with SnakeYAML 1.32. * * @author Andy Wilkinson */ 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 425e3bc0a6..d6bc631d96 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 fd1d69abbf..fe53f9bb9a 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 f76f89549c..b4bc03eb70 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 @@ -181,7 +181,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); @@ -191,7 +191,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); @@ -208,7 +208,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); @@ -225,7 +225,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); @@ -235,7 +235,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); @@ -244,7 +244,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); @@ -367,7 +367,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); @@ -381,7 +381,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 d54f6ee71d..dd2d67c186 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 @@ -213,7 +213,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); @@ -223,7 +223,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); @@ -233,7 +233,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurationForLoggerThatDoesNotExistShouldReturnNull() { + void getLoggerConfigurationForLoggerThatDoesNotExistShouldReturnNull() { this.loggingSystem.beforeInitialize(); initialize(this.initializationContext, null, null); LoggerConfiguration configuration = this.loggingSystem.getLoggerConfiguration("doesnotexist"); @@ -241,7 +241,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests { } @Test - void getLoggingConfigurationForALL() { + void getLoggerConfigurationForALL() { this.loggingSystem.beforeInitialize(); initialize(this.initializationContext, null, null); Logger logger = (Logger) StaticLoggerBinder.getSingleton().getLoggerFactory().getLogger(getClass().getName());