Skip to content

Commit 7bfc6af

Browse files
quaffquaff
committed
Add missing havingValue="true" for *.enabled
Fix that `*.enabled=false` should not be effectively enabled.
1 parent c1a7331 commit 7bfc6af

File tree

35 files changed

+59
-42
lines changed

35 files changed

+59
-42
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/audit/AuditAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242
@AutoConfiguration
4343
@ConditionalOnBean(AuditEventRepository.class)
44-
@ConditionalOnProperty(prefix = "management.auditevents", name = "enabled", matchIfMissing = true)
44+
@ConditionalOnProperty(prefix = "management.auditevents", name = "enabled", havingValue = "true", matchIfMissing = true)
4545
public class AuditAutoConfiguration {
4646

4747
@Bean

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/reactive/ReactiveCloudFoundryActuatorAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
* @since 2.0.0
7777
*/
7878
@AutoConfiguration(after = { HealthEndpointAutoConfiguration.class, InfoEndpointAutoConfiguration.class })
79-
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
79+
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", havingValue = "true",
80+
matchIfMissing = true)
8081
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.REACTIVE)
8182
@ConditionalOnCloudPlatform(CloudPlatform.CLOUD_FOUNDRY)
8283
public class ReactiveCloudFoundryActuatorAutoConfiguration {

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/cloudfoundry/servlet/CloudFoundryActuatorAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,8 @@
7777
*/
7878
@AutoConfiguration(after = { ServletManagementContextAutoConfiguration.class, HealthEndpointAutoConfiguration.class,
7979
InfoEndpointAutoConfiguration.class })
80-
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", matchIfMissing = true)
80+
@ConditionalOnProperty(prefix = "management.cloudfoundry", name = "enabled", havingValue = "true",
81+
matchIfMissing = true)
8182
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
8283
@ConditionalOnClass(DispatcherServlet.class)
8384
@ConditionalOnBean(DispatcherServlet.class)

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/metrics/export/prometheus/PrometheusSimpleclientMetricsExportAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,8 @@ PrometheusSimpleclientScrapeEndpoint prometheusEndpoint(CollectorRegistry collec
119119
*/
120120
@Configuration(proxyBeanMethods = false)
121121
@ConditionalOnClass(PushGateway.class)
122-
@ConditionalOnProperty(prefix = "management.prometheus.metrics.export.pushgateway", name = "enabled")
122+
@ConditionalOnProperty(prefix = "management.prometheus.metrics.export.pushgateway", name = "enabled",
123+
havingValue = "true")
123124
static class PrometheusPushGatewayConfiguration {
124125

125126
/**

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/BravePropagationConfigurations.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ CompositePropagationFactory propagationFactory(TracingProperties properties) {
6868
* Propagates traces and baggage.
6969
*/
7070
@Configuration(proxyBeanMethods = false)
71-
@ConditionalOnProperty(value = "management.tracing.baggage.enabled", matchIfMissing = true)
71+
@ConditionalOnProperty(value = "management.tracing.baggage.enabled", havingValue = "true", matchIfMissing = true)
7272
@EnableConfigurationProperties(TracingProperties.class)
7373
static class PropagationWithBaggage {
7474

@@ -143,7 +143,7 @@ CorrelationScopeDecorator.Builder mdcCorrelationScopeDecoratorBuilder(
143143
@Bean
144144
@Order(0)
145145
@ConditionalOnProperty(prefix = "management.tracing.baggage.correlation", name = "enabled",
146-
matchIfMissing = true)
146+
havingValue = "true", matchIfMissing = true)
147147
CorrelationScopeCustomizer correlationFieldsCorrelationScopeCustomizer() {
148148
return (builder) -> {
149149
Correlation correlationProperties = this.tracingProperties.getBaggage().getCorrelation();

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/OpenTelemetryPropagationConfigurations.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ TextMapPropagator textMapPropagator(TracingProperties properties) {
5858
* Propagates traces and baggage.
5959
*/
6060
@Configuration(proxyBeanMethods = false)
61-
@ConditionalOnProperty(prefix = "management.tracing.baggage", name = "enabled", matchIfMissing = true)
61+
@ConditionalOnProperty(prefix = "management.tracing.baggage", name = "enabled", havingValue = "true",
62+
matchIfMissing = true)
6263
@EnableConfigurationProperties(TracingProperties.class)
6364
static class PropagationWithBaggage {
6465

@@ -81,7 +82,7 @@ TextMapPropagator textMapPropagatorWithBaggage(OtelCurrentTraceContext otelCurre
8182
@Bean
8283
@ConditionalOnMissingBean
8384
@ConditionalOnProperty(prefix = "management.tracing.baggage.correlation", name = "enabled",
84-
matchIfMissing = true)
85+
havingValue = "true", matchIfMissing = true)
8586
Slf4JBaggageEventListener otelSlf4JBaggageEventListener() {
8687
return new Slf4JBaggageEventListener(this.tracingProperties.getBaggage().getCorrelation().getFields());
8788
}

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/exchanges/HttpExchangesAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
*/
4141
@AutoConfiguration
4242
@ConditionalOnWebApplication
43-
@ConditionalOnProperty(prefix = "management.httpexchanges.recording", name = "enabled", matchIfMissing = true)
43+
@ConditionalOnProperty(prefix = "management.httpexchanges.recording", name = "enabled", havingValue = "true",
44+
matchIfMissing = true)
4445
@ConditionalOnBean(HttpExchangeRepository.class)
4546
@EnableConfigurationProperties(HttpExchangesProperties.class)
4647
public class HttpExchangesAutoConfiguration {

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/dao/PersistenceExceptionTranslationAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ public class PersistenceExceptionTranslationAutoConfiguration {
4040

4141
@Bean
4242
@ConditionalOnMissingBean
43-
@ConditionalOnProperty(prefix = "spring.dao.exceptiontranslation", name = "enabled", matchIfMissing = true)
43+
@ConditionalOnProperty(prefix = "spring.dao.exceptiontranslation", name = "enabled", havingValue = "true",
44+
matchIfMissing = true)
4445
public static PersistenceExceptionTranslationPostProcessor persistenceExceptionTranslationPostProcessor(
4546
Environment environment) {
4647
PersistenceExceptionTranslationPostProcessor postProcessor = new PersistenceExceptionTranslationPostProcessor();

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
HibernateJpaAutoConfiguration.class })
106106
@ConditionalOnClass(Flyway.class)
107107
@Conditional(FlywayDataSourceCondition.class)
108-
@ConditionalOnProperty(prefix = "spring.flyway", name = "enabled", matchIfMissing = true)
108+
@ConditionalOnProperty(prefix = "spring.flyway", name = "enabled", havingValue = "true", matchIfMissing = true)
109109
@Import(DatabaseInitializationDependencyConfigurer.class)
110110
@ImportRuntimeHints(FlywayAutoConfigurationRuntimeHints.class)
111111
public class FlywayAutoConfiguration {

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerReactiveWebConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig confi
5959

6060
@Bean
6161
@ConditionalOnMissingBean(name = "freeMarkerViewResolver")
62-
@ConditionalOnProperty(name = "spring.freemarker.enabled", matchIfMissing = true)
62+
@ConditionalOnProperty(name = "spring.freemarker.enabled", havingValue = "true", matchIfMissing = true)
6363
FreeMarkerViewResolver freeMarkerViewResolver() {
6464
FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
6565
resolver.setPrefix(getProperties().getPrefix());

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/freemarker/FreeMarkerServletWebConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ freemarker.template.Configuration freeMarkerConfiguration(FreeMarkerConfig confi
6868

6969
@Bean
7070
@ConditionalOnMissingBean(name = "freeMarkerViewResolver")
71-
@ConditionalOnProperty(name = "spring.freemarker.enabled", matchIfMissing = true)
71+
@ConditionalOnProperty(name = "spring.freemarker.enabled", havingValue = "true", matchIfMissing = true)
7272
FreeMarkerViewResolver freeMarkerViewResolver() {
7373
FreeMarkerViewResolver resolver = new FreeMarkerViewResolver();
7474
getProperties().applyToMvcViewResolver(resolver);

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/groovy/template/GroovyTemplateAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ public GroovyMarkupConfigurer groovyMarkupConfigurer(ObjectProvider<MarkupTempla
123123
@Configuration(proxyBeanMethods = false)
124124
@ConditionalOnClass({ Servlet.class, LocaleContextHolder.class, UrlBasedViewResolver.class })
125125
@ConditionalOnWebApplication(type = Type.SERVLET)
126-
@ConditionalOnProperty(name = "spring.groovy.template.enabled", matchIfMissing = true)
126+
@ConditionalOnProperty(name = "spring.groovy.template.enabled", havingValue = "true", matchIfMissing = true)
127127
public static class GroovyWebConfiguration {
128128

129129
@Bean

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ private void validateMBeans() {
7474
}
7575

7676
@Configuration(proxyBeanMethods = false)
77-
@ConditionalOnProperty(prefix = "spring.datasource.tomcat", name = "jmx-enabled")
77+
@ConditionalOnProperty(prefix = "spring.datasource.tomcat", name = "jmx-enabled", havingValue = "true")
7878
@ConditionalOnClass(DataSourceProxy.class)
7979
@ConditionalOnSingleCandidate(DataSource.class)
8080
static class TomcatDataSourceJmxConfiguration {

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/kafka/KafkaAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public LoggingProducerListener<Object, Object> kafkaProducerListener() {
142142
}
143143

144144
@Bean
145-
@ConditionalOnProperty(name = "spring.kafka.jaas.enabled")
145+
@ConditionalOnProperty(name = "spring.kafka.jaas.enabled", havingValue = "true")
146146
@ConditionalOnMissingBean
147147
public KafkaJaasLoginModuleInitializer kafkaJaasInitializer() throws IOException {
148148
KafkaJaasLoginModuleInitializer jaas = new KafkaJaasLoginModuleInitializer();
@@ -177,7 +177,7 @@ public KafkaAdmin kafkaAdmin(KafkaConnectionDetails connectionDetails, ObjectPro
177177
}
178178

179179
@Bean
180-
@ConditionalOnProperty(name = "spring.kafka.retry.topic.enabled")
180+
@ConditionalOnProperty(name = "spring.kafka.retry.topic.enabled", havingValue = "true")
181181
@ConditionalOnSingleCandidate(KafkaTemplate.class)
182182
public RetryTopicConfiguration kafkaRetryTopicConfiguration(KafkaTemplate<?, ?> kafkaTemplate) {
183183
KafkaProperties.Retry.Topic retryTopic = this.properties.getRetry().getTopic();

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
*/
7575
@AutoConfiguration(after = { DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class })
7676
@ConditionalOnClass({ SpringLiquibase.class, DatabaseChange.class })
77-
@ConditionalOnProperty(prefix = "spring.liquibase", name = "enabled", matchIfMissing = true)
77+
@ConditionalOnProperty(prefix = "spring.liquibase", name = "enabled", havingValue = "true", matchIfMissing = true)
7878
@Conditional(LiquibaseDataSourceCondition.class)
7979
@Import(DatabaseInitializationDependencyConfigurer.class)
8080
@ImportRuntimeHints(LiquibaseAutoConfigurationRuntimeHints.class)

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheReactiveWebConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class MustacheReactiveWebConfiguration {
3434

3535
@Bean
3636
@ConditionalOnMissingBean
37-
@ConditionalOnProperty(prefix = "spring.mustache", name = "enabled", matchIfMissing = true)
37+
@ConditionalOnProperty(prefix = "spring.mustache", name = "enabled", havingValue = "true", matchIfMissing = true)
3838
MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) {
3939
MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler);
4040
PropertyMapper map = PropertyMapper.get().alwaysApplyingWhenNonNull();

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheServletWebConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class MustacheServletWebConfiguration {
3535

3636
@Bean
3737
@ConditionalOnMissingBean
38-
@ConditionalOnProperty(prefix = "spring.mustache", name = "enabled", matchIfMissing = true)
38+
@ConditionalOnProperty(prefix = "spring.mustache", name = "enabled", havingValue = "true", matchIfMissing = true)
3939
MustacheViewResolver mustacheViewResolver(Compiler mustacheCompiler, MustacheProperties mustache) {
4040
MustacheViewResolver resolver = new MustacheViewResolver(mustacheCompiler);
4141
resolver.setPrefix(mustache.getPrefix());

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/pulsar/PulsarAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ DefaultPulsarConsumerFactory<?> pulsarConsumerFactory(PulsarClient pulsarClient,
161161

162162
@Bean
163163
@ConditionalOnMissingBean(PulsarAwareTransactionManager.class)
164-
@ConditionalOnProperty(prefix = "spring.pulsar.transaction", name = "enabled")
164+
@ConditionalOnProperty(prefix = "spring.pulsar.transaction", name = "enabled", havingValue = "true")
165165
public PulsarTransactionManager pulsarTransactionManager(PulsarClient pulsarClient) {
166166
return new PulsarTransactionManager(pulsarClient);
167167
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/SqlInitializationAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
@EnableConfigurationProperties(SqlInitializationProperties.class)
3737
@Import({ DatabaseInitializationDependencyConfigurer.class, R2dbcInitializationConfiguration.class,
3838
DataSourceInitializationConfiguration.class })
39-
@ConditionalOnProperty(prefix = "spring.sql.init", name = "enabled", matchIfMissing = true)
39+
@ConditionalOnProperty(prefix = "spring.sql.init", name = "enabled", havingValue = "true", matchIfMissing = true)
4040
@Conditional(SqlInitializationModeCondition.class)
4141
public class SqlInitializationAutoConfiguration {
4242

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/TemplateEngineConfigurations.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ SpringTemplateEngine templateEngine(ThymeleafProperties properties,
5959

6060
@Configuration(proxyBeanMethods = false)
6161
@ConditionalOnWebApplication(type = Type.REACTIVE)
62-
@ConditionalOnProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true)
62+
@ConditionalOnProperty(name = "spring.thymeleaf.enabled", havingValue = "true", matchIfMissing = true)
6363
static class ReactiveTemplateEngineConfiguration {
6464

6565
@Bean

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafAutoConfiguration.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ SpringResourceTemplateResolver defaultTemplateResolver() {
128128

129129
@Configuration(proxyBeanMethods = false)
130130
@ConditionalOnWebApplication(type = Type.SERVLET)
131-
@ConditionalOnProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true)
131+
@ConditionalOnProperty(name = "spring.thymeleaf.enabled", havingValue = "true", matchIfMissing = true)
132132
static class ThymeleafWebMvcConfiguration {
133133

134134
@Bean
@@ -180,7 +180,7 @@ private String appendCharset(MimeType type, String charset) {
180180

181181
@Configuration(proxyBeanMethods = false)
182182
@ConditionalOnWebApplication(type = Type.REACTIVE)
183-
@ConditionalOnProperty(name = "spring.thymeleaf.enabled", matchIfMissing = true)
183+
@ConditionalOnProperty(name = "spring.thymeleaf.enabled", havingValue = "true", matchIfMissing = true)
184184
static class ThymeleafWebFluxConfiguration {
185185

186186
@Bean

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/JtaAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
ArtemisAutoConfiguration.class, HibernateJpaAutoConfiguration.class, TransactionAutoConfiguration.class,
4141
TransactionManagerCustomizationAutoConfiguration.class })
4242
@ConditionalOnClass(jakarta.transaction.Transaction.class)
43-
@ConditionalOnProperty(prefix = "spring.jta", value = "enabled", matchIfMissing = true)
43+
@ConditionalOnProperty(prefix = "spring.jta", value = "enabled", havingValue = "true", matchIfMissing = true)
4444
@Import(JndiJtaConfiguration.class)
4545
public class JtaAutoConfiguration {
4646

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ public class WebFluxAutoConfiguration {
118118

119119
@Bean
120120
@ConditionalOnMissingBean(HiddenHttpMethodFilter.class)
121-
@ConditionalOnProperty(prefix = "spring.webflux.hiddenmethod.filter", name = "enabled")
121+
@ConditionalOnProperty(prefix = "spring.webflux.hiddenmethod.filter", name = "enabled", havingValue = "true")
122122
public OrderedHiddenHttpMethodFilter hiddenHttpMethodFilter() {
123123
return new OrderedHiddenHttpMethodFilter();
124124
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/HttpEncodingAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@
4444
@EnableConfigurationProperties(ServerProperties.class)
4545
@ConditionalOnWebApplication(type = ConditionalOnWebApplication.Type.SERVLET)
4646
@ConditionalOnClass(CharacterEncodingFilter.class)
47-
@ConditionalOnProperty(prefix = "server.servlet.encoding", value = "enabled", matchIfMissing = true)
47+
@ConditionalOnProperty(prefix = "server.servlet.encoding", value = "enabled", havingValue = "true",
48+
matchIfMissing = true)
4849
public class HttpEncodingAutoConfiguration {
4950

5051
private final Encoding properties;

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,8 @@
5151
*/
5252
@AutoConfiguration
5353
@ConditionalOnClass({ Servlet.class, StandardServletMultipartResolver.class, MultipartConfigElement.class })
54-
@ConditionalOnProperty(prefix = "spring.servlet.multipart", name = "enabled", matchIfMissing = true)
54+
@ConditionalOnProperty(prefix = "spring.servlet.multipart", name = "enabled", havingValue = "true",
55+
matchIfMissing = true)
5556
@ConditionalOnWebApplication(type = Type.SERVLET)
5657
@EnableConfigurationProperties(MultipartProperties.class)
5758
public class MultipartAutoConfiguration {

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcAutoConfiguration.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -163,14 +163,15 @@ public class WebMvcAutoConfiguration {
163163

164164
@Bean
165165
@ConditionalOnMissingBean(HiddenHttpMethodFilter.class)
166-
@ConditionalOnProperty(prefix = "spring.mvc.hiddenmethod.filter", name = "enabled")
166+
@ConditionalOnProperty(prefix = "spring.mvc.hiddenmethod.filter", name = "enabled", havingValue = "true")
167167
public OrderedHiddenHttpMethodFilter hiddenHttpMethodFilter() {
168168
return new OrderedHiddenHttpMethodFilter();
169169
}
170170

171171
@Bean
172172
@ConditionalOnMissingBean(FormContentFilter.class)
173-
@ConditionalOnProperty(prefix = "spring.mvc.formcontent.filter", name = "enabled", matchIfMissing = true)
173+
@ConditionalOnProperty(prefix = "spring.mvc.formcontent.filter", name = "enabled", havingValue = "true",
174+
matchIfMissing = true)
174175
public OrderedFormContentFilter formContentFilter() {
175176
return new OrderedFormContentFilter();
176177
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/error/ErrorMvcAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ DefaultErrorViewResolver conventionErrorViewResolver() {
142142
}
143143

144144
@Configuration(proxyBeanMethods = false)
145-
@ConditionalOnProperty(prefix = "server.error.whitelabel", name = "enabled", matchIfMissing = true)
145+
@ConditionalOnProperty(prefix = "server.error.whitelabel", name = "enabled", havingValue = "true",
146+
matchIfMissing = true)
146147
@Conditional(ErrorTemplateMissingCondition.class)
147148
protected static class WhitelabelErrorViewConfiguration {
148149

‎spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,8 @@ public class LocalDevToolsAutoConfiguration {
6868
* Local LiveReload configuration.
6969
*/
7070
@Configuration(proxyBeanMethods = false)
71-
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
71+
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", havingValue = "true",
72+
matchIfMissing = true)
7273
static class LiveReloadConfiguration {
7374

7475
@Bean
@@ -96,7 +97,8 @@ LiveReloadServerEventListener liveReloadServerEventListener(OptionalLiveReloadSe
9697
*/
9798
@Lazy(false)
9899
@Configuration(proxyBeanMethods = false)
99-
@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", matchIfMissing = true)
100+
@ConditionalOnProperty(prefix = "spring.devtools.restart", name = "enabled", havingValue = "true",
101+
matchIfMissing = true)
100102
static class RestartConfiguration {
101103

102104
private final DevToolsProperties properties;

‎spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ public DispatcherFilter remoteDevToolsDispatcherFilter(AccessManager accessManag
102102
* Configuration for remote update and restarts.
103103
*/
104104
@Configuration(proxyBeanMethods = false)
105-
@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true)
105+
@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", havingValue = "true",
106+
matchIfMissing = true)
106107
static class RemoteRestartConfiguration {
107108

108109
@Bean

‎spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/remote/client/RemoteClientConfiguration.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,8 @@ private void logWarnings() {
130130
* LiveReload configuration.
131131
*/
132132
@Configuration(proxyBeanMethods = false)
133-
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", matchIfMissing = true)
133+
@ConditionalOnProperty(prefix = "spring.devtools.livereload", name = "enabled", havingValue = "true",
134+
matchIfMissing = true)
134135
static class LiveReloadConfiguration {
135136

136137
private final DevToolsProperties properties;
@@ -181,7 +182,8 @@ final ExecutorService getExecutor() {
181182
* Client configuration for remote update and restarts.
182183
*/
183184
@Configuration(proxyBeanMethods = false)
184-
@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", matchIfMissing = true)
185+
@ConditionalOnProperty(prefix = "spring.devtools.remote.restart", name = "enabled", havingValue = "true",
186+
matchIfMissing = true)
185187
static class RemoteRestartClientConfiguration {
186188

187189
private final DevToolsProperties properties;

‎spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/json/JsonTestersAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
@AutoConfiguration(
6666
after = { JacksonAutoConfiguration.class, GsonAutoConfiguration.class, JsonbAutoConfiguration.class })
6767
@ConditionalOnClass(name = "org.assertj.core.api.Assert")
68-
@ConditionalOnProperty("spring.test.jsontesters.enabled")
68+
@ConditionalOnProperty(name = "spring.test.jsontesters.enabled", havingValue = "true")
6969
public class JsonTestersAutoConfiguration {
7070

7171
@Bean

‎spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/MockRestServiceServerAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
* @see AutoConfigureMockRestServiceServer
4848
*/
4949
@AutoConfiguration
50-
@ConditionalOnProperty(prefix = "spring.test.webclient.mockrestserviceserver", name = "enabled")
50+
@ConditionalOnProperty(prefix = "spring.test.webclient.mockrestserviceserver", name = "enabled", havingValue = "true")
5151
public class MockRestServiceServerAutoConfiguration {
5252

5353
@Bean

‎spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebClientAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@
3737
*/
3838
@AutoConfiguration(after = MockMvcAutoConfiguration.class)
3939
@ConditionalOnClass(WebClient.class)
40-
@ConditionalOnProperty(prefix = "spring.test.mockmvc.webclient", name = "enabled", matchIfMissing = true)
40+
@ConditionalOnProperty(prefix = "spring.test.mockmvc.webclient", name = "enabled", havingValue = "true",
41+
matchIfMissing = true)
4142
public class MockMvcWebClientAutoConfiguration {
4243

4344
@Bean

‎spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcWebDriverAutoConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@
4343
*/
4444
@AutoConfiguration(after = MockMvcAutoConfiguration.class)
4545
@ConditionalOnClass(HtmlUnitDriver.class)
46-
@ConditionalOnProperty(prefix = "spring.test.mockmvc.webdriver", name = "enabled", matchIfMissing = true)
46+
@ConditionalOnProperty(prefix = "spring.test.mockmvc.webdriver", name = "enabled", havingValue = "true",
47+
matchIfMissing = true)
4748
public class MockMvcWebDriverAutoConfiguration {
4849

4950
private static final String SECURITY_CONTEXT_EXECUTOR = "org.springframework.security.concurrent.DelegatingSecurityContextExecutor";

0 commit comments

Comments
 (0)