From 8d3d07bde696c1f0b02c9abcc8d4965afda70001 Mon Sep 17 00:00:00 2001 From: Ryan Baxter Date: Mon, 21 Nov 2016 12:07:01 -0500 Subject: [PATCH] We no longer need InfoEndpointRebinderConfiguration since we will not be supporting Boot 1.3.x in Dalston. See #145. --- .../RefreshEndpointAutoConfiguration.java | 55 ------------------- 1 file changed, 55 deletions(-) diff --git a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java index bac20fea..32c58d29 100644 --- a/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java +++ b/spring-cloud-context/src/main/java/org/springframework/cloud/autoconfigure/RefreshEndpointAutoConfiguration.java @@ -58,13 +58,6 @@ import org.springframework.integration.monitor.IntegrationMBeanExporter; @AutoConfigureAfter(EndpointAutoConfiguration.class) public class RefreshEndpointAutoConfiguration { - @ConditionalOnBean(EndpointAutoConfiguration.class) - @ConditionalOnMissingClass("org.springframework.boot.actuate.info.InfoContributor") - @Bean - InfoEndpointRebinderConfiguration infoEndpointRebinderConfiguration() { - return new InfoEndpointRebinderConfiguration(); - } - @ConditionalOnMissingBean @ConditionalOnEnabledHealthIndicator("refresh") @Bean @@ -133,52 +126,4 @@ public class RefreshEndpointAutoConfiguration { } } - - private static class InfoEndpointRebinderConfiguration - implements ApplicationListener, BeanPostProcessor { - - @Autowired - private ConfigurableEnvironment environment; - - private Map map = new LinkedHashMap(); - - @Override - public void onApplicationEvent(EnvironmentChangeEvent event) { - for (String key : event.getKeys()) { - if (key.startsWith("info.")) { - this.map.put(key.substring("info.".length()), - this.environment.getProperty(key)); - } - } - } - - @Override - public Object postProcessAfterInitialization(Object bean, String beanName) - throws BeansException { - if (bean instanceof InfoEndpoint) { - return infoEndpoint((InfoEndpoint) bean); - } - return bean; - } - - @Override - public Object postProcessBeforeInitialization(Object bean, String beanName) - throws BeansException { - return bean; - } - - private InfoEndpoint infoEndpoint(InfoEndpoint endpoint) { - return new InfoEndpoint(endpoint.invoke()) { - @Override - public Map invoke() { - Map info = new LinkedHashMap( - super.invoke()); - info.putAll(InfoEndpointRebinderConfiguration.this.map); - return info; - } - }; - } - - } - } \ No newline at end of file