Rename …DataProperties to Data…Properties

Closes gh-47043

Author: wilkinsona

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());
 	}
 

module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/CouchbaseDataAutoConfiguration.java

@@ -41,7 +41,7 @@
 @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

@@ -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 @@ TranslationService couchbaseTranslationService() {
 
 	@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 renamed to module/spring-boot-data-couchbase/src/main/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbaseProperties.java

@@ -27,7 +27,7 @@
  * @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 renamed to module/spring-boot-data-couchbase/src/test/java/org/springframework/boot/data/couchbase/autoconfigure/DataCouchbasePropertiesTests.java

@@ -23,15 +23,15 @@
 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 renamed to module/spring-boot-data-jdbc/src/main/java/org/springframework/boot/data/jdbc/autoconfigure/DataJdbcProperties.java

@@ -27,7 +27,7 @@
  * @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

@@ -68,7 +68,7 @@
 @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 @@ static class SpringBootJdbcConfiguration extends AbstractJdbcConfiguration {
 
 		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 renamed to module/spring-boot-data-neo4j/src/main/java/org/springframework/boot/data/neo4j/autoconfigure/DataNeo4jProperties.java

@@ -27,7 +27,7 @@
  * @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

@@ -62,7 +62,7 @@
 @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 @@ Neo4jMappingContext neo4jMappingContext(Neo4jManagedTypes managedTypes, Neo4jCon
 
 	@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

@@ -45,13 +45,13 @@
 @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();
 	}