Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
5247fa32
Commit
5247fa32
authored
May 04, 2017
by
Stephane Nicoll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Harmonize reactive auto-configuration class names
Closes gh-9086
parent
de268d97
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
56 additions
and
56 deletions
+56
-56
CassandraReactiveDataAutoConfiguration.java
...ata/cassandra/CassandraReactiveDataAutoConfiguration.java
+1
-1
CassandraReactiveRepositoriesAutoConfiguration.java
...andra/CassandraReactiveRepositoriesAutoConfiguration.java
+3
-3
CassandraReactiveRepositoriesAutoConfigureRegistrar.java
.../CassandraReactiveRepositoriesAutoConfigureRegistrar.java
+1
-1
MongoReactiveDataAutoConfiguration.java
...figure/data/mongo/MongoReactiveDataAutoConfiguration.java
+4
-4
MongoReactiveRepositoriesAutoConfiguration.java
...ata/mongo/MongoReactiveRepositoriesAutoConfiguration.java
+3
-3
MongoReactiveRepositoriesAutoConfigureRegistrar.java
...ongo/MongoReactiveRepositoriesAutoConfigureRegistrar.java
+1
-1
MongoReactiveAutoConfiguration.java
...t/autoconfigure/mongo/MongoReactiveAutoConfiguration.java
+2
-2
spring.factories
...utoconfigure/src/main/resources/META-INF/spring.factories
+5
-5
CassandraReactiveDataAutoConfigurationTests.java
...assandra/CassandraReactiveDataAutoConfigurationTests.java
+3
-3
CassandraReactiveRepositoriesAutoConfigurationTests.java
.../CassandraReactiveRepositoriesAutoConfigurationTests.java
+5
-5
MongoReactiveAndBlockingRepositoriesAutoConfigurationTests.java
...eactiveAndBlockingRepositoriesAutoConfigurationTests.java
+6
-6
MongoReactiveDataAutoConfigurationTests.java
...e/data/mongo/MongoReactiveDataAutoConfigurationTests.java
+5
-5
MongoReactiveRepositoriesAutoConfigurationTests.java
...ongo/MongoReactiveRepositoriesAutoConfigurationTests.java
+8
-8
MongoReactiveAutoConfigurationTests.java
...oconfigure/mongo/MongoReactiveAutoConfigurationTests.java
+6
-6
spring.factories
...utoconfigure/src/main/resources/META-INF/spring.factories
+3
-3
No files found.
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/
ReactiveCassandra
DataAutoConfiguration.java
→
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/
CassandraReactive
DataAutoConfiguration.java
View file @
5247fa32
...
...
@@ -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
ReactiveCassandra
DataAutoConfiguration
{
public
class
CassandraReactive
DataAutoConfiguration
{
@Bean
@ConditionalOnMissingBean
(
ReactiveSession
.
class
)
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/
ReactiveCassandra
RepositoriesAutoConfiguration.java
→
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/
CassandraReactive
RepositoriesAutoConfiguration.java
View file @
5247fa32
...
...
@@ -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
(
ReactiveCassandra
RepositoriesAutoConfigureRegistrar
.
class
)
@AutoConfigureAfter
(
ReactiveCassandra
DataAutoConfiguration
.
class
)
public
class
ReactiveCassandra
RepositoriesAutoConfiguration
{
@Import
(
CassandraReactive
RepositoriesAutoConfigureRegistrar
.
class
)
@AutoConfigureAfter
(
CassandraReactive
DataAutoConfiguration
.
class
)
public
class
CassandraReactive
RepositoriesAutoConfiguration
{
}
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/
ReactiveCassandra
RepositoriesAutoConfigureRegistrar.java
→
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/cassandra/
CassandraReactive
RepositoriesAutoConfigureRegistrar.java
View file @
5247fa32
...
...
@@ -31,7 +31,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
* @author Eddú Meléndez
* @since 2.0.0
*/
class
ReactiveCassandra
RepositoriesAutoConfigureRegistrar
class
CassandraReactive
RepositoriesAutoConfigureRegistrar
extends
AbstractRepositoryConfigurationSourceSupport
{
@Override
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/
ReactiveMongo
DataAutoConfiguration.java
→
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/
MongoReactive
DataAutoConfiguration.java
View file @
5247fa32
...
...
@@ -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.
ReactiveMongo
AutoConfiguration
;
import
org.springframework.boot.autoconfigure.mongo.
MongoReactive
AutoConfiguration
;
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
(
ReactiveMongo
AutoConfiguration
.
class
)
public
class
ReactiveMongo
DataAutoConfiguration
{
@AutoConfigureAfter
(
MongoReactive
AutoConfiguration
.
class
)
public
class
MongoReactive
DataAutoConfiguration
{
private
final
MongoProperties
properties
;
public
ReactiveMongo
DataAutoConfiguration
(
MongoProperties
properties
)
{
public
MongoReactive
DataAutoConfiguration
(
MongoProperties
properties
)
{
this
.
properties
=
properties
;
}
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/
ReactiveMongo
RepositoriesAutoConfiguration.java
→
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/
MongoReactive
RepositoriesAutoConfiguration.java
View file @
5247fa32
...
...
@@ -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
(
ReactiveMongo
RepositoriesAutoConfigureRegistrar
.
class
)
@AutoConfigureAfter
(
ReactiveMongo
DataAutoConfiguration
.
class
)
public
class
ReactiveMongo
RepositoriesAutoConfiguration
{
@Import
(
MongoReactive
RepositoriesAutoConfigureRegistrar
.
class
)
@AutoConfigureAfter
(
MongoReactive
DataAutoConfiguration
.
class
)
public
class
MongoReactive
RepositoriesAutoConfiguration
{
}
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/
ReactiveMongo
RepositoriesAutoConfigureRegistrar.java
→
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/
MongoReactive
RepositoriesAutoConfigureRegistrar.java
View file @
5247fa32
...
...
@@ -31,7 +31,7 @@ import org.springframework.data.repository.config.RepositoryConfigurationExtensi
* @author Mark Paluch
* @since 2.0.0
*/
class
ReactiveMongo
RepositoriesAutoConfigureRegistrar
class
MongoReactive
RepositoriesAutoConfigureRegistrar
extends
AbstractRepositoryConfigurationSourceSupport
{
@Override
...
...
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/
ReactiveMongo
AutoConfiguration.java
→
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/
MongoReactive
AutoConfiguration.java
View file @
5247fa32
...
...
@@ -40,7 +40,7 @@ import org.springframework.core.env.Environment;
@Configuration
@ConditionalOnClass
(
MongoClient
.
class
)
@EnableConfigurationProperties
(
MongoProperties
.
class
)
public
class
ReactiveMongo
AutoConfiguration
{
public
class
MongoReactive
AutoConfiguration
{
private
final
MongoClientSettings
settings
;
...
...
@@ -48,7 +48,7 @@ public class ReactiveMongoAutoConfiguration {
private
MongoClient
mongo
;
public
ReactiveMongo
AutoConfiguration
(
MongoProperties
properties
,
public
MongoReactive
AutoConfiguration
(
MongoProperties
properties
,
ObjectProvider
<
MongoClientSettings
>
settings
,
Environment
environment
)
{
this
.
settings
=
settings
.
getIfAvailable
();
this
.
factory
=
new
ReactiveMongoClientFactory
(
properties
,
environment
);
...
...
spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories
View file @
5247fa32
...
...
@@ -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.
ReactiveMongo
AutoConfiguration,\
org.springframework.boot.autoconfigure.mongo.
MongoReactive
AutoConfiguration,\
org.springframework.boot.autoconfigure.mustache.MustacheAutoConfiguration,\
org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,\
org.springframework.boot.autoconfigure.reactor.core.ReactorCoreAutoConfiguration,\
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/
ReactiveCassandra
DataAutoConfigurationTests.java
→
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/
CassandraReactive
DataAutoConfigurationTests.java
View file @
5247fa32
...
...
@@ -38,12 +38,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import
static
org
.
mockito
.
Mockito
.
mock
;
/**
* Tests for {@link
ReactiveCassandra
DataAutoConfiguration}.
* Tests for {@link
CassandraReactive
DataAutoConfiguration}.
*
* @author Eddú Meléndez
* @author Stephane Nicoll
*/
public
class
ReactiveCassandra
DataAutoConfigurationTests
{
public
class
CassandraReactive
DataAutoConfigurationTests
{
private
AnnotationConfigApplicationContext
context
;
...
...
@@ -93,7 +93,7 @@ public class ReactiveCassandraDataAutoConfigurationTests {
}
ctx
.
register
(
TestConfiguration
.
class
,
CassandraAutoConfiguration
.
class
,
CassandraDataAutoConfiguration
.
class
,
ReactiveCassandra
DataAutoConfiguration
.
class
);
CassandraReactive
DataAutoConfiguration
.
class
);
ctx
.
refresh
();
this
.
context
=
ctx
;
}
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/
ReactiveCassandra
RepositoriesAutoConfigurationTests.java
→
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/cassandra/
CassandraReactive
RepositoriesAutoConfigurationTests.java
View file @
5247fa32
...
...
@@ -45,12 +45,12 @@ import static org.assertj.core.api.Assertions.assertThat;
import
static
org
.
mockito
.
Mockito
.
mock
;
/**
* Tests for {@link
ReactiveCassandra
RepositoriesAutoConfiguration}.
* Tests for {@link
CassandraReactive
RepositoriesAutoConfiguration}.
*
* @author Eddú Meléndez
* @author Stephane Nicoll
*/
public
class
ReactiveCassandra
RepositoriesAutoConfigurationTests
{
public
class
CassandraReactive
RepositoriesAutoConfigurationTests
{
private
AnnotationConfigApplicationContext
context
;
...
...
@@ -98,8 +98,8 @@ public class ReactiveCassandraRepositoriesAutoConfigurationTests {
ctx
.
register
(
CassandraAutoConfiguration
.
class
,
CassandraRepositoriesAutoConfiguration
.
class
,
CassandraDataAutoConfiguration
.
class
,
ReactiveCassandra
DataAutoConfiguration
.
class
,
ReactiveCassandra
RepositoriesAutoConfiguration
.
class
,
CassandraReactive
DataAutoConfiguration
.
class
,
CassandraReactive
RepositoriesAutoConfiguration
.
class
,
PropertyPlaceholderAutoConfiguration
.
class
);
ctx
.
refresh
();
this
.
context
=
ctx
;
...
...
@@ -123,7 +123,7 @@ public class ReactiveCassandraRepositoriesAutoConfigurationTests {
}
@Configuration
@TestAutoConfigurationPackage
(
ReactiveCassandra
RepositoriesAutoConfigurationTests
.
class
)
@TestAutoConfigurationPackage
(
CassandraReactive
RepositoriesAutoConfigurationTests
.
class
)
@EnableReactiveCassandraRepositories
(
basePackageClasses
=
ReactiveCityCassandraRepository
.
class
)
static
class
CustomizedConfiguration
{
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/
ReactiveAndBlockingMongo
RepositoriesAutoConfigurationTests.java
→
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/
MongoReactiveAndBlocking
RepositoriesAutoConfigurationTests.java
View file @
5247fa32
...
...
@@ -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.
ReactiveMongo
AutoConfiguration
;
import
org.springframework.boot.autoconfigure.mongo.
MongoReactive
AutoConfiguration
;
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
ReactiveMongo
RepositoriesAutoConfiguration}.
* {@link
MongoReactive
RepositoriesAutoConfiguration}.
*
* @author Mark Paluch
*/
public
class
ReactiveAndBlockingMongo
RepositoriesAutoConfigurationTests
{
public
class
MongoReactiveAndBlocking
RepositoriesAutoConfigurationTests
{
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
,
ReactiveMongo
AutoConfiguration
.
class
,
MongoReactive
AutoConfiguration
.
class
,
MongoDataAutoConfiguration
.
class
,
MongoRepositoriesAutoConfiguration
.
class
,
ReactiveMongo
DataAutoConfiguration
.
class
,
ReactiveMongo
RepositoriesAutoConfiguration
.
class
})
{
MongoReactive
DataAutoConfiguration
.
class
,
MongoReactive
RepositoriesAutoConfiguration
.
class
})
{
names
.
add
(
type
.
getName
());
}
return
names
.
toArray
(
new
String
[
0
]);
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/
ReactiveMongo
DataAutoConfigurationTests.java
→
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/
MongoReactive
DataAutoConfigurationTests.java
View file @
5247fa32
...
...
@@ -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.
ReactiveMongo
AutoConfiguration
;
import
org.springframework.boot.autoconfigure.mongo.
MongoReactive
AutoConfiguration
;
import
org.springframework.context.annotation.AnnotationConfigApplicationContext
;
import
org.springframework.data.mongodb.core.ReactiveMongoTemplate
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
/**
* Tests for {@link
ReactiveMongo
DataAutoConfiguration}.
* Tests for {@link
MongoReactive
DataAutoConfiguration}.
*
* @author Mark Paluch
*/
public
class
ReactiveMongo
DataAutoConfigurationTests
{
public
class
MongoReactive
DataAutoConfigurationTests
{
private
AnnotationConfigApplicationContext
context
;
...
...
@@ -47,8 +47,8 @@ public class ReactiveMongoDataAutoConfigurationTests {
public
void
templateExists
()
{
this
.
context
=
new
AnnotationConfigApplicationContext
(
PropertyPlaceholderAutoConfiguration
.
class
,
MongoAutoConfiguration
.
class
,
MongoDataAutoConfiguration
.
class
,
ReactiveMongo
AutoConfiguration
.
class
,
ReactiveMongo
DataAutoConfiguration
.
class
);
MongoDataAutoConfiguration
.
class
,
MongoReactive
AutoConfiguration
.
class
,
MongoReactive
DataAutoConfiguration
.
class
);
assertThat
(
this
.
context
.
getBeanNamesForType
(
ReactiveMongoTemplate
.
class
))
.
hasSize
(
1
);
}
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/
ReactiveMongo
RepositoriesAutoConfigurationTests.java
→
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/
MongoReactive
RepositoriesAutoConfigurationTests.java
View file @
5247fa32
...
...
@@ -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.
ReactiveMongo
AutoConfiguration
;
import
org.springframework.boot.autoconfigure.mongo.
MongoReactive
AutoConfiguration
;
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
ReactiveMongo
RepositoriesAutoConfiguration}.
* Tests for {@link
MongoReactive
RepositoriesAutoConfiguration}.
*
* @author Mark Paluch
*/
public
class
ReactiveMongo
RepositoriesAutoConfigurationTests
{
public
class
MongoReactive
RepositoriesAutoConfigurationTests
{
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
,
ReactiveMongo
AutoConfiguration
.
class
,
ReactiveMongo
DataAutoConfiguration
.
class
,
ReactiveMongo
RepositoriesAutoConfiguration
.
class
,
MongoDataAutoConfiguration
.
class
,
MongoReactive
AutoConfiguration
.
class
,
MongoReactive
DataAutoConfiguration
.
class
,
MongoReactive
RepositoriesAutoConfiguration
.
class
,
PropertyPlaceholderAutoConfiguration
.
class
);
this
.
context
.
refresh
();
}
...
...
@@ -115,7 +115,7 @@ public class ReactiveMongoRepositoriesAutoConfigurationTests {
}
@Configuration
@TestAutoConfigurationPackage
(
ReactiveMongo
RepositoriesAutoConfigurationTests
.
class
)
@TestAutoConfigurationPackage
(
MongoReactive
RepositoriesAutoConfigurationTests
.
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
(
ReactiveMongo
RepositoriesAutoConfigurationTests
.
class
)
@TestAutoConfigurationPackage
(
MongoReactive
RepositoriesAutoConfigurationTests
.
class
)
protected
static
class
SortOfInvalidCustomConfiguration
{
}
...
...
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/
ReactiveMongo
AutoConfigurationTests.java
→
spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/
MongoReactive
AutoConfigurationTests.java
View file @
5247fa32
...
...
@@ -39,11 +39,11 @@ import static org.mockito.BDDMockito.given;
import
static
org
.
mockito
.
Mockito
.
mock
;
/**
* Tests for {@link
ReactiveMongo
AutoConfiguration}.
* Tests for {@link
MongoReactive
AutoConfiguration}.
*
* @author Mark Paluch
*/
public
class
ReactiveMongo
AutoConfigurationTests
{
public
class
MongoReactive
AutoConfigurationTests
{
private
AnnotationConfigApplicationContext
context
;
...
...
@@ -58,7 +58,7 @@ public class ReactiveMongoAutoConfigurationTests {
public
void
clientExists
()
{
this
.
context
=
new
AnnotationConfigApplicationContext
(
PropertyPlaceholderAutoConfiguration
.
class
,
ReactiveMongo
AutoConfiguration
.
class
);
MongoReactive
AutoConfiguration
.
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
,
ReactiveMongo
AutoConfiguration
.
class
);
MongoReactive
AutoConfiguration
.
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
,
ReactiveMongo
AutoConfiguration
.
class
);
MongoReactive
AutoConfiguration
.
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
,
ReactiveMongo
AutoConfiguration
.
class
);
MongoReactive
AutoConfiguration
.
class
);
this
.
context
.
refresh
();
MongoClient
mongo
=
this
.
context
.
getBean
(
MongoClient
.
class
);
MongoClientSettings
settings
=
mongo
.
getSettings
();
...
...
spring-boot-test-autoconfigure/src/main/resources/META-INF/spring.factories
View file @
5247fa32
...
...
@@ -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.
ReactiveMongo
AutoConfiguration,\
org.springframework.boot.autoconfigure.mongo.
MongoReactive
AutoConfiguration,\
org.springframework.boot.autoconfigure.mongo.embedded.EmbeddedMongoAutoConfiguration
# AutoConfigureDataNeo4j auto-configuration imports
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment