Skip to content

Allow multiple hosts to be set in MongoProperties #32125

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Allow multiple hosts to be set in MongoProperties #32125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
110a268
Allow multiple hosts to be set in MongoProperties
thegeekyasian Aug 21, 2022
f1ada42
Fixing quality gate issues by removing unused imports
thegeekyasian Aug 22, 2022
de24863
Merge branch 'spring-projects:main' into geekyasian-32113
thegeekyasian Aug 22, 2022
ee3af95
Adding description for additional-hosts property in autoconfigure
thegeekyasian Aug 22, 2022
e538e53
modifying additional-hosts datatype to list, removing regex
thegeekyasian Aug 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions ...configure/src/main/java/org/springframework/boot/autoconfigure/mongo/MongoProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@

package org.springframework.boot.autoconfigure.mongo;

import java.util.List;

import com.mongodb.ConnectionString;
import org.bson.UuidRepresentation;

Expand All @@ -33,6 +35,7 @@
* @author Nasko Vasilev
* @author Mark Paluch
* @author Artsiom Yudovin
* @author Safeer Ansari
* @since 1.0.0
*/
@ConfigurationProperties(prefix = "spring.data.mongodb")
Expand Down Expand Up @@ -105,6 +108,11 @@ public class MongoProperties {
*/
private Boolean autoIndexCreation;

/**
* List of additional hosts to connect with different hosts in a replica set.
*/
private List<String> additionalHosts;

public String getHost() {
return this.host;
}
Expand Down Expand Up @@ -208,6 +216,14 @@ public void setAutoIndexCreation(Boolean autoIndexCreation) {
this.autoIndexCreation = autoIndexCreation;
}

public List<String> getAdditionalHosts() {
return this.additionalHosts;
}

public void setAdditionalHosts(List<String> additionalHosts) {
this.additionalHosts = additionalHosts;
}

public static class Gridfs {

/**
Expand Down
15 changes: 13 additions & 2 deletions ...ingframework/boot/autoconfigure/mongo/MongoPropertiesClientSettingsBuilderCustomizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@

package org.springframework.boot.autoconfigure.mongo;

import java.util.Collections;
import java.util.ArrayList;
import java.util.List;

import com.mongodb.ConnectionString;
import com.mongodb.MongoClientSettings;
Expand All @@ -30,6 +31,7 @@
* {@link MongoProperties} to a {@link MongoClientSettings}.
*
* @author Scott Frederick
* @author Safeer Ansari
* @since 2.4.0
*/
public class MongoPropertiesClientSettingsBuilderCustomizer implements MongoClientSettingsBuilderCustomizer, Ordered {
Expand Down Expand Up @@ -63,12 +65,21 @@ private void applyHostAndPort(MongoClientSettings.Builder settings) {
String host = getOrDefault(this.properties.getHost(), "localhost");
int port = getOrDefault(this.properties.getPort(), MongoProperties.DEFAULT_PORT);
ServerAddress serverAddress = new ServerAddress(host, port);
settings.applyToClusterSettings((cluster) -> cluster.hosts(Collections.singletonList(serverAddress)));
List<ServerAddress> serverAddressList = new ArrayList<>(List.of(serverAddress));
applyAdditionalHosts(serverAddressList);
settings.applyToClusterSettings((cluster) -> cluster.hosts(serverAddressList));
return;
}
settings.applyConnectionString(new ConnectionString(MongoProperties.DEFAULT_URI));
}

private void applyAdditionalHosts(List<ServerAddress> serverAddressList) {
if (this.properties.getAdditionalHosts() != null && !this.properties.getAdditionalHosts().isEmpty()) {
this.properties.getAdditionalHosts()
.forEach((additionalHost) -> serverAddressList.add(new ServerAddress(additionalHost)));
}
}

private void applyCredentials(MongoClientSettings.Builder builder) {
if (this.properties.getUri() == null && this.properties.getUsername() != null
&& this.properties.getPassword() != null) {
Expand Down
13 changes: 13 additions & 0 deletions ...amework/boot/autoconfigure/mongo/MongoPropertiesClientSettingsBuilderCustomizerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@

package org.springframework.boot.autoconfigure.mongo;

import java.util.Arrays;
import java.util.List;

import com.mongodb.MongoClientSettings;
Expand Down Expand Up @@ -53,6 +54,18 @@ void hostCanBeCustomized() {
assertServerAddress(allAddresses.get(0), "mongo.example.com", 27017);
}

@Test
void additionalHostCanBeAdded() {
this.properties.setHost("mongo.example.com");
this.properties.setAdditionalHosts(Arrays.asList("mongo.example.com:33", "mongo.example2.com"));
MongoClientSettings settings = customizeSettings();
List<ServerAddress> allAddresses = getAllAddresses(settings);
assertThat(allAddresses).hasSize(3);
assertServerAddress(allAddresses.get(0), "mongo.example.com", 27017);
assertServerAddress(allAddresses.get(1), "mongo.example.com", 33);
assertServerAddress(allAddresses.get(2), "mongo.example2.com", 27017);
}

@Test
void credentialsCanBeCustomized() {
this.properties.setUsername("user");
Expand Down