From f65336ca56a997f168ac974740fe2de39631b650 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Tue, 10 Dec 2024 16:28:34 +0100 Subject: [PATCH] Fix compilation failure on merge --- .../DefaultDockerComposeIntegrationTests.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/core/DefaultDockerComposeIntegrationTests.java b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/core/DefaultDockerComposeIntegrationTests.java index 2021f0af6a5..61a52019d27 100644 --- a/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/core/DefaultDockerComposeIntegrationTests.java +++ b/spring-boot-project/spring-boot-docker-compose/src/dockerTest/java/org/springframework/boot/docker/compose/core/DefaultDockerComposeIntegrationTests.java @@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.time.Duration; +import java.util.Collections; import java.util.List; import java.util.Set; @@ -29,6 +30,7 @@ import org.assertj.core.api.Assertions; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.io.TempDir; +import org.springframework.boot.docker.compose.core.DockerCli.DockerComposeOptions; import org.springframework.boot.logging.LogLevel; import org.springframework.boot.testsupport.container.DisabledIfDockerUnavailable; import org.springframework.boot.testsupport.container.TestImage; @@ -51,12 +53,15 @@ class DefaultDockerComposeIntegrationTests { // Profile 1 contains redis1 and redis3 // Profile 2 contains redis2 and redis3 File composeFile = createComposeFile(tempDir, "profiles.yaml").toFile(); - DefaultDockerCompose dockerComposeWithProfile1 = new DefaultDockerCompose( - new DockerCli(tempDir.toFile(), DockerComposeFile.of(composeFile), Set.of("1")), null); - DefaultDockerCompose dockerComposeWithProfile2 = new DefaultDockerCompose( - new DockerCli(tempDir.toFile(), DockerComposeFile.of(composeFile), Set.of("2")), null); - DefaultDockerCompose dockerComposeWithAllProfiles = new DefaultDockerCompose( - new DockerCli(tempDir.toFile(), DockerComposeFile.of(composeFile), Set.of("1", "2")), null); + DefaultDockerCompose dockerComposeWithProfile1 = new DefaultDockerCompose(new DockerCli(tempDir.toFile(), + new DockerComposeOptions(DockerComposeFile.of(composeFile), Set.of("1"), Collections.emptyList())), + null); + DefaultDockerCompose dockerComposeWithProfile2 = new DefaultDockerCompose(new DockerCli(tempDir.toFile(), + new DockerComposeOptions(DockerComposeFile.of(composeFile), Set.of("2"), Collections.emptyList())), + null); + DefaultDockerCompose dockerComposeWithAllProfiles = new DefaultDockerCompose(new DockerCli(tempDir.toFile(), + new DockerComposeOptions(DockerComposeFile.of(composeFile), Set.of("1", "2"), Collections.emptyList())), + null); dockerComposeWithAllProfiles.up(LogLevel.DEBUG); try { List runningServicesProfile1 = dockerComposeWithProfile1.getRunningServices();