From 6c76353682d53977e3ea41d9c872411fd4b9a15f Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Fri, 4 Nov 2016 16:43:38 -0700 Subject: [PATCH] Default `management.cloudfoundry.enabled` to true Update `CloudFoundryActuatorAutoConfiguration` so that it is enabled when `management.cloudfoundry.enabled` is missing. See gh-7108 --- .../cloudfoundry/CloudFoundryActuatorAutoConfiguration.java | 2 +- .../CloudFoundryActuatorAutoConfigurationTests.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java index e95bfdbebb..4f3f0e9ecf 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfiguration.java @@ -45,7 +45,7 @@ import org.springframework.web.servlet.HandlerInterceptor; * @since 1.5.0 */ @Configuration -@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = false) +@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true) @ConditionalOnBean(MvcEndpoints.class) @AutoConfigureAfter(EndpointWebMvcAutoConfiguration.class) @ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY) diff --git a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java index 0c7d687139..9129816c24 100644 --- a/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java +++ b/spring-boot-actuator/src/test/java/org/springframework/boot/actuate/cloudfoundry/CloudFoundryActuatorAutoConfigurationTests.java @@ -110,7 +110,6 @@ public class CloudFoundryActuatorAutoConfigurationTests { public void cloudFoundryPlatformActiveAndCloudControllerUrlNotPresent() throws Exception { EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION:---", - "management.cloudfoundry.enabled:true", "vcap.application.application_id:my-app-id"); this.context.refresh(); CloudFoundryEndpointHandlerMapping handlerMapping1 = this.context.getBean( @@ -126,7 +125,6 @@ public class CloudFoundryActuatorAutoConfigurationTests { private CloudFoundryEndpointHandlerMapping x() { EnvironmentTestUtils.addEnvironment(this.context, "VCAP_APPLICATION:---", - "management.cloudfoundry.enabled:true", "vcap.application.application_id:my-app-id", "vcap.application.cf_api:http://my-cloud-controller.com"); this.context.refresh();