Add missing havingValue="true" for *.enabled

Fix that `*.enabled=false` should not be effectively enabled.
spring-projects · Dec 31, 2024 · 7bfc6af · 7bfc6af
1 parent c1a7331
commit 7bfc6af
Show file tree

Hide file tree

Showing 35 changed files with 59 additions and 42 deletions.
diff --git a/...ain/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java b/...ain/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java
@@ -41,7 +41,7 @@
  */
 @AutoConfiguration
 @ConditionalOnBean(AuditEventRepository.class)
-@ConditionalOnProperty(prefix = "management.auditevents", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "management.auditevents", name = "enabled", havingValue = "true", matchIfMissing = true)
 public class AuditAutoConfiguration {
 
 	@Bean

diff --git a/...te/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java b/...te/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java
@@ -76,7 +76,8 @@
  * @since 2.0.0
  */
 @AutoConfiguration(after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", havingValue = "true",
+		matchIfMissing = true)
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
 @ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
 public class ReactiveCloudFoundryActuatorAutoConfiguration {

diff --git a/...oot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java b/...oot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java
@@ -77,7 +77,8 @@
  */
 @AutoConfiguration(after = { ServletManagementContextAutoConfiguration.class, HealthEndpointAutoConfiguration.class,
 		InfoEndpointAutoConfiguration.class })
-@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", havingValue = "true",
+		matchIfMissing = true)
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnClass(DispatcherServlet.class)
 @ConditionalOnBean(DispatcherServlet.class)

diff --git a/...igure/metrics/export/prometheus/PrometheusSimpleclientMetricsExportAutoConfiguration.java b/...igure/metrics/export/prometheus/PrometheusSimpleclientMetricsExportAutoConfiguration.java
@@ -119,7 +119,8 @@ PrometheusSimpleclientScrapeEndpoint prometheusEndpoint(CollectorRegistry collec
 	 */
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass(PushGateway.class)
-	@ConditionalOnProperty(prefix = "management.prometheus.metrics.export.pushgateway", name = "enabled")
+	@ConditionalOnProperty(prefix = "management.prometheus.metrics.export.pushgateway", name = "enabled",
+			havingValue = "true")
 	static class PrometheusPushGatewayConfiguration {
 
 		/**

diff --git a/...rg/springframework/boot/actuate/autoconfigure/tracing/BravePropagationConfigurations.java b/...rg/springframework/boot/actuate/autoconfigure/tracing/BravePropagationConfigurations.java
@@ -68,7 +68,7 @@ CompositePropagationFactory propagationFactory(TracingProperties properties) {
 	 * Propagates traces and baggage.
 	 */
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(value = "management.tracing.baggage.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(value = "management.tracing.baggage.enabled", havingValue = "true", matchIfMissing = true)
 	@EnableConfigurationProperties(TracingProperties.class)
 	static class PropagationWithBaggage {
 
@@ -143,7 +143,7 @@ CorrelationScopeDecorator.Builder mdcCorrelationScopeDecoratorBuilder(
 		@Bean
 		@Order(0)
 		@ConditionalOnProperty(prefix = "management.tracing.baggage.correlation", name = "enabled",
-				matchIfMissing = true)
+				havingValue = "true", matchIfMissing = true)
 		CorrelationScopeCustomizer correlationFieldsCorrelationScopeCustomizer() {
 			return (builder) -> {
 				Correlation correlationProperties = this.tracingProperties.getBaggage().getCorrelation();

diff --git a/...gframework/boot/actuate/autoconfigure/tracing/OpenTelemetryPropagationConfigurations.java b/...gframework/boot/actuate/autoconfigure/tracing/OpenTelemetryPropagationConfigurations.java
@@ -58,7 +58,8 @@ TextMapPropagator textMapPropagator(TracingProperties properties) {
 	 * Propagates traces and baggage.
 	 */
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(prefix = "management.tracing.baggage", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "management.tracing.baggage", name = "enabled", havingValue = "true",
+			matchIfMissing = true)
 	@EnableConfigurationProperties(TracingProperties.class)
 	static class PropagationWithBaggage {
 
@@ -81,7 +82,7 @@ TextMapPropagator textMapPropagatorWithBaggage(OtelCurrentTraceContext otelCurre
 		@Bean
 		@ConditionalOnMissingBean
 		@ConditionalOnProperty(prefix = "management.tracing.baggage.correlation", name = "enabled",
-				matchIfMissing = true)
+				havingValue = "true", matchIfMissing = true)
 		Slf4JBaggageEventListener otelSlf4JBaggageEventListener() {
 			return new Slf4JBaggageEventListener(this.tracingProperties.getBaggage().getCorrelation().getFields());
 		}

diff --git a/...ingframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesAutoConfiguration.java b/...ingframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesAutoConfiguration.java
@@ -40,7 +40,8 @@
  */
 @AutoConfiguration
 @ConditionalOnWebApplication
-@ConditionalOnProperty(prefix = "management.httpexchanges.recording", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "management.httpexchanges.recording", name = "enabled", havingValue = "true",
+		matchIfMissing = true)
 @ConditionalOnBean(HttpExchangeRepository.class)
 @EnableConfigurationProperties(HttpExchangesProperties.class)
 public class HttpExchangesAutoConfiguration {

diff --git a/...ingframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java b/...ingframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java
@@ -40,7 +40,8 @@ public class PersistenceExceptionTranslationAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnProperty(prefix = "spring.dao.exceptiontranslation", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.dao.exceptiontranslation", name = "enabled", havingValue = "true",
+			matchIfMissing = true)
 	public static PersistenceExceptionTranslationPostProcessor persistenceExceptionTranslationPostProcessor(
 			Environment environment) {
 		PersistenceExceptionTranslationPostProcessor postProcessor = new PersistenceExceptionTranslationPostProcessor();

diff --git a/.../src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/.../src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java
@@ -105,7 +105,7 @@
 		HibernateJpaAutoConfiguration.class })
 @ConditionalOnClass(Flyway.class)
 @Conditional(FlywayDataSourceCondition.class)
-@ConditionalOnProperty(prefix = "spring.flyway", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.flyway", name = "enabled", havingValue = "true", matchIfMissing = true)
 @Import(DatabaseInitializationDependencyConfigurer.class)
 @ImportRuntimeHints(FlywayAutoConfigurationRuntimeHints.class)
 public class FlywayAutoConfiguration {

diff --git a/...org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java b/...org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java
@@ -59,7 +59,7 @@ freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig confi
 
 	@Bean
 	@ConditionalOnMissingBean(name = "freeMarkerViewResolver")
-	@ConditionalOnProperty(name = "spring.freemarker.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.freemarker.enabled", havingValue = "true", matchIfMissing = true)
 	FreeMarkerViewResolver freeMarkerViewResolver() {
 		FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
 		resolver.setPrefix(getProperties().getPrefix());

diff --git a/.../org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java b/.../org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java
@@ -68,7 +68,7 @@ freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig confi
 
 	@Bean
 	@ConditionalOnMissingBean(name = "freeMarkerViewResolver")
-	@ConditionalOnProperty(name = "spring.freemarker.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.freemarker.enabled", havingValue = "true", matchIfMissing = true)
 	FreeMarkerViewResolver freeMarkerViewResolver() {
 		FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
 		getProperties().applyToMvcViewResolver(resolver);

diff --git a/...g/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java b/...g/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java
@@ -123,7 +123,7 @@ public GroovyMarkupConfigurer groovyMarkupConfigurer(ObjectProvider<MarkupTempla
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnClass({ Servlet.class, LocaleContextHolder.class, UrlBasedViewResolver.class })
 	@ConditionalOnWebApplication(type = Type.SERVLET)
-	@ConditionalOnProperty(name = "spring.groovy.template.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.groovy.template.enabled", havingValue = "true", matchIfMissing = true)
 	public static class GroovyWebConfiguration {
 
 		@Bean

diff --git a/...src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java b/...src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java
@@ -74,7 +74,7 @@ private void validateMBeans() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(prefix = "spring.datasource.tomcat", name = "jmx-enabled")
+	@ConditionalOnProperty(prefix = "spring.datasource.tomcat", name = "jmx-enabled", havingValue = "true")
 	@ConditionalOnClass(DataSourceProxy.class)
 	@ConditionalOnSingleCandidate(DataSource.class)
 	static class TomcatDataSourceJmxConfiguration {

diff --git a/...re/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java b/...re/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java
@@ -142,7 +142,7 @@ public LoggingProducerListener<Object, Object> kafkaProducerListener() {
 	}
 
 	@Bean
-	@ConditionalOnProperty(name = "spring.kafka.jaas.enabled")
+	@ConditionalOnProperty(name = "spring.kafka.jaas.enabled", havingValue = "true")
 	@ConditionalOnMissingBean
 	public KafkaJaasLoginModuleInitializer kafkaJaasInitializer() throws IOException {
 		KafkaJaasLoginModuleInitializer jaas = new KafkaJaasLoginModuleInitializer();
@@ -177,7 +177,7 @@ public KafkaAdmin kafkaAdmin(KafkaConnectionDetails connectionDetails, ObjectPro
 	}
 
 	@Bean
-	@ConditionalOnProperty(name = "spring.kafka.retry.topic.enabled")
+	@ConditionalOnProperty(name = "spring.kafka.retry.topic.enabled", havingValue = "true")
 	@ConditionalOnSingleCandidate(KafkaTemplate.class)
 	public RetryTopicConfiguration kafkaRetryTopicConfiguration(KafkaTemplate<?, ?> kafkaTemplate) {
 		KafkaProperties.Retry.Topic retryTopic = this.properties.getRetry().getTopic();

diff --git a/...ain/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java
@@ -74,7 +74,7 @@
  */
 @AutoConfiguration(after = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class })
 @ConditionalOnClass({ SpringLiquibase.class, DatabaseChange.class })
-@ConditionalOnProperty(prefix = "spring.liquibase", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.liquibase", name = "enabled", havingValue = "true", matchIfMissing = true)
 @Conditional(LiquibaseDataSourceCondition.class)
 @Import(DatabaseInitializationDependencyConfigurer.class)
 @ImportRuntimeHints(LiquibaseAutoConfigurationRuntimeHints.class)

diff --git a/...ava/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java b/...ava/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java
@@ -34,7 +34,7 @@ class MustacheReactiveWebConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnProperty(prefix = "spring.mustache", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.mustache", name = "enabled", havingValue = "true", matchIfMissing = true)
 	MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) {
 		MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler);
 		PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();

diff --git a/...java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java b/...java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java
@@ -35,7 +35,7 @@ class MustacheServletWebConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean
-	@ConditionalOnProperty(prefix = "spring.mustache", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.mustache", name = "enabled", havingValue = "true", matchIfMissing = true)
 	MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) {
 		MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler);
 		resolver.setPrefix(mustache.getPrefix());

diff --git a/.../src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfiguration.java b/.../src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfiguration.java
@@ -161,7 +161,7 @@ DefaultPulsarConsumerFactory<?> pulsarConsumerFactory(PulsarClient pulsarClient,
 
 	@Bean
 	@ConditionalOnMissingBean(PulsarAwareTransactionManager.class)
-	@ConditionalOnProperty(prefix = "spring.pulsar.transaction", name = "enabled")
+	@ConditionalOnProperty(prefix = "spring.pulsar.transaction", name = "enabled", havingValue = "true")
 	public PulsarTransactionManager pulsarTransactionManager(PulsarClient pulsarClient) {
 		return new PulsarTransactionManager(pulsarClient);
 	}

diff --git a/...a/org/springframework/boot/autoconfigure/sql/init/SqlInitializationAutoConfiguration.java b/...a/org/springframework/boot/autoconfigure/sql/init/SqlInitializationAutoConfiguration.java
@@ -36,7 +36,7 @@
 @EnableConfigurationProperties(SqlInitializationProperties.class)
 @Import({ DatabaseInitializationDependencyConfigurer.class, R2dbcInitializationConfiguration.class,
 		DataSourceInitializationConfiguration.class })
-@ConditionalOnProperty(prefix = "spring.sql.init", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.sql.init", name = "enabled", havingValue = "true", matchIfMissing = true)
 @Conditional(SqlInitializationModeCondition.class)
 public class SqlInitializationAutoConfiguration {
 

diff --git a/...n/java/org/springframework/boot/autoconfigure/thymeleaf/TemplateEngineConfigurations.java b/...n/java/org/springframework/boot/autoconfigure/thymeleaf/TemplateEngineConfigurations.java
@@ -59,7 +59,7 @@ SpringTemplateEngine templateEngine(ThymeleafProperties properties,
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnWebApplication(type = Type.REACTIVE)
-	@ConditionalOnProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.thymeleaf.enabled", havingValue = "true", matchIfMissing = true)
 	static class ReactiveTemplateEngineConfiguration {
 
 		@Bean

diff --git a/...ain/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java
@@ -128,7 +128,7 @@ SpringResourceTemplateResolver defaultTemplateResolver() {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnWebApplication(type = Type.SERVLET)
-	@ConditionalOnProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.thymeleaf.enabled", havingValue = "true", matchIfMissing = true)
 	static class ThymeleafWebMvcConfiguration {
 
 		@Bean
@@ -180,7 +180,7 @@ private String appendCharset(MimeType type, String charset) {
 
 	@Configuration(proxyBeanMethods = false)
 	@ConditionalOnWebApplication(type = Type.REACTIVE)
-	@ConditionalOnProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true)
+	@ConditionalOnProperty(name = "spring.thymeleaf.enabled", havingValue = "true", matchIfMissing = true)
 	static class ThymeleafWebFluxConfiguration {
 
 		@Bean

diff --git a/...ain/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java b/...ain/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java
@@ -40,7 +40,7 @@
 		ArtemisAutoConfiguration.class, HibernateJpaAutoConfiguration.class, TransactionAutoConfiguration.class,
 		TransactionManagerCustomizationAutoConfiguration.class })
 @ConditionalOnClass(jakarta.transaction.Transaction.class)
-@ConditionalOnProperty(prefix = "spring.jta", value = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.jta", value = "enabled", havingValue = "true", matchIfMissing = true)
 @Import(JndiJtaConfiguration.class)
 public class JtaAutoConfiguration {
 

diff --git a/...in/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java b/...in/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java
@@ -118,7 +118,7 @@ public class WebFluxAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(HiddenHttpMethodFilter.class)
-	@ConditionalOnProperty(prefix = "spring.webflux.hiddenmethod.filter", name = "enabled")
+	@ConditionalOnProperty(prefix = "spring.webflux.hiddenmethod.filter", name = "enabled", havingValue = "true")
 	public OrderedHiddenHttpMethodFilter hiddenHttpMethodFilter() {
 		return new OrderedHiddenHttpMethodFilter();
 	}

diff --git a/...ava/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfiguration.java b/...ava/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfiguration.java
@@ -44,7 +44,8 @@
 @EnableConfigurationProperties(ServerProperties.class)
 @ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
 @ConditionalOnClass(CharacterEncodingFilter.class)
-@ConditionalOnProperty(prefix = "server.servlet.encoding", value = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "server.servlet.encoding", value = "enabled", havingValue = "true",
+		matchIfMissing = true)
 public class HttpEncodingAutoConfiguration {
 
 	private final Encoding properties;

diff --git a/...n/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java b/...n/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java
@@ -51,7 +51,8 @@
  */
 @AutoConfiguration
 @ConditionalOnClass({ Servlet.class, StandardServletMultipartResolver.class, MultipartConfigElement.class })
-@ConditionalOnProperty(prefix = "spring.servlet.multipart", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.servlet.multipart", name = "enabled", havingValue = "true",
+		matchIfMissing = true)
 @ConditionalOnWebApplication(type = Type.SERVLET)
 @EnableConfigurationProperties(MultipartProperties.class)
 public class MultipartAutoConfiguration {

diff --git a/...main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java b/...main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java
@@ -163,14 +163,15 @@ public class WebMvcAutoConfiguration {
 
 	@Bean
 	@ConditionalOnMissingBean(HiddenHttpMethodFilter.class)
-	@ConditionalOnProperty(prefix = "spring.mvc.hiddenmethod.filter", name = "enabled")
+	@ConditionalOnProperty(prefix = "spring.mvc.hiddenmethod.filter", name = "enabled", havingValue = "true")
 	public OrderedHiddenHttpMethodFilter hiddenHttpMethodFilter() {
 		return new OrderedHiddenHttpMethodFilter();
 	}
 
 	@Bean
 	@ConditionalOnMissingBean(FormContentFilter.class)
-	@ConditionalOnProperty(prefix = "spring.mvc.formcontent.filter", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.mvc.formcontent.filter", name = "enabled", havingValue = "true",
+			matchIfMissing = true)
 	public OrderedFormContentFilter formContentFilter() {
 		return new OrderedFormContentFilter();
 	}

diff --git a/...a/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java b/...a/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java
@@ -142,7 +142,8 @@ DefaultErrorViewResolver conventionErrorViewResolver() {
 	}
 
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(prefix = "server.error.whitelabel", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "server.error.whitelabel", name = "enabled", havingValue = "true",
+			matchIfMissing = true)
 	@Conditional(ErrorTemplateMissingCondition.class)
 	protected static class WhitelabelErrorViewConfiguration {
 

diff --git a/.../java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java b/.../java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java
@@ -68,7 +68,8 @@ public class LocalDevToolsAutoConfiguration {
 	 * Local LiveReload configuration.
 	 */
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", havingValue = "true",
+			matchIfMissing = true)
 	static class LiveReloadConfiguration {
 
 		@Bean
@@ -96,7 +97,8 @@ LiveReloadServerEventListener liveReloadServerEventListener(OptionalLiveReloadSe
 	 */
 	@Lazy(false)
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", havingValue = "true",
+			matchIfMissing = true)
 	static class RestartConfiguration {
 
 		private final DevToolsProperties properties;

diff --git a/...java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java b/...java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java
@@ -102,7 +102,8 @@ public DispatcherFilter remoteDevToolsDispatcherFilter(AccessManager accessManag
 	 * Configuration for remote update and restarts.
 	 */
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", havingValue = "true",
+			matchIfMissing = true)
 	static class RemoteRestartConfiguration {
 
 		@Bean

diff --git a/.../main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java b/.../main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java
@@ -130,7 +130,8 @@ private void logWarnings() {
 	 * LiveReload configuration.
 	 */
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", havingValue = "true",
+			matchIfMissing = true)
 	static class LiveReloadConfiguration {
 
 		private final DevToolsProperties properties;
@@ -181,7 +182,8 @@ final ExecutorService getExecutor() {
 	 * Client configuration for remote update and restarts.
 	 */
 	@Configuration(proxyBeanMethods = false)
-	@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true)
+	@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", havingValue = "true",
+			matchIfMissing = true)
 	static class RemoteRestartClientConfiguration {
 
 		private final DevToolsProperties properties;

diff --git a/...n/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java b/...n/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java
@@ -65,7 +65,7 @@
 @AutoConfiguration(
 		after = { JacksonAutoConfiguration.class, GsonAutoConfiguration.class, JsonbAutoConfiguration.class })
 @ConditionalOnClass(name = "org.assertj.core.api.Assert")
-@ConditionalOnProperty("spring.test.jsontesters.enabled")
+@ConditionalOnProperty(name = "spring.test.jsontesters.enabled", havingValue = "true")
 public class JsonTestersAutoConfiguration {
 
 	@Bean

diff --git a/...gframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java b/...gframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java
@@ -47,7 +47,7 @@
  * @see AutoConfigureMockRestServiceServer
  */
 @AutoConfiguration
-@ConditionalOnProperty(prefix = "spring.test.webclient.mockrestserviceserver", name = "enabled")
+@ConditionalOnProperty(prefix = "spring.test.webclient.mockrestserviceserver", name = "enabled", havingValue = "true")
 public class MockRestServiceServerAutoConfiguration {
 
 	@Bean

diff --git a/...pringframework/boot/test/autoconfigure/web/servlet/MockMvcWebClientAutoConfiguration.java b/...pringframework/boot/test/autoconfigure/web/servlet/MockMvcWebClientAutoConfiguration.java
@@ -37,7 +37,8 @@
  */
 @AutoConfiguration(after = MockMvcAutoConfiguration.class)
 @ConditionalOnClass(WebClient.class)
-@ConditionalOnProperty(prefix = "spring.test.mockmvc.webclient", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.test.mockmvc.webclient", name = "enabled", havingValue = "true",
+		matchIfMissing = true)
 public class MockMvcWebClientAutoConfiguration {
 
 	@Bean

diff --git a/...pringframework/boot/test/autoconfigure/web/servlet/MockMvcWebDriverAutoConfiguration.java b/...pringframework/boot/test/autoconfigure/web/servlet/MockMvcWebDriverAutoConfiguration.java
@@ -43,7 +43,8 @@
  */
 @AutoConfiguration(after = MockMvcAutoConfiguration.class)
 @ConditionalOnClass(HtmlUnitDriver.class)
-@ConditionalOnProperty(prefix = "spring.test.mockmvc.webdriver", name = "enabled", matchIfMissing = true)
+@ConditionalOnProperty(prefix = "spring.test.mockmvc.webdriver", name = "enabled", havingValue = "true",
+		matchIfMissing = true)
 public class MockMvcWebDriverAutoConfiguration {
 
 	private static final String SECURITY_CONTEXT_EXECUTOR = "org.springframework.security.concurrent.DelegatingSecurityContextExecutor";