Commit 5247fa32 authored by Stephane Nicoll's avatar Stephane Nicoll

Harmonize reactive auto-configuration class names

Closes gh-9086
parent de268d97
......@@ -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)
......
......@@ -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 {
}
......@@ -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
......
......@@ -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;
}
......
......@@ -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 {
}
......@@ -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
......
......@@ -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<MongoClientSettings> settings, Environment environment) {
this.settings = settings.getIfAvailable();
this.factory = new ReactiveMongoClientFactory(properties, environment);
......
......@@ -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,\
......
......@@ -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;
}
......
......@@ -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 {
......
......@@ -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<String> 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]);
......
......@@ -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);
}
......
......@@ -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 {
}
......
......@@ -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();
......
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment