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

Apply customize() to createCredentialNetworkMongoClient() 

See gh-11376
This commit is contained in:
Johnny Lim 2017-12-19 07:41:32 +09:00 committed by Stephane Nicoll
parent 601b5e4d9a
commit 90369996a9
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -92,6 +92,10 @@ public class ReactiveMongoClientFactory {
ClusterSettings clusterSettings = ClusterSettings.builder() ClusterSettings clusterSettings = ClusterSettings.builder()
.hosts(Collections.singletonList(new ServerAddress(host, port))).build(); .hosts(Collections.singletonList(new ServerAddress(host, port))).build();
builder.clusterSettings(clusterSettings); builder.clusterSettings(clusterSettings);
return createMongoClient(builder);
}
private MongoClient createMongoClient(Builder builder) {
customize(builder); customize(builder);
return MongoClients.create(builder.build()); return MongoClients.create(builder.build());
} }
@ -102,7 +106,7 @@ public class ReactiveMongoClientFactory {
} }
ConnectionString connectionString = new ConnectionString( ConnectionString connectionString = new ConnectionString(
this.properties.determineUri()); this.properties.determineUri());
return MongoClients.create(createBuilder(settings, connectionString).build()); return createMongoClient(createBuilder(settings, connectionString));
} }
private MongoClient createCredentialNetworkMongoClient(MongoClientSettings settings) { private MongoClient createCredentialNetworkMongoClient(MongoClientSettings settings) {
@ -117,7 +121,7 @@ public class ReactiveMongoClientFactory {
ServerAddress serverAddress = new ServerAddress(host, port); ServerAddress serverAddress = new ServerAddress(host, port);
builder.clusterSettings(ClusterSettings.builder() builder.clusterSettings(ClusterSettings.builder()
.hosts(Collections.singletonList(serverAddress)).build()); .hosts(Collections.singletonList(serverAddress)).build());
return MongoClients.create(builder.build()); return createMongoClient(builder);
} }
private void applyCredentials(Builder builder) { private void applyCredentials(Builder builder) {
@ -155,7 +159,6 @@ public class ReactiveMongoClientFactory {
if (connection.getApplicationName() != null) { if (connection.getApplicationName() != null) {
builder.applicationName(connection.getApplicationName()); builder.applicationName(connection.getApplicationName());
} }
customize(builder);
return builder; return builder;
} }

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

@ -160,6 +160,16 @@ public class ReactiveMongoClientFactoryTests {
verify(customizer).customize(any(MongoClientSettings.Builder.class)); verify(customizer).customize(any(MongoClientSettings.Builder.class));
} }
@Test
public void customizerIsInvokedWhenHostIsSet() {
MongoProperties properties = new MongoProperties();
properties.setHost("localhost");
MongoClientSettingsBuilderCustomizer customizer = mock(
MongoClientSettingsBuilderCustomizer.class);
createMongoClient(properties, this.environment, customizer);
verify(customizer).customize(any(MongoClientSettings.Builder.class));
}
@Test @Test
public void customizerIsInvokedForEmbeddedMongo() { public void customizerIsInvokedForEmbeddedMongo() {
MongoProperties properties = new MongoProperties(); MongoProperties properties = new MongoProperties();