spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2026-09-17 12:09:16 +00:00
Code Issues Projects Releases Wiki Activity

Rename …DataProperties to Data…Properties

Browse Source 
Closes gh-47043
This commit is contained in:
Andy Wilkinson
2025-09-04 17:47:18 +01:00
parent 3f03a3d55e
commit 42c494caa2
10 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseClientFactoryConfiguration.java
+1 -1
View File
@@ -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());
}
module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java
+1 -1
View File
@@ -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 {
module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataConfiguration.java
+2 -2
View File
@@ -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();
module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataProperties.java → module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseProperties.java
+1 -1
View File
@@ -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
module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataPropertiesTests.java → module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbasePropertiesTests.java
+3 -3
View File
@@ -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);
}
}
module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcDataProperties.java → module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcProperties.java
+1 -1
View File
@@ -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
module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/JdbcRepositoriesAutoConfiguration.java
+3 -3
View File
@@ -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;
}
module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataProperties.java → module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jProperties.java
+1 -1
View File
@@ -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.
module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jDataAutoConfiguration.java
+2 -2
View File
@@ -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();
module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/Neo4jReactiveDataAutoConfiguration.java
+3 -3
View File
@@ -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();
}