Skip to content

Commit 5a205db

Browse files
izeyewilkinsona
authored andcommitted
Polish
See gh-36620
1 parent 3f2c583 commit 5a205db

File tree

8 files changed

+24
-24
lines changed

8 files changed

+24
-24
lines changed

spring-boot-project/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/logging/LoggersEndpoint.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ public String getConfiguredLevel() {
151151
*/
152152
public static class GroupLoggerLevels extends LoggerLevels {
153153

154-
private List<String> members;
154+
private final List<String> members;
155155

156156
public GroupLoggerLevels(LogLevel configuredLevel, List<String> members) {
157157
super(configuredLevel);
@@ -165,7 +165,7 @@ public List<String> getMembers() {
165165
}
166166

167167
/**
168-
* Levels configured for single logger group exposed in a JSON friendly way.
168+
* Levels configured for single logger exposed in a JSON friendly way.
169169
*/
170170
public static class SingleLoggerLevels extends LoggerLevels {
171171

spring-boot-project/spring-boot-tools/spring-boot-gradle-plugin/src/main/java/org/springframework/boot/gradle/tasks/bundling/Closures.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* <p>
3232
* To accommodate the differences, we use {@code org.gradle.util.internal.ConfigureUtil}
3333
* with Gradle 7.1 and later. With earlier versions, {@code org.gradle.util.ConfigureUtil}
34-
* is used. This avoids users by nagged about deprecated API usage in our plugin.
34+
* is used. This avoids users to be nagged about deprecated API usage in our plugin.
3535
*
3636
* @author Andy Wilkinson
3737
*/

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public LoggerConfiguration(String name, LogLevel configuredLevel, LogLevel effec
6060
public LoggerConfiguration(String name, LevelConfiguration levelConfiguration,
6161
LevelConfiguration inheritedLevelConfiguration) {
6262
Assert.notNull(name, "Name must not be null");
63-
Assert.notNull(inheritedLevelConfiguration, "EffectiveLevelConfiguration must not be null");
63+
Assert.notNull(inheritedLevelConfiguration, "InheritedLevelConfiguration must not be null");
6464
this.name = name;
6565
this.levelConfiguration = levelConfiguration;
6666
this.inheritedLevelConfiguration = inheritedLevelConfiguration;
@@ -140,15 +140,15 @@ public String toString() {
140140
}
141141

142142
/**
143-
* Supported logger configurations scopes.
143+
* Supported logger configuration scopes.
144144
*
145145
* @since 2.7.13
146146
*/
147147
public enum ConfigurationScope {
148148

149149
/**
150-
* Only return configuration that has been applied directly applied. Often
151-
* referred to as 'configured' or 'assigned' configuration.
150+
* Only return configuration that has been applied directly. Often referred to as
151+
* 'configured' or 'assigned' configuration.
152152
*/
153153
DIRECT,
154154

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/env/YamlPropertySourceLoaderSnakeYaml132Tests.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.springframework.boot.testsupport.classpath.ClassPathOverrides;
2020

2121
/**
22-
* Tests for {@link YamlPropertySourceLoader} with SnakeYAML 1.33.
22+
* Tests for {@link YamlPropertySourceLoader} with SnakeYAML 1.32.
2323
*
2424
* @author Andy Wilkinson
2525
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,10 @@ void createWithLevelConfigurationWhenNameIsNullThrowsException() {
5353
}
5454

5555
@Test
56-
void createWithLevelConfigurationWhenEffectiveLevelIsNullThrowsException() {
56+
void createWithLevelConfigurationWhenInheritedLevelConfigurationIsNullThrowsException() {
5757
assertThatIllegalArgumentException()
5858
.isThrownBy(() -> new LoggerConfiguration("test", null, (LevelConfiguration) null))
59-
.withMessage("EffectiveLevelConfiguration must not be null");
59+
.withMessage("InheritedLevelConfiguration must not be null");
6060
}
6161

6262
@Test

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void setLevelToNull(CapturedOutput output) {
166166
}
167167

168168
@Test
169-
void getLoggingConfigurations() {
169+
void getLoggerConfigurations() {
170170
this.loggingSystem.beforeInitialize();
171171
this.loggingSystem.initialize(null, null, null);
172172
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@@ -176,7 +176,7 @@ void getLoggingConfigurations() {
176176
}
177177

178178
@Test
179-
void getLoggingConfiguration() {
179+
void getLoggerConfiguration() {
180180
this.loggingSystem.beforeInitialize();
181181
this.loggingSystem.initialize(null, null, null);
182182
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ void setLevelToNull(CapturedOutput output) {
181181
}
182182

183183
@Test
184-
void getLoggingConfigurations() {
184+
void getLoggerConfigurations() {
185185
this.loggingSystem.beforeInitialize();
186186
this.loggingSystem.initialize(this.initializationContext, null, null);
187187
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@@ -191,7 +191,7 @@ void getLoggingConfigurations() {
191191
}
192192

193193
@Test
194-
void getLoggingConfigurationsShouldReturnAllLoggers() {
194+
void getLoggerConfigurationsShouldReturnAllLoggers() {
195195
LogManager.getLogger("org.springframework.boot.logging.log4j2.Log4J2LoggingSystemTests$Nested");
196196
this.loggingSystem.beforeInitialize();
197197
this.loggingSystem.initialize(this.initializationContext, null, null);
@@ -208,7 +208,7 @@ void getLoggingConfigurationsShouldReturnAllLoggers() {
208208
}
209209

210210
@Test // gh-35227
211-
void getLoggingConfigurationsWhenHasCustomLevel() {
211+
void getLoggerConfigurationWhenHasCustomLevel() {
212212
this.loggingSystem.beforeInitialize();
213213
this.loggingSystem.initialize(this.initializationContext, null, null);
214214
LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false);
@@ -225,7 +225,7 @@ private void assertIsPresent(String loggerName, Map<String, LogLevel> loggers, L
225225
}
226226

227227
@Test
228-
void getLoggingConfiguration() {
228+
void getLoggerConfiguration() {
229229
this.loggingSystem.beforeInitialize();
230230
this.loggingSystem.initialize(this.initializationContext, null, null);
231231
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@@ -235,7 +235,7 @@ void getLoggingConfiguration() {
235235
}
236236

237237
@Test
238-
void getLoggingConfigurationShouldReturnLoggerWithNullConfiguredLevel() {
238+
void getLoggerConfigurationShouldReturnLoggerWithNullConfiguredLevel() {
239239
this.loggingSystem.beforeInitialize();
240240
this.loggingSystem.initialize(this.initializationContext, null, null);
241241
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@@ -244,7 +244,7 @@ void getLoggingConfigurationShouldReturnLoggerWithNullConfiguredLevel() {
244244
}
245245

246246
@Test
247-
void getLoggingConfigurationForNonExistentLoggerShouldReturnNull() {
247+
void getLoggerConfigurationForNonExistentLoggerShouldReturnNull() {
248248
this.loggingSystem.beforeInitialize();
249249
this.loggingSystem.initialize(this.initializationContext, null, null);
250250
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@@ -367,7 +367,7 @@ void initializationIsOnlyPerformedOnceUntilCleanedUp() {
367367
}
368368

369369
@Test
370-
void getLoggingConfigurationWithResetLevelReturnsNull() {
370+
void getLoggerConfigurationWithResetLevelReturnsNull() {
371371
this.loggingSystem.beforeInitialize();
372372
this.loggingSystem.initialize(this.initializationContext, null, null);
373373
this.loggingSystem.setLogLevel("com.example", LogLevel.WARN);
@@ -381,7 +381,7 @@ void getLoggingConfigurationWithResetLevelReturnsNull() {
381381
}
382382

383383
@Test
384-
void getLoggingConfigurationWithResetLevelWhenAlreadyConfiguredReturnsParentConfiguredLevel() {
384+
void getLoggerConfigurationWithResetLevelWhenAlreadyConfiguredReturnsParentConfiguredLevel() {
385385
LoggerContext loggerContext = (LoggerContext) LogManager.getContext(false);
386386
this.loggingSystem.beforeInitialize();
387387
this.loggingSystem.initialize(this.initializationContext, null, null);

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ void setLevelToNull(CapturedOutput output) {
213213
}
214214

215215
@Test
216-
void getLoggingConfigurations() {
216+
void getLoggerConfigurations() {
217217
this.loggingSystem.beforeInitialize();
218218
initialize(this.initializationContext, null, null);
219219
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@@ -223,7 +223,7 @@ void getLoggingConfigurations() {
223223
}
224224

225225
@Test
226-
void getLoggingConfiguration() {
226+
void getLoggerConfiguration() {
227227
this.loggingSystem.beforeInitialize();
228228
initialize(this.initializationContext, null, null);
229229
this.loggingSystem.setLogLevel(getClass().getName(), LogLevel.DEBUG);
@@ -233,15 +233,15 @@ void getLoggingConfiguration() {
233233
}
234234

235235
@Test
236-
void getLoggingConfigurationForLoggerThatDoesNotExistShouldReturnNull() {
236+
void getLoggerConfigurationForLoggerThatDoesNotExistShouldReturnNull() {
237237
this.loggingSystem.beforeInitialize();
238238
initialize(this.initializationContext, null, null);
239239
LoggerConfiguration configuration = this.loggingSystem.getLoggerConfiguration("doesnotexist");
240240
assertThat(configuration).isNull();
241241
}
242242

243243
@Test
244-
void getLoggingConfigurationForALL() {
244+
void getLoggerConfigurationForALL() {
245245
this.loggingSystem.beforeInitialize();
246246
initialize(this.initializationContext, null, null);
247247
Logger logger = (Logger) StaticLoggerBinder.getSingleton().getLoggerFactory().getLogger(getClass().getName());

0 commit comments

Comments
 (0)