Browse Source

Flip default for management.add-application-context-header

Closes gh-8656
pull/1688/merge
Madhura Bhave 9 years ago
parent
commit
20f201b57a
  1. 2
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java
  2. 2
      spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java
  3. 12
      spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java
  4. 1
      spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfiguration.java

@ -238,7 +238,7 @@ public class EndpointWebMvcAutoConfiguration @@ -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

2
spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/ManagementServerProperties.java

@ -84,7 +84,7 @@ public class ManagementServerProperties implements SecurityPrerequisite { @@ -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();

12
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/EndpointWebMvcAutoConfigurationTests.java

@ -146,22 +146,22 @@ public class EndpointWebMvcAutoConfigurationTests { @@ -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

1
spring-boot-actuator/src/test/java/org/springframework/boot/actuate/autoconfigure/ManagementServerPropertiesTests.java

@ -47,6 +47,7 @@ public class ManagementServerPropertiesTests { @@ -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

Loading…
Cancel
Save