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
d9c9ed1d
Commit
d9c9ed1d
authored
Apr 05, 2019
by
ayudovin
Committed by
Stephane Nicoll
Apr 17, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add auto-configuration support for ReactiveGridFsTemplate
See gh-16467
parent
1a05851f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
0 deletions
+28
-0
MongoReactiveDataAutoConfiguration.java
...figure/data/mongo/MongoReactiveDataAutoConfiguration.java
+20
-0
MongoReactiveDataAutoConfigurationTests.java
...e/data/mongo/MongoReactiveDataAutoConfigurationTests.java
+8
-0
No files found.
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfiguration.java
View file @
d9c9ed1d
...
@@ -29,6 +29,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
...
@@ -29,6 +29,8 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.context.annotation.Import
;
import
org.springframework.core.io.buffer.DataBufferFactory
;
import
org.springframework.core.io.buffer.DefaultDataBufferFactory
;
import
org.springframework.data.mongodb.ReactiveMongoDatabaseFactory
;
import
org.springframework.data.mongodb.ReactiveMongoDatabaseFactory
;
import
org.springframework.data.mongodb.core.ReactiveMongoTemplate
;
import
org.springframework.data.mongodb.core.ReactiveMongoTemplate
;
import
org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory
;
import
org.springframework.data.mongodb.core.SimpleReactiveMongoDatabaseFactory
;
...
@@ -37,6 +39,7 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
...
@@ -37,6 +39,7 @@ import org.springframework.data.mongodb.core.convert.MongoConverter;
import
org.springframework.data.mongodb.core.convert.MongoCustomConversions
;
import
org.springframework.data.mongodb.core.convert.MongoCustomConversions
;
import
org.springframework.data.mongodb.core.convert.NoOpDbRefResolver
;
import
org.springframework.data.mongodb.core.convert.NoOpDbRefResolver
;
import
org.springframework.data.mongodb.core.mapping.MongoMappingContext
;
import
org.springframework.data.mongodb.core.mapping.MongoMappingContext
;
import
org.springframework.data.mongodb.gridfs.ReactiveGridFsTemplate
;
/**
/**
* {@link EnableAutoConfiguration Auto-configuration} for Spring Data's reactive mongo
* {@link EnableAutoConfiguration Auto-configuration} for Spring Data's reactive mongo
...
@@ -49,6 +52,7 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
...
@@ -49,6 +52,7 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
* to the {@literal test} database.
* to the {@literal test} database.
*
*
* @author Mark Paluch
* @author Mark Paluch
* @author Artsiom Yudovin
* @since 2.0.0
* @since 2.0.0
*/
*/
@Configuration
(
proxyBeanMethods
=
false
)
@Configuration
(
proxyBeanMethods
=
false
)
...
@@ -85,4 +89,20 @@ public class MongoReactiveDataAutoConfiguration {
...
@@ -85,4 +89,20 @@ public class MongoReactiveDataAutoConfiguration {
return
mappingConverter
;
return
mappingConverter
;
}
}
@Bean
@ConditionalOnMissingBean
public
DataBufferFactory
dataBufferFactory
()
{
return
new
DefaultDataBufferFactory
();
}
@Bean
@ConditionalOnMissingBean
public
ReactiveGridFsTemplate
reactiveGridFsTemplate
(
ReactiveMongoDatabaseFactory
reactiveMongoDbFactory
,
MappingMongoConverter
mappingMongoConverter
,
DataBufferFactory
dataBufferFactory
)
{
return
new
ReactiveGridFsTemplate
(
dataBufferFactory
,
reactiveMongoDbFactory
,
mappingMongoConverter
,
null
);
}
}
}
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/data/mongo/MongoReactiveDataAutoConfigurationTests.java
View file @
d9c9ed1d
...
@@ -23,6 +23,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon
...
@@ -23,6 +23,7 @@ import org.springframework.boot.autoconfigure.context.PropertyPlaceholderAutoCon
import
org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration
;
import
org.springframework.boot.autoconfigure.mongo.MongoReactiveAutoConfiguration
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.boot.test.context.runner.ApplicationContextRunner
;
import
org.springframework.data.mongodb.core.ReactiveMongoTemplate
;
import
org.springframework.data.mongodb.core.ReactiveMongoTemplate
;
import
org.springframework.data.mongodb.gridfs.ReactiveGridFsTemplate
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
import
static
org
.
assertj
.
core
.
api
.
Assertions
.
assertThat
;
...
@@ -30,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
...
@@ -30,6 +31,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link MongoReactiveDataAutoConfiguration}.
* Tests for {@link MongoReactiveDataAutoConfiguration}.
*
*
* @author Mark Paluch
* @author Mark Paluch
* @author Artsiom Yudovin
*/
*/
public
class
MongoReactiveDataAutoConfigurationTests
{
public
class
MongoReactiveDataAutoConfigurationTests
{
...
@@ -55,4 +57,10 @@ public class MongoReactiveDataAutoConfigurationTests {
...
@@ -55,4 +57,10 @@ public class MongoReactiveDataAutoConfigurationTests {
.
doesNotHaveBean
(
MongoReactiveDataAutoConfiguration
.
class
));
.
doesNotHaveBean
(
MongoReactiveDataAutoConfiguration
.
class
));
}
}
@Test
public
void
gridFsTemplateExists
()
{
this
.
contextRunner
.
run
((
context
)
->
assertThat
(
context
)
.
hasSingleBean
(
ReactiveGridFsTemplate
.
class
));
}
}
}
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