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 …DataAutoConfiguration to Data…AutoConfiguration

Browse Source 
Closes gh-47049
This commit is contained in:
Andy Wilkinson
2025-10-01 17:39:08 +01:00
parent 787840735b
commit 26364c27e2
227 changed files with 709 additions and 674 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataAutoConfiguration.java → module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfiguration.java
+2 -2
View File
@@ -55,9 +55,9 @@ import org.springframework.data.mongodb.gridfs.GridFsTemplate;
@AutoConfiguration(after = MongoAutoConfiguration.class)
@ConditionalOnClass({ MongoClient.class, MongoTemplate.class })
@EnableConfigurationProperties({ MongoProperties.class, DataMongoProperties.class })
@Import({ MongoDataConfiguration.class, MongoDatabaseFactoryConfiguration.class,
@Import({ DataMongoConfiguration.class, MongoDatabaseFactoryConfiguration.class,
MongoDatabaseFactoryDependentConfiguration.class })
public final class MongoDataAutoConfiguration {
public final class DataMongoAutoConfiguration {
@Bean
@ConditionalOnMissingBean(MongoConnectionDetails.class)
module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataConfiguration.java → module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoConfiguration.java
+2 -2
View File
@@ -45,11 +45,11 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
* @author Scott Fredericks
*/
@Configuration(proxyBeanMethods = false)
class MongoDataConfiguration {
class DataMongoConfiguration {
private final DataMongoProperties properties;
MongoDataConfiguration(DataMongoProperties properties) {
DataMongoConfiguration(DataMongoProperties properties) {
this.properties = properties;
}
module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveDataAutoConfiguration.java → module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfiguration.java
+2 -2
View File
@@ -73,8 +73,8 @@ import org.springframework.util.StringUtils;
@ConditionalOnClass({ MongoClient.class, ReactiveMongoTemplate.class })
@ConditionalOnBean(MongoClient.class)
@EnableConfigurationProperties({ MongoProperties.class, DataMongoProperties.class })
@Import(MongoDataConfiguration.class)
public final class MongoReactiveDataAutoConfiguration {
@Import(DataMongoConfiguration.class)
public final class DataMongoReactiveAutoConfiguration {
@Bean
@ConditionalOnMissingBean(ReactiveMongoDatabaseFactory.class)
module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesAutoConfiguration.java → module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfiguration.java
+3 -3
View File
@@ -48,12 +48,12 @@ import org.springframework.data.mongodb.repository.support.ReactiveMongoReposito
* @since 4.0.0
* @see EnableReactiveMongoRepositories
*/
@AutoConfiguration(after = MongoReactiveDataAutoConfiguration.class)
@AutoConfiguration(after = DataMongoReactiveAutoConfiguration.class)
@ConditionalOnClass({ MongoClient.class, ReactiveMongoRepository.class })
@ConditionalOnMissingBean({ ReactiveMongoRepositoryFactoryBean.class,
ReactiveMongoRepositoryConfigurationExtension.class })
@ConditionalOnRepositoryType(store = "mongodb", type = RepositoryType.REACTIVE)
@Import(MongoReactiveRepositoriesRegistrar.class)
public final class MongoReactiveRepositoriesAutoConfiguration {
@Import(DataMongoReactiveRepositoriesRegistrar.class)
public final class DataMongoReactiveRepositoriesAutoConfiguration {
}
module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesRegistrar.java → module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesRegistrar.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
*
* @author Mark Paluch
*/
class MongoReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
class DataMongoReactiveRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
@Override
protected Class<? extends Annotation> getAnnotation() {
module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesAutoConfiguration.java → module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfiguration.java
+3 -3
View File
@@ -50,11 +50,11 @@ import org.springframework.data.mongodb.repository.support.MongoRepositoryFactor
* @since 4.0.0
* @see EnableMongoRepositories
*/
@AutoConfiguration(after = MongoDataAutoConfiguration.class)
@AutoConfiguration(after = DataMongoAutoConfiguration.class)
@ConditionalOnClass({ MongoClient.class, MongoRepository.class })
@ConditionalOnMissingBean({ MongoRepositoryFactoryBean.class, MongoRepositoryConfigurationExtension.class })
@ConditionalOnRepositoryType(store = "mongodb", type = RepositoryType.IMPERATIVE)
@Import(MongoRepositoriesRegistrar.class)
public final class MongoRepositoriesAutoConfiguration {
@Import(DataMongoRepositoriesRegistrar.class)
public final class DataMongoRepositoriesAutoConfiguration {
}
module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesRegistrar.java → module/spring-boot-data-mongodb/src/main/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesRegistrar.java
+1 -1
View File
@@ -30,7 +30,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
*
* @author Dave Syer
*/
class MongoRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
class DataMongoRepositoriesRegistrar extends AbstractRepositoryConfigurationSourceSupport {
@Override
protected Class<? extends Annotation> getAnnotation() {
module/spring-boot-data-mongodb/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
+4 -4
View File
@@ -1,4 +1,4 @@
org.springframework.boot.data.mongodb.autoconfigure.MongoDataAutoConfiguration
org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveDataAutoConfiguration
org.springframework.boot.data.mongodb.autoconfigure.MongoReactiveRepositoriesAutoConfiguration
org.springframework.boot.data.mongodb.autoconfigure.MongoRepositoriesAutoConfiguration
org.springframework.boot.data.mongodb.autoconfigure.DataMongoAutoConfiguration
org.springframework.boot.data.mongodb.autoconfigure.DataMongoReactiveAutoConfiguration
org.springframework.boot.data.mongodb.autoconfigure.DataMongoReactiveRepositoriesAutoConfiguration
org.springframework.boot.data.mongodb.autoconfigure.DataMongoRepositoriesAutoConfiguration
module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoDataAutoConfigurationTests.java → module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoAutoConfigurationTests.java
+5 -5
View File
@@ -62,7 +62,7 @@ import org.springframework.test.util.ReflectionTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link MongoDataAutoConfiguration}.
* Tests for {@link DataMongoAutoConfiguration}.
*
* @author Josh Long
* @author Oliver Gierke
@@ -72,11 +72,11 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Phillip Webb
* @author Scott Frederick
*/
class MongoDataAutoConfigurationTests {
class DataMongoAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
MongoAutoConfiguration.class, MongoDataAutoConfiguration.class));
MongoAutoConfiguration.class, DataMongoAutoConfiguration.class));
@Test
void templateExists() {
@@ -155,7 +155,7 @@ class MongoDataAutoConfigurationTests {
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
String cityPackage = City.class.getPackage().getName();
AutoConfigurationPackages.register(context, cityPackage);
context.register(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class);
context.register(MongoAutoConfiguration.class, DataMongoAutoConfiguration.class);
try {
context.refresh();
assertDomainTypesDiscovered(context.getBean(MongoMappingContext.class), City.class);
@@ -235,7 +235,7 @@ class MongoDataAutoConfigurationTests {
@Test
void backsOffIfMongoClientBeanIsNotPresent() {
ApplicationContextRunner runner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(MongoDataAutoConfiguration.class));
.withConfiguration(AutoConfigurations.of(DataMongoAutoConfiguration.class));
runner.run((context) -> assertThat(context).doesNotHaveBean(MongoTemplate.class));
}
module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoPropertiesTests.java
+1 -1
View File
@@ -35,7 +35,7 @@ class DataMongoPropertiesTests {
@Test
void canBindAutoIndexCreation() {
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(MongoDataAutoConfiguration.class))
new ApplicationContextRunner().withConfiguration(AutoConfigurations.of(DataMongoAutoConfiguration.class))
.withPropertyValues("spring.data.mongodb.auto-index-creation=true")
.run((context) -> {
DataMongoProperties properties = context.getBean(DataMongoProperties.class);
module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java → module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java
+5 -5
View File
@@ -39,12 +39,12 @@ import org.springframework.util.StringUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link MongoRepositoriesAutoConfiguration} and
* {@link MongoReactiveRepositoriesAutoConfiguration}.
* Tests for {@link DataMongoRepositoriesAutoConfiguration} and
* {@link DataMongoReactiveRepositoriesAutoConfiguration}.
*
* @author Mark Paluch
*/
class MongoReactiveAndBlockingRepositoriesAutoConfigurationTests {
class DataMongoReactiveAndBlockingRepositoriesAutoConfigurationTests {
private AnnotationConfigApplicationContext context;
@@ -82,8 +82,8 @@ class MongoReactiveAndBlockingRepositoriesAutoConfigurationTests {
public String[] selectImports(AnnotationMetadata importingClassMetadata) {
List<String> names = new ArrayList<>();
for (Class<?> type : new Class<?>[] { MongoAutoConfiguration.class, MongoReactiveAutoConfiguration.class,
MongoDataAutoConfiguration.class, MongoRepositoriesAutoConfiguration.class,
MongoReactiveDataAutoConfiguration.class, MongoReactiveRepositoriesAutoConfiguration.class }) {
DataMongoAutoConfiguration.class, DataMongoRepositoriesAutoConfiguration.class,
DataMongoReactiveAutoConfiguration.class, DataMongoReactiveRepositoriesAutoConfiguration.class }) {
names.add(type.getName());
}
return StringUtils.toStringArray(names);
module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveDataAutoConfigurationTests.java → module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveAutoConfigurationTests.java
+5 -5
View File
@@ -39,7 +39,7 @@ import org.springframework.test.util.ReflectionTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link MongoReactiveDataAutoConfiguration}.
* Tests for {@link DataMongoReactiveAutoConfiguration}.
*
* @author Mark Paluch
* @author Artsiom Yudovin
@@ -48,11 +48,11 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author Phillip Webb
* @author Scott Frederick
*/
class MongoReactiveDataAutoConfigurationTests {
class DataMongoReactiveAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(PropertyPlaceholderAutoConfiguration.class,
MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class));
MongoReactiveAutoConfiguration.class, DataMongoReactiveAutoConfiguration.class));
@Test
void templateExists() {
@@ -85,8 +85,8 @@ class MongoReactiveDataAutoConfigurationTests {
@Test
void backsOffIfMongoClientBeanIsNotPresent() {
ApplicationContextRunner runner = new ApplicationContextRunner().withConfiguration(AutoConfigurations
.of(PropertyPlaceholderAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class));
runner.run((context) -> assertThat(context).doesNotHaveBean(MongoReactiveDataAutoConfiguration.class));
.of(PropertyPlaceholderAutoConfiguration.class, DataMongoReactiveAutoConfiguration.class));
runner.run((context) -> assertThat(context).doesNotHaveBean(DataMongoReactiveAutoConfiguration.class));
}
@Test
module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoReactiveRepositoriesAutoConfigurationTests.java → module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoReactiveRepositoriesAutoConfigurationTests.java
+7 -7
View File
@@ -40,17 +40,17 @@ import org.springframework.test.util.ReflectionTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link MongoReactiveRepositoriesAutoConfiguration}.
* Tests for {@link DataMongoReactiveRepositoriesAutoConfiguration}.
*
* @author Mark Paluch
* @author Andy Wilkinson
*/
class MongoReactiveRepositoriesAutoConfigurationTests {
class DataMongoReactiveRepositoriesAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
MongoReactiveAutoConfiguration.class, MongoReactiveDataAutoConfiguration.class,
MongoReactiveRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, DataMongoAutoConfiguration.class,
MongoReactiveAutoConfiguration.class, DataMongoReactiveAutoConfiguration.class,
DataMongoReactiveRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
@Test
void testDefaultRepositoryConfiguration() {
@@ -108,7 +108,7 @@ class MongoReactiveRepositoriesAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class)
@TestAutoConfigurationPackage(DataMongoReactiveRepositoriesAutoConfigurationTests.class)
@EnableMongoRepositories(basePackageClasses = CityMongoDbRepository.class)
static class CustomizedConfiguration {
@@ -117,7 +117,7 @@ class MongoReactiveRepositoriesAutoConfigurationTests {
@Configuration(proxyBeanMethods = false)
// To not find any repositories
@EnableReactiveMongoRepositories("foo.bar")
@TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class)
@TestAutoConfigurationPackage(DataMongoReactiveRepositoriesAutoConfigurationTests.class)
static class SortOfInvalidCustomConfiguration {
}
module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/MongoRepositoriesAutoConfigurationTests.java → module/spring-boot-data-mongodb/src/test/java/org/springframework/boot/data/mongodb/autoconfigure/DataMongoRepositoriesAutoConfigurationTests.java
+6 -6
View File
@@ -37,16 +37,16 @@ import org.springframework.test.util.ReflectionTestUtils;
import static org.assertj.core.api.Assertions.assertThat;
/**
* Tests for {@link MongoRepositoriesAutoConfiguration}.
* Tests for {@link DataMongoRepositoriesAutoConfiguration}.
*
* @author Dave Syer
* @author Oliver Gierke
*/
class MongoRepositoriesAutoConfigurationTests {
class DataMongoRepositoriesAutoConfigurationTests {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, MongoDataAutoConfiguration.class,
MongoRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
.withConfiguration(AutoConfigurations.of(MongoAutoConfiguration.class, DataMongoAutoConfiguration.class,
DataMongoRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class));
@Test
void testDefaultRepositoryConfiguration() {
@@ -104,7 +104,7 @@ class MongoRepositoriesAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
@TestAutoConfigurationPackage(MongoRepositoriesAutoConfigurationTests.class)
@TestAutoConfigurationPackage(DataMongoRepositoriesAutoConfigurationTests.class)
@EnableMongoRepositories(basePackageClasses = CityMongoDbRepository.class)
static class CustomizedConfiguration {
@@ -113,7 +113,7 @@ class MongoRepositoriesAutoConfigurationTests {
@Configuration(proxyBeanMethods = false)
// To not find any repositories
@EnableMongoRepositories("foo.bar")
@TestAutoConfigurationPackage(MongoRepositoriesAutoConfigurationTests.class)
@TestAutoConfigurationPackage(DataMongoRepositoriesAutoConfigurationTests.class)
static class SortOfInvalidCustomConfiguration {
}