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

Polish

Browse Source
This commit is contained in:
Madhura Bhave
2018-02-07 13:20:57 -08:00
parent 7d53c54364
commit dd3bcc5691
4 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,7 +47,7 @@ import org.springframework.beans.BeansException;
import org.springframework.boot.actuate.endpoint.Sanitizer;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetaData;
import org.springframework.boot.context.properties.ConfigurationBeanFactoryMetadata;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
@@ -107,15 +107,15 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
private ContextConfigurationProperties describeConfigurationProperties(
ApplicationContext context, ObjectMapper mapper) {
ConfigurationBeanFactoryMetaData beanFactoryMetaData = getBeanFactoryMetaData(
ConfigurationBeanFactoryMetadata beanFactoryMetadata = getBeanFactoryMetadata(
context);
Map<String, Object> beans = getConfigurationPropertiesBeans(context,
beanFactoryMetaData);
beanFactoryMetadata);
Map<String, ConfigurationPropertiesBeanDescriptor> beanDescriptors = new HashMap<>();
for (Map.Entry<String, Object> entry : beans.entrySet()) {
String beanName = entry.getKey();
Object bean = entry.getValue();
String prefix = extractPrefix(context, beanFactoryMetaData, beanName);
String prefix = extractPrefix(context, beanFactoryMetadata, beanName);
beanDescriptors.put(beanName, new ConfigurationPropertiesBeanDescriptor(
prefix, sanitize(prefix, safeSerialize(mapper, bean, prefix))));
}
@@ -123,10 +123,10 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
context.getParent() == null ? null : context.getParent().getId());
}
private ConfigurationBeanFactoryMetaData getBeanFactoryMetaData(
private ConfigurationBeanFactoryMetadata getBeanFactoryMetadata(
ApplicationContext context) {
Map<String, ConfigurationBeanFactoryMetaData> beans = context
.getBeansOfType(ConfigurationBeanFactoryMetaData.class);
Map<String, ConfigurationBeanFactoryMetadata> beans = context
.getBeansOfType(ConfigurationBeanFactoryMetadata.class);
if (beans.size() == 1) {
return beans.values().iterator().next();
}
@@ -135,11 +135,11 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
private Map<String, Object> getConfigurationPropertiesBeans(
ApplicationContext context,
ConfigurationBeanFactoryMetaData beanFactoryMetaData) {
ConfigurationBeanFactoryMetadata beanFactoryMetadata) {
Map<String, Object> beans = new HashMap<>();
beans.putAll(context.getBeansWithAnnotation(ConfigurationProperties.class));
if (beanFactoryMetaData != null) {
beans.putAll(beanFactoryMetaData
if (beanFactoryMetadata != null) {
beans.putAll(beanFactoryMetadata
.getBeansWithFactoryAnnotation(ConfigurationProperties.class));
}
return beans;
@@ -204,7 +204,7 @@ public class ConfigurationPropertiesReportEndpoint implements ApplicationContext
* @return the prefix
*/
private String extractPrefix(ApplicationContext context,
ConfigurationBeanFactoryMetaData beanFactoryMetaData, String beanName) {
ConfigurationBeanFactoryMetadata beanFactoryMetaData, String beanName) {
ConfigurationProperties annotation = context.findAnnotationOnBean(beanName,
ConfigurationProperties.class);
if (beanFactoryMetaData != null) {