SpringCloud/spring-cloud-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source
This commit is contained in:
Spencer Gibb
2020-01-30 14:35:41 -05:00
parent 4678998351 744ad89177
commit 44dce764e8
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/WritableEnvironmentEndpointAutoConfiguration.java
View File

@@ -48,8 +48,7 @@ import org.springframework.core.env.Environment;
@AutoConfigureBefore(EnvironmentEndpointAutoConfiguration.class)
@AutoConfigureAfter(LifecycleMvcEndpointAutoConfiguration.class)
@EnableConfigurationProperties({ EnvironmentEndpointProperties.class })
@ConditionalOnProperty(value = "management.endpoint.env.post.enabled",
matchIfMissing = true)
@ConditionalOnProperty("management.endpoint.env.post.enabled")
public class WritableEnvironmentEndpointAutoConfiguration {
private final EnvironmentEndpointProperties properties;
@@ -62,7 +61,8 @@ public class WritableEnvironmentEndpointAutoConfiguration {
@Bean
@ConditionalOnMissingBean
@ConditionalOnAvailableEndpoint
public WritableEnvironmentEndpoint environmentEndpoint(Environment environment) {
public WritableEnvironmentEndpoint writableEnvironmentEndpoint(
Environment environment) {
WritableEnvironmentEndpoint endpoint = new WritableEnvironmentEndpoint(
environment);
String[] keysToSanitize = this.properties.getKeysToSanitize();
@@ -74,7 +74,7 @@ public class WritableEnvironmentEndpointAutoConfiguration {
@Bean
@ConditionalOnAvailableEndpoint
public WritableEnvironmentEndpointWebExtension environmentEndpointWebExtension(
public WritableEnvironmentEndpointWebExtension writableEnvironmentEndpointWebExtension(
WritableEnvironmentEndpoint endpoint, EnvironmentManager environment) {
return new WritableEnvironmentEndpointWebExtension(endpoint, environment);
}