From 040445612f157827e7ee199c2d6af55cbd2497bc Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Tue, 28 Sep 2021 18:15:56 +0200 Subject: [PATCH] Polishing --- .../org/springframework/core/env/AbstractEnvironment.java | 3 +++ .../org/springframework/core/env/StandardEnvironment.java | 7 +++++-- .../main/java/org/apache/commons/logging/LogAdapter.java | 8 ++++---- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java index d4027e16f36..85968d699a8 100644 --- a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java +++ b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java @@ -48,6 +48,7 @@ import org.springframework.util.StringUtils; * * @author Chris Beams * @author Juergen Hoeller + * @author Phillip Webb * @since 3.1 * @see ConfigurableEnvironment * @see StandardEnvironment @@ -129,6 +130,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment { * {@link #customizePropertySources(MutablePropertySources)} during * construction to allow subclasses to contribute or manipulate * {@link PropertySource} instances as appropriate. + * @param propertySources property sources to use * @since 5.3.4 * @see #customizePropertySources(MutablePropertySources) */ @@ -138,6 +140,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment { customizePropertySources(propertySources); } + /** * Factory method used to create the {@link ConfigurablePropertyResolver} * instance used by the Environment. diff --git a/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java index b228de56bb2..9d2a2eb6b88 100644 --- a/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java +++ b/spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java @@ -46,6 +46,7 @@ package org.springframework.core.env; * variable names. * * @author Chris Beams + * @author Phillip Webb * @since 3.1 * @see ConfigurableEnvironment * @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() { } /** - * 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 * @since 5.3.4 */ diff --git a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java b/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java index c918ee7c2df..cc5bed06ea9 100644 --- a/spring-jcl/src/main/java/org/apache/commons/logging/LogAdapter.java +++ b/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"); * you may not use this file except in compliance with the License. @@ -278,7 +278,7 @@ final class LogAdapter { protected final String name; - protected transient T logger; + protected final transient T logger; public Slf4jLog(T logger) { this.name = logger.getName(); @@ -500,9 +500,9 @@ final class LogAdapter { @SuppressWarnings("serial") 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) { this.name = name;