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

Merge branch 'main' into 4.0.x

Browse Source
This commit is contained in:
Phillip Webb
2025-06-04 15:38:10 -07:00
parent 685fe7d4bd b1b14d2c0c
commit db5556363e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-docker-compose/src/main/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilder.java
View File

@@ -46,7 +46,7 @@ public class ConnectionFactoryOptionsBuilder {
/**
* Create a new {@link ConnectionFactoryOptionsBuilder} instance.
* @param driver the driver protocol
* @param driver the driver
* @param containerPort the source container port
*/
public ConnectionFactoryOptionsBuilder(String driver, int containerPort) {

4
spring-boot-project/spring-boot-docker-compose/src/test/java/org/springframework/boot/docker/compose/service/connection/r2dbc/ConnectionFactoryOptionsBuilderTests.java
View File

@@ -45,7 +45,11 @@ class ConnectionFactoryOptionsBuilderTests {
@Test
void createWhenDriverProtocolIsNullThrowsException() {
assertThatIllegalArgumentException().isThrownBy(() -> new ConnectionFactoryOptionsBuilder(null, 123))
<<<<<<< HEAD
.withMessage("'driverProtocol' must not be null");
=======
.withMessage("Driver must not be null");
>>>>>>> 3.4.x
}
@Test