Add `@AmqpListener` annotation support by artembilan · Pull Request #3357 · spring-projects/spring-amqp

artembilan · 2026-02-23T23:34:25Z

Extract AbstractListenerAnnotationBeanPostProcessor into the core spring-amqp module from the RabbitListenerAnnotationBeanPostProcessor for the common infrastructure and API which can be used in other implementations.
Implement AmqpListenerAnnotationBeanPostProcessor as an extension of just extracted AbstractListenerAnnotationBeanPostProcessor
The AmqpListenerAnnotationBeanPostProcessor processes bean methods with @AmqpListener
The @AmqpListeners is a @Repeatable container for @AmqpListener
The MethodAmqpListenerEndpoint is an AbstractAmqpListenerEndpoint extension for POJO method-based listeners.
The @AmqpListener parsing in the AmqpListenerAnnotationBeanPostProcessor creates MethodAmqpListenerEndpoint instances for methods they re declared on
The MethodAmqpMessageListenerContainerFactory is an extension of the AmqpMessageListenerContainerFactory with POJO method-specific listeners
Extract simple record BytesToStringConverter into spring-amqp module and replace internal type in the RabbitListenerAnnotationBeanPostProcessor
Fix nullability for the RabbitListenerAnnotationBeanPostProcessor
Fix TODO in the AmqpListenerEndpoint.getId() Javadoc: the final id generation decision in done at the moment of bean registration in the AmqpListenerEndpointRegistry
Add AmqpMessageListenerContainerFactory.configureEndpoint() for target extensions where final endpoint properties are merged with whatever is provided as default values in the container factory
Fix AmqpMessageListenerContainerFactory.createContainer() moving setupMessageListener() call in the end.
Essentially, all the properties must be set into the listener container before we provide a listener over there
Expose AmqpListenerAnnotationBeanPostProcessor as a bean in the AmqpDefaultConfiguration
Add io.projectreactor:reactor-core as test dependency for request-reply test with a Mono return type

* Extract `AbstractListenerAnnotationBeanPostProcessor` into the core `spring-amqp` module from the `RabbitListenerAnnotationBeanPostProcessor` for the common infrastructure and API which can be used in other implementations. * Implement `AmqpListenerAnnotationBeanPostProcessor` as an extension of just extracted `AbstractListenerAnnotationBeanPostProcessor` * The `AmqpListenerAnnotationBeanPostProcessor` processes bean methods with `@AmqpListener` * The `@AmqpListeners` is a `@Repeatable` container for `@AmqpListener` * The `MethodAmqpListenerEndpoint` is an `AbstractAmqpListenerEndpoint` extension for POJO method-based listeners. The `@AmqpListener` parsing in the `AmqpListenerAnnotationBeanPostProcessor` creates `MethodAmqpListenerEndpoint` instances for methods they re declared on * The `MethodAmqpMessageListenerContainerFactory` is an extension of the `AmqpMessageListenerContainerFactory` with POJO method-specific listeners * Extract simple `record BytesToStringConverter` into `spring-amqp` module and replace internal type in the `RabbitListenerAnnotationBeanPostProcessor` * Fix nullability for the `RabbitListenerAnnotationBeanPostProcessor` * Fix TODO in the `AmqpListenerEndpoint.getId()` Javadoc: the final id generation decision in done at the moment of bean registration in the `AmqpListenerEndpointRegistry` * Add `AmqpMessageListenerContainerFactory.configureEndpoint()` for target extensions where final endpoint properties are merged with whatever is provided as default values in the container factory * Fix `AmqpMessageListenerContainerFactory.createContainer()` moving `setupMessageListener()` call in the end. Essentially, all the properties must be set into the listener container before we provide a listener over there * Expose `AmqpListenerAnnotationBeanPostProcessor` as a bean in the `AmqpDefaultConfiguration` * Add `io.projectreactor:reactor-core` as test dependency for request-reply test with a `Mono` return type

artembilan · 2026-02-23T23:40:48Z

TODO (which could be done in the separate PRs)

Kotlin suspend functions tests
Docs
@AmqpHandler for type-base routing with a common @AmqpListener on the class. But I have doubts for this so far. We can come back here eventually.

I mean there are still more like sendAndReceive() on the client, streaming support, but that is not related to the annotation.

Thanks

cppwfs

Looks great!
Just some nitpicks.

cppwfs · 2026-02-24T12:32:50Z

...main/java/org/springframework/amqp/listener/AbstractListenerAnnotationBeanPostProcessor.java

+		}
+	}
+
+	protected @Nullable Integer resolveExpressiontoInteger(String value, String attribute) {


to should be capitalized

cppwfs · 2026-02-24T12:33:35Z

...main/java/org/springframework/amqp/listener/AbstractListenerAnnotationBeanPostProcessor.java

+						methods.add(new ListenerMethod<>(method, listenerAnnotations));
+					}
+					if (hasClassLevelListeners) {
+						Annotation rabbitHandler = AnnotationUtils.findAnnotation(method, handlerAnnotation);


amqpHandler instead of rabbitHandler.

cppwfs · 2026-02-24T12:34:36Z

...main/java/org/springframework/amqp/listener/AbstractListenerAnnotationBeanPostProcessor.java

+	protected static String noBeanFoundMessage(Object target, String listenerBeanName, String requestedBeanName,
+			Class<?> expectedClass) {
+
+		return "Could not register rabbit listener endpoint on ["


AMQP instead of rabbit

cppwfs · 2026-02-24T12:38:44Z

spring-amqp-client/src/main/java/org/springframework/amqp/client/annotation/AmqpListener.java

+	/**
+	 * The AMQP 1.0 addresses to listen to.
+	 * The entries can be 'queue name', 'property-placeholder keys' or 'expressions'.
+	 * Expression must be resolved to the address.


Shouldn't this say that Each expression must be resolved to an address?

cppwfs · 2026-02-24T12:40:11Z

spring-amqp-client/src/main/java/org/springframework/amqp/client/annotation/AmqpListener.java

+	 * The entries can be 'queue name', 'property-placeholder keys' or 'expressions'.
+	 * Expression must be resolved to the address.
+	 * The addresses must exist.
+	 * @return the addresses or expressions (SpEL) to listen to from in the target listener container.


Change to listen to from in to to listen to in

cppwfs · 2026-02-24T14:38:16Z

spring-amqp-client/src/main/java/org/springframework/amqp/client/annotation/AmqpListener.java

+	/**
+	 * Override the container factory's {@code headerMapper} used for this listener.
+	 * @return the header mapper bean name.
+	 * If a SpEL expression is provided ({@code #{...}}),


cppwfs · 2026-02-24T15:01:26Z

...-client/src/main/java/org/springframework/amqp/client/config/MethodAmqpListenerEndpoint.java

+
+	/**
+	 * Set the default behavior for messages rejection, for example, when the listener
+	 * threw an exception. When {@code true} (default), messages will be requeued, otherwise - rejected.


threw should be throws

cppwfs · 2026-02-24T15:07:18Z

...-client/src/main/java/org/springframework/amqp/client/config/MethodAmqpListenerEndpoint.java

+
+	private @Nullable BeanResolver beanResolver;
+
+	public MethodAmqpListenerEndpoint(Object bean, Method method, String... addresses) {


Missing Javadoc.

cppwfs · 2026-02-24T15:27:20Z

...main/java/org/springframework/amqp/listener/AbstractListenerAnnotationBeanPostProcessor.java

+		if (resolved != null && beanType.isAssignableFrom(resolved.getClass())) {
+			return (B) resolved;
+		}
+		else if (resolved instanceof String factoryBeanName && StringUtils.hasText(factoryBeanName)) {


Wouldn't we want else if (resolved != null && resolve instance of...?

The instanceof operator does the trick for null.
So, if resolved == null, then instanceof resolves to false.

cppwfs · 2026-02-24T15:34:52Z

...main/java/org/springframework/amqp/listener/AbstractListenerAnnotationBeanPostProcessor.java

+	/**
+	 * A method annotated with {@link A}, together with the annotations.
+	 *
+	 * @param method      the method with annotations


odd tab here

* Resolve copy/paste artifacts in the `AbstractListenerAnnotationBeanPostProcessor`: replace `rabbit` with empty string - the `handler` and `listener` are enough for the context * Add Javadoc to `MethodAmqpListenerEndpoint` ctor

cppwfs

LGTM Great work!

artembilan added this to the 4.1.0-M3 milestone Feb 23, 2026

artembilan requested a review from cppwfs February 23, 2026 23:34

artembilan added the type: enhancement label Feb 23, 2026

cppwfs requested changes Feb 24, 2026

View reviewed changes

AmqpListener: Fix typos in the Javadocs and method names

0567c4c

* Resolve copy/paste artifacts in the `AbstractListenerAnnotationBeanPostProcessor`: replace `rabbit` with empty string - the `handler` and `listener` are enough for the context * Add Javadoc to `MethodAmqpListenerEndpoint` ctor

artembilan requested a review from cppwfs February 24, 2026 16:09

cppwfs approved these changes Feb 24, 2026

View reviewed changes

cppwfs merged commit 7455fc5 into spring-projects:main Feb 24, 2026
3 checks passed

artembilan deleted the AmqpListenerAnnotation branch February 25, 2026 14:59


		private @Nullable BeanResolver beanResolver;

		public MethodAmqpListenerEndpoint(Object bean, Method method, String... addresses) {

Conversation

artembilan commented Feb 23, 2026

Uh oh!

artembilan commented Feb 23, 2026

Uh oh!

cppwfs left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cppwfs left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants