Skip to content

Commit 0404456

Browse files
committed
Polishing
1 parent 86b010a commit 0404456

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
*
4949
* @author Chris Beams
5050
* @author Juergen Hoeller
51+
* @author Phillip Webb
5152
* @since 3.1
5253
* @see ConfigurableEnvironment
5354
* @see StandardEnvironment
@@ -129,6 +130,7 @@ public AbstractEnvironment() {
129130
* {@link #customizePropertySources(MutablePropertySources)} during
130131
* construction to allow subclasses to contribute or manipulate
131132
* {@link PropertySource} instances as appropriate.
133+
* @param propertySources property sources to use
132134
* @since 5.3.4
133135
* @see #customizePropertySources(MutablePropertySources)
134136
*/
@@ -138,6 +140,7 @@ protected AbstractEnvironment(MutablePropertySources propertySources) {
138140
customizePropertySources(propertySources);
139141
}
140142

143+
141144
/**
142145
* Factory method used to create the {@link ConfigurablePropertyResolver}
143146
* instance used by the Environment.

spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
* variable names.
4747
*
4848
* @author Chris Beams
49+
* @author Phillip Webb
4950
* @since 3.1
5051
* @see ConfigurableEnvironment
5152
* @see SystemEnvironmentPropertySource
@@ -61,13 +62,15 @@ public class StandardEnvironment extends AbstractEnvironment {
6162

6263

6364
/**
64-
* Create a new {@code StandardEnvironment} instance.
65+
* Create a new {@code StandardEnvironment} instance with a default
66+
* {@link MutablePropertySources} instance.
6567
*/
6668
public StandardEnvironment() {
6769
}
6870

6971
/**
70-
* Create a new {@code StandardEnvironment} instance with a specific {@link MutablePropertySources} instance.
72+
* Create a new {@code StandardEnvironment} instance with a specific
73+
* {@link MutablePropertySources} instance.
7174
* @param propertySources property sources to use
7275
* @since 5.3.4
7376
*/

spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2002-2020 the original author or authors.
2+
* Copyright 2002-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -278,7 +278,7 @@ private static class Slf4jLog<T extends Logger> implements Log, Serializable {
278278

279279
protected final String name;
280280

281-
protected transient T logger;
281+
protected final transient T logger;
282282

283283
public Slf4jLog(T logger) {
284284
this.name = logger.getName();
@@ -500,9 +500,9 @@ protected Object readResolve() {
500500
@SuppressWarnings("serial")
501501
private static class JavaUtilLog implements Log, Serializable {
502502

503-
private String name;
503+
private final String name;
504504

505-
private transient java.util.logging.Logger logger;
505+
private final transient java.util.logging.Logger logger;
506506

507507
public JavaUtilLog(String name) {
508508
this.name = name;

0 commit comments

Comments
 (0)