Consumer Batching Polishing

Change boolean assertion; simply enforce the condition.

Author: garyrussell

spring-rabbit/src/main/java/org/springframework/amqp/rabbit/listener/SimpleMessageListenerContainer.java

@@ -357,7 +357,8 @@ public void setBatchSize(int batchSize) {
 
 	/**
 	 * 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 @@ protected final boolean sharedConnectionEnabled() {
 
 	@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)