From dfc84069178cbba57425e85841c9c3257242db0b Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Mon, 22 Feb 2021 19:05:25 +0900 Subject: [PATCH] Polish contribution See gh-26462 Closes gh-26586 --- .../org/springframework/core/env/StandardEnvironment.java | 8 ++++++++ .../springframework/core/env/CustomEnvironmentTests.java | 4 ++-- .../web/context/support/StandardServletEnvironment.java | 8 ++++++++ 3 files changed, 18 insertions(+), 2 deletions(-) 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 5b6c60ada2..b228de56bb 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 @@ -60,9 +60,17 @@ public class StandardEnvironment extends AbstractEnvironment { public static final String SYSTEM_PROPERTIES_PROPERTY_SOURCE_NAME = "systemProperties"; + /** + * Create a new {@code StandardEnvironment} instance. + */ public StandardEnvironment() { } + /** + * Create a new {@code StandardEnvironment} instance with a specific {@link MutablePropertySources} instance. + * @param propertySources property sources to use + * @since 5.3.4 + */ protected StandardEnvironment(MutablePropertySources propertySources) { super(propertySources); } diff --git a/spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java b/spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java index 7f35a190c8..cc6098f52b 100644 --- a/spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java +++ b/spring-core/src/test/java/org/springframework/core/env/CustomEnvironmentTests.java @@ -108,7 +108,7 @@ class CustomEnvironmentTests { } @Test - public void withNoProfileProperties() { + void withNoProfileProperties() { ConfigurableEnvironment env = new AbstractEnvironment() { @Override @Nullable @@ -131,7 +131,7 @@ class CustomEnvironmentTests { } @Test - public void withCustomMutablePropertySources() { + void withCustomMutablePropertySources() { class CustomMutablePropertySources extends MutablePropertySources {} MutablePropertySources propertySources = new CustomMutablePropertySources(); ConfigurableEnvironment env = new AbstractEnvironment(propertySources) {}; diff --git a/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java b/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java index 00b09095e3..3ec9b92be6 100644 --- a/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java +++ b/spring-web/src/main/java/org/springframework/web/context/support/StandardServletEnvironment.java @@ -54,9 +54,17 @@ public class StandardServletEnvironment extends StandardEnvironment implements C public static final String JNDI_PROPERTY_SOURCE_NAME = "jndiProperties"; + /** + * Create a new {@code StandardServletEnvironment} instance. + */ public StandardServletEnvironment() { } + /** + * Create a new {@code StandardServletEnvironment} instance with a specific {@link MutablePropertySources} instance. + * @param propertySources property sources to use + * @since 5.3.4 + */ protected StandardServletEnvironment(MutablePropertySources propertySources) { super(propertySources); }