diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java similarity index 98% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraDataAutoConfiguration.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java index 19d8fc74f5..16355b4a76 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraDataAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfiguration.java @@ -46,7 +46,7 @@ import org.springframework.data.cassandra.core.ReactiveCassandraTemplate; @ConditionalOnClass({ Cluster.class, ReactiveCassandraTemplate.class, Flux.class }) @ConditionalOnBean(Session.class) @AutoConfigureAfter(CassandraDataAutoConfiguration.class) -public class ReactiveCassandraDataAutoConfiguration { +public class CassandraReactiveDataAutoConfiguration { @Bean @ConditionalOnMissingBean(ReactiveSession.class) diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfiguration.java similarity index 91% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraRepositoriesAutoConfiguration.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfiguration.java index f1e9a42433..e4b00e506b 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraRepositoriesAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfiguration.java @@ -40,8 +40,8 @@ import org.springframework.data.cassandra.repository.support.ReactiveCassandraRe @ConditionalOnClass({ ReactiveSession.class, ReactiveCassandraRepository.class }) @ConditionalOnProperty(prefix = "spring.data.cassandra.reactive-repositories", name = "enabled", havingValue = "true", matchIfMissing = true) @ConditionalOnMissingBean(ReactiveCassandraRepositoryFactoryBean.class) -@Import(ReactiveCassandraRepositoriesAutoConfigureRegistrar.class) -@AutoConfigureAfter(ReactiveCassandraDataAutoConfiguration.class) -public class ReactiveCassandraRepositoriesAutoConfiguration { +@Import(CassandraReactiveRepositoriesAutoConfigureRegistrar.class) +@AutoConfigureAfter(CassandraReactiveDataAutoConfiguration.class) +public class CassandraReactiveRepositoriesAutoConfiguration { } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigureRegistrar.java similarity index 97% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraRepositoriesAutoConfigureRegistrar.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigureRegistrar.java index bd8bf31b75..9bae1fed6d 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigureRegistrar.java @@ -31,7 +31,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi * @author Eddú Meléndez * @since 2.0.0 */ -class ReactiveCassandraRepositoriesAutoConfigureRegistrar +class CassandraReactiveRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { @Override diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoDataAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfiguration.java similarity index 91% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoDataAutoConfiguration.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfiguration.java index f5371feda2..0eb48286cd 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoDataAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfiguration.java @@ -23,7 +23,7 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.mongo.MongoProperties; -import org.springframework.boot.autoconfigure.mongo.ReactiveMongoAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -48,12 +48,12 @@ import org.springframework.data.mongodb.core.convert.MongoConverter; @Configuration @ConditionalOnClass({ MongoClient.class, ReactiveMongoTemplate.class }) @EnableConfigurationProperties(MongoProperties.class) -@AutoConfigureAfter(ReactiveMongoAutoConfiguration.class) -public class ReactiveMongoDataAutoConfiguration { +@AutoConfigureAfter(MongoReactiveAutoConfiguration.class) +public class MongoReactiveDataAutoConfiguration { private final MongoProperties properties; - public ReactiveMongoDataAutoConfiguration(MongoProperties properties) { + public MongoReactiveDataAutoConfiguration(MongoProperties properties) { this.properties = properties; } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoRepositoriesAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfiguration.java similarity index 93% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoRepositoriesAutoConfiguration.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfiguration.java index 7f90663fcb..38c9433b94 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoRepositoriesAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfiguration.java @@ -52,8 +52,8 @@ import org.springframework.data.mongodb.repository.support.ReactiveMongoReposito @ConditionalOnMissingBean({ ReactiveMongoRepositoryFactoryBean.class, ReactiveMongoRepositoryConfigurationExtension.class }) @ConditionalOnProperty(prefix = "spring.data.mongodb.reactive-repositories", name = "enabled", havingValue = "true", matchIfMissing = true) -@Import(ReactiveMongoRepositoriesAutoConfigureRegistrar.class) -@AutoConfigureAfter(ReactiveMongoDataAutoConfiguration.class) -public class ReactiveMongoRepositoriesAutoConfiguration { +@Import(MongoReactiveRepositoriesAutoConfigureRegistrar.class) +@AutoConfigureAfter(MongoReactiveDataAutoConfiguration.class) +public class MongoReactiveRepositoriesAutoConfiguration { } diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoRepositoriesAutoConfigureRegistrar.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigureRegistrar.java similarity index 97% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoRepositoriesAutoConfigureRegistrar.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigureRegistrar.java index 91f4ea69ed..e11cb9b0f6 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoRepositoriesAutoConfigureRegistrar.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigureRegistrar.java @@ -31,7 +31,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi * @author Mark Paluch * @since 2.0.0 */ -class ReactiveMongoRepositoriesAutoConfigureRegistrar +class MongoReactiveRepositoriesAutoConfigureRegistrar extends AbstractRepositoryConfigurationSourceSupport { @Override diff --git a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoAutoConfiguration.java b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java similarity index 95% rename from spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoAutoConfiguration.java rename to spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java index cfcd64a82a..bbcd0c1f32 100644 --- a/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoAutoConfiguration.java +++ b/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfiguration.java @@ -40,7 +40,7 @@ import org.springframework.core.env.Environment; @Configuration @ConditionalOnClass(MongoClient.class) @EnableConfigurationProperties(MongoProperties.class) -public class ReactiveMongoAutoConfiguration { +public class MongoReactiveAutoConfiguration { private final MongoClientSettings settings; @@ -48,7 +48,7 @@ public class ReactiveMongoAutoConfiguration { private MongoClient mongo; - public ReactiveMongoAutoConfiguration(MongoProperties properties, + public MongoReactiveAutoConfiguration(MongoProperties properties, ObjectProvider settings, Environment environment) { this.settings = settings.getIfAvailable(); this.factory = new ReactiveMongoClientFactory(properties, environment); diff --git a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index e4686feb2b..0d4090fcef 100644 --- a/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -30,9 +30,9 @@ org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfigurat org.springframework.boot.autoconfigure.couchbase.CouchbaseAutoConfiguration,\ org.springframework.boot.autoconfigure.dao.PersistenceExceptionTranslationAutoConfiguration,\ org.springframework.boot.autoconfigure.data.cassandra.CassandraDataAutoConfiguration,\ +org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveDataAutoConfiguration,\ +org.springframework.boot.autoconfigure.data.cassandra.CassandraReactiveRepositoriesAutoConfiguration,\ org.springframework.boot.autoconfigure.data.cassandra.CassandraRepositoriesAutoConfiguration,\ -org.springframework.boot.autoconfigure.data.cassandra.ReactiveCassandraDataAutoConfiguration,\ -org.springframework.boot.autoconfigure.data.cassandra.ReactiveCassandraRepositoriesAutoConfiguration,\ org.springframework.boot.autoconfigure.data.couchbase.CouchbaseDataAutoConfiguration,\ org.springframework.boot.autoconfigure.data.couchbase.CouchbaseRepositoriesAutoConfiguration,\ org.springframework.boot.autoconfigure.data.elasticsearch.ElasticsearchAutoConfiguration,\ @@ -42,9 +42,9 @@ org.springframework.boot.autoconfigure.data.jpa.JpaRepositoriesAutoConfiguration org.springframework.boot.autoconfigure.data.ldap.LdapDataAutoConfiguration,\ org.springframework.boot.autoconfigure.data.ldap.LdapRepositoriesAutoConfiguration,\ org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration,\ +org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration,\ +org.springframework.boot.autoconfigure.data.mongo.MongoReactiveRepositoriesAutoConfiguration,\ org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration,\ -org.springframework.boot.autoconfigure.data.mongo.ReactiveMongoDataAutoConfiguration,\ -org.springframework.boot.autoconfigure.data.mongo.ReactiveMongoRepositoriesAutoConfiguration,\ org.springframework.boot.autoconfigure.data.neo4j.Neo4jDataAutoConfiguration,\ org.springframework.boot.autoconfigure.data.neo4j.Neo4jRepositoriesAutoConfiguration,\ org.springframework.boot.autoconfigure.data.solr.SolrRepositoriesAutoConfiguration,\ @@ -89,7 +89,7 @@ org.springframework.boot.autoconfigure.mobile.DeviceDelegatingViewResolverAutoCo org.springframework.boot.autoconfigure.mobile.SitePreferenceAutoConfiguration,\ org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration,\ org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration,\ -org.springframework.boot.autoconfigure.mongo.ReactiveMongoAutoConfiguration,\ +org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration,\ org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration,\ org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\ org.springframework.boot.autoconfigure.reactor.core.ReactorCoreAutoConfiguration,\ diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java similarity index 95% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraDataAutoConfigurationTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java index efb4b01abe..8ffb94aa3f 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveDataAutoConfigurationTests.java @@ -38,12 +38,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; /** - * Tests for {@link ReactiveCassandraDataAutoConfiguration}. + * Tests for {@link CassandraReactiveDataAutoConfiguration}. * * @author Eddú Meléndez * @author Stephane Nicoll */ -public class ReactiveCassandraDataAutoConfigurationTests { +public class CassandraReactiveDataAutoConfigurationTests { private AnnotationConfigApplicationContext context; @@ -93,7 +93,7 @@ public class ReactiveCassandraDataAutoConfigurationTests { } ctx.register(TestConfiguration.class, CassandraAutoConfiguration.class, CassandraDataAutoConfiguration.class, - ReactiveCassandraDataAutoConfiguration.class); + CassandraReactiveDataAutoConfiguration.class); ctx.refresh(); this.context = ctx; } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java similarity index 93% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraRepositoriesAutoConfigurationTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java index b67abbe54d..2d3ea4fee3 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/ReactiveCassandraRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/CassandraReactiveRepositoriesAutoConfigurationTests.java @@ -45,12 +45,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.mock; /** - * Tests for {@link ReactiveCassandraRepositoriesAutoConfiguration}. + * Tests for {@link CassandraReactiveRepositoriesAutoConfiguration}. * * @author Eddú Meléndez * @author Stephane Nicoll */ -public class ReactiveCassandraRepositoriesAutoConfigurationTests { +public class CassandraReactiveRepositoriesAutoConfigurationTests { private AnnotationConfigApplicationContext context; @@ -98,8 +98,8 @@ public class ReactiveCassandraRepositoriesAutoConfigurationTests { ctx.register(CassandraAutoConfiguration.class, CassandraRepositoriesAutoConfiguration.class, CassandraDataAutoConfiguration.class, - ReactiveCassandraDataAutoConfiguration.class, - ReactiveCassandraRepositoriesAutoConfiguration.class, + CassandraReactiveDataAutoConfiguration.class, + CassandraReactiveRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); ctx.refresh(); this.context = ctx; @@ -123,7 +123,7 @@ public class ReactiveCassandraRepositoriesAutoConfigurationTests { } @Configuration - @TestAutoConfigurationPackage(ReactiveCassandraRepositoriesAutoConfigurationTests.class) + @TestAutoConfigurationPackage(CassandraReactiveRepositoriesAutoConfigurationTests.class) @EnableReactiveCassandraRepositories(basePackageClasses = ReactiveCityCassandraRepository.class) static class CustomizedConfiguration { diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java similarity index 90% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java index 9e423a9630..c72d55ed11 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java @@ -27,7 +27,7 @@ import org.springframework.boot.autoconfigure.data.mongo.city.CityRepository; import org.springframework.boot.autoconfigure.data.mongo.city.ReactiveCityRepository; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfigurationTests; -import org.springframework.boot.autoconfigure.mongo.ReactiveMongoAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration; import org.springframework.boot.test.util.EnvironmentTestUtils; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; @@ -41,11 +41,11 @@ import static org.assertj.core.api.Assertions.assertThat; /** * Tests for {@link MongoRepositoriesAutoConfiguration} and - * {@link ReactiveMongoRepositoriesAutoConfiguration}. + * {@link MongoReactiveRepositoriesAutoConfiguration}. * * @author Mark Paluch */ -public class ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests { +public class MongoReactiveAndBlockingRepositoriesAutoConfigurationTests { private AnnotationConfigApplicationContext context; @@ -87,11 +87,11 @@ public class ReactiveAndBlockingMongoRepositoriesAutoConfigurationTests { public String[] selectImports(AnnotationMetadata importingClassMetadata) { List names = new ArrayList<>(); for (Class type : new Class[] { MongoAutoConfiguration.class, - ReactiveMongoAutoConfiguration.class, + MongoReactiveAutoConfiguration.class, MongoDataAutoConfiguration.class, MongoRepositoriesAutoConfiguration.class, - ReactiveMongoDataAutoConfiguration.class, - ReactiveMongoRepositoriesAutoConfiguration.class }) { + MongoReactiveDataAutoConfiguration.class, + MongoReactiveRepositoriesAutoConfiguration.class }) { names.add(type.getName()); } return names.toArray(new String[0]); diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoDataAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfigurationTests.java similarity index 83% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoDataAutoConfigurationTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfigurationTests.java index b9efde7d62..f207ab8531 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoDataAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfigurationTests.java @@ -21,18 +21,18 @@ import org.junit.Test; import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoConfiguration; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; -import org.springframework.boot.autoconfigure.mongo.ReactiveMongoAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.data.mongodb.core.ReactiveMongoTemplate; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link ReactiveMongoDataAutoConfiguration}. + * Tests for {@link MongoReactiveDataAutoConfiguration}. * * @author Mark Paluch */ -public class ReactiveMongoDataAutoConfigurationTests { +public class MongoReactiveDataAutoConfigurationTests { private AnnotationConfigApplicationContext context; @@ -47,8 +47,8 @@ public class ReactiveMongoDataAutoConfigurationTests { public void templateExists() { this.context = new AnnotationConfigApplicationContext( PropertyPlaceholderAutoConfiguration.class, MongoAutoConfiguration.class, - MongoDataAutoConfiguration.class, ReactiveMongoAutoConfiguration.class, - ReactiveMongoDataAutoConfiguration.class); + MongoDataAutoConfiguration.class, MongoReactiveAutoConfiguration.class, + MongoReactiveDataAutoConfiguration.class); assertThat(this.context.getBeanNamesForType(ReactiveMongoTemplate.class)) .hasSize(1); } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoRepositoriesAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java similarity index 89% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoRepositoriesAutoConfigurationTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java index 22ec51f2ec..3a9037ec20 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/ReactiveMongoRepositoriesAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveRepositoriesAutoConfigurationTests.java @@ -31,7 +31,7 @@ import org.springframework.boot.autoconfigure.data.empty.EmptyDataPackage; import org.springframework.boot.autoconfigure.data.mongo.city.City; import org.springframework.boot.autoconfigure.data.mongo.city.ReactiveCityRepository; import org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration; -import org.springframework.boot.autoconfigure.mongo.ReactiveMongoAutoConfiguration; +import org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Configuration; import org.springframework.data.mongodb.core.mapping.MongoMappingContext; @@ -42,11 +42,11 @@ import org.springframework.test.util.ReflectionTestUtils; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link ReactiveMongoRepositoriesAutoConfiguration}. + * Tests for {@link MongoReactiveRepositoriesAutoConfiguration}. * * @author Mark Paluch */ -public class ReactiveMongoRepositoriesAutoConfigurationTests { +public class MongoReactiveRepositoriesAutoConfigurationTests { private AnnotationConfigApplicationContext context; @@ -95,9 +95,9 @@ public class ReactiveMongoRepositoriesAutoConfigurationTests { this.context = new AnnotationConfigApplicationContext(); this.context.register(configurationClasses); this.context.register(MongoAutoConfiguration.class, - MongoDataAutoConfiguration.class, ReactiveMongoAutoConfiguration.class, - ReactiveMongoDataAutoConfiguration.class, - ReactiveMongoRepositoriesAutoConfiguration.class, + MongoDataAutoConfiguration.class, MongoReactiveAutoConfiguration.class, + MongoReactiveDataAutoConfiguration.class, + MongoReactiveRepositoriesAutoConfiguration.class, PropertyPlaceholderAutoConfiguration.class); this.context.refresh(); } @@ -115,7 +115,7 @@ public class ReactiveMongoRepositoriesAutoConfigurationTests { } @Configuration - @TestAutoConfigurationPackage(ReactiveMongoRepositoriesAutoConfigurationTests.class) + @TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class) @EnableMongoRepositories(basePackageClasses = CityMongoDbRepository.class) protected static class CustomizedConfiguration { @@ -124,7 +124,7 @@ public class ReactiveMongoRepositoriesAutoConfigurationTests { @Configuration // To not find any repositories @EnableReactiveMongoRepositories("foo.bar") - @TestAutoConfigurationPackage(ReactiveMongoRepositoriesAutoConfigurationTests.class) + @TestAutoConfigurationPackage(MongoReactiveRepositoriesAutoConfigurationTests.class) protected static class SortOfInvalidCustomConfiguration { } diff --git a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoAutoConfigurationTests.java b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java similarity index 94% rename from spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoAutoConfigurationTests.java rename to spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java index e42cfdd977..46611b6472 100644 --- a/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoAutoConfigurationTests.java +++ b/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/MongoReactiveAutoConfigurationTests.java @@ -39,11 +39,11 @@ import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.mock; /** - * Tests for {@link ReactiveMongoAutoConfiguration}. + * Tests for {@link MongoReactiveAutoConfiguration}. * * @author Mark Paluch */ -public class ReactiveMongoAutoConfigurationTests { +public class MongoReactiveAutoConfigurationTests { private AnnotationConfigApplicationContext context; @@ -58,7 +58,7 @@ public class ReactiveMongoAutoConfigurationTests { public void clientExists() { this.context = new AnnotationConfigApplicationContext( PropertyPlaceholderAutoConfiguration.class, - ReactiveMongoAutoConfiguration.class); + MongoReactiveAutoConfiguration.class); assertThat(this.context.getBeanNamesForType(MongoClient.class).length) .isEqualTo(1); } @@ -70,7 +70,7 @@ public class ReactiveMongoAutoConfigurationTests { "spring.data.mongodb.host:localhost"); this.context.register(OptionsConfig.class, PropertyPlaceholderAutoConfiguration.class, - ReactiveMongoAutoConfiguration.class); + MongoReactiveAutoConfiguration.class); this.context.refresh(); assertThat(this.context.getBean(MongoClient.class).getSettings() .getSocketSettings().getReadTimeout(TimeUnit.SECONDS)).isEqualTo(300); @@ -83,7 +83,7 @@ public class ReactiveMongoAutoConfigurationTests { "spring.data.mongodb.uri:mongodb://localhost/test"); this.context.register(OptionsConfig.class, PropertyPlaceholderAutoConfiguration.class, - ReactiveMongoAutoConfiguration.class); + MongoReactiveAutoConfiguration.class); this.context.refresh(); assertThat( this.context.getBean(MongoClient.class).getSettings().getReadPreference()) @@ -97,7 +97,7 @@ public class ReactiveMongoAutoConfigurationTests { "spring.data.mongodb.uri:mongodb://localhost/test"); this.context.register(SslOptionsConfig.class, PropertyPlaceholderAutoConfiguration.class, - ReactiveMongoAutoConfiguration.class); + MongoReactiveAutoConfiguration.class); this.context.refresh(); MongoClient mongo = this.context.getBean(MongoClient.class); MongoClientSettings settings = mongo.getSettings(); diff --git a/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories index 3afd7de3f4..902ac5c42e 100644 --- a/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories @@ -23,11 +23,11 @@ org.springframework.boot.autoconfigure.ldap.embedded.EmbeddedLdapAutoConfigurati # AutoConfigureDataMongo auto-configuration imports org.springframework.boot.test.autoconfigure.data.mongo.AutoConfigureDataMongo=\ org.springframework.boot.autoconfigure.data.mongo.MongoDataAutoConfiguration,\ +org.springframework.boot.autoconfigure.data.mongo.MongoReactiveDataAutoConfiguration,\ +org.springframework.boot.autoconfigure.data.mongo.MongoReactiveRepositoriesAutoConfiguration,\ org.springframework.boot.autoconfigure.data.mongo.MongoRepositoriesAutoConfiguration,\ -org.springframework.boot.autoconfigure.data.mongo.ReactiveMongoDataAutoConfiguration,\ -org.springframework.boot.autoconfigure.data.mongo.ReactiveMongoRepositoriesAutoConfiguration,\ org.springframework.boot.autoconfigure.mongo.MongoAutoConfiguration,\ -org.springframework.boot.autoconfigure.mongo.ReactiveMongoAutoConfiguration,\ +org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration,\ org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration # AutoConfigureDataNeo4j auto-configuration imports