Skip to content

Commit b053a14

Browse files
wilkinsonawilkinsona
committed
Merge pull request #43868 from quaff
* gh-43868: Polish "Replace @ConditionalOnProperty with …BooleanProperty where feasible" Replace @ConditionalOnProperty with …BooleanProperty where feasible Closes gh-43868
2 parents 88eb748 + 766c17f commit b053a14

File tree

9 files changed

+17
-19
lines changed

9 files changed

+17
-19
lines changed

‎spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/endpoint/jackson/JacksonEndpointAutoConfiguration.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2012-2023 the original author or authors.
2+
* Copyright 2012-2025 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -23,8 +23,8 @@
2323
import org.springframework.boot.actuate.endpoint.jackson.EndpointObjectMapper;
2424
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
2525
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
26+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2627
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
27-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2828
import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration;
2929
import org.springframework.context.annotation.Bean;
3030
import org.springframework.context.annotation.Configuration;
@@ -41,7 +41,7 @@
4141
public class JacksonEndpointAutoConfiguration {
4242

4343
@Bean
44-
@ConditionalOnProperty(name = "management.endpoints.jackson.isolated-object-mapper", matchIfMissing = true)
44+
@ConditionalOnBooleanProperty(name = "management.endpoints.jackson.isolated-object-mapper", matchIfMissing = true)
4545
@ConditionalOnClass({ ObjectMapper.class, Jackson2ObjectMapperBuilder.class })
4646
public EndpointObjectMapper endpointObjectMapper() {
4747
ObjectMapper objectMapper = Jackson2ObjectMapperBuilder.json()

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
import org.springframework.beans.factory.ObjectProvider;
3434
import org.springframework.boot.autoconfigure.AutoConfiguration;
3535
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
36+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
3637
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3738
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
38-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3939
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
4040
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4141
import org.springframework.boot.ssl.SslBundles;
@@ -164,7 +164,7 @@ public RabbitTemplate rabbitTemplate(RabbitTemplateConfigurer configurer, Connec
164164

165165
@Bean
166166
@ConditionalOnSingleCandidate(ConnectionFactory.class)
167-
@ConditionalOnProperty(name = "spring.rabbitmq.dynamic", matchIfMissing = true)
167+
@ConditionalOnBooleanProperty(name = "spring.rabbitmq.dynamic", matchIfMissing = true)
168168
@ConditionalOnMissingBean
169169
public AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) {
170170
return new RabbitAdmin(connectionFactory);

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2727
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingClass;
28-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2928
import org.springframework.context.annotation.Bean;
3029
import org.springframework.context.annotation.Configuration;
3130
import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -54,7 +53,7 @@ static class AspectJAutoProxyingConfiguration {
5453

5554
@Configuration(proxyBeanMethods = false)
5655
@EnableAspectJAutoProxy(proxyTargetClass = false)
57-
@ConditionalOnProperty(name = "spring.aop.proxy-target-class", havingValue = "false")
56+
@ConditionalOnBooleanProperty(name = "spring.aop.proxy-target-class", havingValue = false)
5857
static class JdkDynamicAutoProxyConfiguration {
5958

6059
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020

2121
import org.springframework.boot.autoconfigure.AutoConfiguration;
2222
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
23+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2324
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2425
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
25-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2626
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
2727
import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.http.HttpMessageConvertersAutoConfiguration;
@@ -60,7 +60,7 @@ public class HypermediaAutoConfiguration {
6060
@Bean
6161
@ConditionalOnMissingBean
6262
@ConditionalOnClass(name = "com.fasterxml.jackson.databind.ObjectMapper")
63-
@ConditionalOnProperty(name = "spring.hateoas.use-hal-as-default-json-media-type", matchIfMissing = true)
63+
@ConditionalOnBooleanProperty(name = "spring.hateoas.use-hal-as-default-json-media-type", matchIfMissing = true)
6464
HalConfiguration applicationJsonHalConfiguration() {
6565
return new HalConfiguration().withMediaType(MediaType.APPLICATION_JSON);
6666
}

‎spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import org.springframework.boot.autoconfigure.AutoConfiguration;
2222
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
23-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
23+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
2525
import org.springframework.mail.javamail.JavaMailSenderImpl;
2626

@@ -33,7 +33,7 @@
3333
* @since 1.3.0
3434
*/
3535
@AutoConfiguration(after = MailSenderAutoConfiguration.class)
36-
@ConditionalOnProperty("spring.mail.test-connection")
36+
@ConditionalOnBooleanProperty("spring.mail.test-connection")
3737
@ConditionalOnSingleCandidate(JavaMailSenderImpl.class)
3838
public class MailSenderValidatorAutoConfiguration {
3939

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2323
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
2424
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
25-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2625
import org.springframework.boot.autoconfigure.condition.ConditionalOnSingleCandidate;
2726
import org.springframework.context.annotation.Bean;
2827
import org.springframework.context.annotation.Configuration;
@@ -73,7 +72,7 @@ public static class EnableTransactionManagementConfiguration {
7372

7473
@Configuration(proxyBeanMethods = false)
7574
@EnableTransactionManagement(proxyTargetClass = false)
76-
@ConditionalOnProperty(name = "spring.aop.proxy-target-class", havingValue = "false")
75+
@ConditionalOnBooleanProperty(name = "spring.aop.proxy-target-class", havingValue = false)
7776
public static class JdkDynamicAutoProxyConfiguration {
7877

7978
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
2828
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2929
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
30-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3130
import org.springframework.boot.context.properties.EnableConfigurationProperties;
3231
import org.springframework.boot.devtools.autoconfigure.DevToolsProperties.Restart;
3332
import org.springframework.boot.devtools.classpath.ClassPathChangedEvent;
@@ -135,7 +134,8 @@ FileSystemWatcherFactory fileSystemWatcherFactory() {
135134
}
136135

137136
@Bean
138-
@ConditionalOnProperty(name = "spring.devtools.restart.log-condition-evaluation-delta", matchIfMissing = true)
137+
@ConditionalOnBooleanProperty(name = "spring.devtools.restart.log-condition-evaluation-delta",
138+
matchIfMissing = true)
139139
ConditionEvaluationDeltaLoggingListener conditionEvaluationDeltaLoggingListener() {
140140
return new ConditionEvaluationDeltaLoggingListener();
141141
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
package org.springframework.boot.test.autoconfigure.web.client;
1818

1919
import org.springframework.boot.autoconfigure.AutoConfiguration;
20-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
20+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2121
import org.springframework.boot.autoconfigure.web.client.RestTemplateAutoConfiguration;
2222
import org.springframework.boot.web.client.RestTemplateBuilder;
2323
import org.springframework.context.annotation.Bean;
@@ -32,7 +32,7 @@
3232
* @see AutoConfigureMockRestServiceServer
3333
*/
3434
@AutoConfiguration(after = RestTemplateAutoConfiguration.class)
35-
@ConditionalOnProperty("spring.test.webclient.register-rest-template")
35+
@ConditionalOnBooleanProperty("spring.test.webclient.register-rest-template")
3636
public class WebClientRestTemplateAutoConfiguration {
3737

3838
@Bean

‎spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientTemplateAutoConfiguration.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818

1919
import org.springframework.boot.autoconfigure.AutoConfiguration;
2020
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
21+
import org.springframework.boot.autoconfigure.condition.ConditionalOnBooleanProperty;
2122
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
22-
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2323
import org.springframework.boot.autoconfigure.webservices.client.WebServiceTemplateAutoConfiguration;
2424
import org.springframework.boot.webservices.client.WebServiceTemplateBuilder;
2525
import org.springframework.context.annotation.Bean;
@@ -34,7 +34,7 @@
3434
* @see AutoConfigureWebServiceClient
3535
*/
3636
@AutoConfiguration(after = WebServiceTemplateAutoConfiguration.class)
37-
@ConditionalOnProperty("spring.test.webservice.client.register-web-service-template")
37+
@ConditionalOnBooleanProperty("spring.test.webservice.client.register-web-service-template")
3838
@ConditionalOnClass(WebServiceTemplate.class)
3939
@ConditionalOnBean(WebServiceTemplateBuilder.class)
4040
public class WebServiceClientTemplateAutoConfiguration {

0 commit comments

Comments
 (0)