Browse Source

Polishing

pull/27555/head
Juergen Hoeller 4 years ago
parent
commit
040445612f
  1. 3
      spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
  2. 7
      spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java
  3. 8
      spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java

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

@ -48,6 +48,7 @@ import org.springframework.util.StringUtils;
* *
* @author Chris Beams * @author Chris Beams
* @author Juergen Hoeller * @author Juergen Hoeller
* @author Phillip Webb
* @since 3.1 * @since 3.1
* @see ConfigurableEnvironment * @see ConfigurableEnvironment
* @see StandardEnvironment * @see StandardEnvironment
@ -129,6 +130,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
* {@link #customizePropertySources(MutablePropertySources)} during * {@link #customizePropertySources(MutablePropertySources)} during
* construction to allow subclasses to contribute or manipulate * construction to allow subclasses to contribute or manipulate
* {@link PropertySource} instances as appropriate. * {@link PropertySource} instances as appropriate.
* @param propertySources property sources to use
* @since 5.3.4 * @since 5.3.4
* @see #customizePropertySources(MutablePropertySources) * @see #customizePropertySources(MutablePropertySources)
*/ */
@ -138,6 +140,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
customizePropertySources(propertySources); customizePropertySources(propertySources);
} }
/** /**
* Factory method used to create the {@link ConfigurablePropertyResolver} * Factory method used to create the {@link ConfigurablePropertyResolver}
* instance used by the Environment. * instance used by the Environment.

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

@ -46,6 +46,7 @@ package org.springframework.core.env;
* variable names. * variable names.
* *
* @author Chris Beams * @author Chris Beams
* @author Phillip Webb
* @since 3.1 * @since 3.1
* @see ConfigurableEnvironment * @see ConfigurableEnvironment
* @see SystemEnvironmentPropertySource * @see SystemEnvironmentPropertySource
@ -61,13 +62,15 @@ public class StandardEnvironment extends AbstractEnvironment {
/** /**
* Create a new {@code StandardEnvironment} instance. * Create a new {@code StandardEnvironment} instance with a default
* {@link MutablePropertySources} instance.
*/ */
public StandardEnvironment() { public StandardEnvironment() {
} }
/** /**
* Create a new {@code StandardEnvironment} instance with a specific {@link MutablePropertySources} instance. * Create a new {@code StandardEnvironment} instance with a specific
* {@link MutablePropertySources} instance.
* @param propertySources property sources to use * @param propertySources property sources to use
* @since 5.3.4 * @since 5.3.4
*/ */

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2020 the original author or authors. * Copyright 2002-2021 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -278,7 +278,7 @@ final class LogAdapter {
protected final String name; protected final String name;
protected transient T logger; protected final transient T logger;
public Slf4jLog(T logger) { public Slf4jLog(T logger) {
this.name = logger.getName(); this.name = logger.getName();
@ -500,9 +500,9 @@ final class LogAdapter {
@SuppressWarnings("serial") @SuppressWarnings("serial")
private static class JavaUtilLog implements Log, Serializable { private static class JavaUtilLog implements Log, Serializable {
private String name; private final String name;
private transient java.util.logging.Logger logger; private final transient java.util.logging.Logger logger;
public JavaUtilLog(String name) { public JavaUtilLog(String name) {
this.name = name; this.name = name;

Loading…
Cancel
Save