From 20f201b57a71ac06423ccc9e2ddabfa42265c18e Mon Sep 17 00:00:00 2001 From: Madhura Bhave Date: Fri, 24 Mar 2017 15:24:15 -0700 Subject: [PATCH] Flip default for management.add-application-context-header Closes gh-8656 --- .../EndpointWebMvcAutoConfiguration.java | 2 +- .../autoconfigure/ManagementServerProperties.java | 2 +- .../EndpointWebMvcAutoConfigurationTests.java | 12 ++++++------ .../ManagementServerPropertiesTests.java | 1 + 4 files changed, 9 insertions(+), 8 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 c35590bb3fa..02d8d0578f4 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 @@ -238,7 +238,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 = "add-application-context-header", matchIfMissing = true, havingValue = "true") + @ConditionalOnProperty(prefix = "management", name = "add-application-context-header", havingValue = "true") protected static class ApplicationContextFilterConfiguration { @Bean diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java index 32ea845f03b..899cd2d12e1 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java @@ -84,7 +84,7 @@ public class ManagementServerProperties implements SecurityPrerequisite { /** * Add the "X-Application-Context" HTTP header in each response. */ - private boolean addApplicationContextHeader = true; + private boolean addApplicationContextHeader = false; private final Security security = new Security(); 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 3b528e02907..1d259047f1f 100755 --- 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 @@ -146,22 +146,22 @@ public class EndpointWebMvcAutoConfigurationTests { assertContent("/controller", ports.get().management, null); assertContent("/endpoint", ports.get().management, null); assertThat(hasHeader("/endpoint", ports.get().server, "X-Application-Context")) - .isTrue(); + .isFalse(); assertThat(this.applicationContext.containsBean("applicationContextIdFilter")) - .isTrue(); + .isFalse(); } @Test - public void onSamePortWithoutHeader() throws Exception { + public void onSamePortWithHeader() throws Exception { EnvironmentTestUtils.addEnvironment(this.applicationContext, - "management.add-application-context-header:false"); + "management.add-application-context-header:true"); this.applicationContext.register(RootConfig.class, EndpointConfig.class, BaseConfiguration.class, EndpointWebMvcAutoConfiguration.class); this.applicationContext.refresh(); assertThat(hasHeader("/endpoint", ports.get().server, "X-Application-Context")) - .isFalse(); + .isTrue(); assertThat(this.applicationContext.containsBean("applicationContextIdFilter")) - .isFalse(); + .isTrue(); } @Test diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java index e39d9152af4..c2b1913f6cc 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java @@ -47,6 +47,7 @@ public class ManagementServerPropertiesTests { ManagementServerProperties properties = new ManagementServerProperties(); assertThat(properties.getPort()).isNull(); assertThat(properties.getContextPath()).isEqualTo(""); + assertThat(properties.getAddApplicationContextHeader()).isEqualTo(false); } @Test