diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java
index 44a615b499..dcb28e4b41 100644
--- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java
+++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/AbstractAmqpInboundAdapterParser.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2024 the original author or authors.
+ * Copyright 2002-2025 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -29,6 +29,7 @@ import org.springframework.beans.factory.support.AbstractBeanDefinition;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser;
import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.beans.factory.xml.XmlReaderContext;
import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper;
import org.springframework.integration.config.xml.IntegrationNamespaceUtils;
import org.springframework.util.Assert;
@@ -58,7 +59,6 @@ abstract class AbstractAmqpInboundAdapterParser extends AbstractSingleBeanDefini
"recovery-interval",
"receive-timeout",
"shutdown-timeout",
- "tx-size",
"batch-size",
"missing-queues-fatal"
};
@@ -108,8 +108,7 @@ abstract class AbstractAmqpInboundAdapterParser extends AbstractSingleBeanDefini
}
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, "message-converter");
- BeanDefinitionBuilder mapperBuilder = BeanDefinitionBuilder
- .genericBeanDefinition(DefaultAmqpHeaderMapper.class);
+ BeanDefinitionBuilder mapperBuilder = BeanDefinitionBuilder.genericBeanDefinition(DefaultAmqpHeaderMapper.class);
mapperBuilder.setFactoryMethod("inboundMapper");
IntegrationNamespaceUtils.configureHeaderMapper(element, builder, parserContext, mapperBuilder, null);
@@ -125,24 +124,24 @@ abstract class AbstractAmqpInboundAdapterParser extends AbstractSingleBeanDefini
}
private BeanDefinition buildListenerContainer(Element element, ParserContext parserContext) {
+ XmlReaderContext readerContext = parserContext.getReaderContext();
if (!element.hasAttribute("queue-names")) {
- parserContext.getReaderContext().error("If no 'listener-container' reference is provided, " +
- "the 'queue-names' attribute is required.", element);
+ readerContext.error(
+ "If no 'listener-container' reference is provided, the 'queue-names' attribute is required.",
+ element);
}
String consumersPerQueue = element.getAttribute("consumers-per-queue");
BeanDefinitionBuilder builder;
if (StringUtils.hasText(consumersPerQueue)) {
builder = BeanDefinitionBuilder.genericBeanDefinition(DirectMessageListenerContainer.class);
if (StringUtils.hasText(element.getAttribute("concurrent-consumers"))) {
- parserContext.getReaderContext().error("'consumers-per-queue' and 'concurrent-consumers' are mutually "
- + "exclusive", element);
+ readerContext.error("'consumers-per-queue' and 'concurrent-consumers' are mutually exclusive", element);
}
if (StringUtils.hasText(element.getAttribute("tx-size"))) {
- parserContext.getReaderContext().error("'tx-size' is not allowed with 'consumers-per-queue'", element);
+ readerContext.error("'tx-size' is not allowed with 'consumers-per-queue'", element);
}
if (StringUtils.hasText(element.getAttribute("receive-timeout"))) {
- parserContext.getReaderContext().error("'receive-timeout' is not allowed with 'consumers-per-queue'",
- element);
+ readerContext.error("'receive-timeout' is not allowed with 'consumers-per-queue'", element);
}
builder.addPropertyValue("consumersPerQueue", consumersPerQueue);
}
@@ -155,13 +154,7 @@ abstract class AbstractAmqpInboundAdapterParser extends AbstractSingleBeanDefini
}
builder.addConstructorArgReference(connectionFactoryRef);
for (String attributeName : CONTAINER_VALUE_ATTRIBUTES) {
- // TODO remove 'tx-size' in 6.5
- if ("tx-size".equals(attributeName)) {
- IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, attributeName, "batchSize");
- }
- else {
- IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, attributeName);
- }
+ IntegrationNamespaceUtils.setValueIfAttributeDefined(builder, element, attributeName);
}
for (String attributeName : CONTAINER_REFERENCE_ATTRIBUTES) {
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, attributeName);
diff --git a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.xsd b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.xsd
index e6172835ef..14163860e7 100644
--- a/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.xsd
+++ b/spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp.xsd
@@ -1113,20 +1113,6 @@ standard headers to also be mapped. To map all non-standard headers the 'NON_STA
-
-
-
-
- [DEPRECATED]
- How many messages to process in a single transaction (if the channel is transactional). For best
- results it should be
- less than or equal to the prefetch count.
- Not allowed when 'consumers-per-queue' is set.
- Deprecated in favor of 'batch-size'.
-
-
-
-
diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml
index 85e4ee30bb..b437b61557 100644
--- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml
+++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests-context.xml
@@ -18,7 +18,7 @@
+ batch-mode="EXTRACT_PAYLOADS" batch-size="2"/>