From f48cc3ac10cc58f8fd437b45beeb87f40ae671b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 20 Mar 2026 15:32:45 +0100 Subject: [PATCH] Move Spring AMQP 0.9 support to spring-boot-rabbitmq Now that Spring AMQP supports AMQP 1.0 as well, we need to straighten out our existing support. AMQP 0.9 is RabbitMQ specific, so we can no longer refer it to "amqp". This commit migrates the existing support to spring-boot-rabbitmq and renames the starters as well. For continuity, users should migrate from "spring-boot-starter-amqp" to "spring-boot-starter-rabbitmq". While the root package has been changed for consistency, most names are the same, including configuration properties still in the "spring.rabbitmq" namespace. Keys to configure the version of the RabbitMQ clients have migrated to 'rabbitmq.client' and 'rabbitmq.stream.client' respectively. Closes gh-49677 --- documentation/spring-boot-docs/build.gradle | 2 +- .../reference/pages/actuator/endpoints.adoc | 2 +- .../pages/features/dev-services.adoc | 4 +-- .../reference/pages/messaging/amqp.adoc | 18 +++++----- .../pages/testing/testcontainers.adoc | 10 +++--- .../custom/MyRabbitConfiguration.java | 2 +- .../receiving/custom/MyRabbitConfiguration.kt | 2 +- .../main/resources/META-INF/spring.factories | 8 ----- ...ot.autoconfigure.AutoConfiguration.imports | 3 -- .../build.gradle | 6 ++-- .../build.gradle | 2 +- ...ectionDetailsFactoryIntegrationTests.java} | 19 +++++----- ...ectionDetailsFactoryIntegrationTests.java} | 14 ++++---- ...ectionDetailsFactoryIntegrationTests.java} | 12 +++---- ...ectionDetailsFactoryIntegrationTests.java} | 17 ++++----- ...nectionDetailsFactoryIntegrationTests.java | 8 ++--- ...ectionDetailsFactoryIntegrationTests.java} | 10 +++--- ...ectionDetailsFactoryIntegrationTests.java} | 20 +++++------ ...ectionDetailsFactoryIntegrationTests.java} | 34 +++++++++--------- ...ectionDetailsFactoryIntegrationTests.java} | 18 +++++----- ...ectionDetailsFactoryIntegrationTests.java} | 20 +++++------ .../src/dockerTest/resources/logback-test.xml | 0 .../org/springframework/boot/rabbitmq}/ca.crt | 0 .../springframework/boot/rabbitmq}/client.crt | 0 .../springframework/boot/rabbitmq}/client.key | 0 ...tmq-stream-separate-services-compose.yaml} | 0 ...bbitmq-stream-single-service-compose.yaml} | 0 .../docker/compose/rabbitmq-compose.yaml} | 0 .../docker/compose/rabbitmq-ssl-compose.yaml} | 0 .../docker/compose/rabbitmq-ssl.conf | 0 .../compose/rabbitmq-stream-compose.yaml} | 0 .../compose/rabbitmq-stream-ssl-compose.yaml} | 0 .../docker/compose/rabbitmq-stream-ssl.conf | 0 .../springframework/boot/rabbitmq}/server.crt | 0 .../springframework/boot/rabbitmq}/server.key | 0 .../testcontainers/rabbitmq-stream-ssl.conf | 0 .../dockerTest/resources/spring.properties | 0 .../AbstractConnectionFactoryConfigurer.java | 4 +-- ...bitListenerContainerFactoryConfigurer.java | 10 +++--- .../CachingConnectionFactoryConfigurer.java | 4 +-- .../ConnectionFactoryCustomizer.java | 4 +-- ...bitListenerContainerFactoryConfigurer.java | 4 +-- .../EnvironmentBuilderCustomizer.java | 4 +-- .../PropertiesRabbitConnectionDetails.java | 4 +-- .../RabbitAnnotationDrivenConfiguration.java | 2 +- .../RabbitAutoConfiguration.java | 4 +-- .../RabbitConnectionDetails.java | 4 +-- ...RabbitConnectionFactoryBeanConfigurer.java | 6 ++-- ...RabbitListenerRetrySettingsCustomizer.java | 4 +-- .../autoconfigure/RabbitProperties.java | 4 +-- .../RabbitRetryTemplateSettings.java | 4 +-- .../RabbitStreamConfiguration.java | 8 ++--- .../RabbitStreamConnectionDetails.java | 4 +-- .../RabbitStreamTemplateConfigurer.java | 6 ++-- .../RabbitTemplateConfigurer.java | 6 ++-- .../RabbitTemplateCustomizer.java | 4 +-- ...RabbitTemplateRetrySettingsCustomizer.java | 4 +-- ...bitListenerContainerFactoryConfigurer.java | 4 +-- .../SslBundleRabbitConnectionFactoryBean.java | 2 +- ...bitHealthContributorAutoConfiguration.java | 8 ++--- .../autoconfigure/health/package-info.java | 2 +- ...ConnectionFactoryMetricsPostProcessor.java | 4 +-- .../RabbitMetricsAutoConfiguration.java | 6 ++-- .../autoconfigure/metrics/package-info.java | 2 +- .../rabbitmq}/autoconfigure/package-info.java | 2 +- ...ockerComposeConnectionDetailsFactory.java} | 14 ++++---- .../docker/compose/RabbitMqEnvironment.java} | 6 ++-- ...ockerComposeConnectionDetailsFactory.java} | 14 ++++---- .../docker/compose/package-info.java | 2 +- .../health/RabbitHealthIndicator.java | 4 +-- .../boot/rabbitmq}/health/package-info.java | 2 +- .../boot/rabbitmq}/metrics/RabbitMetrics.java | 4 +-- .../boot/rabbitmq}/metrics/package-info.java | 2 +- ...bbitContainerConnectionDetailsFactory.java | 6 ++-- ...tMqContainerConnectionDetailsFactory.java} | 6 ++-- ...eamContainerConnectionDetailsFactory.java} | 8 ++--- .../testcontainers/package-info.java | 2 +- ...itional-spring-configuration-metadata.json | 0 .../main/resources/META-INF/spring.factories | 8 +++++ ...ot.autoconfigure.AutoConfiguration.imports | 3 ++ ...ropertiesRabbitConnectionDetailsTests.java | 4 +-- .../RabbitAutoConfigurationTests.java | 18 +++++----- .../autoconfigure/RabbitPropertiesTests.java | 2 +- .../RabbitStreamConfigurationTests.java | 8 ++--- ...althContributorAutoConfigurationTests.java | 6 ++-- ...ationMeterBinderCycleIntegrationTests.java | 4 +-- .../RabbitMetricsAutoConfigurationTests.java | 4 +-- .../compose/RabbitMqEnvironmentTests.java} | 30 ++++++++-------- .../health/RabbitHealthIndicatorTests.java | 2 +- .../rabbitmq}/metrics/RabbitMetricsTests.java | 2 +- .../src/test/resources/logback-test.xml | 0 .../boot/rabbitmq}/autoconfigure/test.jks | Bin .../spring-boot-dependencies/build.gradle | 10 +++--- settings.gradle | 8 ++--- .../build.gradle | 6 ++-- .../SampleRabbitApplicationSslTests.java} | 4 +-- .../SampleRabbitApplicationTests.java} | 4 +-- .../rabbitmq}/SecureRabbitMqContainer.java | 2 +- .../rabbitmq/SampleRabbitApplication.java} | 8 ++--- .../main/java/smoketest/rabbitmq}/Sender.java | 2 +- .../smoketest/rabbitmq}/package-info.java | 2 +- .../src/test/resources/ssl/rabbitmq.conf | 0 .../src/test/resources/ssl/test-ca.crt | 0 .../src/test/resources/ssl/test-ca.key | 0 .../src/test/resources/ssl/test-client.crt | 0 .../src/test/resources/ssl/test-client.key | 0 .../src/test/resources/ssl/test-server.crt | 0 .../src/test/resources/ssl/test-server.key | 0 .../build.gradle | 4 +-- .../build.gradle | 4 +-- 110 files changed, 286 insertions(+), 284 deletions(-) delete mode 100644 module/spring-boot-amqp/src/main/resources/META-INF/spring.factories delete mode 100644 module/spring-boot-amqp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename module/{spring-boot-amqp => spring-boot-rabbitmq}/build.gradle (98%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java} (74%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactoryIntegrationTests.java} (78%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java} (78%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java} (74%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq}/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java (91%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactoryIntegrationTests.java} (89%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java} (83%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java} (80%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitMqAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java} (86%) rename module/{spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java => spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java} (85%) rename module/{spring-boot-amqp => spring-boot-rabbitmq}/src/dockerTest/resources/logback-test.xml (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/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}/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}/client.key (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-and-rabbit-stream-separate-services-compose.yaml => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-and-rabbitmq-stream-separate-services-compose.yaml} (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-and-rabbit-stream-single-service-compose.yaml => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-and-rabbitmq-stream-single-service-compose.yaml} (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-compose.yaml => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-compose.yaml} (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-ssl-compose.yaml => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-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-ssl.conf (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-stream-compose.yaml => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-stream-compose.yaml} (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbit-stream-ssl-compose.yaml => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-stream-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-stream-ssl.conf (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/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}/server.key (100%) rename module/{spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq}/testcontainers/rabbitmq-stream-ssl.conf (100%) rename module/{spring-boot-amqp => spring-boot-rabbitmq}/src/dockerTest/resources/spring.properties (100%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/AbstractConnectionFactoryConfigurer.java (98%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java (96%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/CachingConnectionFactoryConfigurer.java (97%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/ConnectionFactoryCustomizer.java (93%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java (96%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/EnvironmentBuilderCustomizer.java (94%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/PropertiesRabbitConnectionDetails.java (94%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitAnnotationDrivenConfiguration.java (99%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitAutoConfiguration.java (99%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitConnectionDetails.java (97%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java (97%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitListenerRetrySettingsCustomizer.java (94%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitProperties.java (99%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitRetryTemplateSettings.java (95%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitStreamConfiguration.java (96%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitStreamConnectionDetails.java (96%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitStreamTemplateConfigurer.java (97%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitTemplateConfigurer.java (98%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitTemplateCustomizer.java (93%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitTemplateRetrySettingsCustomizer.java (94%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java (96%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/SslBundleRabbitConnectionFactoryBean.java (96%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/health/RabbitHealthContributorAutoConfiguration.java (91%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/health/package-info.java (91%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/metrics/RabbitConnectionFactoryMetricsPostProcessor.java (96%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java (92%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/metrics/package-info.java (91%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/autoconfigure/package-info.java (92%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactory.java} (85%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironment.java => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironment.java} (89%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactory.java => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactory.java} (86%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/docker/compose/package-info.java (92%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/health/RabbitHealthIndicator.java (96%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/health/package-info.java (93%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/metrics/RabbitMetrics.java (96%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/metrics/package-info.java (93%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java (93%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactory.java} (93%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactory.java => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactory.java} (92%) rename module/{spring-boot-amqp/src/main/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq}/testcontainers/package-info.java (92%) rename module/{spring-boot-amqp => spring-boot-rabbitmq}/src/main/resources/META-INF/additional-spring-configuration-metadata.json (100%) create mode 100644 module/spring-boot-rabbitmq/src/main/resources/META-INF/spring.factories create mode 100644 module/spring-boot-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq}/autoconfigure/PropertiesRabbitConnectionDetailsTests.java (95%) rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitAutoConfigurationTests.java (99%) rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitPropertiesTests.java (99%) rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq}/autoconfigure/RabbitStreamConfigurationTests.java (98%) rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq}/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java (89%) rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq}/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java (94%) rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq}/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java (95%) rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironmentTests.java => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironmentTests.java} (57%) rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq}/health/RabbitHealthIndicatorTests.java (98%) rename module/{spring-boot-amqp/src/test/java/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq}/metrics/RabbitMetricsTests.java (97%) rename module/{spring-boot-amqp => spring-boot-rabbitmq}/src/test/resources/logback-test.xml (100%) rename module/{spring-boot-amqp/src/test/resources/org/springframework/boot/amqp => spring-boot-rabbitmq/src/test/resources/org/springframework/boot/rabbitmq}/autoconfigure/test.jks (100%) rename smoke-test/{spring-boot-smoke-test-amqp => spring-boot-smoke-test-rabbitmq}/build.gradle (90%) rename smoke-test/{spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java => spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SampleRabbitApplicationSslTests.java} (97%) rename smoke-test/{spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java => spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SampleRabbitApplicationTests.java} (96%) rename smoke-test/{spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp => spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq}/SecureRabbitMqContainer.java (98%) rename smoke-test/{spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java => spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/SampleRabbitApplication.java} (87%) rename smoke-test/{spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp => spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq}/Sender.java (97%) rename smoke-test/{spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp => spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq}/package-info.java (96%) rename smoke-test/{spring-boot-smoke-test-amqp => spring-boot-smoke-test-rabbitmq}/src/test/resources/ssl/rabbitmq.conf (100%) rename smoke-test/{spring-boot-smoke-test-amqp => spring-boot-smoke-test-rabbitmq}/src/test/resources/ssl/test-ca.crt (100%) rename smoke-test/{spring-boot-smoke-test-amqp => spring-boot-smoke-test-rabbitmq}/src/test/resources/ssl/test-ca.key (100%) rename smoke-test/{spring-boot-smoke-test-amqp => spring-boot-smoke-test-rabbitmq}/src/test/resources/ssl/test-client.crt (100%) rename smoke-test/{spring-boot-smoke-test-amqp => spring-boot-smoke-test-rabbitmq}/src/test/resources/ssl/test-client.key (100%) rename smoke-test/{spring-boot-smoke-test-amqp => spring-boot-smoke-test-rabbitmq}/src/test/resources/ssl/test-server.crt (100%) rename smoke-test/{spring-boot-smoke-test-amqp => spring-boot-smoke-test-rabbitmq}/src/test/resources/ssl/test-server.key (100%) rename starter/{spring-boot-starter-amqp-test => spring-boot-starter-rabbitmq-test}/build.gradle (85%) rename starter/{spring-boot-starter-amqp => spring-boot-starter-rabbitmq}/build.gradle (86%) diff --git a/documentation/spring-boot-docs/build.gradle b/documentation/spring-boot-docs/build.gradle index e3692e7a2d1..86ccc81a567 100644 --- a/documentation/spring-boot-docs/build.gradle +++ b/documentation/spring-boot-docs/build.gradle @@ -94,7 +94,6 @@ dependencies { implementation(project(path: ":loader:spring-boot-loader-tools")) implementation(project(path: ":module:spring-boot-actuator")) implementation(project(path: ":module:spring-boot-actuator-autoconfigure")) - implementation(project(path: ":module:spring-boot-amqp")) implementation(project(path: ":module:spring-boot-cache")) implementation(project(path: ":module:spring-boot-cache-test")) implementation(project(path: ":module:spring-boot-data-cassandra")) @@ -130,6 +129,7 @@ dependencies { implementation(project(path: ":module:spring-boot-micrometer-metrics")) implementation(project(path: ":module:spring-boot-persistence")) implementation(project(path: ":module:spring-boot-r2dbc")) + implementation(project(path: ":module:spring-boot-rabbitmq")) implementation(project(path: ":module:spring-boot-restdocs")) implementation(project(path: ":module:spring-boot-reactor-netty")) implementation(project(path: ":module:spring-boot-restclient")) diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc index 26091564a6d..6943f9ac0a3 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/actuator/endpoints.adoc @@ -673,7 +673,7 @@ with the `key` listed in the following table: | Always responds with `UP`. | `rabbit` -| javadoc:org.springframework.boot.amqp.health.RabbitHealthIndicator[] +| javadoc:org.springframework.boot.rabbitmq.health.RabbitHealthIndicator[] | Checks that a Rabbit server is up. | `redis` diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc index 592ef98102c..d73f66e962e 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/features/dev-services.adoc @@ -125,10 +125,10 @@ The following service connections are currently supported: | javadoc:org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails[] | Containers named "clickhouse/clickhouse-server", "gvenzl/oracle-free", "gvenzl/oracle-xe", "mariadb", "mssql/server", "mysql", or "postgres" -| javadoc:org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails[] +| javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails[] | Containers named "rabbitmq" with container port 5672 mapped -| javadoc:org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails[] +| javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails[] | Containers named "rabbitmq" with container port 5552 mapped, or port 5551 mapped when SSL is configured | javadoc:org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails[] diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/messaging/amqp.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/messaging/amqp.adoc index aaa67268da6..3864f7ebe9e 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/messaging/amqp.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/messaging/amqp.adoc @@ -3,7 +3,7 @@ The Advanced Message Queuing Protocol (AMQP) is a platform-neutral, wire-level protocol for message-oriented middleware. The Spring AMQP project applies core Spring concepts to the development of AMQP-based messaging solutions. -Spring Boot offers several conveniences for working with AMQP through RabbitMQ, including the `spring-boot-starter-amqp` starter. +Spring Boot offers several conveniences for working with AMQP through RabbitMQ, including the `spring-boot-starter-rabbitmq` starter. @@ -38,12 +38,12 @@ spring: NOTE: When specifying addresses that way, the `host` and `port` properties are ignored. If the address uses the `amqps` protocol, SSL support is enabled automatically. -See javadoc:org.springframework.boot.amqp.autoconfigure.RabbitProperties[] for more of the supported property-based configuration options. -To configure lower-level details of the RabbitMQ javadoc:com.rabbitmq.client.ConnectionFactory[] that is used by Spring AMQP, define a javadoc:org.springframework.boot.amqp.autoconfigure.ConnectionFactoryCustomizer[] bean. +See javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitProperties[] for more of the supported property-based configuration options. +To configure lower-level details of the RabbitMQ javadoc:com.rabbitmq.client.ConnectionFactory[] that is used by Spring AMQP, define a javadoc:org.springframework.boot.rabbitmq.autoconfigure.ConnectionFactoryCustomizer[] bean. If a javadoc:org.springframework.amqp.rabbit.connection.ConnectionNameStrategy[] bean exists in the context, it will be automatically used to name connections created by the auto-configured javadoc:org.springframework.amqp.rabbit.connection.CachingConnectionFactory[]. -To make an application-wide, additive customization to the javadoc:org.springframework.amqp.rabbit.core.RabbitTemplate[], use a javadoc:org.springframework.boot.amqp.autoconfigure.RabbitTemplateCustomizer[] bean. +To make an application-wide, additive customization to the javadoc:org.springframework.amqp.rabbit.core.RabbitTemplate[], use a javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitTemplateCustomizer[] bean. TIP: See https://spring.io/blog/2010/06/14/understanding-amqp-the-protocol-used-by-rabbitmq/[Understanding AMQP, the protocol used by RabbitMQ] for more details. @@ -74,9 +74,9 @@ spring: ---- Retries are disabled by default. -You can also customize the javadoc:org.springframework.core.retry.RetryTemplate[] programmatically by declaring a javadoc:org.springframework.boot.amqp.autoconfigure.RabbitTemplateRetrySettingsCustomizer[] bean. +You can also customize the javadoc:org.springframework.core.retry.RetryTemplate[] programmatically by declaring a javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitTemplateRetrySettingsCustomizer[] bean. -If you need to create more javadoc:org.springframework.amqp.rabbit.core.RabbitTemplate[] instances or if you want to override the default, Spring Boot provides a javadoc:org.springframework.boot.amqp.autoconfigure.RabbitTemplateConfigurer[] bean that you can use to initialize a javadoc:org.springframework.amqp.rabbit.core.RabbitTemplate[] with the same settings as the factories used by the auto-configuration. +If you need to create more javadoc:org.springframework.amqp.rabbit.core.RabbitTemplate[] instances or if you want to override the default, Spring Boot provides a javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitTemplateConfigurer[] bean that you can use to initialize a javadoc:org.springframework.amqp.rabbit.core.RabbitTemplate[] with the same settings as the factories used by the auto-configuration. If there's a bean of type javadoc:org.springframework.amqp.rabbit.support.micrometer.RabbitTemplateObservationConvention[] in the context, it will automatically be configured on the javadoc:org.springframework.amqp.rabbit.core.RabbitTemplate[]. @@ -97,7 +97,7 @@ spring: If a javadoc:org.springframework.amqp.support.converter.MessageConverter[], javadoc:org.springframework.rabbit.stream.support.converter.StreamMessageConverter[], javadoc:org.springframework.rabbit.stream.producer.ProducerCustomizer[] or javadoc:org.springframework.rabbit.stream.micrometer.RabbitStreamTemplateObservationConvention[] bean is defined, it is associated automatically to the auto-configured javadoc:org.springframework.rabbit.stream.producer.RabbitStreamTemplate[]. -If you need to create more javadoc:org.springframework.rabbit.stream.producer.RabbitStreamTemplate[] instances or if you want to override the default, Spring Boot provides a javadoc:org.springframework.boot.amqp.autoconfigure.RabbitStreamTemplateConfigurer[] bean that you can use to initialize a javadoc:org.springframework.rabbit.stream.producer.RabbitStreamTemplate[] with the same settings as the factories used by the auto-configuration. +If you need to create more javadoc:org.springframework.rabbit.stream.producer.RabbitStreamTemplate[] instances or if you want to override the default, Spring Boot provides a javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamTemplateConfigurer[] bean that you can use to initialize a javadoc:org.springframework.rabbit.stream.producer.RabbitStreamTemplate[] with the same settings as the factories used by the auto-configuration. @@ -120,7 +120,7 @@ include-code::MyBean[] TIP: See javadoc:org.springframework.amqp.rabbit.annotation.EnableRabbit[format=annotation] for more details. -If you need to create more javadoc:org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory[] instances or if you want to override the default, Spring Boot provides a javadoc:org.springframework.boot.amqp.autoconfigure.SimpleRabbitListenerContainerFactoryConfigurer[] and a javadoc:org.springframework.boot.amqp.autoconfigure.DirectRabbitListenerContainerFactoryConfigurer[] that you can use to initialize a javadoc:org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory[] and a javadoc:org.springframework.amqp.rabbit.config.DirectRabbitListenerContainerFactory[] with the same settings as the factories used by the auto-configuration. +If you need to create more javadoc:org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory[] instances or if you want to override the default, Spring Boot provides a javadoc:org.springframework.boot.rabbitmq.autoconfigure.SimpleRabbitListenerContainerFactoryConfigurer[] and a javadoc:org.springframework.boot.rabbitmq.autoconfigure.DirectRabbitListenerContainerFactoryConfigurer[] that you can use to initialize a javadoc:org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory[] and a javadoc:org.springframework.amqp.rabbit.config.DirectRabbitListenerContainerFactory[] with the same settings as the factories used by the auto-configuration. TIP: It does not matter which container type you chose. Those two beans are exposed by the auto-configuration. @@ -137,7 +137,7 @@ You can enable retries to handle situations where your listener throws an except By default, javadoc:org.springframework.amqp.rabbit.retry.RejectAndDontRequeueRecoverer[] is used, but you can define a javadoc:org.springframework.amqp.rabbit.retry.MessageRecoverer[] of your own. When retries are exhausted, the message is rejected and either dropped or routed to a dead-letter exchange if the broker is configured to do so. By default, retries are disabled. -You can also customize the javadoc:org.springframework.core.retry.RetryPolicy[] programmatically by declaring a javadoc:org.springframework.boot.amqp.autoconfigure.RabbitListenerRetrySettingsCustomizer[] bean. +You can also customize the javadoc:org.springframework.core.retry.RetryPolicy[] programmatically by declaring a javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitListenerRetrySettingsCustomizer[] bean. IMPORTANT: By default, if retries are disabled and the listener throws an exception, the delivery is retried indefinitely. You can modify this behavior in two ways: Set the `defaultRequeueRejected` property to `false` so that zero re-deliveries are attempted or throw an javadoc:org.springframework.amqp.AmqpRejectAndDontRequeueException[] to signal the message should be rejected. diff --git a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc index 4142d8eead4..e5d6ef85271 100644 --- a/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc +++ b/documentation/spring-boot-docs/src/docs/antora/modules/reference/pages/testing/testcontainers.adoc @@ -179,11 +179,11 @@ javadoc:org.testcontainers.clickhouse.ClickHouseContainer[], javadoc:{url-testcontainers-mariadb-javadoc}/org.testcontainers.mariadb.MariaDBContainer[], javadoc:{url-testcontainers-mssqlserver-javadoc}/org.testcontainers.mssqlserver.MSSQLServerContainer[], javadoc:{url-testcontainers-mysql-javadoc}/org.testcontainers.mysql.MySQLContainer[], javadoc:org.testcontainers.oracle.OracleContainer[OracleContainer (free)], javadoc:{url-testcontainers-oracle-xe-javadoc}/org.testcontainers.containers.OracleContainer[OracleContainer (XE)] or javadoc:{url-testcontainers-postgresql-javadoc}/org.testcontainers.postgresql.PostgreSQLContainer[] -| javadoc:org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails[] +| javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails[] | Containers of type javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.rabbitmq.RabbitMQContainer[] -| javadoc:org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails[] -| Containers of type javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.rabbitmq.RabbitMQContainer[] when the `@ServiceConnection` `type` attribute includes javadoc:org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails[] +| javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails[] +| Containers of type javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.rabbitmq.RabbitMQContainer[] when the `@ServiceConnection` `type` attribute includes javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails[] | javadoc:org.springframework.boot.data.redis.autoconfigure.DataRedisConnectionDetails[] | Containers of type javadoc:com.redis.testcontainers.RedisContainer[] or javadoc:com.redis.testcontainers.RedisStackContainer[], or containers named "redis", "redis/redis-stack" or "redis/redis-stack-server" @@ -194,12 +194,12 @@ javadoc:org.testcontainers.oracle.OracleContainer[OracleContainer (free)], javad [TIP] ==== -By default, with the exception of javadoc:org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails[], all applicable connection details beans will be created for a given javadoc:org.testcontainers.containers.Container[]. +By default, with the exception of javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails[], all applicable connection details beans will be created for a given javadoc:org.testcontainers.containers.Container[]. For example, a javadoc:{url-testcontainers-postgresql-javadoc}/org.testcontainers.postgresql.PostgreSQLContainer[] will create both javadoc:org.springframework.boot.jdbc.autoconfigure.JdbcConnectionDetails[] and javadoc:org.springframework.boot.r2dbc.autoconfigure.R2dbcConnectionDetails[]. If you want to create only a subset of the applicable types, you can use the `type` attribute of javadoc:org.springframework.boot.testcontainers.service.connection.ServiceConnection[format=annotation]. -To create a javadoc:org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails[] bean from a javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.rabbitmq.RabbitMQContainer[], you must opt in using the `type` attribute of javadoc:org.springframework.boot.testcontainers.service.connection.ServiceConnection[format=annotation]. +To create a javadoc:org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails[] bean from a javadoc:{url-testcontainers-rabbitmq-javadoc}/org.testcontainers.rabbitmq.RabbitMQContainer[], you must opt in using the `type` attribute of javadoc:org.springframework.boot.testcontainers.service.connection.ServiceConnection[format=annotation]. The container must also expose port 5552, or port 5551 when SSL is configured, for RabbitMQ Streams. ==== diff --git a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/messaging/amqp/receiving/custom/MyRabbitConfiguration.java b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/messaging/amqp/receiving/custom/MyRabbitConfiguration.java index e109d5de244..172c9cbba0d 100644 --- a/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/messaging/amqp/receiving/custom/MyRabbitConfiguration.java +++ b/documentation/spring-boot-docs/src/main/java/org/springframework/boot/docs/messaging/amqp/receiving/custom/MyRabbitConfiguration.java @@ -18,7 +18,7 @@ package org.springframework.boot.docs.messaging.amqp.receiving.custom; import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.boot.amqp.autoconfigure.SimpleRabbitListenerContainerFactoryConfigurer; +import org.springframework.boot.rabbitmq.autoconfigure.SimpleRabbitListenerContainerFactoryConfigurer; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/messaging/amqp/receiving/custom/MyRabbitConfiguration.kt b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/messaging/amqp/receiving/custom/MyRabbitConfiguration.kt index 4f1c80f3866..95ca6f61003 100644 --- a/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/messaging/amqp/receiving/custom/MyRabbitConfiguration.kt +++ b/documentation/spring-boot-docs/src/main/kotlin/org/springframework/boot/docs/messaging/amqp/receiving/custom/MyRabbitConfiguration.kt @@ -19,7 +19,7 @@ package org.springframework.boot.docs.messaging.amqp.receiving.custom import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory import org.springframework.amqp.rabbit.connection.CachingConnectionFactory import org.springframework.amqp.rabbit.connection.ConnectionFactory -import org.springframework.boot.amqp.autoconfigure.SimpleRabbitListenerContainerFactoryConfigurer +import org.springframework.boot.rabbitmq.autoconfigure.SimpleRabbitListenerContainerFactoryConfigurer import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/module/spring-boot-amqp/src/main/resources/META-INF/spring.factories b/module/spring-boot-amqp/src/main/resources/META-INF/spring.factories deleted file mode 100644 index 17fb2095415..00000000000 --- a/module/spring-boot-amqp/src/main/resources/META-INF/spring.factories +++ /dev/null @@ -1,8 +0,0 @@ -# Connection Details Factories -org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\ -org.springframework.boot.amqp.docker.compose.RabbitDockerComposeConnectionDetailsFactory,\ -org.springframework.boot.amqp.docker.compose.RabbitStreamDockerComposeConnectionDetailsFactory,\ -org.springframework.boot.amqp.testcontainers.DeprecatedRabbitContainerConnectionDetailsFactory,\ -org.springframework.boot.amqp.testcontainers.RabbitContainerConnectionDetailsFactory,\ -org.springframework.boot.amqp.testcontainers.RabbitStreamContainerConnectionDetailsFactory - diff --git a/module/spring-boot-amqp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-amqp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index daf8ae3ba45..00000000000 --- a/module/spring-boot-amqp/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1,3 +0,0 @@ -org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration -org.springframework.boot.amqp.autoconfigure.health.RabbitHealthContributorAutoConfiguration -org.springframework.boot.amqp.autoconfigure.metrics.RabbitMetricsAutoConfiguration \ No newline at end of file diff --git a/module/spring-boot-autoconfigure-classic-modules/build.gradle b/module/spring-boot-autoconfigure-classic-modules/build.gradle index 461466400f4..88fdf6e2a8c 100644 --- a/module/spring-boot-autoconfigure-classic-modules/build.gradle +++ b/module/spring-boot-autoconfigure-classic-modules/build.gradle @@ -28,9 +28,6 @@ dependencies { api(project(":module:spring-boot-activemq")) { transitive = false } - api(project(":module:spring-boot-amqp")) { - transitive = false - } api(project(":module:spring-boot-artemis")) { transitive = false } @@ -226,6 +223,9 @@ dependencies { api(project(":module:spring-boot-r2dbc")) { transitive = false } + api(project(":module:spring-boot-rabbitmq")) { + transitive = false + } api(project(":module:spring-boot-reactor")) { transitive = false } diff --git a/module/spring-boot-amqp/build.gradle b/module/spring-boot-rabbitmq/build.gradle similarity index 98% rename from module/spring-boot-amqp/build.gradle rename to module/spring-boot-rabbitmq/build.gradle index d264876a319..e36a07f0ef7 100644 --- a/module/spring-boot-amqp/build.gradle +++ b/module/spring-boot-rabbitmq/build.gradle @@ -23,7 +23,7 @@ plugins { id "org.springframework.boot.optional-dependencies" } -description = "Spring Boot AMQP" +description = "Spring Boot RabbitMQ" dependencies { api(project(":core:spring-boot")) diff --git a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 74% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java index 5b1c7797bba..0c4902328af 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package org.springframework.boot.amqp.docker.compose; +package org.springframework.boot.rabbitmq.docker.compose; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; 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.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; 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-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 78% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactoryIntegrationTests.java index 4d644b742e4..fb482a6cbb8 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -14,33 +14,33 @@ * limitations under the License. */ -package org.springframework.boot.amqp.docker.compose; +package org.springframework.boot.rabbitmq.docker.compose; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address; 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; /** - * 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-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 78% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java index 67f8fad358e..1a4d0fdf981 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -14,28 +14,28 @@ * limitations under the License. */ -package org.springframework.boot.amqp.docker.compose; +package org.springframework.boot.rabbitmq.docker.compose; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; import org.springframework.boot.docker.compose.service.connection.test.DockerComposeTest; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; import org.springframework.boot.ssl.SslBundle; 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-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java similarity index 74% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java index d9f077bc21c..af67b52c44b 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/docker/compose/SingleServiceRabbitAndRabbitStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/docker/compose/SingleServiceRabbitAndRabbitMqStreamDockerComposeConnectionDetailsFactoryIntegrationTests.java @@ -14,26 +14,27 @@ * limitations under the License. */ -package org.springframework.boot.amqp.docker.compose; +package org.springframework.boot.rabbitmq.docker.compose; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; 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.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; 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-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java similarity index 91% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java index 51e32711184..61b0a43c531 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import java.time.Duration; import java.util.ArrayList; @@ -30,9 +30,9 @@ import org.springframework.amqp.rabbit.annotation.Queue; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; @@ -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-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactoryIntegrationTests.java similarity index 89% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactoryIntegrationTests.java index ea80da8d9bf..0de6be2fad4 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import java.time.Duration; import java.util.ArrayList; @@ -30,9 +30,9 @@ import org.springframework.amqp.rabbit.annotation.Queue; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.testcontainers.service.connection.ServiceConnection; import org.springframework.boot.testsupport.container.TestImage; import org.springframework.context.annotation.Bean; @@ -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-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java similarity index 83% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java index 1e65d213f2a..3f3981b727d 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import java.time.Duration; import java.util.ArrayList; @@ -31,13 +31,13 @@ import org.testcontainers.rabbitmq.RabbitMQContainer; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.amqp.autoconfigure.EnvironmentBuilderCustomizer; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; -import org.springframework.boot.amqp.testcontainers.RabbitContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; -import org.springframework.boot.amqp.testcontainers.RabbitStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.EnvironmentBuilderCustomizer; +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.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-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java similarity index 80% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java index d439b0fdbf4..c13ddc3eae7 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamWithSslContainerConnectionDetailsFactoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import java.time.Duration; import java.util.ArrayList; @@ -32,13 +32,13 @@ import org.testcontainers.utility.MountableFile; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.amqp.autoconfigure.EnvironmentBuilderCustomizer; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; -import org.springframework.boot.amqp.testcontainers.RabbitContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; -import org.springframework.boot.amqp.testcontainers.RabbitStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.EnvironmentBuilderCustomizer; +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.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,15 +62,15 @@ 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; @Container @ServiceConnection(type = RabbitStreamConnectionDetails.class) - @PemTrustStore(certificate = "classpath:org/springframework/boot/amqp/ca.crt") - @PemKeyStore(certificate = "classpath:org/springframework/boot/amqp/client.crt", - privateKey = "classpath:org/springframework/boot/amqp/client.key") + @PemTrustStore(certificate = "classpath:org/springframework/boot/rabbitmq/ca.crt") + @PemKeyStore(certificate = "classpath:org/springframework/boot/rabbitmq/client.crt", + privateKey = "classpath:org/springframework/boot/rabbitmq/client.key") static final RabbitMQContainer rabbit = getRabbitMqStreamContainer(); private static RabbitMQContainer getRabbitMqStreamContainer() { @@ -80,15 +80,15 @@ class RabbitStreamWithSslContainerConnectionDetailsFactoryIntegrationTests { container.withCopyToContainer(Transferable.of(enabledPlugins), "/etc/rabbitmq/enabled_plugins"); container.withCopyFileToContainer( MountableFile - .forClasspathResource("org/springframework/boot/amqp/testcontainers/rabbitmq-stream-ssl.conf"), + .forClasspathResource("org/springframework/boot/rabbitmq/testcontainers/rabbitmq-stream-ssl.conf"), "/etc/rabbitmq/rabbitmq.conf"); - container.withCopyFileToContainer(MountableFile.forClasspathResource("org/springframework/boot/amqp/ca.crt"), - "/etc/rabbitmq/ca.crt"); container.withCopyFileToContainer( - MountableFile.forClasspathResource("org/springframework/boot/amqp/server.key"), + MountableFile.forClasspathResource("org/springframework/boot/rabbitmq/ca.crt"), "/etc/rabbitmq/ca.crt"); + container.withCopyFileToContainer( + MountableFile.forClasspathResource("org/springframework/boot/rabbitmq/server.key"), "/etc/rabbitmq/server.key"); container.withCopyFileToContainer( - MountableFile.forClasspathResource("org/springframework/boot/amqp/server.crt"), + MountableFile.forClasspathResource("org/springframework/boot/rabbitmq/server.crt"), "/etc/rabbitmq/server.crt"); return container; } diff --git a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitMqAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java similarity index 86% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitMqAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java index 778f6536bd5..099cd381686 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SeparateContainersRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SeparateContainersRabbitMqAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -35,13 +35,13 @@ import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.amqp.autoconfigure.EnvironmentBuilderCustomizer; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; -import org.springframework.boot.amqp.testcontainers.RabbitContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; -import org.springframework.boot.amqp.testcontainers.RabbitStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.EnvironmentBuilderCustomizer; +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.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-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java similarity index 85% rename from module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java rename to module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java index 6dc8b12291c..686a447bc2e 100644 --- a/module/spring-boot-amqp/src/dockerTest/java/org/springframework/boot/amqp/testcontainers/SingleContainerRabbitAndRabbitStreamContainerConnectionDetailsFactoryIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/dockerTest/java/org/springframework/boot/rabbitmq/testcontainers/SingleContainerRabbitAndRabbitMqStreamContainerConnectionDetailsFactoryIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import java.nio.charset.StandardCharsets; import java.time.Duration; @@ -35,13 +35,13 @@ import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.annotation.RabbitListener; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.amqp.autoconfigure.EnvironmentBuilderCustomizer; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; -import org.springframework.boot.amqp.testcontainers.RabbitContainerConnectionDetailsFactory.RabbitMqContainerConnectionDetails; -import org.springframework.boot.amqp.testcontainers.RabbitStreamContainerConnectionDetailsFactory.RabbitMqStreamContainerConnectionDetails; import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.EnvironmentBuilderCustomizer; +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.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-amqp/src/dockerTest/resources/logback-test.xml b/module/spring-boot-rabbitmq/src/dockerTest/resources/logback-test.xml similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/logback-test.xml rename to module/spring-boot-rabbitmq/src/dockerTest/resources/logback-test.xml diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/ca.crt b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/ca.crt similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/ca.crt rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/ca.crt diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/client.crt b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/client.crt similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/client.crt rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/client.crt diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/client.key b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/client.key similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/client.key rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/client.key diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-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/rabbitmq-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/rabbitmq-ssl-compose.yaml diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq-ssl.conf b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-ssl.conf similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq-ssl.conf rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-ssl.conf diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-amqp/src/dockerTest/resources/org/springframework/boot/amqp/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-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq-stream-ssl.conf b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-stream-ssl.conf similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/docker/compose/rabbitmq-stream-ssl.conf rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/docker/compose/rabbitmq-stream-ssl.conf diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/server.crt b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/server.crt similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/server.crt rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/server.crt diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/server.key b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/server.key similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/server.key rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/server.key diff --git a/module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/testcontainers/rabbitmq-stream-ssl.conf b/module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/testcontainers/rabbitmq-stream-ssl.conf similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/org/springframework/boot/amqp/testcontainers/rabbitmq-stream-ssl.conf rename to module/spring-boot-rabbitmq/src/dockerTest/resources/org/springframework/boot/rabbitmq/testcontainers/rabbitmq-stream-ssl.conf diff --git a/module/spring-boot-amqp/src/dockerTest/resources/spring.properties b/module/spring-boot-rabbitmq/src/dockerTest/resources/spring.properties similarity index 100% rename from module/spring-boot-amqp/src/dockerTest/resources/spring.properties rename to module/spring-boot-rabbitmq/src/dockerTest/resources/spring.properties diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractConnectionFactoryConfigurer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/AbstractConnectionFactoryConfigurer.java similarity index 98% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractConnectionFactoryConfigurer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/AbstractConnectionFactoryConfigurer.java index 07b17ce5a9a..3a0a8a959c6 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractConnectionFactoryConfigurer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/AbstractConnectionFactoryConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.util.stream.Collectors; @@ -33,7 +33,7 @@ import org.springframework.util.Assert; * @author Moritz Halbritter * @author Andy Wilkinson * @author Phillip Webb - * @since 4.0.0 + * @since 4.2.0 */ public abstract class AbstractConnectionFactoryConfigurer { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java similarity index 96% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java index ffed69eda93..16d9d1800ca 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/AbstractRabbitListenerContainerFactoryConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.util.List; import java.util.concurrent.Executor; @@ -28,8 +28,8 @@ import org.springframework.amqp.rabbit.retry.MessageRecoverer; import org.springframework.amqp.rabbit.retry.RejectAndDontRequeueRecoverer; import org.springframework.amqp.rabbit.support.micrometer.RabbitListenerObservationConvention; import org.springframework.amqp.support.converter.MessageConverter; -import org.springframework.boot.amqp.autoconfigure.RabbitProperties.ListenerRetry; -import org.springframework.boot.amqp.autoconfigure.RabbitProperties.Retry; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitProperties.ListenerRetry; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitProperties.Retry; import org.springframework.boot.retry.RetryPolicySettings; import org.springframework.core.retry.RetryPolicy; import org.springframework.util.Assert; @@ -41,7 +41,7 @@ import org.springframework.util.Assert; * @param the container factory type. * @author Gary Russell * @author Stephane Nicoll - * @since 4.0.0 + * @since 4.2.0 */ public abstract class AbstractRabbitListenerContainerFactoryConfigurer> { @@ -102,7 +102,7 @@ public abstract class AbstractRabbitListenerContainerFactoryConfigurer { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/ConnectionFactoryCustomizer.java similarity index 93% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/ConnectionFactoryCustomizer.java index 15f2e14dfff..3efbfc5ef51 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/ConnectionFactoryCustomizer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/ConnectionFactoryCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import com.rabbitmq.client.ConnectionFactory; @@ -23,7 +23,7 @@ import com.rabbitmq.client.ConnectionFactory; * {@link ConnectionFactory} to fine-tune its auto-configuration. * * @author Andy Wilkinson - * @since 4.0.0 + * @since 4.2.0 */ @FunctionalInterface public interface ConnectionFactoryCustomizer { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java similarity index 96% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java index e4057b5c2ec..54590c07c78 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/DirectRabbitListenerContainerFactoryConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.springframework.amqp.rabbit.config.DirectRabbitListenerContainerFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; @@ -30,7 +30,7 @@ import org.springframework.boot.context.properties.PropertyMapper; * * @author Gary Russell * @author Stephane Nicoll - * @since 4.0.0 + * @since 4.2.0 */ public final class DirectRabbitListenerContainerFactoryConfigurer extends AbstractRabbitListenerContainerFactoryConfigurer { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/EnvironmentBuilderCustomizer.java similarity index 94% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/EnvironmentBuilderCustomizer.java index 8d5f2373cd8..52ac68749ff 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/EnvironmentBuilderCustomizer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/EnvironmentBuilderCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import com.rabbitmq.stream.Environment; import com.rabbitmq.stream.EnvironmentBuilder; @@ -25,7 +25,7 @@ import com.rabbitmq.stream.EnvironmentBuilder; * {@link Environment}. * * @author Andy Wilkinson - * @since 4.0.0 + * @since 4.2.0 */ @FunctionalInterface public interface EnvironmentBuilderCustomizer { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetails.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/PropertiesRabbitConnectionDetails.java similarity index 94% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetails.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/PropertiesRabbitConnectionDetails.java index e15052bf330..3e3900f8a47 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetails.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/PropertiesRabbitConnectionDetails.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.util.ArrayList; import java.util.List; import org.jspecify.annotations.Nullable; -import org.springframework.boot.amqp.autoconfigure.RabbitProperties.Ssl; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitProperties.Ssl; import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.ssl.SslBundles; import org.springframework.util.Assert; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAnnotationDrivenConfiguration.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitAnnotationDrivenConfiguration.java similarity index 99% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAnnotationDrivenConfiguration.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitAnnotationDrivenConfiguration.java index 2c1b260abe0..a2e01ef3942 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAnnotationDrivenConfiguration.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitAnnotationDrivenConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.springframework.amqp.rabbit.annotation.EnableRabbit; import org.springframework.amqp.rabbit.config.ContainerCustomizer; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitAutoConfiguration.java similarity index 99% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitAutoConfiguration.java index e6f98bcbd2a..001aef04c19 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitAutoConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import com.rabbitmq.client.Channel; import com.rabbitmq.client.impl.CredentialsProvider; @@ -72,7 +72,7 @@ import org.springframework.core.io.ResourceLoader; * @author Moritz Halbritter * @author Andy Wilkinson * @author Scott Frederick - * @since 4.0.0 + * @since 4.2.0 */ @AutoConfiguration @ConditionalOnClass({ RabbitTemplate.class, Channel.class }) diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionDetails.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitConnectionDetails.java similarity index 97% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionDetails.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitConnectionDetails.java index d6cb1be0512..80c7a510896 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionDetails.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitConnectionDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.util.List; @@ -30,7 +30,7 @@ import org.springframework.util.Assert; * @author Moritz Halbritter * @author Andy Wilkinson * @author Phillip Webb - * @since 4.0.0 + * @since 4.2.0 */ public interface RabbitConnectionDetails extends ConnectionDetails { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java similarity index 97% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java index 4657603a65f..c44e3e3b526 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitConnectionFactoryBeanConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.time.Duration; @@ -23,8 +23,8 @@ import com.rabbitmq.client.impl.CredentialsRefreshService; import org.jspecify.annotations.Nullable; import org.springframework.amqp.rabbit.connection.RabbitConnectionFactoryBean; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address; import org.springframework.boot.context.properties.PropertyMapper; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails.Address; import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.ssl.SslBundles; import org.springframework.core.io.ResourceLoader; @@ -44,7 +44,7 @@ import org.springframework.util.unit.DataSize; * @author Andy Wilkinson * @author Phillip Webb * @author Scott Frederick - * @since 4.0.0 + * @since 4.2.0 */ public class RabbitConnectionFactoryBeanConfigurer { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitListenerRetrySettingsCustomizer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitListenerRetrySettingsCustomizer.java similarity index 94% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitListenerRetrySettingsCustomizer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitListenerRetrySettingsCustomizer.java index 8a3bc26dd23..e8a5bf42b27 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitListenerRetrySettingsCustomizer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitListenerRetrySettingsCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.springframework.boot.retry.RetryPolicySettings; import org.springframework.core.retry.RetryPolicy; @@ -24,7 +24,7 @@ import org.springframework.core.retry.RetryPolicy; * settings} used by message listeners. * * @author Stephane Nicoll - * @since 4.0.0 + * @since 4.2.0 * @see RetryPolicy */ @FunctionalInterface diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitProperties.java similarity index 99% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitProperties.java index c23d7879829..48449dca89e 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitProperties.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitProperties.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.time.Duration; import java.time.temporal.ChronoUnit; @@ -53,7 +53,7 @@ import org.springframework.util.unit.DataSize; * @author Lasse Wulff * @author Yanming Zhou * @author Jay Choi - * @since 4.0.0 + * @since 4.2.0 */ @ConfigurationProperties("spring.rabbitmq") public class RabbitProperties { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitRetryTemplateSettings.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitRetryTemplateSettings.java similarity index 95% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitRetryTemplateSettings.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitRetryTemplateSettings.java index 8e29c1d440e..97d6961575b 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitRetryTemplateSettings.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitRetryTemplateSettings.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.util.LinkedList; @@ -26,7 +26,7 @@ import org.springframework.core.retry.RetryTemplate; * Define the settings of a {@link RetryTemplate}. * * @author Stephane Nicoll - * @since 4.0.0 + * @since 4.2.0 */ public class RabbitRetryTemplateSettings { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfiguration.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamConfiguration.java similarity index 96% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfiguration.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamConfiguration.java index 416a23d8196..e2545e8f7d6 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfiguration.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import javax.net.ssl.SSLException; @@ -27,13 +27,13 @@ import org.jspecify.annotations.Nullable; import org.springframework.amqp.rabbit.config.ContainerCustomizer; import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.beans.factory.ObjectProvider; -import org.springframework.boot.amqp.autoconfigure.RabbitProperties.Stream; -import org.springframework.boot.amqp.autoconfigure.RabbitProperties.Stream.Ssl; -import org.springframework.boot.amqp.autoconfigure.RabbitProperties.StreamContainer; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.boot.context.properties.PropertyMapper; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitProperties.Stream; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitProperties.Stream.Ssl; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitProperties.StreamContainer; import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.ssl.SslBundles; import org.springframework.boot.ssl.SslManagerBundle; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConnectionDetails.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamConnectionDetails.java similarity index 96% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConnectionDetails.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamConnectionDetails.java index 5de8fc8301c..e37512cae9a 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConnectionDetails.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamConnectionDetails.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.jspecify.annotations.Nullable; @@ -26,7 +26,7 @@ import org.springframework.boot.ssl.SslBundle; * * @author Eddú Meléndez * @author Jay Choi - * @since 4.1.0 + * @since 4.2.0 */ public interface RabbitStreamConnectionDetails extends ConnectionDetails { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamTemplateConfigurer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamTemplateConfigurer.java similarity index 97% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamTemplateConfigurer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamTemplateConfigurer.java index fe7306d3e47..52ddf6e8150 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamTemplateConfigurer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamTemplateConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.jspecify.annotations.Nullable; @@ -32,7 +32,7 @@ import org.springframework.rabbit.stream.support.converter.StreamMessageConverte * auto-configuration. * * @author Eddú Meléndez - * @since 4.0.0 + * @since 4.2.0 */ public class RabbitStreamTemplateConfigurer { @@ -73,7 +73,7 @@ public class RabbitStreamTemplateConfigurer { /** * Set the observation convention to use. * @param observationConvention the observation convention to use - * @since 4.1.0 + * @since 4.2.0 */ public void setObservationConvention(@Nullable RabbitStreamTemplateObservationConvention observationConvention) { this.observationConvention = observationConvention; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitTemplateConfigurer.java similarity index 98% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitTemplateConfigurer.java index 52823cb48d9..252f2b7afcc 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateConfigurer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitTemplateConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.time.Duration; import java.util.List; @@ -45,7 +45,7 @@ import org.springframework.util.CollectionUtils; * * @author Stephane Nicoll * @author Yanming Zhou - * @since 4.0.0 + * @since 4.2.0 */ public class RabbitTemplateConfigurer { @@ -87,7 +87,7 @@ public class RabbitTemplateConfigurer { /** * Sets the observation convention to use. * @param observationConvention the observation convention to use - * @since 4.1.0 + * @since 4.2.0 */ public void setObservationConvention(@Nullable RabbitTemplateObservationConvention observationConvention) { this.observationConvention = observationConvention; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateCustomizer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitTemplateCustomizer.java similarity index 93% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateCustomizer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitTemplateCustomizer.java index 9015fa8ca49..a75614857bc 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateCustomizer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitTemplateCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.springframework.amqp.rabbit.core.RabbitTemplate; @@ -22,7 +22,7 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate; * Callback interface that can be used to customize a {@link RabbitTemplate}. * * @author dang zhicairang - * @since 4.0.0 + * @since 4.2.0 */ @FunctionalInterface public interface RabbitTemplateCustomizer { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateRetrySettingsCustomizer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitTemplateRetrySettingsCustomizer.java similarity index 94% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateRetrySettingsCustomizer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitTemplateRetrySettingsCustomizer.java index 099b510132b..d72ad89c47b 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitTemplateRetrySettingsCustomizer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitTemplateRetrySettingsCustomizer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.core.retry.RetryTemplate; @@ -24,7 +24,7 @@ import org.springframework.core.retry.RetryTemplate; * {@linkplain RabbitRetryTemplateSettings retry settings} used by {@link RabbitTemplate}. * * @author Stephane Nicoll - * @since 4.0.0 + * @since 4.2.0 * @see RabbitTemplateConfigurer * @see RetryTemplate */ diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java similarity index 96% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java index 10fac5395c1..ecc05752b1f 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/SimpleRabbitListenerContainerFactoryConfigurer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; @@ -30,7 +30,7 @@ import org.springframework.boot.context.properties.PropertyMapper; * * @author Stephane Nicoll * @author Gary Russell - * @since 4.0.0 + * @since 4.2.0 */ public final class SimpleRabbitListenerContainerFactoryConfigurer extends AbstractRabbitListenerContainerFactoryConfigurer { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SslBundleRabbitConnectionFactoryBean.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/SslBundleRabbitConnectionFactoryBean.java similarity index 96% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SslBundleRabbitConnectionFactoryBean.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/SslBundleRabbitConnectionFactoryBean.java index d681e44e11d..c3f0b389ea9 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/SslBundleRabbitConnectionFactoryBean.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/SslBundleRabbitConnectionFactoryBean.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.jspecify.annotations.Nullable; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfiguration.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/health/RabbitHealthContributorAutoConfiguration.java similarity index 91% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfiguration.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/health/RabbitHealthContributorAutoConfiguration.java index 0abccb7e34c..29a48116119 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfiguration.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/health/RabbitHealthContributorAutoConfiguration.java @@ -14,12 +14,10 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure.health; +package org.springframework.boot.rabbitmq.autoconfigure.health; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; -import org.springframework.boot.amqp.health.RabbitHealthIndicator; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; @@ -28,13 +26,15 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean import org.springframework.boot.health.autoconfigure.contributor.CompositeHealthContributorConfiguration; import org.springframework.boot.health.autoconfigure.contributor.ConditionalOnEnabledHealthIndicator; import org.springframework.boot.health.contributor.HealthContributor; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; +import org.springframework.boot.rabbitmq.health.RabbitHealthIndicator; import org.springframework.context.annotation.Bean; /** * {@link EnableAutoConfiguration Auto-configuration} for {@link RabbitHealthIndicator}. * * @author Christian Dupuis - * @since 4.0.0 + * @since 4.2.0 */ @AutoConfiguration(after = RabbitAutoConfiguration.class) @ConditionalOnClass({ RabbitHealthIndicator.class, RabbitTemplate.class, ConditionalOnEnabledHealthIndicator.class }) diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/health/package-info.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/health/package-info.java similarity index 91% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/health/package-info.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/health/package-info.java index bbd0d5e86d3..27f98c583ad 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/health/package-info.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/health/package-info.java @@ -18,6 +18,6 @@ * Auto-configuration for RabbitMQ health. */ @NullMarked -package org.springframework.boot.amqp.autoconfigure.health; +package org.springframework.boot.rabbitmq.autoconfigure.health; import org.jspecify.annotations.NullMarked; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitConnectionFactoryMetricsPostProcessor.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitConnectionFactoryMetricsPostProcessor.java similarity index 96% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitConnectionFactoryMetricsPostProcessor.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitConnectionFactoryMetricsPostProcessor.java index 9841b953e93..2f9f18802c7 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitConnectionFactoryMetricsPostProcessor.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitConnectionFactoryMetricsPostProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure.metrics; +package org.springframework.boot.rabbitmq.autoconfigure.metrics; import com.rabbitmq.client.ConnectionFactory; import com.rabbitmq.client.MetricsCollector; @@ -24,7 +24,7 @@ import org.jspecify.annotations.Nullable; import org.springframework.amqp.rabbit.connection.AbstractConnectionFactory; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.boot.amqp.metrics.RabbitMetrics; +import org.springframework.boot.rabbitmq.metrics.RabbitMetrics; import org.springframework.context.ApplicationContext; import org.springframework.core.Ordered; import org.springframework.util.StringUtils; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java similarity index 92% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java index 27b5b6ad36e..9f5756f2ad5 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitMetricsAutoConfiguration.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure.metrics; +package org.springframework.boot.rabbitmq.autoconfigure.metrics; import com.rabbitmq.client.ConnectionFactory; import io.micrometer.core.instrument.MeterRegistry; import org.springframework.amqp.rabbit.connection.AbstractConnectionFactory; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.condition.ConditionalOnBean; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; @@ -33,7 +33,7 @@ import org.springframework.context.annotation.Bean; * {@link ConnectionFactory connection factories}. * * @author Stephane Nicoll - * @since 4.0.0 + * @since 4.2.0 */ @AutoConfiguration( afterName = "org.springframework.boot.micrometer.metrics.autoconfigure.CompositeMeterRegistryAutoConfiguration", diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/package-info.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/package-info.java similarity index 91% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/package-info.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/package-info.java index ab0814c6f72..94b2c885530 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/metrics/package-info.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/package-info.java @@ -18,6 +18,6 @@ * Auto-configuration for RabbitMQ metrics. */ @NullMarked -package org.springframework.boot.amqp.autoconfigure.metrics; +package org.springframework.boot.rabbitmq.autoconfigure.metrics; import org.jspecify.annotations.NullMarked; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/package-info.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/package-info.java similarity index 92% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/package-info.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/package-info.java index b519c35a2ca..8b021e23bb0 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/package-info.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/autoconfigure/package-info.java @@ -18,6 +18,6 @@ * Auto-configuration for RabbitMQ. */ @NullMarked -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import org.jspecify.annotations.NullMarked; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactory.java similarity index 85% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactory.java index daa79344ae7..30b7ab878cb 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitDockerComposeConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqDockerComposeConnectionDetailsFactory.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.springframework.boot.amqp.docker.compose; +package org.springframework.boot.rabbitmq.docker.compose; import java.util.List; import org.jspecify.annotations.Nullable; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; 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.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; import org.springframework.boot.ssl.SslBundle; /** @@ -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-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironment.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironment.java similarity index 89% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironment.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironment.java index bc776b015db..a71a8207ec7 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironment.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironment.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.docker.compose; +package org.springframework.boot.rabbitmq.docker.compose; import java.util.Map; @@ -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-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactory.java similarity index 86% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactory.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactory.java index 6b19483ff4a..9a0b8f22bc3 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/RabbitStreamDockerComposeConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqStreamDockerComposeConnectionDetailsFactory.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package org.springframework.boot.amqp.docker.compose; +package org.springframework.boot.rabbitmq.docker.compose; import org.jspecify.annotations.Nullable; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; 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.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; import org.springframework.boot.ssl.SslBundle; /** @@ -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-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/package-info.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/package-info.java similarity index 92% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/package-info.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/package-info.java index c2d355c0797..7fffb63a7c4 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/docker/compose/package-info.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/docker/compose/package-info.java @@ -18,6 +18,6 @@ * Support for Docker Compose RabbitMQ service connections. */ @NullMarked -package org.springframework.boot.amqp.docker.compose; +package org.springframework.boot.rabbitmq.docker.compose; import org.jspecify.annotations.NullMarked; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/health/RabbitHealthIndicator.java similarity index 96% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/health/RabbitHealthIndicator.java index 045ab2f89c2..28726d12d8e 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/RabbitHealthIndicator.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/health/RabbitHealthIndicator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.health; +package org.springframework.boot.rabbitmq.health; import org.jspecify.annotations.Nullable; @@ -29,7 +29,7 @@ import org.springframework.util.Assert; * RabbitMQ messaging system. * * @author Christian Dupuis - * @since 4.0.0 + * @since 4.2.0 */ public class RabbitHealthIndicator extends AbstractHealthIndicator { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/package-info.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/health/package-info.java similarity index 93% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/package-info.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/health/package-info.java index ecb6ea0b164..83f913732e9 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/health/package-info.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/health/package-info.java @@ -18,6 +18,6 @@ * Health integration for AMQP and RabbitMQ. */ @NullMarked -package org.springframework.boot.amqp.health; +package org.springframework.boot.rabbitmq.health; import org.jspecify.annotations.NullMarked; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/RabbitMetrics.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/metrics/RabbitMetrics.java similarity index 96% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/RabbitMetrics.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/metrics/RabbitMetrics.java index 20ae4111b16..ab7cd3b5f7f 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/RabbitMetrics.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/metrics/RabbitMetrics.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.metrics; +package org.springframework.boot.rabbitmq.metrics; import java.util.Collections; @@ -32,7 +32,7 @@ import org.springframework.util.Assert; * * @author Arnaud Cogoluègnes * @author Stephane Nicoll - * @since 4.0.0 + * @since 4.2.0 */ public class RabbitMetrics implements MeterBinder { diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/package-info.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/metrics/package-info.java similarity index 93% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/package-info.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/metrics/package-info.java index e63026906cd..c40e5aed68f 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/metrics/package-info.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/metrics/package-info.java @@ -18,6 +18,6 @@ * Metrics for AMQP and RabbitMQ. */ @NullMarked -package org.springframework.boot.amqp.metrics; +package org.springframework.boot.rabbitmq.metrics; import org.jspecify.annotations.NullMarked; diff --git a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java similarity index 93% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java index b641c37e439..750d611deb6 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/DeprecatedRabbitContainerConnectionDetailsFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import java.net.URI; import java.util.List; @@ -22,7 +22,7 @@ import java.util.List; import org.jspecify.annotations.Nullable; import org.testcontainers.containers.RabbitMQContainer; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionSource; @@ -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-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactory.java similarity index 93% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactory.java index fd47f98fd47..5e13fc5d999 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitContainerConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqContainerConnectionDetailsFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import java.net.URI; import java.util.List; @@ -22,7 +22,7 @@ import java.util.List; import org.jspecify.annotations.Nullable; import org.testcontainers.rabbitmq.RabbitMQContainer; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails; import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionSource; @@ -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-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactory.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactory.java similarity index 92% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactory.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactory.java index 5fc1321b742..17171157b33 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/RabbitStreamContainerConnectionDetailsFactory.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/RabbitMqStreamContainerConnectionDetailsFactory.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import org.jspecify.annotations.Nullable; import org.testcontainers.rabbitmq.RabbitMQContainer; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConnectionDetails; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConnectionDetails; import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionDetailsFactory; import org.springframework.boot.testcontainers.service.connection.ContainerConnectionSource; @@ -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-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/package-info.java b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/package-info.java similarity index 92% rename from module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/package-info.java rename to module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/package-info.java index 69c6364ef32..272d19a6b98 100644 --- a/module/spring-boot-amqp/src/main/java/org/springframework/boot/amqp/testcontainers/package-info.java +++ b/module/spring-boot-rabbitmq/src/main/java/org/springframework/boot/rabbitmq/testcontainers/package-info.java @@ -18,6 +18,6 @@ * Support for testcontainers RabbitMQ service connections. */ @NullMarked -package org.springframework.boot.amqp.testcontainers; +package org.springframework.boot.rabbitmq.testcontainers; import org.jspecify.annotations.NullMarked; diff --git a/module/spring-boot-amqp/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/module/spring-boot-rabbitmq/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from module/spring-boot-amqp/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to module/spring-boot-rabbitmq/src/main/resources/META-INF/additional-spring-configuration-metadata.json 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 new file mode 100644 index 00000000000..a7a1d458e73 --- /dev/null +++ b/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring.factories @@ -0,0 +1,8 @@ +# Connection Details Factories +org.springframework.boot.autoconfigure.service.connection.ConnectionDetailsFactory=\ +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.RabbitMqContainerConnectionDetailsFactory,\ +org.springframework.boot.rabbitmq.testcontainers.RabbitMqStreamContainerConnectionDetailsFactory + diff --git a/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 00000000000..9ec393f97b3 --- /dev/null +++ b/module/spring-boot-rabbitmq/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,3 @@ +org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration +org.springframework.boot.rabbitmq.autoconfigure.health.RabbitHealthContributorAutoConfiguration +org.springframework.boot.rabbitmq.autoconfigure.metrics.RabbitMetricsAutoConfiguration \ No newline at end of file diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetailsTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/PropertiesRabbitConnectionDetailsTests.java similarity index 95% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetailsTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/PropertiesRabbitConnectionDetailsTests.java index fb37bd6f271..aed57edc4e0 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/PropertiesRabbitConnectionDetailsTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/PropertiesRabbitConnectionDetailsTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.boot.amqp.autoconfigure.RabbitConnectionDetails.Address; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitConnectionDetails.Address; import org.springframework.boot.ssl.DefaultSslBundleRegistry; import org.springframework.boot.ssl.SslBundle; diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfigurationTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitAutoConfigurationTests.java similarity index 99% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfigurationTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitAutoConfigurationTests.java index 6073381f4b5..787f078c985 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfigurationTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.io.IOException; import java.security.NoSuchAlgorithmException; @@ -961,7 +961,7 @@ class RabbitAutoConfigurationTests { void enableSslWithBundle() { this.contextRunner.withUserConfiguration(TestConfiguration.class) .withPropertyValues("spring.rabbitmq.ssl.bundle=test-bundle", - "spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.ssl.bundle.jks.test-bundle.keystore.password=secret") .run((context) -> { com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context); @@ -974,7 +974,7 @@ class RabbitAutoConfigurationTests { void enableSslWithBundleAndWithoutHostnameVerification() { this.contextRunner.withUserConfiguration(TestConfiguration.class) .withPropertyValues("spring.rabbitmq.ssl.bundle=test-bundle", "spring.rabbitmq.ssl.verify-hostname=false", - "spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.ssl.bundle.jks.test-bundle.keystore.password=secret") .run((context) -> { com.rabbitmq.client.ConnectionFactory rabbitConnectionFactory = getTargetConnectionFactory(context); @@ -987,9 +987,9 @@ class RabbitAutoConfigurationTests { void enableSslWithKeystoreTypeAndTrustStoreTypeShouldWork() { this.contextRunner.withUserConfiguration(TestConfiguration.class) .withPropertyValues("spring.rabbitmq.ssl.enabled:true", - "spring.rabbitmq.ssl.key-store=/org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.rabbitmq.ssl.key-store=/org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.rabbitmq.ssl.key-store-type=jks", "spring.rabbitmq.ssl.key-store-password=secret", - "spring.rabbitmq.ssl.trust-store=/org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.rabbitmq.ssl.trust-store=/org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.rabbitmq.ssl.trust-store-type=jks", "spring.rabbitmq.ssl.trust-store-password=secret") .run((context) -> assertThat(context).hasNotFailed()); } @@ -1021,10 +1021,10 @@ class RabbitAutoConfigurationTests { void enableSslWithValidStoreAlgorithmShouldWork() { this.contextRunner.withUserConfiguration(TestConfiguration.class) .withPropertyValues("spring.rabbitmq.ssl.enabled:true", - "spring.rabbitmq.ssl.key-store=/org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.rabbitmq.ssl.key-store=/org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.rabbitmq.ssl.key-store-type=jks", "spring.rabbitmq.ssl.key-store-password=secret", "spring.rabbitmq.ssl.key-store-algorithm=PKIX", - "spring.rabbitmq.ssl.trust-store=/org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.rabbitmq.ssl.trust-store=/org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.rabbitmq.ssl.trust-store-type=jks", "spring.rabbitmq.ssl.trust-store-password=secret", "spring.rabbitmq.ssl.trust-store-algorithm=PKIX") .run((context) -> assertThat(context).hasNotFailed()); @@ -1034,7 +1034,7 @@ class RabbitAutoConfigurationTests { void enableSslWithInvalidKeyStoreAlgorithmShouldFail() { this.contextRunner.withUserConfiguration(TestConfiguration.class) .withPropertyValues("spring.rabbitmq.ssl.enabled:true", - "spring.rabbitmq.ssl.key-store=/org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.rabbitmq.ssl.key-store=/org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.rabbitmq.ssl.key-store-type=jks", "spring.rabbitmq.ssl.key-store-password=secret", "spring.rabbitmq.ssl.key-store-algorithm=test-invalid-algo") .run((context) -> { @@ -1048,7 +1048,7 @@ class RabbitAutoConfigurationTests { void enableSslWithInvalidTrustStoreAlgorithmShouldFail() { this.contextRunner.withUserConfiguration(TestConfiguration.class) .withPropertyValues("spring.rabbitmq.ssl.enabled:true", - "spring.rabbitmq.ssl.trust-store=/org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.rabbitmq.ssl.trust-store=/org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.rabbitmq.ssl.trust-store-type=jks", "spring.rabbitmq.ssl.trust-store-password=secret", "spring.rabbitmq.ssl.trust-store-algorithm=test-invalid-algo") .run((context) -> { diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitPropertiesTests.java similarity index 99% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitPropertiesTests.java index 81ecdf6f625..5c2a7bff664 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitPropertiesTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitPropertiesTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.util.List; diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfigurationTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamConfigurationTests.java similarity index 98% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfigurationTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamConfigurationTests.java index 87230b0618c..6ca687352ab 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitStreamConfigurationTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/RabbitStreamConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure; +package org.springframework.boot.rabbitmq.autoconfigure; import java.time.Duration; import java.util.List; @@ -34,9 +34,9 @@ import org.springframework.amqp.rabbit.config.ContainerCustomizer; import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory; import org.springframework.amqp.rabbit.listener.RabbitListenerEndpointRegistry; import org.springframework.amqp.support.converter.MessageConverter; -import org.springframework.boot.amqp.autoconfigure.RabbitStreamConfiguration.PropertiesRabbitStreamConnectionDetails; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.autoconfigure.ssl.SslAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitStreamConfiguration.PropertiesRabbitStreamConnectionDetails; import org.springframework.boot.ssl.NoSuchSslBundleException; import org.springframework.boot.ssl.SslBundle; import org.springframework.boot.ssl.SslBundles; @@ -352,7 +352,7 @@ class RabbitStreamConfigurationTests { @Test void whenStreamSslBundleIsConfiguredThenTlsIsUsed() { this.contextRunner.withPropertyValues("spring.rabbitmq.stream.ssl.bundle=test-bundle", - "spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.ssl.bundle.jks.test-bundle.keystore.password=secret") .run((context) -> { assertThat(context).hasNotFailed(); @@ -388,7 +388,7 @@ class RabbitStreamConfigurationTests { void whenConnectionDetailsSslBundleIsProvidedThenTlsIsUsedWithoutProperties() { this.contextRunner.withUserConfiguration(CustomConnectionDetails.class) .withPropertyValues( - "spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/amqp/autoconfigure/test.jks", + "spring.ssl.bundle.jks.test-bundle.keystore.location=classpath:org/springframework/boot/rabbitmq/autoconfigure/test.jks", "spring.ssl.bundle.jks.test-bundle.keystore.password=secret") .run((context) -> { assertThat(context).hasNotFailed(); diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java similarity index 89% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java index 8739399d0aa..4b3571c2c8c 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/health/RabbitHealthContributorAutoConfigurationTests.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure.health; +package org.springframework.boot.rabbitmq.autoconfigure.health; import org.junit.jupiter.api.Test; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; -import org.springframework.boot.amqp.health.RabbitHealthIndicator; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.health.autoconfigure.contributor.HealthContributorAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; +import org.springframework.boot.rabbitmq.health.RabbitHealthIndicator; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import static org.assertj.core.api.Assertions.assertThat; diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java similarity index 94% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java index 8c8c31a499e..81928ab8009 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitMetricsAutoConfigurationMeterBinderCycleIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure.metrics; +package org.springframework.boot.rabbitmq.autoconfigure.metrics; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.binder.MeterBinder; @@ -22,8 +22,8 @@ import io.micrometer.core.instrument.simple.SimpleMeterRegistry; import org.junit.jupiter.api.Test; import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java similarity index 95% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java index b75b0e1857d..937a1203a09 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.autoconfigure.metrics; +package org.springframework.boot.rabbitmq.autoconfigure.metrics; import io.micrometer.core.instrument.MeterRegistry; import io.micrometer.core.instrument.simple.SimpleMeterRegistry; @@ -22,9 +22,9 @@ import org.junit.jupiter.api.Test; import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.boot.amqp.autoconfigure.RabbitAutoConfiguration; import org.springframework.boot.autoconfigure.AutoConfigurations; import org.springframework.boot.micrometer.metrics.autoconfigure.MetricsAutoConfiguration; +import org.springframework.boot.rabbitmq.autoconfigure.RabbitAutoConfiguration; import org.springframework.boot.test.context.runner.ApplicationContextRunner; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironmentTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironmentTests.java similarity index 57% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironmentTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironmentTests.java index 1ecb0b4d6ff..533ee69f8c2 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/docker/compose/RabbitEnvironmentTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/docker/compose/RabbitMqEnvironmentTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.docker.compose; +package org.springframework.boot.rabbitmq.docker.compose; import java.util.Collections; import java.util.Map; @@ -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"); } diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/health/RabbitHealthIndicatorTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/health/RabbitHealthIndicatorTests.java similarity index 98% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/health/RabbitHealthIndicatorTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/health/RabbitHealthIndicatorTests.java index 5ce2f8e64a2..161cb2fa6e9 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/health/RabbitHealthIndicatorTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/health/RabbitHealthIndicatorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.health; +package org.springframework.boot.rabbitmq.health; import java.util.Collections; diff --git a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/RabbitMetricsTests.java b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/metrics/RabbitMetricsTests.java similarity index 97% rename from module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/RabbitMetricsTests.java rename to module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/metrics/RabbitMetricsTests.java index 780de803e4f..a8b3f5b3c1d 100644 --- a/module/spring-boot-amqp/src/test/java/org/springframework/boot/amqp/metrics/RabbitMetricsTests.java +++ b/module/spring-boot-rabbitmq/src/test/java/org/springframework/boot/rabbitmq/metrics/RabbitMetricsTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.boot.amqp.metrics; +package org.springframework.boot.rabbitmq.metrics; import com.rabbitmq.client.ConnectionFactory; import io.micrometer.core.instrument.Tags; diff --git a/module/spring-boot-amqp/src/test/resources/logback-test.xml b/module/spring-boot-rabbitmq/src/test/resources/logback-test.xml similarity index 100% rename from module/spring-boot-amqp/src/test/resources/logback-test.xml rename to module/spring-boot-rabbitmq/src/test/resources/logback-test.xml diff --git a/module/spring-boot-amqp/src/test/resources/org/springframework/boot/amqp/autoconfigure/test.jks b/module/spring-boot-rabbitmq/src/test/resources/org/springframework/boot/rabbitmq/autoconfigure/test.jks similarity index 100% rename from module/spring-boot-amqp/src/test/resources/org/springframework/boot/amqp/autoconfigure/test.jks rename to module/spring-boot-rabbitmq/src/test/resources/org/springframework/boot/rabbitmq/autoconfigure/test.jks diff --git a/platform/spring-boot-dependencies/build.gradle b/platform/spring-boot-dependencies/build.gradle index f585495dfbc..fc8e69bab79 100644 --- a/platform/spring-boot-dependencies/build.gradle +++ b/platform/spring-boot-dependencies/build.gradle @@ -2055,7 +2055,7 @@ bom { releaseNotes("https://github.com/r2dbc/r2dbc-spi/releases/tag/v{version}") } } - library("Rabbit AMQP Client", "5.30.0") { + library("RabbitMQ Client", "5.30.0") { group("com.rabbitmq") { modules = [ "amqp-client" @@ -2067,7 +2067,7 @@ bom { releaseNotes("https://github.com/rabbitmq/rabbitmq-java-client/releases/tag/v{version}") } } - library("Rabbit Stream Client", "1.6.0") { + library("RabbitMQ Stream Client", "1.6.0") { group("com.rabbitmq") { modules = [ "stream-client" @@ -2123,7 +2123,6 @@ bom { "spring-boot-activemq", "spring-boot-actuator", "spring-boot-actuator-autoconfigure", - "spring-boot-amqp", "spring-boot-artemis", "spring-boot-autoconfigure", "spring-boot-autoconfigure-classic", @@ -2219,6 +2218,7 @@ bom { "spring-boot-pulsar", "spring-boot-quartz", "spring-boot-r2dbc", + "spring-boot-rabbitmq", "spring-boot-reactor", "spring-boot-reactor-netty", "spring-boot-restclient", @@ -2244,8 +2244,6 @@ bom { "spring-boot-starter-activemq-test", "spring-boot-starter-actuator", "spring-boot-starter-actuator-test", - "spring-boot-starter-amqp", - "spring-boot-starter-amqp-test", "spring-boot-starter-artemis", "spring-boot-starter-artemis-test", "spring-boot-starter-aspectj", @@ -2364,6 +2362,8 @@ bom { "spring-boot-starter-quartz-test", "spring-boot-starter-r2dbc", "spring-boot-starter-r2dbc-test", + "spring-boot-starter-rabbitmqmq", + "spring-boot-starter-rabbitmqmq-test", "spring-boot-starter-reactor-netty", "spring-boot-starter-restclient", "spring-boot-starter-restclient-test", diff --git a/settings.gradle b/settings.gradle index 696ee76c44e..bee3c760772 100644 --- a/settings.gradle +++ b/settings.gradle @@ -80,7 +80,6 @@ include "core:spring-boot-testcontainers" include "module:spring-boot-activemq" include "module:spring-boot-actuator" include "module:spring-boot-actuator-autoconfigure" -include "module:spring-boot-amqp" include "module:spring-boot-artemis" include "module:spring-boot-autoconfigure-classic" include "module:spring-boot-autoconfigure-classic-modules" @@ -167,6 +166,7 @@ include "module:spring-boot-persistence" include "module:spring-boot-pulsar" include "module:spring-boot-quartz" include "module:spring-boot-r2dbc" +include "module:spring-boot-rabbitmq" include "module:spring-boot-reactor" include "module:spring-boot-reactor-netty" include "module:spring-boot-restclient" @@ -211,8 +211,6 @@ include "starter:spring-boot-starter-activemq" include "starter:spring-boot-starter-activemq-test" include "starter:spring-boot-starter-actuator" include "starter:spring-boot-starter-actuator-test" -include "starter:spring-boot-starter-amqp" -include "starter:spring-boot-starter-amqp-test" include "starter:spring-boot-starter-artemis" include "starter:spring-boot-starter-artemis-test" include "starter:spring-boot-starter-aspectj" @@ -332,6 +330,8 @@ include "starter:spring-boot-starter-quartz" include "starter:spring-boot-starter-quartz-test" include "starter:spring-boot-starter-r2dbc" include "starter:spring-boot-starter-r2dbc-test" +include "starter:spring-boot-starter-rabbitmq" +include "starter:spring-boot-starter-rabbitmq-test" include "starter:spring-boot-starter-reactor-netty" include "starter:spring-boot-starter-restclient" include "starter:spring-boot-starter-restclient-test" @@ -401,7 +401,6 @@ include ":smoke-test:spring-boot-smoke-test-actuator-extension" include ":smoke-test:spring-boot-smoke-test-actuator-log4j2" include ":smoke-test:spring-boot-smoke-test-actuator-noweb" include ":smoke-test:spring-boot-smoke-test-actuator-ui" -include ":smoke-test:spring-boot-smoke-test-amqp" include ":smoke-test:spring-boot-smoke-test-ant" include ":smoke-test:spring-boot-smoke-test-artemis" include ":smoke-test:spring-boot-smoke-test-aspectj" @@ -458,6 +457,7 @@ include ":smoke-test:spring-boot-smoke-test-prometheus" include ":smoke-test:spring-boot-smoke-test-property-validation" include ":smoke-test:spring-boot-smoke-test-pulsar" include ":smoke-test:spring-boot-smoke-test-quartz" +include ":smoke-test:spring-boot-smoke-test-rabbitmq" include ":smoke-test:spring-boot-smoke-test-reactive-oauth2-client" include ":smoke-test:spring-boot-smoke-test-reactive-oauth2-resource-server" include ":smoke-test:spring-boot-smoke-test-restclient" diff --git a/smoke-test/spring-boot-smoke-test-amqp/build.gradle b/smoke-test/spring-boot-smoke-test-rabbitmq/build.gradle similarity index 90% rename from smoke-test/spring-boot-smoke-test-amqp/build.gradle rename to smoke-test/spring-boot-smoke-test-rabbitmq/build.gradle index 5c5d5045964..58a7af072b5 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/build.gradle +++ b/smoke-test/spring-boot-smoke-test-rabbitmq/build.gradle @@ -19,13 +19,13 @@ plugins { id "org.springframework.boot.docker-test" } -description = "Spring Boot AMQP smoke test" +description = "Spring Boot RabbitMQ smoke test" dependencies { - implementation(project(":starter:spring-boot-starter-amqp")) + implementation(project(":starter:spring-boot-starter-rabbitmq")) dockerTestImplementation(project(":core:spring-boot-testcontainers")) - dockerTestImplementation(project(":starter:spring-boot-starter-amqp-test")) + dockerTestImplementation(project(":starter:spring-boot-starter-rabbitmq-test")) dockerTestImplementation(project(":test-support:spring-boot-docker-test-support")) dockerTestImplementation("org.awaitility:awaitility") dockerTestImplementation("org.testcontainers:testcontainers-junit-jupiter") diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java b/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SampleRabbitApplicationSslTests.java similarity index 97% rename from smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SampleRabbitApplicationSslTests.java index e1acf6319d0..f846f70ae49 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationSslTests.java +++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SampleRabbitApplicationSslTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package smoketest.amqp; +package smoketest.rabbitmq; import java.time.Duration; @@ -43,7 +43,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest @Testcontainers(disabledWithoutDocker = true) @ExtendWith(OutputCaptureExtension.class) -class SampleAmqpSimpleApplicationSslTests { +class SampleRabbitApplicationSslTests { @Container @ServiceConnection diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java b/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SampleRabbitApplicationTests.java similarity index 96% rename from smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SampleRabbitApplicationTests.java index e763ade7aa0..62634819871 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SampleAmqpSimpleApplicationTests.java +++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SampleRabbitApplicationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package smoketest.amqp; +package smoketest.rabbitmq; import java.time.Duration; @@ -37,7 +37,7 @@ import static org.assertj.core.api.Assertions.assertThat; @SpringBootTest @Testcontainers(disabledWithoutDocker = true) @ExtendWith(OutputCaptureExtension.class) -class SampleAmqpSimpleApplicationTests { +class SampleRabbitApplicationTests { @Container @ServiceConnection diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java b/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SecureRabbitMqContainer.java similarity index 98% rename from smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SecureRabbitMqContainer.java index 7599d2d4ff2..5dfb9e776c3 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/dockerTest/java/smoketest/amqp/SecureRabbitMqContainer.java +++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/dockerTest/java/smoketest/rabbitmq/SecureRabbitMqContainer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package smoketest.amqp; +package smoketest.rabbitmq; import org.testcontainers.rabbitmq.RabbitMQContainer; import org.testcontainers.utility.DockerImageName; diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java b/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/SampleRabbitApplication.java similarity index 87% rename from smoke-test/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/SampleRabbitApplication.java index 7c01337d3cb..da492b1fe4f 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/SampleAmqpSimpleApplication.java +++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/SampleRabbitApplication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package smoketest.amqp; +package smoketest.rabbitmq; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -30,9 +30,9 @@ import org.springframework.messaging.handler.annotation.Payload; @SpringBootApplication @RabbitListener(queues = "foo") -public class SampleAmqpSimpleApplication { +public class SampleRabbitApplication { - private static final Log logger = LogFactory.getLog(SampleAmqpSimpleApplication.class); + private static final Log logger = LogFactory.getLog(SampleRabbitApplication.class); @Bean public Sender mySender() { @@ -55,7 +55,7 @@ public class SampleAmqpSimpleApplication { } public static void main(String[] args) { - SpringApplication.run(SampleAmqpSimpleApplication.class, args); + SpringApplication.run(SampleRabbitApplication.class, args); } } diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/Sender.java b/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/Sender.java similarity index 97% rename from smoke-test/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/Sender.java rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/Sender.java index 078f2416966..c3fd88bbed2 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/Sender.java +++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/Sender.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package smoketest.amqp; +package smoketest.rabbitmq; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/package-info.java b/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/package-info.java similarity index 96% rename from smoke-test/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/package-info.java rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/package-info.java index bc9e41a079d..a078a228474 100644 --- a/smoke-test/spring-boot-smoke-test-amqp/src/main/java/smoketest/amqp/package-info.java +++ b/smoke-test/spring-boot-smoke-test-rabbitmq/src/main/java/smoketest/rabbitmq/package-info.java @@ -15,6 +15,6 @@ */ @NullMarked -package smoketest.amqp; +package smoketest.rabbitmq; import org.jspecify.annotations.NullMarked; diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/rabbitmq.conf b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/rabbitmq.conf similarity index 100% rename from smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/rabbitmq.conf rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/rabbitmq.conf diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-ca.crt b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-ca.crt similarity index 100% rename from smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-ca.crt rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-ca.crt diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-ca.key b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-ca.key similarity index 100% rename from smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-ca.key rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-ca.key diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-client.crt b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-client.crt similarity index 100% rename from smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-client.crt rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-client.crt diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-client.key b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-client.key similarity index 100% rename from smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-client.key rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-client.key diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-server.crt b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-server.crt similarity index 100% rename from smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-server.crt rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-server.crt diff --git a/smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-server.key b/smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-server.key similarity index 100% rename from smoke-test/spring-boot-smoke-test-amqp/src/test/resources/ssl/test-server.key rename to smoke-test/spring-boot-smoke-test-rabbitmq/src/test/resources/ssl/test-server.key diff --git a/starter/spring-boot-starter-amqp-test/build.gradle b/starter/spring-boot-starter-rabbitmq-test/build.gradle similarity index 85% rename from starter/spring-boot-starter-amqp-test/build.gradle rename to starter/spring-boot-starter-rabbitmq-test/build.gradle index 567bff1c0b7..aa2b7da78b3 100644 --- a/starter/spring-boot-starter-amqp-test/build.gradle +++ b/starter/spring-boot-starter-rabbitmq-test/build.gradle @@ -18,10 +18,10 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for testing Spring AMQP and Rabbit MQ" +description = "Starter for testing RabbitMQ messaging and streaming broker" dependencies { - api(project(":starter:spring-boot-starter-amqp")) + api(project(":starter:spring-boot-starter-rabbitmq")) api(project(":starter:spring-boot-starter-test")) api("org.springframework.amqp:spring-rabbit-test") diff --git a/starter/spring-boot-starter-amqp/build.gradle b/starter/spring-boot-starter-rabbitmq/build.gradle similarity index 86% rename from starter/spring-boot-starter-amqp/build.gradle rename to starter/spring-boot-starter-rabbitmq/build.gradle index 5c3afd03ab2..351bcaf77ea 100644 --- a/starter/spring-boot-starter-amqp/build.gradle +++ b/starter/spring-boot-starter-rabbitmq/build.gradle @@ -18,10 +18,10 @@ plugins { id "org.springframework.boot.starter" } -description = "Starter for using Spring AMQP and Rabbit MQ" +description = "Starter for using RabbitMQ messaging and streaming broker" dependencies { api(project(":starter:spring-boot-starter")) - api(project(":module:spring-boot-amqp")) + api(project(":module:spring-boot-rabbitmq")) }