Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

INT-3926: Add <poller> for all outbound tags

Browse Source 
JIRA: https://jira.spring.io/browse/INT-3926

* Add `<poller>` for all `<outbound-adapter(gateway)>`
* Add/modify tests for `<queue>` as an input channel and particular `<poller>`
* Move XSD from the `xml` package to the `config` level to achieve the consistency throughout the project.
This commit is contained in:
Artem Bilan
2016-01-06 19:06:03 -05:00
committed by Gary Russell
parent afc286a66a
commit 74cbc58698
29 changed files with 149 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-4.3.xsd
View File

@@ -370,6 +370,7 @@
</xsd:documentation>
</xsd:annotation>
<xsd:sequence>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType" minOccurs="0" maxOccurs="1" />
</xsd:sequence>
<xsd:attribute name="exchange-name" type="xsd:string">

8
spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests-context.xml
View File

@@ -17,7 +17,9 @@
amqp-template="amqpTemplate"
auto-startup="false"
order="5"
return-channel="returnChannel"/>
return-channel="returnChannel">
<int:poller fixed-delay="100"/>
</amqp:outbound-gateway>
<rabbit:template id="amqpTemplate" connection-factory="connectionFactory"/>
@@ -25,7 +27,9 @@
<constructor-arg value="org.springframework.amqp.rabbit.connection.ConnectionFactory"/>
</bean>
<int:channel id="toRabbit0"/>
<int:channel id="toRabbit0">
<int:queue/>
</int:channel>
<int:channel id="toRabbit1"/>
<int:channel id="toRabbit2"/>
<int:channel id="toRabbit3"/>

8
spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpointTests-context.xml
View File

@@ -55,9 +55,13 @@
mapped-request-headers="foo*"
amqp-template="amqpTemplateConfirmsAdapter"
confirm-correlation-expression="headers['amqp_confirmCorrelationData']"
confirm-ack-channel="ackChannel" />
confirm-ack-channel="ackChannel" >
<int:poller fixed-delay="100"/>
</amqp:outbound-channel-adapter>
<int:channel id="pcRequestChannelForAdapter"/>
<int:channel id="pcRequestChannelForAdapter">
<int:queue/>
</int:channel>
<rabbit:template id="amqpTemplateReturns" connection-factory="connectionFactory" mandatory="true" />