Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move configuration of ConfigurationPropertiesReportEndpoint

Browse Source 
See gh-10263
This commit is contained in:
Stephane Nicoll
2017-09-14 13:01:38 +02:00
parent 0d62b0cb3c
commit bb622292ba
7 changed files with 134 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpoint.java
View File

@@ -66,7 +66,6 @@ import org.springframework.util.StringUtils;
* @since 2.0.0
*/
@Endpoint(id = "configprops")
@ConfigurationProperties("endpoints.configprops")
public class ConfigurationPropertiesReportEndpoint implements ApplicationContextAware {
private static final String CGLIB_FILTER_ID = "cglibFilter";

4
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointParentTests.java
View File

@@ -48,7 +48,7 @@ public class ConfigurationPropertiesReportEndpointParentTests {
ConfigurationPropertiesDescriptor result = endpoint
.configurationProperties();
assertThat(result.getBeans().keySet())
.containsExactlyInAnyOrder("endpoint", "someProperties");
.containsExactlyInAnyOrder("someProperties");
assertThat((result.getParent().getBeans().keySet()))
.containsExactly("testProperties");
});
@@ -68,7 +68,7 @@ public class ConfigurationPropertiesReportEndpointParentTests {
ConfigurationPropertiesDescriptor result = endpoint
.configurationProperties();
assertThat(result.getBeans().keySet())
.containsExactlyInAnyOrder("endpoint", "otherProperties");
.containsExactlyInAnyOrder("otherProperties");
assertThat((result.getParent().getBeans().keySet()))
.containsExactly("testProperties");
});

19
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/context/properties/ConfigurationPropertiesReportEndpointTests.java
View File

@@ -100,25 +100,6 @@ public class ConfigurationPropertiesReportEndpointTests {
});
}
@Test
public void keysToSanitizeCanBeConfiguredViaTheEnvironment() throws Exception {
ApplicationContextRunner tester = new ApplicationContextRunner()
.withPropertyValues(
"endpoints.configprops.keys-to-sanitize: .*pass.*, property")
.withUserConfiguration(Config.class);
tester.run((context) -> {
ConfigurationPropertiesReportEndpoint endpoint = context
.getBean(ConfigurationPropertiesReportEndpoint.class);
ConfigurationPropertiesDescriptor properties = endpoint
.configurationProperties();
Map<String, Object> nestedProperties = properties.getBeans()
.get("testProperties").getProperties();
assertThat(nestedProperties).isNotNull();
assertThat(nestedProperties.get("dbPassword")).isEqualTo("******");
assertThat(nestedProperties.get("myTestProperty")).isEqualTo("******");
});
}
@Test
@SuppressWarnings("unchecked")
public void keySanitizationWithCustomPatternUsingCompositeKeys() throws Exception {