From 14dee1f16a95d63aff1bdbab024a8ea45ba91346 Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Wed, 21 Oct 2020 10:43:16 -0400 Subject: [PATCH] Consumer Batching Polishing Change boolean assertion; simply enforce the condition. --- .../rabbit/listener/SimpleMessageListenerContainer.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java index 6f7f78d1..161338d9 100644 --- a/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java +++ b/spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java @@ -357,7 +357,8 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta /** * Set to true to present a list of messages based on the {@link #setBatchSize(int)}, - * if the listener supports it. + * if the listener supports it. This will coerce {@link #setDeBatchingEnabled(boolean) + * deBatchingEnabled} to true as well. * @param consumerBatchEnabled true to create message batches in the container. * @since 2.2 * @see #setBatchSize(int) @@ -512,8 +513,9 @@ public class SimpleMessageListenerContainer extends AbstractMessageListenerConta @Override protected void doInitialize() { - Assert.state(!this.consumerBatchEnabled || isDeBatchingEnabled(), - "When setting 'consumerBatchEnabled' to true, 'deBatchingEnabled' must also be true"); + if (this.consumerBatchEnabled) { + setDeBatchingEnabled(true); + } } @ManagedMetric(metricType = MetricType.GAUGE)