From 0a6456a7481b1d1c6f42e12a4837938c2e8ee526 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Wed, 18 Jan 2017 20:27:55 -0800 Subject: [PATCH] Always use `prefix` config annotation attribute Update use of `@ConfigurationProperties` to prefer the more explicit `prefix` attribute, rather than `value`. See gh-7579 --- .../actuate/autoconfigure/HealthIndicatorProperties.java | 2 +- .../actuate/autoconfigure/MetricFilterProperties.java | 2 +- .../boot/actuate/endpoint/mvc/DocsMvcEndpoint.java | 2 +- .../boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java | 2 +- .../boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java | 2 +- .../health/DiskSpaceHealthIndicatorProperties.java | 2 +- .../actuate/metrics/export/MetricExportProperties.java | 2 +- .../boot/autoconfigure/batch/BatchProperties.java | 2 +- .../autoconfigure/data/rest/RepositoryRestProperties.java | 2 +- .../autoconfigure/elasticsearch/jest/JestProperties.java | 2 +- .../boot/autoconfigure/hazelcast/HazelcastProperties.java | 2 +- .../boot/autoconfigure/info/ProjectInfoProperties.java | 2 +- .../boot/autoconfigure/jdbc/DataSourceConfiguration.java | 8 ++++---- .../boot/autoconfigure/jersey/JerseyProperties.java | 2 +- .../activemq/ActiveMQConnectionFactoryConfiguration.java | 2 +- .../mobile/DeviceDelegatingViewResolverProperties.java | 2 +- .../security/oauth2/OAuth2ClientProperties.java | 2 +- .../oauth2/authserver/AuthorizationServerProperties.java | 2 +- .../OAuth2AuthorizationServerConfiguration.java | 2 +- .../OAuth2ProtectedResourceDetailsConfiguration.java | 2 +- .../oauth2/client/OAuth2RestOperationsConfiguration.java | 2 +- .../security/oauth2/client/OAuth2SsoProperties.java | 2 +- .../oauth2/resource/ResourceServerProperties.java | 2 +- .../boot/autoconfigure/session/SessionProperties.java | 2 +- .../boot/autoconfigure/social/FacebookProperties.java | 2 +- .../boot/autoconfigure/social/LinkedInProperties.java | 2 +- .../boot/autoconfigure/social/TwitterProperties.java | 2 +- .../boot/autoconfigure/thymeleaf/ThymeleafProperties.java | 2 +- .../autoconfigure/transaction/TransactionProperties.java | 2 +- .../transaction/jta/BitronixJtaConfiguration.java | 2 +- .../boot/autoconfigure/web/WebMvcProperties.java | 2 +- .../autoconfigure/webservices/WebServicesProperties.java | 2 +- .../autoconfigure/restdocs/RestDocsAutoConfiguration.java | 2 +- .../web/servlet/MockMvcAutoConfiguration.java | 2 +- .../boot/jta/atomikos/AtomikosProperties.java | 2 +- 35 files changed, 38 insertions(+), 38 deletions(-) diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java index 6588038133..071586e1bf 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java @@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Christian Dupuis * @since 1.2.0 */ -@ConfigurationProperties("management.health.status") +@ConfigurationProperties(prefix = "management.health.status") public class HealthIndicatorProperties { /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java index cdbedf4975..3feff10228 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java @@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Phillip Webb * @since 1.4.0 */ -@ConfigurationProperties("endpoints.metrics.filter") +@ConfigurationProperties(prefix = "endpoints.metrics.filter") public class MetricFilterProperties { /** diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/DocsMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/DocsMvcEndpoint.java index 2d8261b161..1816fb14a9 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/DocsMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/DocsMvcEndpoint.java @@ -27,7 +27,7 @@ import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry * @author Dave Syer * @since 1.3.0 */ -@ConfigurationProperties("endpoints.docs") +@ConfigurationProperties(prefix = "endpoints.docs") public class DocsMvcEndpoint extends AbstractNamedMvcEndpoint { private static final String DOCS_LOCATION = "classpath:/META-INF/resources/spring-boot-actuator/docs/"; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java index 33e252bcab..18dfa1ad26 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java @@ -31,7 +31,7 @@ import org.springframework.web.bind.annotation.ResponseBody; * @author Andy Wilkinson * @since 1.3.0 */ -@ConfigurationProperties("endpoints.actuator") +@ConfigurationProperties(prefix = "endpoints.actuator") public class HalJsonMvcEndpoint extends AbstractNamedMvcEndpoint { private final ManagementServletContext managementServletContext; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java index 210ed279ab..b3dde9935c 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java @@ -54,7 +54,7 @@ import org.springframework.web.bind.annotation.ResponseStatus; * @author Phillip Webb * @since 1.4.0 */ -@ConfigurationProperties("endpoints.heapdump") +@ConfigurationProperties(prefix = "endpoints.heapdump") @HypermediaDisabled public class HeapdumpMvcEndpoint extends AbstractNamedMvcEndpoint { diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorProperties.java index bb5929095d..5c8c776ece 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorProperties.java @@ -27,7 +27,7 @@ import org.springframework.util.Assert; * @author Andy Wilkinson * @since 1.2.0 */ -@ConfigurationProperties("management.health.diskspace") +@ConfigurationProperties(prefix = "management.health.diskspace") public class DiskSpaceHealthIndicatorProperties { private static final int MEGABYTES = 1024 * 1024; diff --git a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java index fb2bc15920..2b26408ede 100644 --- a/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java +++ b/spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java @@ -32,7 +32,7 @@ import org.springframework.util.PatternMatchUtils; * @author Simon Buettner * @since 1.3.0 */ -@ConfigurationProperties("spring.metrics.export") +@ConfigurationProperties(prefix = "spring.metrics.export") public class MetricExportProperties extends TriggerProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java index bf5547472c..23a81c1496 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java @@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Vedran Pavic * @since 1.2.0 */ -@ConfigurationProperties("spring.batch") +@ConfigurationProperties(prefix = "spring.batch") public class BatchProperties { private static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/" diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java index 7bfcdabe85..0403d3f3ae 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java @@ -27,7 +27,7 @@ import org.springframework.http.MediaType; * @author Stephane Nicoll * @since 1.3.0 */ -@ConfigurationProperties("spring.data.rest") +@ConfigurationProperties(prefix = "spring.data.rest") public class RepositoryRestProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java index 4830c9a4b7..dbfd9b9ee8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java @@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Stephane Nicoll * @since 1.4.0 */ -@ConfigurationProperties("spring.elasticsearch.jest") +@ConfigurationProperties(prefix = "spring.elasticsearch.jest") public class JestProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java index 61ef267818..5521b19f97 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java @@ -26,7 +26,7 @@ import org.springframework.util.Assert; * @author Stephane Nicoll * @since 1.3.0 */ -@ConfigurationProperties("spring.hazelcast") +@ConfigurationProperties(prefix = "spring.hazelcast") public class HazelcastProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java index 7ab0c521a6..0ab854367a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java @@ -28,7 +28,7 @@ import org.springframework.core.io.Resource; * @author Stephane Nicoll * @since 1.4.0 */ -@ConfigurationProperties("spring.info") +@ConfigurationProperties(prefix = "spring.info") public class ProjectInfoProperties { private final Build build = new Build(); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java index e94c6c0163..b4b8169f62 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jdbc/DataSourceConfiguration.java @@ -50,7 +50,7 @@ abstract class DataSourceConfiguration { static class Tomcat extends DataSourceConfiguration { @Bean - @ConfigurationProperties("spring.datasource.tomcat") + @ConfigurationProperties(prefix = "spring.datasource.tomcat") public org.apache.tomcat.jdbc.pool.DataSource dataSource( DataSourceProperties properties) { org.apache.tomcat.jdbc.pool.DataSource dataSource = createDataSource( @@ -75,7 +75,7 @@ abstract class DataSourceConfiguration { static class Hikari extends DataSourceConfiguration { @Bean - @ConfigurationProperties("spring.datasource.hikari") + @ConfigurationProperties(prefix = "spring.datasource.hikari") public HikariDataSource dataSource(DataSourceProperties properties) { return createDataSource(properties, HikariDataSource.class); } @@ -93,7 +93,7 @@ abstract class DataSourceConfiguration { static class Dbcp extends DataSourceConfiguration { @Bean - @ConfigurationProperties("spring.datasource.dbcp") + @ConfigurationProperties(prefix = "spring.datasource.dbcp") public org.apache.commons.dbcp.BasicDataSource dataSource( DataSourceProperties properties) { org.apache.commons.dbcp.BasicDataSource dataSource = createDataSource( @@ -118,7 +118,7 @@ abstract class DataSourceConfiguration { static class Dbcp2 extends DataSourceConfiguration { @Bean - @ConfigurationProperties("spring.datasource.dbcp2") + @ConfigurationProperties(prefix = "spring.datasource.dbcp2") public org.apache.commons.dbcp2.BasicDataSource dataSource( DataSourceProperties properties) { return createDataSource(properties, diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java index 77e56b032e..c65e3d0277 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java @@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Stephane Nicoll * @since 1.2.0 */ -@ConfigurationProperties("spring.jersey") +@ConfigurationProperties(prefix = "spring.jersey") public class JerseyProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java index c81534285e..69cb1b7b46 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java @@ -54,7 +54,7 @@ class ActiveMQConnectionFactoryConfiguration { @Bean(destroyMethod = "stop") @ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "true", matchIfMissing = false) - @ConfigurationProperties("spring.activemq.pool.configuration") + @ConfigurationProperties(prefix = "spring.activemq.pool.configuration") public PooledConnectionFactory pooledJmsConnectionFactory( ActiveMQProperties properties) { PooledConnectionFactory pooledConnectionFactory = new PooledConnectionFactory( diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverProperties.java index f34ee78759..4ba6a33c1d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverProperties.java @@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Stephane Nicoll * @since 1.2.0 */ -@ConfigurationProperties("spring.mobile.devicedelegatingviewresolver") +@ConfigurationProperties(prefix = "spring.mobile.devicedelegatingviewresolver") public class DeviceDelegatingViewResolverProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2ClientProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2ClientProperties.java index 5cbb857572..f1998a0fb1 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2ClientProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2ClientProperties.java @@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Stephane Nicoll * @since 1.3.0 */ -@ConfigurationProperties("security.oauth2.client") +@ConfigurationProperties(prefix = "security.oauth2.client") public class OAuth2ClientProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/AuthorizationServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/AuthorizationServerProperties.java index c038ac41f7..564daca214 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/AuthorizationServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/AuthorizationServerProperties.java @@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Dave Syer * @since 1.3.0 */ -@ConfigurationProperties("security.oauth2.authorization") +@ConfigurationProperties(prefix = "security.oauth2.authorization") public class AuthorizationServerProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java index 4480b40de7..3ac33cdce8 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java @@ -174,7 +174,7 @@ public class OAuth2AuthorizationServerConfiguration } @Bean - @ConfigurationProperties("security.oauth2.client") + @ConfigurationProperties(prefix = "security.oauth2.client") public BaseClientDetails oauth2ClientDetails() { BaseClientDetails details = new BaseClientDetails(); if (this.client.getClientId() == null) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ProtectedResourceDetailsConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ProtectedResourceDetailsConfiguration.java index f2c5fbdf6c..3731c9a955 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ProtectedResourceDetailsConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ProtectedResourceDetailsConfiguration.java @@ -31,7 +31,7 @@ import org.springframework.security.oauth2.client.token.grant.code.Authorization class OAuth2ProtectedResourceDetailsConfiguration { @Bean - @ConfigurationProperties("security.oauth2.client") + @ConfigurationProperties(prefix = "security.oauth2.client") @Primary public AuthorizationCodeResourceDetails oauth2RemoteResource() { return new AuthorizationCodeResourceDetails(); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java index 86866d662f..ba5ff1cf9e 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java @@ -74,7 +74,7 @@ public class OAuth2RestOperationsConfiguration { protected static class SingletonScopedConfiguration { @Bean - @ConfigurationProperties("security.oauth2.client") + @ConfigurationProperties(prefix = "security.oauth2.client") @Primary public ClientCredentialsResourceDetails oauth2RemoteResource() { ClientCredentialsResourceDetails details = new ClientCredentialsResourceDetails(); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java index a53a19d7ae..18c2af2249 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java @@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Dave Syer * @since 1.3.0 */ -@ConfigurationProperties("security.oauth2.sso") +@ConfigurationProperties(prefix = "security.oauth2.sso") public class OAuth2SsoProperties { public static final String DEFAULT_LOGIN_PATH = "/login"; diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java index c53f5c60d0..c55ddd5de0 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java @@ -37,7 +37,7 @@ import org.springframework.validation.Validator; * @author Dave Syer * @since 1.3.0 */ -@ConfigurationProperties("security.oauth2.resource") +@ConfigurationProperties(prefix = "security.oauth2.resource") public class ResourceServerProperties implements Validator, BeanFactoryAware { @JsonIgnore diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java index fc83b3f595..5faead4c59 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java @@ -30,7 +30,7 @@ import org.springframework.session.hazelcast.HazelcastFlushMode; * @author Vedran Pavic * @since 1.4.0 */ -@ConfigurationProperties("spring.session") +@ConfigurationProperties(prefix = "spring.session") public class SessionProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookProperties.java index 5280fe4a26..17473b370c 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookProperties.java @@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Stephane Nicoll * @since 1.2.0 */ -@ConfigurationProperties("spring.social.facebook") +@ConfigurationProperties(prefix = "spring.social.facebook") public class FacebookProperties extends SocialProperties { } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInProperties.java index c19ce5e065..d0df42a91a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInProperties.java @@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Stephane Nicoll * @since 1.2.0 */ -@ConfigurationProperties("spring.social.linkedin") +@ConfigurationProperties(prefix = "spring.social.linkedin") public class LinkedInProperties extends SocialProperties { } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterProperties.java index 6f14ace3b5..4c71e07018 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterProperties.java @@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Stephane Nicoll * @since 1.2.0 */ -@ConfigurationProperties("spring.social.twitter") +@ConfigurationProperties(prefix = "spring.social.twitter") public class TwitterProperties extends SocialProperties { } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java index e9c14c3a19..442c36d425 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/thymeleaf/ThymeleafProperties.java @@ -27,7 +27,7 @@ import org.springframework.util.MimeType; * @author Stephane Nicoll * @since 1.2.0 */ -@ConfigurationProperties("spring.thymeleaf") +@ConfigurationProperties(prefix = "spring.thymeleaf") public class ThymeleafProperties { private static final Charset DEFAULT_ENCODING = Charset.forName("UTF-8"); diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java index 7273dd2e5d..9ff6e75f3a 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/TransactionProperties.java @@ -27,7 +27,7 @@ import org.springframework.transaction.support.AbstractPlatformTransactionManage * @author Phillip Webb * @since 1.5.0 */ -@ConfigurationProperties("spring.transaction") +@ConfigurationProperties(prefix = "spring.transaction") public class TransactionProperties implements PlatformTransactionManagerCustomizer { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java index dbd3d54fef..ca2c99f5a2 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/transaction/jta/BitronixJtaConfiguration.java @@ -71,7 +71,7 @@ class BitronixJtaConfiguration { @Bean @ConditionalOnMissingBean - @ConfigurationProperties("spring.jta.bitronix.properties") + @ConfigurationProperties(prefix = "spring.jta.bitronix.properties") public bitronix.tm.Configuration bitronixConfiguration() { bitronix.tm.Configuration config = TransactionManagerServices.getConfiguration(); if (StringUtils.hasText(this.jtaProperties.getTransactionManagerId())) { diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java index c9a288022f..bb0a416bfe 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java @@ -33,7 +33,7 @@ import org.springframework.validation.DefaultMessageCodesResolver; * @author Eddú Meléndez * @since 1.1 */ -@ConfigurationProperties("spring.mvc") +@ConfigurationProperties(prefix = "spring.mvc") public class WebMvcProperties { /** diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java index 978c32f5af..187b3d2512 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java @@ -31,7 +31,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @author Stephane Nicoll * @since 1.4.0 */ -@ConfigurationProperties("spring.webservices") +@ConfigurationProperties(prefix = "spring.webservices") public class WebServicesProperties { /** diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java index 55772c1402..e47fddeed0 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java @@ -56,7 +56,7 @@ public class RestDocsAutoConfiguration { } @Bean - @ConfigurationProperties("spring.test.restdocs") + @ConfigurationProperties(prefix = "spring.test.restdocs") public RestDocsMockMvcBuilderCustomizer restDocumentationConfigurer( MockMvcRestDocumentationConfigurer configurer, ObjectProvider resultHandler) { diff --git a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java index 6fbce1b698..f3d60753c0 100644 --- a/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java +++ b/spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/web/servlet/MockMvcAutoConfiguration.java @@ -74,7 +74,7 @@ public class MockMvcAutoConfiguration { } @Bean - @ConfigurationProperties("spring.test.mockmvc") + @ConfigurationProperties(prefix = "spring.test.mockmvc") public SpringBootMockMvcBuilderCustomizer springBootMockMvcBuilderCustomizer() { return new SpringBootMockMvcBuilderCustomizer(this.context); } diff --git a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java index 1b7354b2c4..aab6d539cc 100644 --- a/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java +++ b/spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java @@ -33,7 +33,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 1.2.0 * @see #asProperties() */ -@ConfigurationProperties("spring.jta.atomikos.properties") +@ConfigurationProperties(prefix = "spring.jta.atomikos.properties") public class AtomikosProperties { private final Map values = new TreeMap();