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

Merge branch '3.2.x' into 3.3.x 

Closes gh-42059
This commit is contained in:
Phillip Webb 2024-08-29 15:06:12 -07:00
parent 71f509c9fd 10855056cc
commit a09af7ebcf
2 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mongo/PropertiesMongoConnectionDetails.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -23,6 +23,8 @@ import java.util.List;
import com.mongodb.ConnectionString; import com.mongodb.ConnectionString;
import org.springframework.util.StringUtils;
/** /**
* Adapts {@link MongoProperties} to {@link MongoConnectionDetails}. * Adapts {@link MongoProperties} to {@link MongoConnectionDetails}.
* *
@ -90,7 +92,7 @@ public class PropertiesMongoConnectionDetails implements MongoConnectionDetails
private List<String> getOptions() { private List<String> getOptions() {
List<String> options = new ArrayList<>(); List<String> options = new ArrayList<>();
if (this.properties.getReplicaSetName() != null) { if (StringUtils.hasText(this.properties.getReplicaSetName())) {
options.add("replicaSet=" + this.properties.getReplicaSetName()); options.add("replicaSet=" + this.properties.getReplicaSetName());
} }
if (this.properties.getUsername() != null && this.properties.getAuthenticationDatabase() != null) { if (this.properties.getUsername() != null && this.properties.getAuthenticationDatabase() != null) {

16
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/mongo/PropertiesMongoConnectionDetailsTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2023 the original author or authors. * Copyright 2012-2024 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -104,6 +104,20 @@ class PropertiesMongoConnectionDetailsTests {
assertThat(connectionString.getRequiredReplicaSetName()).isEqualTo("test"); assertThat(connectionString.getRequiredReplicaSetName()).isEqualTo("test");
} }
@Test
void replicaSetCanBeNull() {
this.properties.setReplicaSetName(null);
ConnectionString connectionString = getConnectionString();
assertThat(connectionString.getRequiredReplicaSetName()).isNull();
}
@Test
void replicaSetCanBeBlank() {
this.properties.setReplicaSetName("");
ConnectionString connectionString = getConnectionString();
assertThat(connectionString.getRequiredReplicaSetName()).isNull();
}
@Test @Test
void whenAdditionalHostsAreConfiguredThenTheyAreIncludedInHostsOfConnectionString() { void whenAdditionalHostsAreConfiguredThenTheyAreIncludedInHostsOfConnectionString() {
this.properties.setHost("mongo1.example.com"); this.properties.setHost("mongo1.example.com");