Refactor @ConfigurationProperties that only use prefix

See gh-43917

Signed-off-by: Yanming Zhou <zhouyanming@gmail.com>
This commit is contained in:
Yanming Zhou
2025-01-22 10:14:53 +08:00
committed by Phillip Webb
parent 7bcdb7d3ee
commit c1d97ffe16
173 changed files with 237 additions and 237 deletions

View File

@@ -51,7 +51,7 @@ import org.springframework.util.unit.DataSize;
* @author Yanming Zhou
* @since 1.0.0
*/
@ConfigurationProperties(prefix = "spring.rabbitmq")
@ConfigurationProperties("spring.rabbitmq")
public class RabbitProperties {
private static final int DEFAULT_PORT = 5672;

View File

@@ -29,7 +29,7 @@ import org.springframework.transaction.annotation.Isolation;
* @author Mukul Kumar Chaundhyan
* @since 1.2.0
*/
@ConfigurationProperties(prefix = "spring.batch")
@ConfigurationProperties("spring.batch")
public class BatchProperties {
private final Job job = new Job();

View File

@@ -32,7 +32,7 @@ import org.springframework.util.Assert;
* @author Ryon Day
* @since 1.3.0
*/
@ConfigurationProperties(prefix = "spring.cache")
@ConfigurationProperties("spring.cache")
public class CacheProperties {
/**

View File

@@ -34,7 +34,7 @@ import org.springframework.core.io.Resource;
* @author Scott Frederick
* @since 1.3.0
*/
@ConfigurationProperties(prefix = "spring.cassandra")
@ConfigurationProperties("spring.cassandra")
public class CassandraProperties {
/**

View File

@@ -25,7 +25,7 @@ import org.springframework.util.unit.DataSize;
* @author Brian Clozel
* @since 2.2.1
*/
@ConfigurationProperties(prefix = "spring.codec")
@ConfigurationProperties("spring.codec")
public class CodecProperties {
/**

View File

@@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Andy Wilkinson
* @since 2.3.0
*/
@ConfigurationProperties(prefix = "spring.lifecycle")
@ConfigurationProperties("spring.lifecycle")
public class LifecycleProperties {
/**

View File

@@ -35,7 +35,7 @@ import org.springframework.core.io.Resource;
* @author Misagh Moayyed
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.messages")
@ConfigurationProperties("spring.messages")
public class MessageSourceProperties {
/**

View File

@@ -32,7 +32,7 @@ import org.springframework.util.StringUtils;
* @author Scott Frederick
* @since 1.4.0
*/
@ConfigurationProperties(prefix = "spring.couchbase")
@ConfigurationProperties("spring.couchbase")
public class CouchbaseProperties {
/**

View File

@@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Stephane Nicoll
* @since 1.4.0
*/
@ConfigurationProperties(prefix = "spring.data.couchbase")
@ConfigurationProperties("spring.data.couchbase")
public class CouchbaseDataProperties {
/**

View File

@@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Jens Schauder
* @since 3.3.0
*/
@ConfigurationProperties(prefix = "spring.data.jdbc")
@ConfigurationProperties("spring.data.jdbc")
public class JdbcDataProperties {
/**

View File

@@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Michael J. Simons
* @since 2.4.0
*/
@ConfigurationProperties(prefix = "spring.data.neo4j")
@ConfigurationProperties("spring.data.neo4j")
public class Neo4jDataProperties {
/**

View File

@@ -34,7 +34,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Yanming Zhou
* @since 1.0.0
*/
@ConfigurationProperties(prefix = "spring.data.redis")
@ConfigurationProperties("spring.data.redis")
public class RedisProperties {
/**

View File

@@ -28,7 +28,7 @@ import org.springframework.http.MediaType;
* @author Stephane Nicoll
* @since 1.3.0
*/
@ConfigurationProperties(prefix = "spring.data.rest")
@ConfigurationProperties("spring.data.rest")
public class RepositoryRestProperties {
/**

View File

@@ -40,7 +40,7 @@ import org.springframework.boot.convert.DurationUnit;
* @author Chris Bono
* @since 1.1.0
*/
@ConfigurationProperties(prefix = "spring.flyway")
@ConfigurationProperties("spring.flyway")
public class FlywayProperties {
/**

View File

@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Andy Wilkinson
* @since 1.1.0
*/
@ConfigurationProperties(prefix = "spring.freemarker")
@ConfigurationProperties("spring.freemarker")
public class FreeMarkerProperties extends AbstractTemplateViewResolverProperties {
public static final String DEFAULT_TEMPLATE_LOADER_PATH = "classpath:/templates/";

View File

@@ -34,7 +34,7 @@ import org.springframework.web.cors.CorsConfiguration;
* @author Brian Clozel
* @since 2.7.0
*/
@ConfigurationProperties(prefix = "spring.graphql.cors")
@ConfigurationProperties("spring.graphql.cors")
public class GraphQlCorsProperties {
/**

View File

@@ -28,7 +28,7 @@ import org.springframework.core.io.Resource;
* @author Brian Clozel
* @since 2.7.0
*/
@ConfigurationProperties(prefix = "spring.graphql")
@ConfigurationProperties("spring.graphql")
public class GraphQlProperties {
/**

View File

@@ -109,7 +109,7 @@ public class GroovyTemplateAutoConfiguration {
@Bean
@ConditionalOnMissingBean(GroovyMarkupConfig.class)
@ConfigurationProperties(prefix = "spring.groovy.template.configuration")
@ConfigurationProperties("spring.groovy.template.configuration")
public GroovyMarkupConfigurer groovyMarkupConfigurer(ObjectProvider<MarkupTemplateEngine> templateEngine) {
GroovyMarkupConfigurer configurer = new GroovyMarkupConfigurer();
configurer.setResourceLoaderPath(this.properties.getResourceLoaderPath());

View File

@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
* @author Ivan Golovko
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.gson")
@ConfigurationProperties("spring.gson")
public class GsonProperties {
/**

View File

@@ -27,7 +27,7 @@ import org.springframework.util.Assert;
* @author Stephane Nicoll
* @since 1.3.0
*/
@ConfigurationProperties(prefix = "spring.h2.console")
@ConfigurationProperties("spring.h2.console")
public class H2ConsoleProperties {
/**

View File

@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Andy Wilkinson
* @since 1.2.1
*/
@ConfigurationProperties(prefix = "spring.hateoas")
@ConfigurationProperties("spring.hateoas")
public class HateoasProperties {
/**

View File

@@ -26,7 +26,7 @@ import org.springframework.util.Assert;
* @author Stephane Nicoll
* @since 1.3.0
*/
@ConfigurationProperties(prefix = "spring.hazelcast")
@ConfigurationProperties("spring.hazelcast")
public class HazelcastProperties {
/**

View File

@@ -29,7 +29,7 @@ import org.springframework.core.io.Resource;
* @author Stephane Nicoll
* @since 1.4.0
*/
@ConfigurationProperties(prefix = "spring.info")
@ConfigurationProperties("spring.info")
public class ProjectInfoProperties {
private final Build build = new Build();

View File

@@ -32,7 +32,7 @@ import org.springframework.boot.sql.init.DatabaseInitializationMode;
* @author Artem Bilan
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.integration")
@ConfigurationProperties("spring.integration")
public class IntegrationProperties {
private final Channel channel = new Channel();

View File

@@ -43,7 +43,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Eddú Meléndez
* @since 1.2.0
*/
@ConfigurationProperties(prefix = "spring.jackson")
@ConfigurationProperties("spring.jackson")
public class JacksonProperties {
/**

View File

@@ -77,7 +77,7 @@ abstract class DataSourceConfiguration {
}
@Bean
@ConfigurationProperties(prefix = "spring.datasource.tomcat")
@ConfigurationProperties("spring.datasource.tomcat")
org.apache.tomcat.jdbc.pool.DataSource dataSource(DataSourceProperties properties,
JdbcConnectionDetails connectionDetails) {
Class<? extends DataSource> dataSourceType = org.apache.tomcat.jdbc.pool.DataSource.class;
@@ -112,7 +112,7 @@ abstract class DataSourceConfiguration {
}
@Bean
@ConfigurationProperties(prefix = "spring.datasource.hikari")
@ConfigurationProperties("spring.datasource.hikari")
HikariDataSource dataSource(DataSourceProperties properties, JdbcConnectionDetails connectionDetails) {
HikariDataSource dataSource = createDataSource(connectionDetails, HikariDataSource.class,
properties.getClassLoader());
@@ -141,7 +141,7 @@ abstract class DataSourceConfiguration {
}
@Bean
@ConfigurationProperties(prefix = "spring.datasource.dbcp2")
@ConfigurationProperties("spring.datasource.dbcp2")
org.apache.commons.dbcp2.BasicDataSource dataSource(DataSourceProperties properties,
JdbcConnectionDetails connectionDetails) {
Class<? extends DataSource> dataSourceType = org.apache.commons.dbcp2.BasicDataSource.class;
@@ -167,7 +167,7 @@ abstract class DataSourceConfiguration {
}
@Bean
@ConfigurationProperties(prefix = "spring.datasource.oracleucp")
@ConfigurationProperties("spring.datasource.oracleucp")
PoolDataSourceImpl dataSource(DataSourceProperties properties, JdbcConnectionDetails connectionDetails)
throws SQLException {
PoolDataSourceImpl dataSource = createDataSource(connectionDetails, PoolDataSourceImpl.class,

View File

@@ -44,7 +44,7 @@ import org.springframework.util.StringUtils;
* @author Scott Frederick
* @since 1.1.0
*/
@ConfigurationProperties(prefix = "spring.datasource")
@ConfigurationProperties("spring.datasource")
public class DataSourceProperties implements BeanClassLoaderAware, InitializingBean {
private ClassLoader classLoader;

View File

@@ -29,7 +29,7 @@ import org.springframework.boot.convert.DurationUnit;
* @author Stephane Nicoll
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.jdbc")
@ConfigurationProperties("spring.jdbc")
public class JdbcProperties {
private final Template template = new Template();

View File

@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Stephane Nicoll
* @since 1.2.0
*/
@ConfigurationProperties(prefix = "spring.jersey")
@ConfigurationProperties("spring.jersey")
public class JerseyProperties {
/**

View File

@@ -31,7 +31,7 @@ import org.springframework.boot.context.properties.DeprecatedConfigurationProper
* @author Vedran Pavic
* @since 1.0.0
*/
@ConfigurationProperties(prefix = "spring.jms")
@ConfigurationProperties("spring.jms")
public class JmsProperties {
/**

View File

@@ -34,7 +34,7 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty;
* @author Eddú Meléndez
* @since 3.1.0
*/
@ConfigurationProperties(prefix = "spring.activemq")
@ConfigurationProperties("spring.activemq")
public class ActiveMQProperties {
private static final String DEFAULT_EMBEDDED_BROKER_URL = "vm://localhost?broker.persistent=false";

View File

@@ -35,7 +35,7 @@ import org.springframework.boot.context.properties.NestedConfigurationProperty;
* @author Justin Bertram
* @since 1.3.0
*/
@ConfigurationProperties(prefix = "spring.artemis")
@ConfigurationProperties("spring.artemis")
public class ArtemisProperties {
/**

View File

@@ -25,7 +25,7 @@ import org.springframework.jmx.support.RegistrationPolicy;
* @author Scott Frederick
* @since 2.7.0
*/
@ConfigurationProperties(prefix = "spring.jmx")
@ConfigurationProperties("spring.jmx")
public class JmxProperties {
/**

View File

@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Michael Simons
* @since 1.3.0
*/
@ConfigurationProperties(prefix = "spring.jooq")
@ConfigurationProperties("spring.jooq")
public class JooqProperties {
/**

View File

@@ -62,7 +62,7 @@ import org.springframework.util.unit.DataSize;
* @author Scott Frederick
* @since 1.5.0
*/
@ConfigurationProperties(prefix = "spring.kafka")
@ConfigurationProperties("spring.kafka")
public class KafkaProperties {
/**

View File

@@ -31,7 +31,7 @@ import org.springframework.util.ObjectUtils;
* @author Eddú Meléndez
* @since 1.5.0
*/
@ConfigurationProperties(prefix = "spring.ldap")
@ConfigurationProperties("spring.ldap")
public class LdapProperties {
private static final int DEFAULT_PORT = 389;

View File

@@ -31,7 +31,7 @@ import org.springframework.util.StringUtils;
* @author Mathieu Ouellet
* @since 1.5.0
*/
@ConfigurationProperties(prefix = "spring.ldap.embedded")
@ConfigurationProperties("spring.ldap.embedded")
public class EmbeddedLdapProperties {
/**

View File

@@ -31,7 +31,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Eddú Meléndez
* @since 1.2.0
*/
@ConfigurationProperties(prefix = "spring.mail")
@ConfigurationProperties("spring.mail")
public class MailProperties {
private static final Charset DEFAULT_CHARSET = StandardCharsets.UTF_8;

View File

@@ -38,7 +38,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Safeer Ansari
* @since 1.0.0
*/
@ConfigurationProperties(prefix = "spring.data.mongodb")
@ConfigurationProperties("spring.data.mongodb")
public class MongoProperties {
/**

View File

@@ -30,7 +30,7 @@ import org.springframework.util.MimeType;
* @author Dave Syer
* @since 1.2.2
*/
@ConfigurationProperties(prefix = "spring.mustache")
@ConfigurationProperties("spring.mustache")
public class MustacheProperties {
private static final MimeType DEFAULT_CONTENT_TYPE = MimeType.valueOf("text/html");

View File

@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Stephane Nicoll
* @since 2.4.0
*/
@ConfigurationProperties(prefix = "spring.neo4j")
@ConfigurationProperties("spring.neo4j")
public class Neo4jProperties {
/**

View File

@@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Brian Clozel
* @since 2.5.0
*/
@ConfigurationProperties(prefix = "spring.netty")
@ConfigurationProperties("spring.netty")
public class NettyProperties {
/**

View File

@@ -34,7 +34,7 @@ import org.springframework.orm.jpa.vendor.Database;
* @author Madhura Bhave
* @since 1.1.0
*/
@ConfigurationProperties(prefix = "spring.jpa")
@ConfigurationProperties("spring.jpa")
public class JpaProperties {
/**

View File

@@ -34,7 +34,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Rodolpho S. Couto
* @since 2.3.0
*/
@ConfigurationProperties(prefix = "spring.r2dbc")
@ConfigurationProperties("spring.r2dbc")
public class R2dbcProperties {
/**

View File

@@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Brian Clozel
* @since 3.2.0
*/
@ConfigurationProperties(prefix = "spring.reactor")
@ConfigurationProperties("spring.reactor")
public class ReactorProperties {
/**

View File

@@ -26,7 +26,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Moritz Halbritter
* @since 2.7.9
*/
@ConfigurationProperties(prefix = "spring.reactor.netty")
@ConfigurationProperties("spring.reactor.netty")
public class ReactorNettyProperties {
/**

View File

@@ -36,7 +36,7 @@ import org.springframework.util.StringUtils;
* @author Madhura Bhave
* @since 1.0.0
*/
@ConfigurationProperties(prefix = "spring.security")
@ConfigurationProperties("spring.security")
public class SecurityProperties {
/**

View File

@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
* @author Moritz Halbritter
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.security.oauth2.client")
@ConfigurationProperties("spring.security.oauth2.client")
public class OAuth2ClientProperties implements InitializingBean {
/**

View File

@@ -37,7 +37,7 @@ import org.springframework.util.StreamUtils;
* @author Yan Kardziyaka
* @since 2.1.0
*/
@ConfigurationProperties(prefix = "spring.security.oauth2.resourceserver")
@ConfigurationProperties("spring.security.oauth2.resourceserver")
public class OAuth2ResourceServerProperties {
private final Jwt jwt = new Jwt();

View File

@@ -34,7 +34,7 @@ import org.springframework.util.StringUtils;
* @author Steve Riesenberg
* @since 3.1.0
*/
@ConfigurationProperties(prefix = "spring.security.oauth2.authorizationserver")
@ConfigurationProperties("spring.security.oauth2.authorizationserver")
public class OAuth2AuthorizationServerProperties implements InitializingBean {
/**

View File

@@ -25,7 +25,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Andy Wilkinson
* @since 1.3.0
*/
@ConfigurationProperties(prefix = "spring.sendgrid")
@ConfigurationProperties("spring.sendgrid")
public class SendGridProperties {
/**

View File

@@ -26,7 +26,7 @@ import org.springframework.session.SaveMode;
* @author Vedran Pavic
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.session.hazelcast")
@ConfigurationProperties("spring.session.hazelcast")
public class HazelcastSessionProperties {
/**

View File

@@ -27,7 +27,7 @@ import org.springframework.session.SaveMode;
* @author Vedran Pavic
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.session.jdbc")
@ConfigurationProperties("spring.session.jdbc")
public class JdbcSessionProperties {
private static final String DEFAULT_SCHEMA_LOCATION = "classpath:org/springframework/"

View File

@@ -24,7 +24,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Andy Wilkinson
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.session.mongodb")
@ConfigurationProperties("spring.session.mongodb")
public class MongoSessionProperties {
/**

View File

@@ -26,7 +26,7 @@ import org.springframework.session.SaveMode;
* @author Vedran Pavic
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.session.redis")
@ConfigurationProperties("spring.session.redis")
public class RedisSessionProperties {
/**

View File

@@ -36,7 +36,7 @@ import org.springframework.session.web.http.SessionRepositoryFilter;
* @author Vedran Pavic
* @since 1.4.0
*/
@ConfigurationProperties(prefix = "spring.session")
@ConfigurationProperties("spring.session")
public class SessionProperties {
/**

View File

@@ -29,7 +29,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties;
* @author Moritz Halbritter
* @since 3.1.0
*/
@ConfigurationProperties(prefix = "spring.ssl")
@ConfigurationProperties("spring.ssl")
public class SslProperties {
/**

View File

@@ -34,7 +34,7 @@ import org.springframework.util.unit.DataSize;
* @author Kazuki Shimizu
* @since 1.2.0
*/
@ConfigurationProperties(prefix = "spring.thymeleaf")
@ConfigurationProperties("spring.thymeleaf")
public class ThymeleafProperties {
private static final Charset DEFAULT_ENCODING = StandardCharsets.UTF_8;

View File

@@ -31,7 +31,7 @@ import org.springframework.transaction.support.AbstractPlatformTransactionManage
* @author Phillip Webb
* @since 1.5.0
*/
@ConfigurationProperties(prefix = "spring.transaction")
@ConfigurationProperties("spring.transaction")
public class TransactionProperties implements TransactionManagerCustomizer<AbstractPlatformTransactionManager> {
/**

View File

@@ -32,7 +32,7 @@ import org.springframework.util.unit.DataSize;
* @author Chris Bono
* @since 2.6.0
*/
@ConfigurationProperties(prefix = "spring.webflux.multipart")
@ConfigurationProperties("spring.webflux.multipart")
public class ReactiveMultipartProperties {
/**

View File

@@ -26,7 +26,7 @@ import org.springframework.util.StringUtils;
* @author Vedran Pavic
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.webflux")
@ConfigurationProperties("spring.webflux")
public class WebFluxProperties {
/**

View File

@@ -36,7 +36,7 @@ import org.springframework.validation.DefaultMessageCodesResolver;
* @author Vedran Pavic
* @since 2.0.0
*/
@ConfigurationProperties(prefix = "spring.mvc")
@ConfigurationProperties("spring.mvc")
public class WebMvcProperties {
/**

View File

@@ -29,7 +29,7 @@ import org.springframework.util.Assert;
* @author Stephane Nicoll
* @since 1.4.0
*/
@ConfigurationProperties(prefix = "spring.webservices")
@ConfigurationProperties("spring.webservices")
public class WebServicesProperties {
/**

View File

@@ -141,7 +141,7 @@ class TomcatDataSourceConfigurationTests {
static class TomcatDataSourceConfiguration {
@Bean
@ConfigurationProperties(prefix = "spring.datasource.tomcat")
@ConfigurationProperties("spring.datasource.tomcat")
DataSource dataSource() {
return DataSourceBuilder.create().type(org.apache.tomcat.jdbc.pool.DataSource.class).build();
}