root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch '2.7.x' into 3.0.x 

Closes gh-36633
This commit is contained in:
Andy Wilkinson 2023-07-28 12:22:21 +01:00
parent 81844c04c4 36239df0da
commit 3e99118a48
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/logging/LoggerConfiguration.java
View File

@ -60,7 +60,7 @@ public final class LoggerConfiguration {
public LoggerConfiguration(String name, LevelConfiguration levelConfiguration, public LoggerConfiguration(String name, LevelConfiguration levelConfiguration,
LevelConfiguration inheritedLevelConfiguration) { LevelConfiguration inheritedLevelConfiguration) {
Assert.notNull(name, "Name must not be null"); 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.name = name;
this.levelConfiguration = levelConfiguration; this.levelConfiguration = levelConfiguration;
this.inheritedLevelConfiguration = inheritedLevelConfiguration; this.inheritedLevelConfiguration = inheritedLevelConfiguration;
@ -140,15 +140,15 @@ public final class LoggerConfiguration {
} }
/** /**
* Supported logger configurations scopes. * Supported logger configuration scopes.
* *
* @since 2.7.13 * @since 2.7.13
*/ */
public enum ConfigurationScope { public enum ConfigurationScope {
/** /**
* Only return configuration that has been applied directly applied. Often * Only return configuration that has been applied directly. Often referred to as
* referred to as 'configured' or 'assigned' configuration. * 'configured' or 'assigned' configuration.
*/ */
DIRECT, DIRECT,

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/LoggerConfigurationTests.java
View File

@ -53,10 +53,10 @@ class LoggerConfigurationTests {
} }
@Test @Test
void createWithLevelConfigurationWhenEffectiveLevelIsNullThrowsException() { void createWithLevelConfigurationWhenInheritedLevelConfigurationIsNullThrowsException() {
assertThatIllegalArgumentException() assertThatIllegalArgumentException()
.isThrownBy(() -> new LoggerConfiguration("test", null, (LevelConfiguration) null)) .isThrownBy(() -> new LoggerConfiguration("test", null, (LevelConfiguration) null))
.withMessage("EffectiveLevelConfiguration must not be null"); .withMessage("InheritedLevelConfiguration must not be null");
} }
@Test @Test

4
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/java/JavaLoggingSystemTests.java
View File

@ -166,7 +166,7 @@ class JavaLoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurations() { void getLoggerConfigurations() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(null, null, null); this.loggingSystem.initialize(null, null, null);
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@ -176,7 +176,7 @@ class JavaLoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfiguration() { void getLoggerConfiguration() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(null, null, null); this.loggingSystem.initialize(null, null, null);
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);

16
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/log4j2/Log4J2LoggingSystemTests.java
View File

@ -198,7 +198,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurations() { void getLoggerConfigurations() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.initialize(this.initializationContext, null, null);
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@ -208,7 +208,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurationsShouldReturnAllLoggers() { void getLoggerConfigurationsShouldReturnAllLoggers() {
LogManager.getLogger("org.springframework.boot.logging.log4j2.Log4J2LoggingSystemTests$Nested"); LogManager.getLogger("org.springframework.boot.logging.log4j2.Log4J2LoggingSystemTests$Nested");
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.initialize(this.initializationContext, null, null);
@ -225,7 +225,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test // gh-35227 @Test // gh-35227
void getLoggingConfigurationsWhenHasCustomLevel() { void getLoggerConfigurationWhenHasCustomLevel() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.initialize(this.initializationContext, null, null);
LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false); LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false);
@ -242,7 +242,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfiguration() { void getLoggerConfiguration() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.initialize(this.initializationContext, null, null);
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@ -252,7 +252,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurationShouldReturnLoggerWithNullConfiguredLevel() { void getLoggerConfigurationShouldReturnLoggerWithNullConfiguredLevel() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.initialize(this.initializationContext, null, null);
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@ -261,7 +261,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurationForNonExistentLoggerShouldReturnNull() { void getLoggerConfigurationForNonExistentLoggerShouldReturnNull() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.initialize(this.initializationContext, null, null);
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@ -396,7 +396,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurationWithResetLevelReturnsNull() { void getLoggerConfigurationWithResetLevelReturnsNull() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.initialize(this.initializationContext, null, null);
this.loggingSystem.setLogLevel("com.example", LogLevel.WARN); this.loggingSystem.setLogLevel("com.example", LogLevel.WARN);
@ -410,7 +410,7 @@ class Log4J2LoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurationWithResetLevelWhenAlreadyConfiguredReturnsParentConfiguredLevel() { void getLoggerConfigurationWithResetLevelWhenAlreadyConfiguredReturnsParentConfiguredLevel() {
LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false); LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false);
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
this.loggingSystem.initialize(this.initializationContext, null, null); this.loggingSystem.initialize(this.initializationContext, null, null);

8
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/logging/logback/LogbackLoggingSystemTests.java
View File

@ -235,7 +235,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurations() { void getLoggerConfigurations() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
initialize(this.initializationContext, null, null); initialize(this.initializationContext, null, null);
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@ -245,7 +245,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfiguration() { void getLoggerConfiguration() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
initialize(this.initializationContext, null, null); initialize(this.initializationContext, null, null);
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG); this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@ -255,7 +255,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurationForLoggerThatDoesNotExistShouldReturnNull() { void getLoggerConfigurationForLoggerThatDoesNotExistShouldReturnNull() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
initialize(this.initializationContext, null, null); initialize(this.initializationContext, null, null);
LoggerConfiguration configuration = this.loggingSystem.getLoggerConfiguration("doesnotexist"); LoggerConfiguration configuration = this.loggingSystem.getLoggerConfiguration("doesnotexist");
@ -263,7 +263,7 @@ class LogbackLoggingSystemTests extends AbstractLoggingSystemTests {
} }
@Test @Test
void getLoggingConfigurationForALL() { void getLoggerConfigurationForALL() {
this.loggingSystem.beforeInitialize(); this.loggingSystem.beforeInitialize();
initialize(this.initializationContext, null, null); initialize(this.initializationContext, null, null);
Logger logger = (Logger) LoggerFactory.getILoggerFactory().getLogger(getClass().getName()); Logger logger = (Logger) LoggerFactory.getILoggerFactory().getLogger(getClass().getName());