root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch '2.0.x'

This commit is contained in:
Andy Wilkinson 2018-08-13 12:30:10 +01:00
parent e41519b6b1 58aaf4863f
commit 76d9b1cdbd
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactory.java
View File

@ -159,6 +159,7 @@ public class ReactiveMongoClientFactory {
if (connection.getApplicationName() != null) {
builder.applicationName(connection.getApplicationName());
}
builder.retryWrites(connection.getRetryWrites());
return builder;
}

8
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/ReactiveMongoClientFactoryTests.java
View File

@ -112,6 +112,14 @@ public class ReactiveMongoClientFactoryTests {
assertMongoCredential(credential, "user", "secret", "test");
}
@Test
public void retryWritesIsPropagatedFromUri() {
MongoProperties properties = new MongoProperties();
properties.setUri("mongodb://localhost/test?retryWrites=true");
MongoClient client = createMongoClient(properties);
assertThat(client.getSettings().getRetryWrites()).isTrue();
}
@Test
public void uriCannotBeSetWithCredentials() {
MongoProperties properties = new MongoProperties();