Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Preserve user-provided values in MongoClientSettings

Browse Source 
Prior to this commit, values from MongoProperties would always
overwrite matching fields in MongoClientSettings. This commit
preserves all values in MongoClientSettings if the client app
provides the MongoClientSettings bean, and only overwrites from
MongoProperties if no MongoClientSettings bean is provided.

Fixes gh-22321
This commit is contained in:
Scott Frederick
2020-08-07 15:05:11 -05:00
parent 9c6f0d8f7e
commit b7fdf8fe87
11 changed files with 456 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
spring-boot-project/spring-boot-docs/src/docs/asciidoc/spring-boot-features.adoc
View File

@@ -4365,6 +4365,14 @@ The following example shows how to connect to a MongoDB database:
}
----
If you have defined your own `MongoClient`, it will be used to auto-configure a suitable `MongoDatabaseFactory`.
The auto-configured `MongoClient` is created using a `MongoClientSettings` bean.
If you have defined your own `MongoClientSettings`, it will be used without modification and the `spring.data.mongodb` properties will be ignored.
Otherwise a `MongoClientSettings` will be auto-configured and will have the `spring.data.mongodb` properties applied to it.
In either case, you can declare one or more `MongoClientSettingsBuilderCustomizer` beans to fine-tune the `MongoClientSettings` configuration.
Each will be called in order with the `MongoClientSettings.Builder` that is used to build the `MongoClientSettings`.
You can set the configprop:spring.data.mongodb.uri[] property to change the URL and configure additional settings such as the _replica set_, as shown in the following example:
[source,properties,indent=0,configprops]
@@ -4384,12 +4392,6 @@ For example, you might declare the following settings in your `application.prope
spring.data.mongodb.password=secret
----
If you have defined your own `MongoClient`, it will be used to auto-configure a suitable `MongoDatabaseFactory`.
The auto-configured `MongoClient` is created using `MongoClientSettings`.
To fine-tune its configuration, declare one or more `MongoClientSettingsBuilderCustomizer` beans.
Each will be called in order with the `MongoClientSettings.Builder` that is used to build the `MongoClientSettings`.
TIP: If `spring.data.mongodb.port` is not specified, the default of `27017` is used.
You could delete this line from the example shown earlier.