From 9ed2fdbc9cd9229bbf455406718a058dee775b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edd=C3=BA=20Mel=C3=A9ndez?= Date: Tue, 10 Mar 2026 21:42:28 -0600 Subject: [PATCH] Fix merge MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eddú Meléndez --- ...seConnectionDetailsFactoryIntegrationTests.java | 14 -------------- ...seConnectionDetailsFactoryIntegrationTests.java | 10 ++++++++++ .../boot/rabbitmq}/docker/compose/ca.crt | 0 .../boot/rabbitmq}/docker/compose/client.crt | 0 .../boot/rabbitmq}/docker/compose/client.key | 0 .../docker/compose/rabbit-ssl-compose.yaml | 0 .../boot/rabbitmq}/docker/compose/rabbitmq.conf | 0 .../boot/rabbitmq}/docker/compose/server.crt | 0 .../boot/rabbitmq}/docker/compose/server.key | 0 ...abbitDockerComposeConnectionDetailsFactory.java | 10 ++++++++++ 10 files changed, 20 insertions(+), 14 deletions(-) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/docker/compose/ca.crt (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/docker/compose/client.crt (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/docker/compose/client.key (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/docker/compose/rabbit-ssl-compose.yaml (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/docker/compose/rabbitmq.conf (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/docker/compose/server.crt (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/docker/compose/server.key (100%) diff --git a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java index aec47b7ff38..1a34af51e03 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -19,7 +19,6 @@ package org.springframework.boot.amqp.docker.compose; import org.springframework.boot.amqp.autoconfigure.AmqpConnectionDetails; import org.springframework.boot.amqp.autoconfigure.AmqpConnectionDetails.Address; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; -import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; @@ -37,19 +36,6 @@ class RabbitDockerComposeConnectionDetailsFactoryIntegrationTests { @DockerComposeTest(composeFile = "rabbit-compose.yaml", image = TestImage.RABBITMQ) void runCreatesConnectionDetails(AmqpConnectionDetails connectionDetails) { - assertConnectionDetails(connectionDetails); - assertThat(connectionDetails.getSslBundle()).isNull(); - } - - @DockerComposeTest(composeFile = "rabbit-ssl-compose.yaml", image = TestImage.RABBITMQ, - additionalResources = { "ca.crt", "server.crt", "server.key", "client.crt", "client.key", "rabbitmq.conf" }) - void runWithSslCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) { - assertConnectionDetails(connectionDetails); - SslBundle sslBundle = connectionDetails.getSslBundle(); - assertThat(sslBundle).isNotNull(); - } - - private void assertConnectionDetails(AmqpConnectionDetails connectionDetails) { assertThat(connectionDetails.getUsername()).isEqualTo("myuser"); assertThat(connectionDetails.getPassword()).isEqualTo("secret"); assertThat(connectionDetails.getVirtualHost()).isEqualTo("/"); diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java index eeb49157abf..4e72139bad1 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -19,6 +19,7 @@ package org.springframework.boot.rabbitmq.docker.compose; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails.Address; +import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; @@ -36,6 +37,15 @@ class RabbitDockerComposeConnectionDetailsFactoryIntegrationTests { @DockerComposeTest(composeFile = "rabbit-compose.yaml", image = TestImage.RABBITMQ) void runCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); + assertThat(connectionDetails.getSslBundle()).isNull(); + } + + @DockerComposeTest(composeFile = "rabbit-ssl-compose.yaml", image = TestImage.RABBITMQ, + additionalResources = { "ca.crt", "server.crt", "server.key", "client.crt", "client.key", "rabbitmq.conf" }) + void runWithSslCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) { + assertConnectionDetails(connectionDetails); + SslBundle sslBundle = connectionDetails.getSslBundle(); + assertThat(sslBundle).isNotNull(); } private void assertConnectionDetails(RabbitConnectionDetails connectionDetails) { diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/ca.crt b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/ca.crt similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/ca.crt rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/ca.crt diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/client.crt b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/client.crt similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/client.crt rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/client.crt diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/client.key b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/client.key similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/client.key rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/client.key diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-ssl-compose.yaml b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-ssl-compose.yaml similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-ssl-compose.yaml rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-ssl-compose.yaml diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq.conf b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq.conf similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq.conf rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq.conf diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/server.crt b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/server.crt similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/server.crt rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/server.crt diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/server.key b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/server.key similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/server.key rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/server.key diff --git a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java index c7a619dc064..cf2bc9cf5c0 100644 --- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java @@ -24,6 +24,7 @@ import org.springframework.boot.docker.compose.core.RunningService; import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionDetailsFactory; import org.springframework.boot.docker.compose.service.connection.DockerComposeConnectionSource; import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; +import org.springframework.boot.ssl.SslBundle; /** * {@link DockerComposeConnectionDetailsFactory} to create {@link RabbitConnectionDetails} @@ -65,12 +66,16 @@ class RabbitDockerComposeConnectionDetailsFactory private final List
addresses; + private final @Nullable SslBundle sslBundle; + protected RabbitDockerComposeConnectionDetails(RunningService service) { super(service); this.environment = new RabbitEnvironment(service.env()); + this.sslBundle = getSslBundle(service); this.addresses = List.of(new Address(service.host(), service.ports().get(RABBITMQ_PORT))); } + @Override public @Nullable String getUsername() { return this.environment.getUsername(); @@ -81,6 +86,11 @@ class RabbitDockerComposeConnectionDetailsFactory return this.environment.getPassword(); } + @Override + public @Nullable SslBundle getSslBundle() { + return this.sslBundle; + } + @Override public String getVirtualHost() { return "/";