Search code, repositories, users, issues, pull requests...


 Add support for Rabbitmq AMQP 1.0

91b9044

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>


 Add smoke test for RabbitMQ AMQP 1.0

02ba888

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

@eddumelendez eddumelendez force-pushed the rabbitmq-amqp branch from 77d69d9 to 02ba888 Compare

July 31, 2025 00:59

@eddumelendez eddumelendez changed the title ~~(削除) rabbitmq amqp (削除ここまで)~~ (追記) Add support for Rabbitmq AMQP 1.0 (追記ここまで)

@spring-projects-issues spring-projects-issues added the status: waiting-for-triage label


 Fix checks

93d232d

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

@eddumelendez eddumelendez changed the title ~~(削除) Add support for Rabbitmq AMQP 1.0 (削除ここまで)~~ (追記) Add support for RabbitMQ AMQP 1.0 (追記ここまで)

@eddumelendez eddumelendez mentioned this pull request

rabbitmq-amqp-java-client amqp 1.0 support spring-projects/spring-amqp#2919

Closed

artembilan suggested changes

Aug 4, 2025

module/spring-boot-amqp/build.gradle Outdated Show resolved Hide resolved

...p/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java Outdated Show resolved Hide resolved

smoke-test/spring-boot-smoke-test-rabbit-amqp/src/main/java/smoketest/amqp/Sender.java Show resolved Hide resolved

...p/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java Outdated

* @author Eddú Meléndez

* @since 4.0.0

@AutoConfiguration

Copy link

Member

@artembilan artembilan Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think need to make before = RabbitAutoConfiguration.class and make that one conditional on something missing from this RabbitAmqpAutoConfiguration.
This is an addition to my previous point: the AMQP 1.0 is by default.
If we don't make them conditional on each other, then both protocols are going to be enabled and connected.
Especially, I worry about RabbitAmqpAdmin and RabbitAdmin which are going to handle topology in parallel but in different connections.
I don't think that we need to give a choice to be able to have both protocols in one Spring Boot application.

artembilan suggested changes

Aug 4, 2025

...p/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java

private final RabbitProperties properties;

RabbitAmqpAutoConfiguration(RabbitProperties properties) {

Copy link

Member

@artembilan artembilan Aug 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we need to look into a separate RabbitAmqpProperties abstraction.
Even if some duplication is possible, a bunch of existing properties are not going to be used for AMQP 1.0 at all.
And might cause confusion.


 Fix comments

6572c36

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

@eddumelendez eddumelendez force-pushed the rabbitmq-amqp branch from 4c79b2e to 6572c36 Compare

August 5, 2025 03:55


 Fix format

a3913a1

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

artembilan suggested changes

Aug 6, 2025

...p/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAmqpAutoConfiguration.java Show resolved Hide resolved

eddumelendez added 4 commits

August 6, 2025 15:47


 Autoconfigure only AMQP 1.0 or 0.9

f983ae2

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>


 Add new starter for rabbitmq 0.9

db45892

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>


 Use new starter

b6ec014

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>


 Update smoke test rabbit amqp

58692fb

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

artembilan suggested changes

Aug 7, 2025

...-amqp/src/main/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfiguration.java Outdated

* @since 4.0.0

@AutoConfiguration

@ConditionalOnClass({ RabbitTemplate.class, Channel.class })

@ConditionalOnMissingClass({ "com.rabbitmq.client.amqp.Connection",

"org.springframework.amqp.rabbitmq.client.RabbitAmqpTemplate" })

Copy link

Member

@artembilan artembilan Aug 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think this is correct.
We may still have those classes on classpath, but opt-in to use AMQP 0.9.1.
For example, via auto-configuration exclusion for that our new RabbitAmqpAutoConfiguration.
Why not conditional on bean?

Copy link

Contributor Author

@eddumelendez eddumelendez Aug 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Switched to conditional on missing bean

.../src/test/java/org/springframework/boot/amqp/autoconfigure/RabbitAutoConfigurationTests.java Outdated Show resolved Hide resolved

...org/springframework/boot/amqp/autoconfigure/metrics/RabbitMetricsAutoConfigurationTests.java Outdated Show resolved Hide resolved

starter/spring-boot-starter-rabbitmq/build.gradle Outdated Show resolved Hide resolved


 Fix starter's description

2644bc2

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

@eddumelendez eddumelendez force-pushed the rabbitmq-amqp branch 2 times, most recently from 05bec25 to 2be167a Compare

August 12, 2025 18:21


 Switch to ConditionalOnMissingBean

b3b1d45

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

@eddumelendez eddumelendez force-pushed the rabbitmq-amqp branch from 2be167a to b3b1d45 Compare

August 12, 2025 18:24


 Fix checkstyle

b97cd48

Signed-off-by: Eddú Meléndez <eddu.melendez@gmail.com>

artembilan approved these changes

Aug 12, 2025