From 5b7f0f726b9be082b09b0714cadb1b00bff79280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Thu, 19 Mar 2026 16:03:32 +0100 Subject: [PATCH] Harmonize Docker compose and testcontainers support for RabbitMQ Given that the prefix for such support refers to the name of the service, it should have been RabbitMq, not Rabbit. This was already applied in the newly introduced AMQP 1.0 support, and this commit adapts the existing support for consistency. Closes gh-49664 --- ...ectionDetailsFactoryIntegrationTests.java} | 11 ++++---- ...ectionDetailsFactoryIntegrationTests.java} | 8 +++--- ...ectionDetailsFactoryIntegrationTests.java} | 8 +++--- ...ectionDetailsFactoryIntegrationTests.java} | 9 +++--- ...nectionDetailsFactoryIntegrationTests.java | 2 +- ...ectionDetailsFactoryIntegrationTests.java} | 4 +-- ...ectionDetailsFactoryIntegrationTests.java} | 10 +++---- ...ectionDetailsFactoryIntegrationTests.java} | 8 +++--- ...ectionDetailsFactoryIntegrationTests.java} | 8 +++--- ...ectionDetailsFactoryIntegrationTests.java} | 10 +++---- ...tmq-stream-separate-services-compose.yaml} | 0 ...bbitmq-stream-single-service-compose.yaml} | 0 ...bit-compose.yaml => rabbitmq-compose.yaml} | 0 ...compose.yaml => rabbitmq-ssl-compose.yaml} | 0 ...pose.yaml => rabbitmq-stream-compose.yaml} | 0 ....yaml => rabbitmq-stream-ssl-compose.yaml} | 0 ...ockerComposeConnectionDetailsFactory.java} | 8 +++--- ...ironment.java => RabbitMqEnvironment.java} | 4 +-- ...ockerComposeConnectionDetailsFactory.java} | 8 +++--- ...bbitContainerConnectionDetailsFactory.java | 2 +- ...tMqContainerConnectionDetailsFactory.java} | 2 +- ...eamContainerConnectionDetailsFactory.java} | 4 +-- .../main/resources/META-INF/spring.factories | 8 +++--- ...sts.java => RabbitMqEnvironmentTests.java} | 28 +++++++++---------- 24 files changed, 72 insertions(+), 70 deletions(-) rename module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/{RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java => RabbitMqAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java} (84%) rename module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/{RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java => RabbitMqDockerComposeConnectionDetailsFactoryIntegrationTests.java} (87%) rename module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/{RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java => RabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java} (85%) rename module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/{SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java => SingleServiceRabbitAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java} (85%) rename module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/{RabbitContainerConnectionDetailsFactoryIntegrationTests.java => RabbitMqContainerConnectionDetailsFactoryIntegrationTests.java} (95%) rename module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/{RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java => RabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java} (90%) rename module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/{RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java => RabbitMqStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java} (92%) rename module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/{SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java => SeparateContainersRabbitMqAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java} (92%) rename module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/{SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java => SingleContainerRabbitAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java} (91%) rename module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/{rabbit-and-rabbit-stream-separate-services-compose.yaml => rabbitmq-and-rabbitmq-stream-separate-services-compose.yaml} (100%) rename module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/{rabbit-and-rabbit-stream-single-service-compose.yaml => rabbitmq-and-rabbitmq-stream-single-service-compose.yaml} (100%) rename module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/{rabbit-compose.yaml => rabbitmq-compose.yaml} (100%) rename module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/{rabbit-ssl-compose.yaml => rabbitmq-ssl-compose.yaml} (100%) rename module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/{rabbit-stream-compose.yaml => rabbitmq-stream-compose.yaml} (100%) rename module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/{rabbit-stream-ssl-compose.yaml => rabbitmq-stream-ssl-compose.yaml} (100%) rename module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/{RabbitDockerComposeConnectionDetailsFactory.java => RabbitMqDockerComposeConnectionDetailsFactory.java} (92%) rename module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/{RabbitEnvironment.java => RabbitMqEnvironment.java} (93%) rename module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/{RabbitStreamDockerComposeConnectionDetailsFactory.java => RabbitMqStreamDockerComposeConnectionDetailsFactory.java} (92%) rename module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/{RabbitContainerConnectionDetailsFactory.java => RabbitMqContainerConnectionDetailsFactory.java} (98%) rename module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/{RabbitStreamContainerConnectionDetailsFactory.java => RabbitMqStreamContainerConnectionDetailsFactory.java} (96%) rename module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/{RabbitEnvironmentTests.java => RabbitMqEnvironmentTests.java} (59%) diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 84% rename from module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java index dcef4737265..0c4902328af 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -25,14 +25,14 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link RabbitDockerComposeConnectionDetailsFactory} and - * {@link RabbitStreamDockerComposeConnectionDetailsFactory} when used in combination. + * Integration tests for {@link RabbitMqDockerComposeConnectionDetailsFactory} and + * {@link RabbitMqStreamDockerComposeConnectionDetailsFactory} when used in combination. * * @author Andy Wilkinson */ -class RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests { +class RabbitMqAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests { - @DockerComposeTest(composeFile = "rabbit-and-rabbit-stream-separate-services-compose.yaml", + @DockerComposeTest(composeFile = "rabbitmq-and-rabbitmq-stream-separate-services-compose.yaml", image = TestImage.RABBITMQ) void runCreatesConnectionDetailsFromSeparateServices(RabbitConnectionDetails connectionDetails, RabbitStreamConnectionDetails streamConnectionDetails) { @@ -40,7 +40,8 @@ class RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests assertConnectionDetails(streamConnectionDetails); } - @DockerComposeTest(composeFile = "rabbit-and-rabbit-stream-single-service-compose.yaml", image = TestImage.RABBITMQ) + @DockerComposeTest(composeFile = "rabbitmq-and-rabbitmq-stream-single-service-compose.yaml", + image = TestImage.RABBITMQ) void runCreatesConnectionDetailsFromSingleService(RabbitConnectionDetails connectionDetails, RabbitStreamConnectionDetails streamConnectionDetails) { assertConnectionDetails(connectionDetails); 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/RabbitMqDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 87% rename from module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactoryIntegrationTests.java index fb1e627f60e..fb482a6cbb8 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/RabbitMqDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -25,22 +25,22 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link RabbitDockerComposeConnectionDetailsFactory}. + * Integration tests for {@link RabbitMqDockerComposeConnectionDetailsFactory}. * * @author Moritz Halbritter * @author Andy Wilkinson * @author Phillip Webb * @author Scott Frederick */ -class RabbitDockerComposeConnectionDetailsFactoryIntegrationTests { +class RabbitMqDockerComposeConnectionDetailsFactoryIntegrationTests { - @DockerComposeTest(composeFile = "rabbit-compose.yaml", image = TestImage.RABBITMQ) + @DockerComposeTest(composeFile = "rabbitmq-compose.yaml", image = TestImage.RABBITMQ) void runCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); assertThat(connectionDetails.getSslBundle()).isNull(); } - @DockerComposeTest(composeFile = "rabbit-ssl-compose.yaml", image = TestImage.RABBITMQ, + @DockerComposeTest(composeFile = "rabbitmq-ssl-compose.yaml", image = TestImage.RABBITMQ, additionalResources = { "../../ca.crt", "../../server.crt", "../../server.key", "../../client.crt", "../../client.key", "rabbitmq-ssl.conf" }) void runWithSslCreatesConnectionDetails(RabbitConnectionDetails connectionDetails) { diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 85% rename from module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java index b54ab7270fb..1a4d0fdf981 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -24,18 +24,18 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link RabbitStreamDockerComposeConnectionDetailsFactory}. + * Integration tests for {@link RabbitMqStreamDockerComposeConnectionDetailsFactory}. * * @author Andy Wilkinson */ -class RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests { +class RabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests { - @DockerComposeTest(composeFile = "rabbit-stream-compose.yaml", image = TestImage.RABBITMQ) + @DockerComposeTest(composeFile = "rabbitmq-stream-compose.yaml", image = TestImage.RABBITMQ) void runCreatesConnectionDetails(RabbitStreamConnectionDetails connectionDetails) { assertConnectionDetails(connectionDetails); } - @DockerComposeTest(composeFile = "rabbit-stream-ssl-compose.yaml", image = TestImage.RABBITMQ, + @DockerComposeTest(composeFile = "rabbitmq-stream-ssl-compose.yaml", image = TestImage.RABBITMQ, additionalResources = { "../../ca.crt", "../../server.crt", "../../server.key", "../../client.crt", "../../client.key", "rabbitmq-stream-ssl.conf" }) void runWithSslCreatesConnectionDetails(RabbitStreamConnectionDetails connectionDetails) { diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 85% rename from module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java index ae9d61597f6..af67b52c44b 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -25,15 +25,16 @@ import org.springframework.boot.testsupport.container.TestImage; import static org.assertj.core.api.Assertions.assertThat; /** - * Integration tests for {@link RabbitDockerComposeConnectionDetailsFactory} and - * {@link RabbitStreamDockerComposeConnectionDetailsFactory} when using a single service + * Integration tests for {@link RabbitMqDockerComposeConnectionDetailsFactory} and + * {@link RabbitMqStreamDockerComposeConnectionDetailsFactory} when using a single service * for standard and stream-based messaging. * * @author Andy Wilkinson */ -class SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests { +class SingleServiceRabbitAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests { - @DockerComposeTest(composeFile = "rabbit-and-rabbit-stream-single-service-compose.yaml", image = TestImage.RABBITMQ) + @DockerComposeTest(composeFile = "rabbitmq-and-rabbitmq-stream-single-service-compose.yaml", + image = TestImage.RABBITMQ) void runCreatesConnectionDetails(RabbitConnectionDetails connectionDetails, RabbitStreamConnectionDetails streamConnectionDetails) { assertConnectionDetails(connectionDetails); diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java index 91aed53b74b..61b0a43c531 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java @@ -48,7 +48,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Andy Wilkinson * @author Phillip Webb * @deprecated since 4.0.0 for removal in 4.2.0 in favor of - * {@link RabbitContainerConnectionDetailsFactoryIntegrationTests}. + * {@link RabbitMqContainerConnectionDetailsFactoryIntegrationTests}. */ @SpringJUnitConfig @Testcontainers(disabledWithoutDocker = true) diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactoryIntegrationTests.java similarity index 95% rename from module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactoryIntegrationTests.java index f371b856228..0de6be2fad4 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactoryIntegrationTests.java @@ -42,7 +42,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link RabbitContainerConnectionDetailsFactory}. + * Tests for {@link RabbitMqContainerConnectionDetailsFactory}. * * @author Moritz Halbritter * @author Andy Wilkinson @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; */ @SpringJUnitConfig @Testcontainers(disabledWithoutDocker = true) -class RabbitContainerConnectionDetailsFactoryIntegrationTests { +class RabbitMqContainerConnectionDetailsFactoryIntegrationTests { @Container @ServiceConnection diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java similarity index 90% rename from module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java index 8820db4606a..3f3981b727d 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java @@ -36,8 +36,8 @@ import org.springframework.boot.rabbitmq.autoconfigure.EnvironmentBuilderCustomi import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; -import org.springframework.boot.rabbitmq.testcontainers.RabbitContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; -import org.springframework.boot.rabbitmq.testcontainers.RabbitStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; +import org.springframework.boot.rabbitmq.testcontainers.RabbitMqContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; +import org.springframework.boot.rabbitmq.testcontainers.RabbitMqStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; @@ -50,8 +50,8 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link RabbitStreamContainerConnectionDetailsFactory} with a single container - * that's only used for streams. + * Tests for {@link RabbitMqStreamContainerConnectionDetailsFactory} with a single + * container that's only used for streams. * * @author Eddú Meléndez * @author Andy Wilkinson @@ -60,7 +60,7 @@ import static org.assertj.core.api.Assertions.assertThat; @TestPropertySource( properties = { "spring.rabbitmq.stream.name=stream.queue1", "spring.rabbitmq.listener.type=stream" }) @Testcontainers(disabledWithoutDocker = true) -class RabbitStreamContainerConnectionDetailsFactoryIntegrationTests { +class RabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests { private static final int RABBITMQ_STREAMS_PORT = 5552; diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java similarity index 92% rename from module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java index 6eab916aef2..c13ddc3eae7 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java @@ -37,8 +37,8 @@ import org.springframework.boot.rabbitmq.autoconfigure.EnvironmentBuilderCustomi import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; -import org.springframework.boot.rabbitmq.testcontainers.RabbitContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; -import org.springframework.boot.rabbitmq.testcontainers.RabbitStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; +import org.springframework.boot.rabbitmq.testcontainers.RabbitMqContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; +import org.springframework.boot.rabbitmq.testcontainers.RabbitMqStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; import org.springframework.boot.testcontainers.service.connection.PemKeyStore; import org.springframework.boot.testcontainers.service.connection.PemTrustStore; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; @@ -53,7 +53,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link RabbitStreamContainerConnectionDetailsFactory} with SSL. + * Tests for {@link RabbitMqStreamContainerConnectionDetailsFactory} with SSL. * * @author Eddú Meléndez * @author Andy Wilkinson @@ -62,7 +62,7 @@ import static org.assertj.core.api.Assertions.assertThat; @TestPropertySource( properties = { "spring.rabbitmq.stream.name=stream.queue1", "spring.rabbitmq.listener.type=stream" }) @Testcontainers(disabledWithoutDocker = true) -class RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests { +class RabbitMqStreamWithSslContainerConnectionDetailsFactoryIntegrationTests { private static final int RABBITMQ_STREAMS_TLS_PORT = 5551; diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitMqAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java similarity index 92% rename from module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitMqAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java index e28c2657a7c..099cd381686 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitMqAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java @@ -40,8 +40,8 @@ import org.springframework.boot.rabbitmq.autoconfigure.EnvironmentBuilderCustomi import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; -import org.springframework.boot.rabbitmq.testcontainers.RabbitContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; -import org.springframework.boot.rabbitmq.testcontainers.RabbitStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; +import org.springframework.boot.rabbitmq.testcontainers.RabbitMqContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; +import org.springframework.boot.rabbitmq.testcontainers.RabbitMqStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; @@ -54,7 +54,7 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link RabbitStreamContainerConnectionDetailsFactory} with two containers, + * Tests for {@link RabbitMqStreamContainerConnectionDetailsFactory} with two containers, * one for streams and one for standard messaging. * * @author Eddú Meléndez @@ -64,7 +64,7 @@ import static org.assertj.core.api.Assertions.assertThat; @TestPropertySource( properties = { "spring.rabbitmq.stream.name=stream.queue1", "spring.rabbitmq.listener.type=stream" }) @Testcontainers(disabledWithoutDocker = true) -class SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests { +class SeparateContainersRabbitMqAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests { private static final int RABBITMQ_STREAMS_PORT = 5552; diff --git a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java similarity index 91% rename from module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java index 3d306284fa4..686a447bc2e 100644 --- a/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java @@ -40,8 +40,8 @@ import org.springframework.boot.rabbitmq.autoconfigure.EnvironmentBuilderCustomi import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; -import org.springframework.boot.rabbitmq.testcontainers.RabbitContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; -import org.springframework.boot.rabbitmq.testcontainers.RabbitStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; +import org.springframework.boot.rabbitmq.testcontainers.RabbitMqContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; +import org.springframework.boot.rabbitmq.testcontainers.RabbitMqStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; @@ -54,8 +54,8 @@ import org.springframework.test.context.junit.jupiter.SpringJUnitConfig; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link RabbitStreamContainerConnectionDetailsFactory} with a single container - * used for both streams and standard messaging. + * Tests for {@link RabbitMqStreamContainerConnectionDetailsFactory} with a single + * container used for both streams and standard messaging. * * @author Eddú Meléndez * @author Andy Wilkinson @@ -64,7 +64,7 @@ import static org.assertj.core.api.Assertions.assertThat; @TestPropertySource( properties = { "spring.rabbitmq.stream.name=stream.queue1", "spring.rabbitmq.listener.type=stream" }) @Testcontainers(disabledWithoutDocker = true) -class SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests { +class SingleContainerRabbitAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests { private static final int RABBITMQ_STREAMS_PORT = 5552; diff --git a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-and-rabbit-stream-separate-services-compose.yaml b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-and-rabbitmq-stream-separate-services-compose.yaml similarity index 100% rename from module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-and-rabbit-stream-separate-services-compose.yaml rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-and-rabbitmq-stream-separate-services-compose.yaml diff --git a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-and-rabbit-stream-single-service-compose.yaml b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-and-rabbitmq-stream-single-service-compose.yaml similarity index 100% rename from module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-and-rabbit-stream-single-service-compose.yaml rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-and-rabbitmq-stream-single-service-compose.yaml diff --git a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-compose.yaml b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-compose.yaml similarity index 100% rename from module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-compose.yaml rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-compose.yaml diff --git a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-ssl-compose.yaml b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-ssl-compose.yaml similarity index 100% rename from module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-ssl-compose.yaml rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-ssl-compose.yaml diff --git a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-stream-compose.yaml b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-stream-compose.yaml similarity index 100% rename from module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-stream-compose.yaml rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-stream-compose.yaml diff --git a/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-stream-ssl-compose.yaml b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-stream-ssl-compose.yaml similarity index 100% rename from module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbit-stream-ssl-compose.yaml rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-stream-ssl-compose.yaml 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/RabbitMqDockerComposeConnectionDetailsFactory.java similarity index 92% rename from module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactory.java index bd662a242aa..30b7ab878cb 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/RabbitMqDockerComposeConnectionDetailsFactory.java @@ -33,12 +33,12 @@ import org.springframework.boot.ssl.SslBundle; * * @author Andy Wilkinson */ -class RabbitDockerComposeConnectionDetailsFactory +class RabbitMqDockerComposeConnectionDetailsFactory extends DockerComposeConnectionDetailsFactory { private static final int RABBITMQ_PORT = 5672; - protected RabbitDockerComposeConnectionDetailsFactory() { + protected RabbitMqDockerComposeConnectionDetailsFactory() { super("rabbitmq"); } @@ -60,7 +60,7 @@ class RabbitDockerComposeConnectionDetailsFactory static class RabbitDockerComposeConnectionDetails extends DockerComposeConnectionDetails implements RabbitConnectionDetails { - private final RabbitEnvironment environment; + private final RabbitMqEnvironment environment; private final List
addresses; @@ -68,7 +68,7 @@ class RabbitDockerComposeConnectionDetailsFactory protected RabbitDockerComposeConnectionDetails(RunningService service) { super(service); - this.environment = new RabbitEnvironment(service.env()); + this.environment = new RabbitMqEnvironment(service.env()); this.sslBundle = getSslBundle(service); this.addresses = List.of(new Address(service.host(), service.ports().get(RABBITMQ_PORT))); } diff --git a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitEnvironment.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironment.java similarity index 93% rename from module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitEnvironment.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironment.java index 1d37579e1a8..a71a8207ec7 100644 --- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitEnvironment.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironment.java @@ -28,13 +28,13 @@ import org.jspecify.annotations.Nullable; * @author Phillip Webb * @author Scott Frederick */ -class RabbitEnvironment { +class RabbitMqEnvironment { private final @Nullable String username; private final @Nullable String password; - RabbitEnvironment(Map env) { + RabbitMqEnvironment(Map env) { this.username = env.getOrDefault("RABBITMQ_DEFAULT_USER", env.getOrDefault("RABBITMQ_USERNAME", "guest")); this.password = env.getOrDefault("RABBITMQ_DEFAULT_PASS", env.getOrDefault("RABBITMQ_PASSWORD", "guest")); } diff --git a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactory.java similarity index 92% rename from module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactory.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactory.java index 5b1fbbb8794..9a0b8f22bc3 100644 --- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactory.java @@ -35,10 +35,10 @@ import org.springframework.boot.ssl.SslBundle; * @author Scott Frederick * @author Jay Choi */ -class RabbitStreamDockerComposeConnectionDetailsFactory +class RabbitMqStreamDockerComposeConnectionDetailsFactory extends DockerComposeConnectionDetailsFactory { - protected RabbitStreamDockerComposeConnectionDetailsFactory() { + protected RabbitMqStreamDockerComposeConnectionDetailsFactory() { super("rabbitmq"); } @@ -64,7 +64,7 @@ class RabbitStreamDockerComposeConnectionDetailsFactory private static final int STREAMS_TLS_PORT = 5551; - private final RabbitEnvironment environment; + private final RabbitMqEnvironment environment; private final String host; @@ -74,7 +74,7 @@ class RabbitStreamDockerComposeConnectionDetailsFactory protected RabbitStreamDockerComposeConnectionDetails(RunningService service) { super(service); - this.environment = new RabbitEnvironment(service.env()); + this.environment = new RabbitMqEnvironment(service.env()); this.host = service.host(); this.sslBundle = getSslBundle(service); this.port = service.ports().get((this.sslBundle != null) ? STREAMS_TLS_PORT : STREAMS_PORT); diff --git a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java index 445d8410611..750d611deb6 100644 --- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java @@ -37,7 +37,7 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect * @author Andy Wilkinson * @author Phillip Webb * @deprecated since 4.0.0 for removal in 4.2.0 in favor of - * {@link RabbitContainerConnectionDetailsFactory}. + * {@link RabbitMqContainerConnectionDetailsFactory}. */ @Deprecated(since = "4.0.0", forRemoval = true) class DeprecatedRabbitContainerConnectionDetailsFactory diff --git a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitContainerConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactory.java similarity index 98% rename from module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitContainerConnectionDetailsFactory.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactory.java index 32a89a3e23a..5e13fc5d999 100644 --- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitContainerConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactory.java @@ -37,7 +37,7 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect * @author Andy Wilkinson * @author Phillip Webb */ -class RabbitContainerConnectionDetailsFactory +class RabbitMqContainerConnectionDetailsFactory extends ContainerConnectionDetailsFactory { @Override diff --git a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitStreamContainerConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactory.java similarity index 96% rename from module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitStreamContainerConnectionDetailsFactory.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactory.java index dccd1d44141..17171157b33 100644 --- a/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitStreamContainerConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactory.java @@ -33,10 +33,10 @@ import org.springframework.boot.testcontainers.service.connection.ServiceConnect * @author Eddú Meléndez * @author Jay Choi */ -class RabbitStreamContainerConnectionDetailsFactory +class RabbitMqStreamContainerConnectionDetailsFactory extends ContainerConnectionDetailsFactory { - RabbitStreamContainerConnectionDetailsFactory() { + RabbitMqStreamContainerConnectionDetailsFactory() { super(ANY_CONNECTION_NAME, "org.springframework.rabbit.stream.producer.RabbitStreamTemplate"); } diff --git a/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring.factories b/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring.factories index e3667de2bbc..a7a1d458e73 100644 --- a/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring.factories +++ b/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring.factories @@ -1,8 +1,8 @@ # Connection Details Factories org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\ -org.springframework.boot.rabbitmq.docker.compose.RabbitDockerComposeConnectionDetailsFactory,\ -org.springframework.boot.rabbitmq.docker.compose.RabbitStreamDockerComposeConnectionDetailsFactory,\ +org.springframework.boot.rabbitmq.docker.compose.RabbitMqDockerComposeConnectionDetailsFactory,\ +org.springframework.boot.rabbitmq.docker.compose.RabbitMqStreamDockerComposeConnectionDetailsFactory,\ org.springframework.boot.rabbitmq.testcontainers.DeprecatedRabbitContainerConnectionDetailsFactory,\ -org.springframework.boot.rabbitmq.testcontainers.RabbitContainerConnectionDetailsFactory,\ -org.springframework.boot.rabbitmq.testcontainers.RabbitStreamContainerConnectionDetailsFactory +org.springframework.boot.rabbitmq.testcontainers.RabbitMqContainerConnectionDetailsFactory,\ +org.springframework.boot.rabbitmq.testcontainers.RabbitMqStreamContainerConnectionDetailsFactory diff --git a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitEnvironmentTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironmentTests.java similarity index 59% rename from module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitEnvironmentTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironmentTests.java index 356d93ad535..533ee69f8c2 100644 --- a/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitEnvironmentTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironmentTests.java @@ -24,48 +24,48 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; /** - * Tests for {@link RabbitEnvironment}. + * Tests for {@link RabbitMqEnvironment}. * * @author Moritz Halbritter * @author Andy Wilkinson * @author Phillip Webb * @author Scott Frederick */ -class RabbitEnvironmentTests { +class RabbitMqEnvironmentTests { @Test - void getUsernameWhenNoRabbitmqDefaultUser() { - RabbitEnvironment environment = new RabbitEnvironment(Collections.emptyMap()); + void getUsernameWhenNoRabbitMqDefaultUser() { + RabbitMqEnvironment environment = new RabbitMqEnvironment(Collections.emptyMap()); assertThat(environment.getUsername()).isEqualTo("guest"); } @Test - void getUsernameWhenHasRabbitmqDefaultUser() { - RabbitEnvironment environment = new RabbitEnvironment(Map.of("RABBITMQ_DEFAULT_USER", "me")); + void getUsernameWhenHasRabbitMqDefaultUser() { + RabbitMqEnvironment environment = new RabbitMqEnvironment(Map.of("RABBITMQ_DEFAULT_USER", "me")); assertThat(environment.getUsername()).isEqualTo("me"); } @Test - void getUsernameWhenHasRabbitmqUsername() { - RabbitEnvironment environment = new RabbitEnvironment(Map.of("RABBITMQ_USERNAME", "me")); + void getUsernameWhenHasRabbitMqUsername() { + RabbitMqEnvironment environment = new RabbitMqEnvironment(Map.of("RABBITMQ_USERNAME", "me")); assertThat(environment.getUsername()).isEqualTo("me"); } @Test - void getUsernameWhenNoRabbitmqDefaultPass() { - RabbitEnvironment environment = new RabbitEnvironment(Collections.emptyMap()); + void getUsernameWhenNoRabbitMqDefaultPass() { + RabbitMqEnvironment environment = new RabbitMqEnvironment(Collections.emptyMap()); assertThat(environment.getPassword()).isEqualTo("guest"); } @Test - void getUsernameWhenHasRabbitmqDefaultPass() { - RabbitEnvironment environment = new RabbitEnvironment(Map.of("RABBITMQ_DEFAULT_PASS", "secret")); + void getUsernameWhenHasRabbitMqDefaultPass() { + RabbitMqEnvironment environment = new RabbitMqEnvironment(Map.of("RABBITMQ_DEFAULT_PASS", "secret")); assertThat(environment.getPassword()).isEqualTo("secret"); } @Test - void getUsernameWhenHasRabbitmqPassword() { - RabbitEnvironment environment = new RabbitEnvironment(Map.of("RABBITMQ_PASSWORD", "secret")); + void getUsernameWhenHasRabbitMqPassword() { + RabbitMqEnvironment environment = new RabbitMqEnvironment(Map.of("RABBITMQ_PASSWORD", "secret")); assertThat(environment.getPassword()).isEqualTo("secret"); }