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

Revert "Make sure we copy variables to new InfoEndpoint. Fixes #143."

Browse Source 
This reverts commit 30f34cf3bc.
This commit is contained in:
Ryan Baxter
2016-11-21 12:01:31 -05:00
parent 0a6466d9c0
commit dde952982e
1 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java
View File

@@ -58,14 +58,11 @@ import org.springframework.integration.monitor.IntegrationMBeanExporter;
@AutoConfigureAfter(EndpointAutoConfiguration.class)
public class RefreshEndpointAutoConfiguration {
@ConditionalOnBean(EndpointAutoConfiguration.class)
@ConditionalOnMissingClass("org.springframework.boot.actuate.info.InfoContributor")
protected static class InfoEndpointAutoConfiguration {
@ConditionalOnBean(EndpointAutoConfiguration.class)
@Bean
InfoEndpointRebinderConfiguration infoEndpointRebinderConfiguration() {
return new InfoEndpointRebinderConfiguration();
}
@Bean
InfoEndpointRebinderConfiguration infoEndpointRebinderConfiguration() {
return new InfoEndpointRebinderConfiguration();
}
@ConditionalOnMissingBean
@@ -171,7 +168,7 @@ public class RefreshEndpointAutoConfiguration {
}
private InfoEndpoint infoEndpoint(InfoEndpoint endpoint) {
InfoEndpoint newEndpoint = new InfoEndpoint(endpoint.invoke()) {
return new InfoEndpoint(endpoint.invoke()) {
@Override
public Map<String, Object> invoke() {
Map<String, Object> info = new LinkedHashMap<String, Object>(
@@ -180,10 +177,6 @@ public class RefreshEndpointAutoConfiguration {
return info;
}
};
newEndpoint.setId(endpoint.getId());
newEndpoint.setEnabled(endpoint.isEnabled());
newEndpoint.setSensitive(endpoint.isSensitive());
return newEndpoint;
}
}