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

3
spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-4.3.xsd
View File

@@ -68,6 +68,7 @@
<xsd:complexContent>
<xsd:extension base="udpAdapterType">
<xsd:all>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" maxOccurs="1" />
</xsd:all>
@@ -203,6 +204,7 @@
<xsd:element name="tcp-outbound-channel-adapter">
<xsd:complexType>
<xsd:all>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" maxOccurs="1" />
</xsd:all>
@@ -343,6 +345,7 @@
<xsd:element name="tcp-outbound-gateway">
<xsd:complexType>
<xsd:all>
<xsd:element ref="integration:poller" minOccurs="0" maxOccurs="1"/>
<xsd:element name="request-handler-advice-chain" type="integration:handlerAdviceChainType"
minOccurs="0" maxOccurs="1" />
</xsd:all>

15
spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests-context.xml
View File

@@ -143,9 +143,12 @@
order="12"
/>
<int:channel id="udpAdviceChannel" />
<int:channel id="udpAdviceChannel" >
<int:queue/>
</int:channel>
<ip:udp-outbound-channel-adapter channel="udpAdviceChannel" host="localhost" port="0">
<int:poller fixed-delay="100"/>
<ip:request-handler-advice-chain>
<bean class="org.springframework.integration.ip.config.ParserUnitTests$FooAdvice" />
</ip:request-handler-advice-chain>
@@ -173,12 +176,15 @@
<constructor-arg value="org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory" />
</bean>
<int:channel id="tcpAdviceChannel" />
<int:channel id="tcpAdviceChannel">
<int:queue/>
</int:channel>
<ip:tcp-outbound-channel-adapter id="tcpOutAdvice"
channel="tcpAdviceChannel"
connection-factory="mockClientCf"
phase="125">
<int:poller fixed-delay="100"/>
<ip:request-handler-advice-chain>
<bean class="org.springframework.integration.ip.config.ParserUnitTests$FooAdvice" />
</ip:request-handler-advice-chain>
@@ -229,13 +235,16 @@
phase="127"
/>
<int:channel id="tcpAdviceGateChannel" />
<int:channel id="tcpAdviceGateChannel">
<int:queue/>
</int:channel>
<ip:tcp-outbound-gateway id="outAdviceGateway"
request-channel="tcpAdviceGateChannel"
reply-channel="replyChannel"
remote-timeout-expression="4000"
connection-factory="mockClientCf">
<int:poller fixed-delay="100"/>
<ip:request-handler-advice-chain>
<bean class="org.springframework.integration.ip.config.ParserUnitTests$FooAdvice" />
</ip:request-handler-advice-chain>

39
spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 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.
@@ -27,6 +27,8 @@ import static org.mockito.Mockito.mock;
import java.util.Iterator;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -76,16 +78,19 @@ import org.springframework.messaging.MessageChannel;
import org.springframework.messaging.MessageHandler;
import org.springframework.messaging.support.GenericMessage;
import org.springframework.scheduling.TaskScheduler;
import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
/**
* @author Gary Russell
* @author Oleg Zhurakousky
* @author Artem Bilan
* @since 2.0
*/
@ContextConfiguration
@RunWith(SpringJUnit4ClassRunner.class)
@DirtiesContext
public class ParserUnitTests {
@Autowired
@@ -213,19 +218,19 @@ public class ParserUnitTests {
private MessageChannel errorChannel;
@Autowired
private DirectChannel udpChannel;
private MessageChannel udpChannel;
@Autowired
private DirectChannel udpAdviceChannel;
private MessageChannel udpAdviceChannel;
@Autowired
private DirectChannel tcpAdviceChannel;
private MessageChannel tcpAdviceChannel;
@Autowired
private DirectChannel tcpAdviceGateChannel;
private MessageChannel tcpAdviceGateChannel;
@Autowired
private DirectChannel tcpChannel;
private MessageChannel tcpChannel;
@Autowired
TcpReceivingChannelAdapter tcpInClientMode;
@@ -274,7 +279,7 @@ public class ParserUnitTests {
@Autowired
QueueChannel eventChannel;
private static volatile int adviceCalled;
private static CountDownLatch adviceCalled = new CountDownLatch(1);
@Test
public void testInUdp() {
@@ -409,24 +414,24 @@ public class ParserUnitTests {
}
@Test
public void udpAdvice() {
adviceCalled = 0;
public void udpAdvice() throws InterruptedException {
adviceCalled = new CountDownLatch(1);
this.udpAdviceChannel.send(new GenericMessage<String>("foo"));
assertEquals(1, adviceCalled);
assertTrue(adviceCalled.await(10, TimeUnit.SECONDS));
}
@Test
public void tcpAdvice() {
adviceCalled = 0;
public void tcpAdvice() throws InterruptedException {
adviceCalled = new CountDownLatch(1);
this.tcpAdviceChannel.send(new GenericMessage<String>("foo"));
assertEquals(1, adviceCalled);
assertTrue(adviceCalled.await(10, TimeUnit.SECONDS));
}
@Test
public void tcpGatewayAdvice() {
adviceCalled = 0;
public void tcpGatewayAdvice() throws InterruptedException {
adviceCalled = new CountDownLatch(1);
this.tcpAdviceGateChannel.send(new GenericMessage<String>("foo"));
assertEquals(1, adviceCalled);
assertTrue(adviceCalled.await(10, TimeUnit.SECONDS));
}
@Test
@@ -693,7 +698,7 @@ public class ParserUnitTests {
@Override
protected Object doInvoke(ExecutionCallback callback, Object target, Message<?> message) throws Exception {
adviceCalled++;
adviceCalled.countDown();
return null;
}