Skip to content

Commit 0a6456a

Browse files
philwebbphilwebb
committed
Always use prefix config annotation attribute
Update use of `@ConfigurationProperties` to prefer the more explicit `prefix` attribute, rather than `value`. See gh-7579
1 parent 43d432a commit 0a6456a

File tree

35 files changed

+38
-38
lines changed

35 files changed

+38
-38
lines changed

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/HealthIndicatorProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @author Christian Dupuis
2727
* @since 1.2.0
2828
*/
29-
@ConfigurationProperties("management.health.status")
29+
@ConfigurationProperties(prefix = "management.health.status")
3030
public class HealthIndicatorProperties {
3131

3232
/**

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/autoconfigure/MetricFilterProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author Phillip Webb
3030
* @since 1.4.0
3131
*/
32-
@ConfigurationProperties("endpoints.metrics.filter")
32+
@ConfigurationProperties(prefix = "endpoints.metrics.filter")
3333
public class MetricFilterProperties {
3434

3535
/**

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/DocsMvcEndpoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author Dave Syer
2828
* @since 1.3.0
2929
*/
30-
@ConfigurationProperties("endpoints.docs")
30+
@ConfigurationProperties(prefix = "endpoints.docs")
3131
public class DocsMvcEndpoint extends AbstractNamedMvcEndpoint {
3232

3333
private static final String DOCS_LOCATION = "classpath:/META-INF/resources/spring-boot-actuator/docs/";

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HalJsonMvcEndpoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @author Andy Wilkinson
3232
* @since 1.3.0
3333
*/
34-
@ConfigurationProperties("endpoints.actuator")
34+
@ConfigurationProperties(prefix = "endpoints.actuator")
3535
public class HalJsonMvcEndpoint extends AbstractNamedMvcEndpoint {
3636

3737
private final ManagementServletContext managementServletContext;

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/endpoint/mvc/HeapdumpMvcEndpoint.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
* @author Phillip Webb
5555
* @since 1.4.0
5656
*/
57-
@ConfigurationProperties("endpoints.heapdump")
57+
@ConfigurationProperties(prefix = "endpoints.heapdump")
5858
@HypermediaDisabled
5959
public class HeapdumpMvcEndpoint extends AbstractNamedMvcEndpoint {
6060

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/health/DiskSpaceHealthIndicatorProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author Andy Wilkinson
2828
* @since 1.2.0
2929
*/
30-
@ConfigurationProperties("management.health.diskspace")
30+
@ConfigurationProperties(prefix = "management.health.diskspace")
3131
public class DiskSpaceHealthIndicatorProperties {
3232

3333
private static final int MEGABYTES = 1024 * 1024;

‎spring-boot-actuator/src/main/java/org/springframework/boot/actuate/metrics/export/MetricExportProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* @author Simon Buettner
3333
* @since 1.3.0
3434
*/
35-
@ConfigurationProperties("spring.metrics.export")
35+
@ConfigurationProperties(prefix = "spring.metrics.export")
3636
public class MetricExportProperties extends TriggerProperties {
3737

3838
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/batch/BatchProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @author Vedran Pavic
2727
* @since 1.2.0
2828
*/
29-
@ConfigurationProperties("spring.batch")
29+
@ConfigurationProperties(prefix = "spring.batch")
3030
public class BatchProperties {
3131

3232
private static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/"

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/rest/RepositoryRestProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author Stephane Nicoll
2828
* @since 1.3.0
2929
*/
30-
@ConfigurationProperties("spring.data.rest")
30+
@ConfigurationProperties(prefix = "spring.data.rest")
3131
public class RepositoryRestProperties {
3232

3333
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/elasticsearch/jest/JestProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author Stephane Nicoll
2828
* @since 1.4.0
2929
*/
30-
@ConfigurationProperties("spring.elasticsearch.jest")
30+
@ConfigurationProperties(prefix = "spring.elasticsearch.jest")
3131
public class JestProperties {
3232

3333
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/hazelcast/HazelcastProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @author Stephane Nicoll
2727
* @since 1.3.0
2828
*/
29-
@ConfigurationProperties("spring.hazelcast")
29+
@ConfigurationProperties(prefix = "spring.hazelcast")
3030
public class HazelcastProperties {
3131

3232
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/info/ProjectInfoProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
* @author Stephane Nicoll
2929
* @since 1.4.0
3030
*/
31-
@ConfigurationProperties("spring.info")
31+
@ConfigurationProperties(prefix = "spring.info")
3232
public class ProjectInfoProperties {
3333

3434
private final Build build = new Build();

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected <T> T createDataSource(DataSourceProperties properties,
5050
static class Tomcat extends DataSourceConfiguration {
5151

5252
@Bean
53-
@ConfigurationProperties("spring.datasource.tomcat")
53+
@ConfigurationProperties(prefix = "spring.datasource.tomcat")
5454
public org.apache.tomcat.jdbc.pool.DataSource dataSource(
5555
DataSourceProperties properties) {
5656
org.apache.tomcat.jdbc.pool.DataSource dataSource = createDataSource(
@@ -75,7 +75,7 @@ public org.apache.tomcat.jdbc.pool.DataSource dataSource(
7575
static class Hikari extends DataSourceConfiguration {
7676

7777
@Bean
78-
@ConfigurationProperties("spring.datasource.hikari")
78+
@ConfigurationProperties(prefix = "spring.datasource.hikari")
7979
public HikariDataSource dataSource(DataSourceProperties properties) {
8080
return createDataSource(properties, HikariDataSource.class);
8181
}
@@ -93,7 +93,7 @@ public HikariDataSource dataSource(DataSourceProperties properties) {
9393
static class Dbcp extends DataSourceConfiguration {
9494

9595
@Bean
96-
@ConfigurationProperties("spring.datasource.dbcp")
96+
@ConfigurationProperties(prefix = "spring.datasource.dbcp")
9797
public org.apache.commons.dbcp.BasicDataSource dataSource(
9898
DataSourceProperties properties) {
9999
org.apache.commons.dbcp.BasicDataSource dataSource = createDataSource(
@@ -118,7 +118,7 @@ public org.apache.commons.dbcp.BasicDataSource dataSource(
118118
static class Dbcp2 extends DataSourceConfiguration {
119119

120120
@Bean
121-
@ConfigurationProperties("spring.datasource.dbcp2")
121+
@ConfigurationProperties(prefix = "spring.datasource.dbcp2")
122122
public org.apache.commons.dbcp2.BasicDataSource dataSource(
123123
DataSourceProperties properties) {
124124
return createDataSource(properties,

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jersey/JerseyProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
* @author Stephane Nicoll
3030
* @since 1.2.0
3131
*/
32-
@ConfigurationProperties("spring.jersey")
32+
@ConfigurationProperties(prefix = "spring.jersey")
3333
public class JerseyProperties {
3434

3535
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/jms/activemq/ActiveMQConnectionFactoryConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static class PooledConnectionFactoryConfiguration {
5454

5555
@Bean(destroyMethod = "stop")
5656
@ConditionalOnProperty(prefix = "spring.activemq.pool", name = "enabled", havingValue = "true", matchIfMissing = false)
57-
@ConfigurationProperties("spring.activemq.pool.configuration")
57+
@ConfigurationProperties(prefix = "spring.activemq.pool.configuration")
5858
public PooledConnectionFactory pooledJmsConnectionFactory(
5959
ActiveMQProperties properties) {
6060
PooledConnectionFactory pooledConnectionFactory = new PooledConnectionFactory(

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mobile/DeviceDelegatingViewResolverProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @author Stephane Nicoll
2525
* @since 1.2.0
2626
*/
27-
@ConfigurationProperties("spring.mobile.devicedelegatingviewresolver")
27+
@ConfigurationProperties(prefix = "spring.mobile.devicedelegatingviewresolver")
2828
public class DeviceDelegatingViewResolverProperties {
2929

3030
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/OAuth2ClientProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author Stephane Nicoll
2828
* @since 1.3.0
2929
*/
30-
@ConfigurationProperties("security.oauth2.client")
30+
@ConfigurationProperties(prefix = "security.oauth2.client")
3131
public class OAuth2ClientProperties {
3232

3333
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/AuthorizationServerProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @author Dave Syer
2525
* @since 1.3.0
2626
*/
27-
@ConfigurationProperties("security.oauth2.authorization")
27+
@ConfigurationProperties(prefix = "security.oauth2.authorization")
2828
public class AuthorizationServerProperties {
2929

3030
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/authserver/OAuth2AuthorizationServerConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ protected BaseClientDetailsConfiguration(OAuth2ClientProperties client) {
174174
}
175175

176176
@Bean
177-
@ConfigurationProperties("security.oauth2.client")
177+
@ConfigurationProperties(prefix = "security.oauth2.client")
178178
public BaseClientDetails oauth2ClientDetails() {
179179
BaseClientDetails details = new BaseClientDetails();
180180
if (this.client.getClientId() == null) {

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2ProtectedResourceDetailsConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
class OAuth2ProtectedResourceDetailsConfiguration {
3232

3333
@Bean
34-
@ConfigurationProperties("security.oauth2.client")
34+
@ConfigurationProperties(prefix = "security.oauth2.client")
3535
@Primary
3636
public AuthorizationCodeResourceDetails oauth2RemoteResource() {
3737
return new AuthorizationCodeResourceDetails();

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2RestOperationsConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public class OAuth2RestOperationsConfiguration {
7474
protected static class SingletonScopedConfiguration {
7575

7676
@Bean
77-
@ConfigurationProperties("security.oauth2.client")
77+
@ConfigurationProperties(prefix = "security.oauth2.client")
7878
@Primary
7979
public ClientCredentialsResourceDetails oauth2RemoteResource() {
8080
ClientCredentialsResourceDetails details = new ClientCredentialsResourceDetails();

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/client/OAuth2SsoProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @author Dave Syer
2525
* @since 1.3.0
2626
*/
27-
@ConfigurationProperties("security.oauth2.sso")
27+
@ConfigurationProperties(prefix = "security.oauth2.sso")
2828
public class OAuth2SsoProperties {
2929

3030
public static final String DEFAULT_LOGIN_PATH = "/login";

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/security/oauth2/resource/ResourceServerProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
* @author Dave Syer
3838
* @since 1.3.0
3939
*/
40-
@ConfigurationProperties("security.oauth2.resource")
40+
@ConfigurationProperties(prefix = "security.oauth2.resource")
4141
public class ResourceServerProperties implements Validator, BeanFactoryAware {
4242

4343
@JsonIgnore

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/session/SessionProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
* @author Vedran Pavic
3131
* @since 1.4.0
3232
*/
33-
@ConfigurationProperties("spring.session")
33+
@ConfigurationProperties(prefix = "spring.session")
3434
public class SessionProperties {
3535

3636
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/FacebookProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @author Stephane Nicoll
2525
* @since 1.2.0
2626
*/
27-
@ConfigurationProperties("spring.social.facebook")
27+
@ConfigurationProperties(prefix = "spring.social.facebook")
2828
public class FacebookProperties extends SocialProperties {
2929

3030
}

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/LinkedInProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @author Stephane Nicoll
2525
* @since 1.2.0
2626
*/
27-
@ConfigurationProperties("spring.social.linkedin")
27+
@ConfigurationProperties(prefix = "spring.social.linkedin")
2828
public class LinkedInProperties extends SocialProperties {
2929

3030
}

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/social/TwitterProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
* @author Stephane Nicoll
2525
* @since 1.2.0
2626
*/
27-
@ConfigurationProperties("spring.social.twitter")
27+
@ConfigurationProperties(prefix = "spring.social.twitter")
2828
public class TwitterProperties extends SocialProperties {
2929

3030
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author Stephane Nicoll
2828
* @since 1.2.0
2929
*/
30-
@ConfigurationProperties("spring.thymeleaf")
30+
@ConfigurationProperties(prefix = "spring.thymeleaf")
3131
public class ThymeleafProperties {
3232

3333
private static final Charset DEFAULT_ENCODING = Charset.forName("UTF-8");

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
* @author Phillip Webb
2828
* @since 1.5.0
2929
*/
30-
@ConfigurationProperties("spring.transaction")
30+
@ConfigurationProperties(prefix = "spring.transaction")
3131
public class TransactionProperties implements
3232
PlatformTransactionManagerCustomizer<AbstractPlatformTransactionManager> {
3333

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class BitronixJtaConfiguration {
7171

7272
@Bean
7373
@ConditionalOnMissingBean
74-
@ConfigurationProperties("spring.jta.bitronix.properties")
74+
@ConfigurationProperties(prefix = "spring.jta.bitronix.properties")
7575
public bitronix.tm.Configuration bitronixConfiguration() {
7676
bitronix.tm.Configuration config = TransactionManagerServices.getConfiguration();
7777
if (StringUtils.hasText(this.jtaProperties.getTransactionManagerId())) {

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/WebMvcProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @author Eddú Meléndez
3434
* @since 1.1
3535
*/
36-
@ConfigurationProperties("spring.mvc")
36+
@ConfigurationProperties(prefix = "spring.mvc")
3737
public class WebMvcProperties {
3838

3939
/**

‎spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/webservices/WebServicesProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
* @author Stephane Nicoll
3232
* @since 1.4.0
3333
*/
34-
@ConfigurationProperties("spring.webservices")
34+
@ConfigurationProperties(prefix = "spring.webservices")
3535
public class WebServicesProperties {
3636

3737
/**

‎spring-boot-test-autoconfigure/src/main/java/org/springframework/boot/test/autoconfigure/restdocs/RestDocsAutoConfiguration.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ public MockMvcRestDocumentationConfigurer restDocsMockMvcConfigurer(
5656
}
5757

5858
@Bean
59-
@ConfigurationProperties("spring.test.restdocs")
59+
@ConfigurationProperties(prefix = "spring.test.restdocs")
6060
public RestDocsMockMvcBuilderCustomizer restDocumentationConfigurer(
6161
MockMvcRestDocumentationConfigurer configurer,
6262
ObjectProvider<RestDocumentationResultHandler> resultHandler) {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public DefaultMockMvcBuilder mockMvcBuilder(
7474
}
7575

7676
@Bean
77-
@ConfigurationProperties("spring.test.mockmvc")
77+
@ConfigurationProperties(prefix = "spring.test.mockmvc")
7878
public SpringBootMockMvcBuilderCustomizer springBootMockMvcBuilderCustomizer() {
7979
return new SpringBootMockMvcBuilderCustomizer(this.context);
8080
}

‎spring-boot/src/main/java/org/springframework/boot/jta/atomikos/AtomikosProperties.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
* @since 1.2.0
3434
* @see #asProperties()
3535
*/
36-
@ConfigurationProperties("spring.jta.atomikos.properties")
36+
@ConfigurationProperties(prefix = "spring.jta.atomikos.properties")
3737
public class AtomikosProperties {
3838

3939
private final Map<String, String> values = new TreeMap<String, String>();

0 commit comments

Comments
 (0)