From 42c494caa2f517ae9fe7ea2eda3c74695462f7bd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Thu, 4 Sep 2025 16:02:39 +0100 Subject: [PATCH] =?UTF-8?q?Rename=20=E2=80=A6DataProperties=20to=20Data?= =?UTF-8?q?=E2=80=A6Properties?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes gh-47043 --- .../autoconfigure/CouchbaseClientFactoryConfiguration.java | 2 +- .../autoconfigure/CouchbaseDataAutoConfiguration.java | 2 +- .../couchbase/autoconfigure/CouchbaseDataConfiguration.java | 4 ++-- ...baseDataProperties.java => DataCouchbaseProperties.java} | 2 +- ...opertiesTests.java => DataCouchbasePropertiesTests.java} | 6 +++--- .../{JdbcDataProperties.java => DataJdbcProperties.java} | 2 +- .../autoconfigure/JdbcRepositoriesAutoConfiguration.java | 6 +++--- .../{Neo4jDataProperties.java => DataNeo4jProperties.java} | 2 +- .../neo4j/autoconfigure/Neo4jDataAutoConfiguration.java | 4 ++-- .../autoconfigure/Neo4jReactiveDataAutoConfiguration.java | 6 +++--- 10 files changed, 18 insertions(+), 18 deletions(-) rename module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseDataProperties.java => DataCouchbaseProperties.java} (98%) rename module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/{CouchbaseDataPropertiesTests.java => DataCouchbasePropertiesTests.java} (87%) rename module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/{JdbcDataProperties.java => DataJdbcProperties.java} (97%) rename module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/{Neo4jDataProperties.java => DataNeo4jProperties.java} (97%) diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseClientFactoryConfiguration.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseClientFactoryConfiguration.java index 14d7910a649..743a91a4355 100644 --- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseClientFactoryConfiguration.java +++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseClientFactoryConfiguration.java @@ -38,7 +38,7 @@ class CouchbaseClientFactoryConfiguration { @Bean @ConditionalOnMissingBean - CouchbaseClientFactory couchbaseClientFactory(Cluster cluster, CouchbaseDataProperties properties) { + CouchbaseClientFactory couchbaseClientFactory(Cluster cluster, DataCouchbaseProperties properties) { return new SimpleCouchbaseClientFactory(cluster, properties.getBucketName(), properties.getScopeName()); } diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java index 177d89fadb7..4d4703ecfcc 100644 --- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java +++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java @@ -41,7 +41,7 @@ import org.springframework.data.couchbase.repository.CouchbaseRepository; @AutoConfiguration(after = CouchbaseAutoConfiguration.class, afterName = "org.springframework.boot.validation.autoconfigure.ValidationAutoConfiguration") @ConditionalOnClass({ Bucket.class, CouchbaseRepository.class }) -@EnableConfigurationProperties(CouchbaseDataProperties.class) +@EnableConfigurationProperties(DataCouchbaseProperties.class) @Import({ CouchbaseDataConfiguration.class, CouchbaseClientFactoryConfiguration.class, CouchbaseClientFactoryDependentConfiguration.class }) public final class CouchbaseDataAutoConfiguration { diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataConfiguration.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataConfiguration.java index f805e319ca9..2de5b1e77ab 100644 --- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataConfiguration.java +++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataConfiguration.java @@ -43,7 +43,7 @@ class CouchbaseDataConfiguration { @Bean @ConditionalOnMissingBean - MappingCouchbaseConverter couchbaseMappingConverter(CouchbaseDataProperties properties, + MappingCouchbaseConverter couchbaseMappingConverter(DataCouchbaseProperties properties, CouchbaseMappingContext couchbaseMappingContext, CouchbaseCustomConversions couchbaseCustomConversions) { MappingCouchbaseConverter converter = new MappingCouchbaseConverter(couchbaseMappingContext, properties.getTypeKey()); @@ -59,7 +59,7 @@ class CouchbaseDataConfiguration { @Bean(name = BeanNames.COUCHBASE_MAPPING_CONTEXT) @ConditionalOnMissingBean(name = BeanNames.COUCHBASE_MAPPING_CONTEXT) - CouchbaseMappingContext couchbaseMappingContext(CouchbaseDataProperties properties, + CouchbaseMappingContext couchbaseMappingContext(DataCouchbaseProperties properties, ApplicationContext applicationContext, CouchbaseCustomConversions couchbaseCustomConversions) throws ClassNotFoundException { CouchbaseMappingContext mappingContext = new CouchbaseMappingContext(); diff --git a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataProperties.java b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseProperties.java similarity index 98% rename from module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataProperties.java rename to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseProperties.java index af84ef60680..72620c5f248 100644 --- a/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataProperties.java +++ b/module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseProperties.java @@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 4.0.0 */ @ConfigurationProperties("spring.data.couchbase") -public class CouchbaseDataProperties { +public class DataCouchbaseProperties { /** * Automatically create views and indexes. Use the meta-data provided by diff --git a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataPropertiesTests.java b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbasePropertiesTests.java similarity index 87% rename from module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataPropertiesTests.java rename to module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbasePropertiesTests.java index 8b345967053..e795c042c9f 100644 --- a/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataPropertiesTests.java +++ b/module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbasePropertiesTests.java @@ -23,15 +23,15 @@ import org.springframework.data.couchbase.core.convert.DefaultCouchbaseTypeMappe import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link CouchbaseDataProperties}. + * Tests for {@link DataCouchbaseProperties}. * * @author Stephane Nicoll */ -class CouchbaseDataPropertiesTests { +class DataCouchbasePropertiesTests { @Test void typeKeyHasConsistentDefault() { - assertThat(new CouchbaseDataProperties().getTypeKey()).isEqualTo(DefaultCouchbaseTypeMapper.DEFAULT_TYPE_KEY); + assertThat(new DataCouchbaseProperties().getTypeKey()).isEqualTo(DefaultCouchbaseTypeMapper.DEFAULT_TYPE_KEY); } } diff --git a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDataProperties.java b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcProperties.java similarity index 97% rename from module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDataProperties.java rename to module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcProperties.java index fc5e486ce54..c491535e695 100644 --- a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDataProperties.java +++ b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcProperties.java @@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 4.0.0 */ @ConfigurationProperties("spring.data.jdbc") -public class JdbcDataProperties { +public class DataJdbcProperties { /** * Dialect to use. By default, the dialect is determined by inspecting the database diff --git a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java index 7d415ec907f..a618180ba1f 100644 --- a/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java +++ b/module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java @@ -68,7 +68,7 @@ import org.springframework.transaction.PlatformTransactionManager; @ConditionalOnBean({ NamedParameterJdbcOperations.class, PlatformTransactionManager.class }) @ConditionalOnClass({ NamedParameterJdbcOperations.class, AbstractJdbcConfiguration.class }) @ConditionalOnBooleanProperty(name = "spring.data.jdbc.repositories.enabled", matchIfMissing = true) -@EnableConfigurationProperties(JdbcDataProperties.class) +@EnableConfigurationProperties(DataJdbcProperties.class) public final class JdbcRepositoriesAutoConfiguration { @Configuration(proxyBeanMethods = false) @@ -84,9 +84,9 @@ public final class JdbcRepositoriesAutoConfiguration { private final ApplicationContext applicationContext; - private final JdbcDataProperties properties; + private final DataJdbcProperties properties; - SpringBootJdbcConfiguration(ApplicationContext applicationContext, JdbcDataProperties properties) { + SpringBootJdbcConfiguration(ApplicationContext applicationContext, DataJdbcProperties properties) { this.applicationContext = applicationContext; this.properties = properties; } diff --git a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataProperties.java b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jProperties.java similarity index 97% rename from module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataProperties.java rename to module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jProperties.java index acd9b494f8e..9cfb447e7da 100644 --- a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataProperties.java +++ b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jProperties.java @@ -27,7 +27,7 @@ import org.springframework.boot.context.properties.ConfigurationProperties; * @since 4.0.0 */ @ConfigurationProperties("spring.data.neo4j") -public class Neo4jDataProperties { +public class DataNeo4jProperties { /** * Database name to use. By default, the server decides the default database to use. diff --git a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java index e53dd420936..60f8eaf8ea9 100644 --- a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java +++ b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java @@ -62,7 +62,7 @@ import org.springframework.transaction.TransactionManager; @AutoConfiguration(before = TransactionAutoConfiguration.class, after = { Neo4jAutoConfiguration.class, TransactionManagerCustomizationAutoConfiguration.class }) @ConditionalOnClass({ Driver.class, Neo4jTransactionManager.class, PlatformTransactionManager.class }) -@EnableConfigurationProperties(Neo4jDataProperties.class) +@EnableConfigurationProperties(DataNeo4jProperties.class) @ConditionalOnBean(Driver.class) public final class Neo4jDataAutoConfiguration { @@ -90,7 +90,7 @@ public final class Neo4jDataAutoConfiguration { @Bean @ConditionalOnMissingBean - DatabaseSelectionProvider databaseSelectionProvider(Neo4jDataProperties properties) { + DatabaseSelectionProvider databaseSelectionProvider(DataNeo4jProperties properties) { String database = properties.getDatabase(); return (database != null) ? DatabaseSelectionProvider.createStaticDatabaseSelectionProvider(database) : DatabaseSelectionProvider.getDefaultSelectionProvider(); diff --git a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java index 18de6c6c29f..a1cb549b7e6 100644 --- a/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java +++ b/module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java @@ -45,13 +45,13 @@ import org.springframework.transaction.ReactiveTransactionManager; @AutoConfiguration(after = Neo4jDataAutoConfiguration.class) @ConditionalOnClass({ Driver.class, ReactiveNeo4jTemplate.class, ReactiveTransactionManager.class, Flux.class }) @ConditionalOnBean(Driver.class) -@EnableConfigurationProperties(Neo4jDataProperties.class) +@EnableConfigurationProperties(DataNeo4jProperties.class) public final class Neo4jReactiveDataAutoConfiguration { @Bean @ConditionalOnMissingBean - ReactiveDatabaseSelectionProvider reactiveDatabaseSelectionProvider(Neo4jDataProperties dataProperties) { - String database = dataProperties.getDatabase(); + ReactiveDatabaseSelectionProvider reactiveDatabaseSelectionProvider(DataNeo4jProperties properties) { + String database = properties.getDatabase(); return (database != null) ? ReactiveDatabaseSelectionProvider.createStaticDatabaseSelectionProvider(database) : ReactiveDatabaseSelectionProvider.getDefaultSelectionProvider(); }