From f5b973a242e435987a4cdb1c20d7afff6ddb41c6 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Fri, 15 Jan 2016 17:44:04 +0000 Subject: [PATCH] Polish contribution - Update copyright headers - Use kebab-case for the property name - Set the header unconditionally when the filter's registered Closes gh-4320 --- .../EndpointWebMvcAutoConfiguration.java | 15 +++------------ .../EndpointWebMvcAutoConfigurationTests.java | 2 +- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java index 9024aa7027..1687b696c4 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -200,7 +200,7 @@ public class EndpointWebMvcAutoConfiguration // Put Servlets and Filters in their own nested class so they don't force early // instantiation of ManagementServerProperties. @Configuration - @ConditionalOnProperty(prefix = "management", name = "addApplicationContextHeader", matchIfMissing = true, havingValue = "true") + @ConditionalOnProperty(prefix = "management", name = "add-application-context-header", matchIfMissing = true, havingValue = "true") protected static class ApplicationContextFilterConfiguration { @Bean @@ -225,8 +225,6 @@ public class EndpointWebMvcAutoConfiguration private final ApplicationContext applicationContext; - private ManagementServerProperties properties; - ApplicationContextHeaderFilter(ApplicationContext applicationContext) { this.applicationContext = applicationContext; } @@ -235,14 +233,7 @@ public class EndpointWebMvcAutoConfiguration protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) throws ServletException, IOException { - if (this.properties == null) { - this.properties = this.applicationContext - .getBean(ManagementServerProperties.class); - } - if (this.properties.getAddApplicationContextHeader()) { - response.addHeader("X-Application-Context", - this.applicationContext.getId()); - } + response.addHeader("X-Application-Context", this.applicationContext.getId()); filterChain.doFilter(request, response); } diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java index f920953f4e..f43a17bb26 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2015 the original author or authors. + * Copyright 2012-2016 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.