From 4c307d6fda2051120a31abf9413b9061ca866441 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Mon, 6 Jan 2025 13:08:34 -0800 Subject: [PATCH] Switch away from using @ConditionalOnProperty prefix Merge `prefix` into `name` attribute and simplify annotations where possible. Closes gh-43703 --- .../logging/otlp/OtlpLoggingConfigurations.java | 7 +++---- .../tracing/otlp/OtlpTracingConfigurations.java | 7 +++---- .../ServletManagementContextAutoConfiguration.java | 4 ++-- .../amqp/RabbitAnnotationDrivenConfiguration.java | 5 ++--- .../autoconfigure/amqp/RabbitAutoConfiguration.java | 2 +- .../amqp/RabbitStreamConfiguration.java | 4 ++-- .../boot/autoconfigure/aop/AopAutoConfiguration.java | 12 +++++------- .../couchbase/CouchbaseAutoConfiguration.java | 2 +- .../data/jpa/JpaRepositoriesAutoConfiguration.java | 5 ++--- .../flyway/FlywayAutoConfiguration.java | 2 +- .../reactive/GraphQlWebFluxAutoConfiguration.java | 2 +- .../rsocket/GraphQlRSocketAutoConfiguration.java | 4 ++-- .../servlet/GraphQlWebMvcAutoConfiguration.java | 2 +- .../hateoas/HypermediaAutoConfiguration.java | 5 ++--- .../integration/IntegrationAutoConfiguration.java | 5 +++-- .../jdbc/DataSourceAutoConfiguration.java | 2 +- .../jdbc/DataSourceJmxConfiguration.java | 4 ++-- .../jdbc/JndiDataSourceAutoConfiguration.java | 4 ++-- .../jersey/JerseyAutoConfiguration.java | 6 +++--- .../jms/JndiConnectionFactoryAutoConfiguration.java | 4 ++-- .../ActiveMQConnectionFactoryConfiguration.java | 3 +-- .../ActiveMQXAConnectionFactoryConfiguration.java | 3 +-- .../ArtemisConnectionFactoryConfiguration.java | 3 +-- .../liquibase/LiquibaseAutoConfiguration.java | 2 +- .../mail/MailSenderAutoConfiguration.java | 6 +++--- .../mail/MailSenderJndiConfiguration.java | 4 ++-- .../mail/MailSenderPropertiesConfiguration.java | 2 +- .../mail/MailSenderValidatorAutoConfiguration.java | 4 ++-- .../autoconfigure/orm/jpa/JpaBaseConfiguration.java | 2 +- .../quartz/QuartzAutoConfiguration.java | 2 +- .../r2dbc/ConnectionFactoryConfigurations.java | 5 ++--- .../rsocket/RSocketServerAutoConfiguration.java | 10 +++++----- ...ReactiveOAuth2ResourceServerJwkConfiguration.java | 6 +++--- .../OAuth2ResourceServerJwtConfiguration.java | 6 +++--- .../ReactiveUserDetailsServiceAutoConfiguration.java | 4 ++-- .../servlet/UserDetailsServiceAutoConfiguration.java | 4 ++-- .../sendgrid/SendGridAutoConfiguration.java | 4 ++-- .../session/RedisReactiveSessionConfiguration.java | 4 ++-- .../session/RedisSessionConfiguration.java | 6 +++--- .../sql/init/SqlInitializationAutoConfiguration.java | 4 ++-- .../transaction/TransactionAutoConfiguration.java | 7 +++---- .../ReactiveWebServerFactoryAutoConfiguration.java | 4 ++-- .../ServletWebServerFactoryAutoConfiguration.java | 4 ++-- .../LocalDevToolsAutoConfiguration.java | 6 +++--- .../RemoteDevToolsAutoConfiguration.java | 5 +++-- .../jdbc/TestDatabaseAutoConfiguration.java | 7 +++---- .../WebClientRestTemplateAutoConfiguration.java | 4 ++-- .../WebServiceClientTemplateAutoConfiguration.java | 4 ++-- 48 files changed, 101 insertions(+), 112 deletions(-) diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingConfigurations.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingConfigurations.java index 14b491bd23..a68f316bfa 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingConfigurations.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/logging/otlp/OtlpLoggingConfigurations.java @@ -46,7 +46,7 @@ final class OtlpLoggingConfigurations { @Bean @ConditionalOnMissingBean - @ConditionalOnProperty(prefix = "management.otlp.logging", name = "endpoint") + @ConditionalOnProperty("management.otlp.logging.endpoint") OtlpLoggingConnectionDetails otlpLoggingConnectionDetails(OtlpLoggingProperties properties) { return new PropertiesOtlpLoggingConnectionDetails(properties); } @@ -81,8 +81,7 @@ final class OtlpLoggingConfigurations { static class Exporters { @Bean - @ConditionalOnProperty(prefix = "management.otlp.logging", name = "transport", havingValue = "http", - matchIfMissing = true) + @ConditionalOnProperty(name = "management.otlp.logging.transport", havingValue = "http", matchIfMissing = true) OtlpHttpLogRecordExporter otlpHttpLogRecordExporter(OtlpLoggingProperties properties, OtlpLoggingConnectionDetails connectionDetails) { OtlpHttpLogRecordExporterBuilder builder = OtlpHttpLogRecordExporter.builder() @@ -95,7 +94,7 @@ final class OtlpLoggingConfigurations { } @Bean - @ConditionalOnProperty(prefix = "management.otlp.logging", name = "transport", havingValue = "grpc") + @ConditionalOnProperty(name = "management.otlp.logging.transport", havingValue = "grpc") OtlpGrpcLogRecordExporter otlpGrpcLogRecordExporter(OtlpLoggingProperties properties, OtlpLoggingConnectionDetails connectionDetails) { OtlpGrpcLogRecordExporterBuilder builder = OtlpGrpcLogRecordExporter.builder() diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConfigurations.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConfigurations.java index 6f0494379b..5fdd42a571 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConfigurations.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/tracing/otlp/OtlpTracingConfigurations.java @@ -44,7 +44,7 @@ class OtlpTracingConfigurations { @Bean @ConditionalOnMissingBean - @ConditionalOnProperty(prefix = "management.otlp.tracing", name = "endpoint") + @ConditionalOnProperty("management.otlp.tracing.endpoint") OtlpTracingConnectionDetails otlpTracingConnectionDetails(OtlpTracingProperties properties) { return new PropertiesOtlpTracingConnectionDetails(properties); } @@ -79,8 +79,7 @@ class OtlpTracingConfigurations { static class Exporters { @Bean - @ConditionalOnProperty(prefix = "management.otlp.tracing", name = "transport", havingValue = "http", - matchIfMissing = true) + @ConditionalOnProperty(name = "management.otlp.tracing.transport", havingValue = "http", matchIfMissing = true) OtlpHttpSpanExporter otlpHttpSpanExporter(OtlpTracingProperties properties, OtlpTracingConnectionDetails connectionDetails) { OtlpHttpSpanExporterBuilder builder = OtlpHttpSpanExporter.builder() @@ -93,7 +92,7 @@ class OtlpTracingConfigurations { } @Bean - @ConditionalOnProperty(prefix = "management.otlp.tracing", name = "transport", havingValue = "grpc") + @ConditionalOnProperty(name = "management.otlp.tracing.transport", havingValue = "grpc") OtlpGrpcSpanExporter otlpGrpcSpanExporter(OtlpTracingProperties properties, OtlpTracingConnectionDetails connectionDetails) { OtlpGrpcSpanExporterBuilder builder = OtlpGrpcSpanExporter.builder() diff --git a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextAutoConfiguration.java b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextAutoConfiguration.java index 7b9fedaa4b..9fb94d8753 100644 --- a/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextAutoConfiguration.java +++ b/spring-boot-project/spring-boot-actuator-autoconfigure/src/main/java/org/springframework/boot/actuate/autoconfigure/web/servlet/ServletManagementContextAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,7 +60,7 @@ public class ServletManagementContextAutoConfiguration { // Put Servlets and Filters in their own nested class so they don't force early // instantiation of ManagementServerProperties. @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "management.server", name = "add-application-context-header", havingValue = "true") + @ConditionalOnProperty(name = "management.server.add-application-context-header", havingValue = "true") protected static class ApplicationContextFilterConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java index 65948817aa..fe4aa20148 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAnnotationDrivenConfiguration.java @@ -82,8 +82,7 @@ class RabbitAnnotationDrivenConfiguration { @Bean(name = "rabbitListenerContainerFactory") @ConditionalOnMissingBean(name = "rabbitListenerContainerFactory") - @ConditionalOnProperty(prefix = "spring.rabbitmq.listener", name = "type", havingValue = "simple", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.rabbitmq.listener.type", havingValue = "simple", matchIfMissing = true) SimpleRabbitListenerContainerFactory simpleRabbitListenerContainerFactory( SimpleRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory, ObjectProvider> simpleContainerCustomizer) { @@ -111,7 +110,7 @@ class RabbitAnnotationDrivenConfiguration { @Bean(name = "rabbitListenerContainerFactory") @ConditionalOnMissingBean(name = "rabbitListenerContainerFactory") - @ConditionalOnProperty(prefix = "spring.rabbitmq.listener", name = "type", havingValue = "direct") + @ConditionalOnProperty(name = "spring.rabbitmq.listener.type", havingValue = "direct") DirectRabbitListenerContainerFactory directRabbitListenerContainerFactory( DirectRabbitListenerContainerFactoryConfigurer configurer, ConnectionFactory connectionFactory, ObjectProvider> directContainerCustomizer) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java index 49393474f6..ad416064ea 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitAutoConfiguration.java @@ -164,7 +164,7 @@ public class RabbitAutoConfiguration { @Bean @ConditionalOnSingleCandidate(ConnectionFactory.class) - @ConditionalOnProperty(prefix = "spring.rabbitmq", name = "dynamic", matchIfMissing = true) + @ConditionalOnProperty(name = "spring.rabbitmq.dynamic", matchIfMissing = true) @ConditionalOnMissingBean public AmqpAdmin amqpAdmin(ConnectionFactory connectionFactory) { return new RabbitAdmin(connectionFactory); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitStreamConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitStreamConfiguration.java index 6e3047d1dd..9baa4d57dc 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitStreamConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/amqp/RabbitStreamConfiguration.java @@ -52,7 +52,7 @@ class RabbitStreamConfiguration { @Bean(name = "rabbitListenerContainerFactory") @ConditionalOnMissingBean(name = "rabbitListenerContainerFactory") - @ConditionalOnProperty(prefix = "spring.rabbitmq.listener", name = "type", havingValue = "stream") + @ConditionalOnProperty(name = "spring.rabbitmq.listener.type", havingValue = "stream") StreamRabbitListenerContainerFactory streamRabbitListenerContainerFactory(Environment rabbitStreamEnvironment, RabbitProperties properties, ObjectProvider consumerCustomizer, ObjectProvider> containerCustomizer) { @@ -90,7 +90,7 @@ class RabbitStreamConfiguration { @Bean @ConditionalOnMissingBean(RabbitStreamOperations.class) - @ConditionalOnProperty(prefix = "spring.rabbitmq.stream", name = "name") + @ConditionalOnProperty(name = "spring.rabbitmq.stream.name") RabbitStreamTemplate rabbitStreamTemplate(Environment rabbitStreamEnvironment, RabbitProperties properties, RabbitStreamTemplateConfigurer configurer) { RabbitStreamTemplate template = new RabbitStreamTemplate(rabbitStreamEnvironment, diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java index 4767aac8b4..200669c33f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/aop/AopAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -44,7 +44,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy; * @see EnableAspectJAutoProxy */ @AutoConfiguration -@ConditionalOnProperty(prefix = "spring.aop", name = "auto", havingValue = "true", matchIfMissing = true) +@ConditionalOnProperty(name = "spring.aop.auto", havingValue = "true", matchIfMissing = true) public class AopAutoConfiguration { @Configuration(proxyBeanMethods = false) @@ -53,15 +53,14 @@ public class AopAutoConfiguration { @Configuration(proxyBeanMethods = false) @EnableAspectJAutoProxy(proxyTargetClass = false) - @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false") + @ConditionalOnProperty(name = "spring.aop.proxy-target-class", havingValue = "false") static class JdkDynamicAutoProxyConfiguration { } @Configuration(proxyBeanMethods = false) @EnableAspectJAutoProxy(proxyTargetClass = true) - @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "true", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.aop.proxy-target-class", havingValue = "true", matchIfMissing = true) static class CglibAutoProxyConfiguration { } @@ -70,8 +69,7 @@ public class AopAutoConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnMissingClass("org.aspectj.weaver.Advice") - @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "true", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.aop.proxy-target-class", havingValue = "true", matchIfMissing = true) static class ClassProxyingConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java index b935fbca31..2af602176f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/couchbase/CouchbaseAutoConfiguration.java @@ -228,7 +228,7 @@ public class CouchbaseAutoConfiguration { super(ConfigurationPhase.REGISTER_BEAN); } - @ConditionalOnProperty(prefix = "spring.couchbase", name = "connection-string") + @ConditionalOnProperty("spring.couchbase.connection-string") private static final class CouchbaseUrlCondition { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java index 625598c109..48e243ec0e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/jpa/JpaRepositoriesAutoConfiguration.java @@ -104,13 +104,12 @@ public class JpaRepositoriesAutoConfiguration { super(ConfigurationPhase.REGISTER_BEAN); } - @ConditionalOnProperty(prefix = "spring.data.jpa.repositories", name = "bootstrap-mode", - havingValue = "deferred") + @ConditionalOnProperty(name = "spring.data.jpa.repositories.bootstrap-mode", havingValue = "deferred") static class DeferredBootstrapMode { } - @ConditionalOnProperty(prefix = "spring.data.jpa.repositories", name = "bootstrap-mode", havingValue = "lazy") + @ConditionalOnProperty(name = "spring.data.jpa.repositories.bootstrap-mode", havingValue = "lazy") static class LazyBootstrapMode { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java index d07ceeef60..9c0079f922 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/flyway/FlywayAutoConfiguration.java @@ -450,7 +450,7 @@ public class FlywayAutoConfiguration { } - @ConditionalOnProperty(prefix = "spring.flyway", name = "url") + @ConditionalOnProperty("spring.flyway.url") private static final class FlywayUrlCondition { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfiguration.java index 05f6eaadcf..07cbb9df9c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/reactive/GraphQlWebFluxAutoConfiguration.java @@ -165,7 +165,7 @@ public class GraphQlWebFluxAutoConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "spring.graphql.websocket", name = "path") + @ConditionalOnProperty("spring.graphql.websocket.path") public static class WebSocketConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfiguration.java index 6114714d3c..7127803fdf 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/rsocket/GraphQlRSocketAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -49,7 +49,7 @@ import org.springframework.messaging.rsocket.annotation.support.RSocketMessageHa @AutoConfiguration(after = { GraphQlAutoConfiguration.class, RSocketMessagingAutoConfiguration.class }) @ConditionalOnClass({ GraphQL.class, GraphQlSource.class, RSocketServer.class, HttpServer.class }) @ConditionalOnBean({ RSocketMessageHandler.class, AnnotatedControllerConfigurer.class }) -@ConditionalOnProperty(prefix = "spring.graphql.rsocket", name = "mapping") +@ConditionalOnProperty("spring.graphql.rsocket.mapping") public class GraphQlRSocketAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java index f1004026d8..00ae761c1c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/graphql/servlet/GraphQlWebMvcAutoConfiguration.java @@ -172,7 +172,7 @@ public class GraphQlWebMvcAutoConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnClass({ ServerContainer.class, WebSocketHandler.class }) - @ConditionalOnProperty(prefix = "spring.graphql.websocket", name = "path") + @ConditionalOnProperty("spring.graphql.websocket.path") public static class WebSocketConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java index 50c0507a85..120fcef39e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hateoas/HypermediaAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -60,8 +60,7 @@ public class HypermediaAutoConfiguration { @Bean @ConditionalOnMissingBean @ConditionalOnClass(name = "com.fasterxml.jackson.databind.ObjectMapper") - @ConditionalOnProperty(prefix = "spring.hateoas", name = "use-hal-as-default-json-media-type", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.hateoas.use-hal-as-default-json-media-type", matchIfMissing = true) HalConfiguration applicationJsonHalConfiguration() { return new HalConfiguration().withMediaType(MediaType.APPLICATION_JSON); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java index ebe3e7852e..48721468c5 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/integration/IntegrationAutoConfiguration.java @@ -347,12 +347,13 @@ public class IntegrationAutoConfiguration { super(ConfigurationPhase.REGISTER_BEAN); } - @ConditionalOnProperty(prefix = "spring.integration.rsocket.client", name = "uri") + @ConditionalOnProperty("spring.integration.rsocket.client.uri") static class WebSocketAddressConfigured { } - @ConditionalOnProperty(prefix = "spring.integration.rsocket.client", name = { "host", "port" }) + @ConditionalOnProperty({ "spring.integration.rsocket.client.host", + "spring.integration.rsocket.client.port" }) static class TcpAddressConfigured { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java index 0f85ec1103..c6d1c82bb8 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceAutoConfiguration.java @@ -95,7 +95,7 @@ public class DataSourceAutoConfiguration { super(ConfigurationPhase.PARSE_CONFIGURATION); } - @ConditionalOnProperty(prefix = "spring.datasource", name = "type") + @ConditionalOnProperty("spring.datasource.type") static class ExplicitType { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java index e07b2f1f2f..c816107732 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceJmxConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -74,7 +74,7 @@ class DataSourceJmxConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "spring.datasource.tomcat", name = "jmx-enabled") + @ConditionalOnProperty("spring.datasource.tomcat.jmx-enabled") @ConditionalOnClass(DataSourceProxy.class) @ConditionalOnSingleCandidate(DataSource.class) static class TomcatDataSourceJmxConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java index 199193af53..f173f403aa 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/JndiDataSourceAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -41,7 +41,7 @@ import org.springframework.jmx.support.JmxUtils; */ @AutoConfiguration(before = { XADataSourceAutoConfiguration.class, DataSourceAutoConfiguration.class }) @ConditionalOnClass({ DataSource.class, EmbeddedDatabaseType.class }) -@ConditionalOnProperty(prefix = "spring.datasource", name = "jndi-name") +@ConditionalOnProperty("spring.datasource.jndi-name") @EnableConfigurationProperties(DataSourceProperties.class) public class JndiDataSourceAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java index 2f739bf74f..85f90c53e6 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -115,7 +115,7 @@ public class JerseyAutoConfiguration implements ServletContextAware { @Bean @ConditionalOnMissingBean(name = "jerseyFilterRegistration") - @ConditionalOnProperty(prefix = "spring.jersey", name = "type", havingValue = "filter") + @ConditionalOnProperty(name = "spring.jersey.type", havingValue = "filter") public FilterRegistrationBean jerseyFilterRegistration(JerseyApplicationPath applicationPath) { FilterRegistrationBean registration = new FilterRegistrationBean<>(); registration.setFilter(new ServletContainer(this.config)); @@ -137,7 +137,7 @@ public class JerseyAutoConfiguration implements ServletContextAware { @Bean @ConditionalOnMissingBean(name = "jerseyServletRegistration") - @ConditionalOnProperty(prefix = "spring.jersey", name = "type", havingValue = "servlet", matchIfMissing = true) + @ConditionalOnProperty(name = "spring.jersey.type", havingValue = "servlet", matchIfMissing = true) public ServletRegistrationBean jerseyServletRegistration(JerseyApplicationPath applicationPath) { ServletRegistrationBean registration = new ServletRegistrationBean<>( new ServletContainer(this.config), applicationPath.getUrlMapping()); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java index 9d413a087d..79c3bd176e 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/JndiConnectionFactoryAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ public class JndiConnectionFactoryAutoConfiguration { } - @ConditionalOnProperty(prefix = "spring.jms", name = "jndi-name") + @ConditionalOnProperty("spring.jms.jndi-name") static class Property { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java index 897c69576c..27f77b8674 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java @@ -46,8 +46,7 @@ import org.springframework.jms.connection.CachingConnectionFactory; class ActiveMQConnectionFactoryConfiguration { @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "false", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.activemq.pool.enabled", havingValue = "false", matchIfMissing = true) static class SimpleConnectionFactoryConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java index d03fabc119..0242729768 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQXAConnectionFactoryConfiguration.java @@ -57,8 +57,7 @@ class ActiveMQXAConnectionFactoryConfiguration { } @Bean - @ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "false", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.activemq.pool.enabled", havingValue = "false", matchIfMissing = true) ActiveMQConnectionFactory nonXaJmsConnectionFactory(ActiveMQProperties properties, ObjectProvider factoryCustomizers, ActiveMQConnectionDetails connectionDetails) { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java index ab4e1f6939..e42e5ef760 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/artemis/ArtemisConnectionFactoryConfiguration.java @@ -43,8 +43,7 @@ import org.springframework.jms.connection.CachingConnectionFactory; class ArtemisConnectionFactoryConfiguration { @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "spring.artemis.pool", name = "enabled", havingValue = "false", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.artemis.pool.enabled", havingValue = "false", matchIfMissing = true) static class SimpleConnectionFactoryConfiguration { @Bean(name = "jmsConnectionFactory") diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java index 469f6a93e9..827d04b00c 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/liquibase/LiquibaseAutoConfiguration.java @@ -209,7 +209,7 @@ public class LiquibaseAutoConfiguration { } - @ConditionalOnProperty(prefix = "spring.liquibase", name = "url") + @ConditionalOnProperty("spring.liquibase.url") private static final class LiquibaseUrlCondition { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java index 3feb692da6..ef7da0e1ae 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,12 +57,12 @@ public class MailSenderAutoConfiguration { super(ConfigurationPhase.PARSE_CONFIGURATION); } - @ConditionalOnProperty(prefix = "spring.mail", name = "host") + @ConditionalOnProperty("spring.mail.host") static class HostProperty { } - @ConditionalOnProperty(prefix = "spring.mail", name = "jndi-name") + @ConditionalOnProperty("spring.mail.jndi-name") static class JndiNameProperty { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java index 02cfe435ca..56c2ab6181 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderJndiConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2021 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +38,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; */ @Configuration(proxyBeanMethods = false) @ConditionalOnClass(Session.class) -@ConditionalOnProperty(prefix = "spring.mail", name = "jndi-name") +@ConditionalOnProperty("spring.mail.jndi-name") @ConditionalOnJndi class MailSenderJndiConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java index 94cabfaa1c..ba265a62ad 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderPropertiesConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.util.StringUtils; * @author Stephane Nicoll */ @Configuration(proxyBeanMethods = false) -@ConditionalOnProperty(prefix = "spring.mail", name = "host") +@ConditionalOnProperty("spring.mail.host") class MailSenderPropertiesConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java index 66fc85674e..24f3951403 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mail/MailSenderValidatorAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -33,7 +33,7 @@ import org.springframework.mail.javamail.JavaMailSenderImpl; * @since 1.3.0 */ @AutoConfiguration(after = MailSenderAutoConfiguration.class) -@ConditionalOnProperty(prefix = "spring.mail", value = "test-connection") +@ConditionalOnProperty("spring.mail.test-connection") @ConditionalOnSingleCandidate(JavaMailSenderImpl.class) public class MailSenderValidatorAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java index bf6a6ceff7..178cfcf295 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/orm/jpa/JpaBaseConfiguration.java @@ -224,7 +224,7 @@ public abstract class JpaBaseConfiguration { @ConditionalOnClass(WebMvcConfigurer.class) @ConditionalOnMissingBean({ OpenEntityManagerInViewInterceptor.class, OpenEntityManagerInViewFilter.class }) @ConditionalOnMissingFilterBean(OpenEntityManagerInViewFilter.class) - @ConditionalOnProperty(prefix = "spring.jpa", name = "open-in-view", havingValue = "true", matchIfMissing = true) + @ConditionalOnProperty(name = "spring.jpa.open-in-view", havingValue = "true", matchIfMissing = true) protected static class JpaWebConfiguration { private static final Log logger = LogFactory.getLog(JpaWebConfiguration.class); diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java index 62567c53bf..fb1b009006 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/quartz/QuartzAutoConfiguration.java @@ -97,7 +97,7 @@ public class QuartzAutoConfiguration { @Configuration(proxyBeanMethods = false) @ConditionalOnSingleCandidate(DataSource.class) - @ConditionalOnProperty(prefix = "spring.quartz", name = "job-store-type", havingValue = "jdbc") + @ConditionalOnProperty(name = "spring.quartz.job-store-type", havingValue = "jdbc") @Import(DatabaseInitializationDependencyConfigurer.class) protected static class JdbcStoreTypeConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryConfigurations.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryConfigurations.java index 6807a349f7..927893f44f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryConfigurations.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/r2dbc/ConnectionFactoryConfigurations.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,8 +123,7 @@ abstract class ConnectionFactoryConfigurations { } @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "spring.r2dbc.pool", value = "enabled", havingValue = "false", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.r2dbc.pool.enabled", havingValue = "false", matchIfMissing = true) @ConditionalOnMissingBean(ConnectionFactory.class) static class GenericConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java index c9ae1d0338..2bf39dea43 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/rsocket/RSocketServerAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -94,7 +94,7 @@ public class RSocketServerAutoConfiguration { } - @ConditionalOnProperty(prefix = "spring.rsocket.server", name = "port") + @ConditionalOnProperty("spring.rsocket.server.port") @ConditionalOnClass(ReactorResourceFactory.class) @Configuration(proxyBeanMethods = false) @Import(ReactorNettyConfigurations.ReactorResourceFactoryConfiguration.class) @@ -147,17 +147,17 @@ public class RSocketServerAutoConfiguration { } - @ConditionalOnProperty(prefix = "spring.rsocket.server", name = "port", matchIfMissing = true) + @ConditionalOnProperty(name = "spring.rsocket.server.port", matchIfMissing = true) static class HasNoPortConfigured { } - @ConditionalOnProperty(prefix = "spring.rsocket.server", name = "mapping-path") + @ConditionalOnProperty("spring.rsocket.server.mapping-path") static class HasMappingPathConfigured { } - @ConditionalOnProperty(prefix = "spring.rsocket.server", name = "transport", havingValue = "websocket") + @ConditionalOnProperty(name = "spring.rsocket.server.transport", havingValue = "websocket") static class HasWebsocketTransportConfigured { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java index 5d592a98e4..13bee47968 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java @@ -227,17 +227,17 @@ class ReactiveOAuth2ResourceServerJwkConfiguration { super(ConfigurationPhase.REGISTER_BEAN); } - @ConditionalOnProperty(prefix = "spring.security.oauth2.resourceserver.jwt", name = "authority-prefix") + @ConditionalOnProperty("spring.security.oauth2.resourceserver.jwt.authority-prefix") static class OnAuthorityPrefix { } - @ConditionalOnProperty(prefix = "spring.security.oauth2.resourceserver.jwt", name = "principal-claim-name") + @ConditionalOnProperty("spring.security.oauth2.resourceserver.jwt.principal-claim-name") static class OnPrincipalClaimName { } - @ConditionalOnProperty(prefix = "spring.security.oauth2.resourceserver.jwt", name = "authorities-claim-name") + @ConditionalOnProperty("spring.security.oauth2.resourceserver.jwt.authorities-claim-name") static class OnAuthoritiesClaimName { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java index f191a8173c..51ae344dbe 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java @@ -219,17 +219,17 @@ class OAuth2ResourceServerJwtConfiguration { super(ConfigurationPhase.REGISTER_BEAN); } - @ConditionalOnProperty(prefix = "spring.security.oauth2.resourceserver.jwt", name = "authority-prefix") + @ConditionalOnProperty("spring.security.oauth2.resourceserver.jwt.authority-prefix") static class OnAuthorityPrefix { } - @ConditionalOnProperty(prefix = "spring.security.oauth2.resourceserver.jwt", name = "principal-claim-name") + @ConditionalOnProperty("spring.security.oauth2.resourceserver.jwt.principal-claim-name") static class OnPrincipalClaimName { } - @ConditionalOnProperty(prefix = "spring.security.oauth2.resourceserver.jwt", name = "authorities-claim-name") + @ConditionalOnProperty("spring.security.oauth2.resourceserver.jwt.authorities-claim-name") static class OnAuthoritiesClaimName { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java index 596f0d9c0b..dc60a634ad 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/reactive/ReactiveUserDetailsServiceAutoConfiguration.java @@ -129,12 +129,12 @@ public class ReactiveUserDetailsServiceAutoConfiguration { } - @ConditionalOnProperty(prefix = "spring.security.user", name = "name") + @ConditionalOnProperty("spring.security.user.name") static final class NameConfigured { } - @ConditionalOnProperty(prefix = "spring.security.user", name = "password") + @ConditionalOnProperty("spring.security.user.password") static final class PasswordConfigured { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfiguration.java index a6b8030837..010803d00a 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/servlet/UserDetailsServiceAutoConfiguration.java @@ -113,12 +113,12 @@ public class UserDetailsServiceAutoConfiguration { } - @ConditionalOnProperty(prefix = "spring.security.user", name = "name") + @ConditionalOnProperty("spring.security.user.name") static final class NameConfigured { } - @ConditionalOnProperty(prefix = "spring.security.user", name = "password") + @ConditionalOnProperty("spring.security.user.password") static final class PasswordConfigured { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java index b51ad06103..afbfbf603f 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sendgrid/SendGridAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -40,7 +40,7 @@ import org.springframework.context.annotation.Bean; */ @AutoConfiguration @ConditionalOnClass(SendGrid.class) -@ConditionalOnProperty(prefix = "spring.sendgrid", value = "api-key") +@ConditionalOnProperty("spring.sendgrid.api-key") @EnableConfigurationProperties(SendGridProperties.class) public class SendGridAutoConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java index b380d49508..0de88a7673 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisReactiveSessionConfiguration.java @@ -51,7 +51,7 @@ import org.springframework.session.data.redis.config.annotation.web.server.Redis class RedisReactiveSessionConfiguration { @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "spring.session.redis", name = "repository-type", havingValue = "default", + @ConditionalOnProperty(name = "spring.session.redis.repository-type", havingValue = "default", matchIfMissing = true) @Import(RedisWebSessionConfiguration.class) static class DefaultRedisSessionConfiguration { @@ -73,7 +73,7 @@ class RedisReactiveSessionConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "spring.session.redis", name = "repository-type", havingValue = "indexed") + @ConditionalOnProperty(name = "spring.session.redis.repository-type", havingValue = "indexed") @Import(RedisIndexedWebSessionConfiguration.class) static class IndexedRedisSessionConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java index 71faf77987..b2d6239ade 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/RedisSessionConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -57,7 +57,7 @@ import org.springframework.session.data.redis.config.annotation.web.http.RedisIn class RedisSessionConfiguration { @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "spring.session.redis", name = "repository-type", havingValue = "default", + @ConditionalOnProperty(name = "spring.session.redis.repository-type", havingValue = "default", matchIfMissing = true) @Import(RedisHttpSessionConfiguration.class) static class DefaultRedisSessionConfiguration { @@ -87,7 +87,7 @@ class RedisSessionConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(prefix = "spring.session.redis", name = "repository-type", havingValue = "indexed") + @ConditionalOnProperty(name = "spring.session.redis.repository-type", havingValue = "indexed") @Import(RedisIndexedHttpSessionConfiguration.class) static class IndexedRedisSessionConfiguration { diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/SqlInitializationAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/SqlInitializationAutoConfiguration.java index 09f4bf71ee..e600437ec4 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/SqlInitializationAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/sql/init/SqlInitializationAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -46,7 +46,7 @@ public class SqlInitializationAutoConfiguration { super(ConfigurationPhase.PARSE_CONFIGURATION); } - @ConditionalOnProperty(prefix = "spring.sql.init", name = "mode", havingValue = "never") + @ConditionalOnProperty(name = "spring.sql.init.mode", havingValue = "never") static class ModeIsNever { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java index b1268020c4..42d461ab34 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -72,15 +72,14 @@ public class TransactionAutoConfiguration { @Configuration(proxyBeanMethods = false) @EnableTransactionManagement(proxyTargetClass = false) - @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "false") + @ConditionalOnProperty(name = "spring.aop.proxy-target-class", havingValue = "false") public static class JdkDynamicAutoProxyConfiguration { } @Configuration(proxyBeanMethods = false) @EnableTransactionManagement(proxyTargetClass = true) - @ConditionalOnProperty(prefix = "spring.aop", name = "proxy-target-class", havingValue = "true", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.aop.proxy-target-class", havingValue = "true", matchIfMissing = true) public static class CglibAutoProxyConfiguration { } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfiguration.java index 18ba60c405..473fda2df9 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/ReactiveWebServerFactoryAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -77,7 +77,7 @@ public class ReactiveWebServerFactoryAutoConfiguration { @Bean @ConditionalOnMissingBean - @ConditionalOnProperty(value = "server.forward-headers-strategy", havingValue = "framework") + @ConditionalOnProperty(name = "server.forward-headers-strategy", havingValue = "framework") public ForwardedHeaderTransformer forwardedHeaderTransformer() { return new ForwardedHeaderTransformer(); } diff --git a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java index 5f4a23e374..b5c736a351 100644 --- a/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java +++ b/spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -89,7 +89,7 @@ public class ServletWebServerFactoryAutoConfiguration { } @Configuration(proxyBeanMethods = false) - @ConditionalOnProperty(value = "server.forward-headers-strategy", havingValue = "framework") + @ConditionalOnProperty(name = "server.forward-headers-strategy", havingValue = "framework") @ConditionalOnMissingFilterBean(ForwardedHeaderFilter.class) static class ForwardedHeaderFilterConfiguration { diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java index 86043b6b6c..75b62dfddd 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/LocalDevToolsAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2023 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnNoOptOut; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.boot.devtools.autoconfigure.DevToolsProperties.Restart; @@ -134,8 +135,7 @@ public class LocalDevToolsAutoConfiguration { } @Bean - @ConditionalOnProperty(prefix = "spring.devtools.restart", name = "log-condition-evaluation-delta", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.devtools.restart.log-condition-evaluation-delta", matchIfMissing = true) ConditionEvaluationDeltaLoggingListener conditionEvaluationDeltaLoggingListener() { return new ConditionEvaluationDeltaLoggingListener(); } diff --git a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java index ec8afdbade..785880941f 100644 --- a/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java +++ b/spring-boot-project/spring-boot-devtools/src/main/java/org/springframework/boot/devtools/autoconfigure/RemoteDevToolsAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +import org.springframework.boot.autoconfigure.condition.ConditionalOnNoOptOut; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration; import org.springframework.boot.autoconfigure.web.ServerProperties; @@ -61,7 +62,7 @@ import org.springframework.http.server.ServerHttpRequest; */ @AutoConfiguration(after = SecurityAutoConfiguration.class) @Conditional(OnEnabledDevToolsCondition.class) -@ConditionalOnProperty(prefix = "spring.devtools.remote", name = "secret") +@ConditionalOnProperty("spring.devtools.remote.secret") @ConditionalOnClass({ Filter.class, ServerHttpRequest.class }) @Import(RemoteDevtoolsSecurityConfiguration.class) @EnableConfigurationProperties({ ServerProperties.class, DevToolsProperties.class }) diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java index cc59cbf970..8ea76cf074 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/jdbc/TestDatabaseAutoConfiguration.java @@ -79,8 +79,7 @@ public class TestDatabaseAutoConfiguration { @Bean @Role(BeanDefinition.ROLE_INFRASTRUCTURE) - @ConditionalOnProperty(prefix = "spring.test.database", name = "replace", havingValue = "NON_TEST", - matchIfMissing = true) + @ConditionalOnProperty(name = "spring.test.database.replace", havingValue = "NON_TEST", matchIfMissing = true) static EmbeddedDataSourceBeanFactoryPostProcessor nonTestEmbeddedDataSourceBeanFactoryPostProcessor( Environment environment) { return new EmbeddedDataSourceBeanFactoryPostProcessor(environment, Replace.NON_TEST); @@ -88,14 +87,14 @@ public class TestDatabaseAutoConfiguration { @Bean @Role(BeanDefinition.ROLE_INFRASTRUCTURE) - @ConditionalOnProperty(prefix = "spring.test.database", name = "replace", havingValue = "ANY") + @ConditionalOnProperty(name = "spring.test.database.replace", havingValue = "ANY") static EmbeddedDataSourceBeanFactoryPostProcessor embeddedDataSourceBeanFactoryPostProcessor( Environment environment) { return new EmbeddedDataSourceBeanFactoryPostProcessor(environment, Replace.ANY); } @Bean - @ConditionalOnProperty(prefix = "spring.test.database", name = "replace", havingValue = "AUTO_CONFIGURED") + @ConditionalOnProperty(name = "spring.test.database.replace", havingValue = "AUTO_CONFIGURED") @ConditionalOnMissingBean public DataSource dataSource(Environment environment) { return new EmbeddedDataSourceFactory(environment).getEmbeddedDatabase(); diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/WebClientRestTemplateAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/WebClientRestTemplateAutoConfiguration.java index 108e3abbb7..9f076b6513 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/WebClientRestTemplateAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/client/WebClientRestTemplateAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -32,7 +32,7 @@ import org.springframework.web.client.RestTemplate; * @see AutoConfigureMockRestServiceServer */ @AutoConfiguration(after = RestTemplateAutoConfiguration.class) -@ConditionalOnProperty(prefix = "spring.test.webclient", name = "register-rest-template") +@ConditionalOnProperty("spring.test.webclient.register-rest-template") public class WebClientRestTemplateAutoConfiguration { @Bean diff --git a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientTemplateAutoConfiguration.java b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientTemplateAutoConfiguration.java index 96587af446..1da166f4ad 100644 --- a/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientTemplateAutoConfiguration.java +++ b/spring-boot-project/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/webservices/client/WebServiceClientTemplateAutoConfiguration.java @@ -1,5 +1,5 @@ /* - * Copyright 2012-2022 the original author or authors. + * Copyright 2012-2024 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -34,7 +34,7 @@ import org.springframework.ws.client.core.WebServiceTemplate; * @see AutoConfigureWebServiceClient */ @AutoConfiguration(after = WebServiceTemplateAutoConfiguration.class) -@ConditionalOnProperty(prefix = "spring.test.webservice.client", name = "register-web-service-template") +@ConditionalOnProperty("spring.test.webservice.client.register-web-service-template") @ConditionalOnClass(WebServiceTemplate.class) @ConditionalOnBean(WebServiceTemplateBuilder.class) public class WebServiceClientTemplateAutoConfiguration {