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

INT-1729 added error-channel suport for WS inbound-gateway

Browse Source
This commit is contained in:
Oleg Zhurakousky
2011-01-10 16:36:05 -05:00
parent aab914676e
commit 27c8d31889
4 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceInboundGateway.java
View File

@@ -35,6 +35,7 @@ import org.springframework.ws.server.endpoint.AbstractMarshallingPayloadEndpoint
/**
* @author Mark Fisher
* @author Oleg Zhurakousky
* @since 1.0.2
*/
public class MarshallingWebServiceInboundGateway extends AbstractMarshallingPayloadEndpoint
@@ -85,6 +86,10 @@ public class MarshallingWebServiceInboundGateway extends AbstractMarshallingPayl
public void setRequestTimeout(long requestTimeout) {
this.gatewayDelegate.setRequestTimeout(requestTimeout);
}
public void setErrorChannel(MessageChannel errorChannel) {
this.gatewayDelegate.setErrorChannel(errorChannel);
}
public void setReplyChannel(MessageChannel replyChannel) {
this.gatewayDelegate.setReplyChannel(replyChannel);

13
spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-2.0.xsd
View File

@@ -229,6 +229,19 @@
</xsd:appinfo>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="error-channel" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>
<tool:annotation kind="ref">
<tool:expected-type type="org.springframework.integration.core.MessageChannel"/>
</tool:annotation>
</xsd:appinfo>
<xsd:documentation>
If a (synchronous) downstream exception is thrown and an error-channel is specified,
the MessagingException will be sent to this channel.
</xsd:documentation>
</xsd:annotation>
</xsd:attribute>
<xsd:attribute name="marshaller" type="xsd:string">
<xsd:annotation>
<xsd:appinfo>

6
spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests-context.xml
View File

@@ -14,13 +14,15 @@
<si:message-history/>
<ws:inbound-gateway id="simple" request-channel="requestsVerySimple" />
<ws:inbound-gateway id="simple" request-channel="requestsVerySimple" error-channel="customErrorChannel"/>
<si:channel id="customErrorChannel"/>
<si:channel id="requestsVerySimple"></si:channel>
<ws:inbound-gateway id="extractsPayload" request-channel="requestsSimple" extract-payload="false"/>
<ws:inbound-gateway id="marshalling" request-channel="requestsMarshalling"
<ws:inbound-gateway id="marshalling" request-channel="requestsMarshalling" error-channel="customErrorChannel"
marshaller="marshaller" unmarshaller="marshaller" />
<si:channel id="requestsMarshalling">

15
spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java
View File

@@ -41,6 +41,7 @@ import org.springframework.integration.Message;
import org.springframework.integration.MessageChannel;
import org.springframework.integration.MessageHeaders;
import org.springframework.integration.core.PollableChannel;
import org.springframework.integration.gateway.MessagingGatewaySupport;
import org.springframework.integration.history.MessageHistory;
import org.springframework.integration.mapping.HeaderMapper;
import org.springframework.integration.test.util.TestUtils;
@@ -71,6 +72,10 @@ public class WebServiceInboundGatewayParserTests {
@Qualifier("requestsSimple")
PollableChannel requestsSimple;
@Autowired
@Qualifier("customErrorChannel")
MessageChannel customErrorChannel;
@Autowired
@Qualifier("requestsVerySimple")
MessageChannel requestsVerySimple;
@@ -91,6 +96,10 @@ public class WebServiceInboundGatewayParserTests {
assertThat(
(MessageChannel) accessor.getPropertyValue("requestChannel"),
is(requestsVerySimple));
assertThat(
(MessageChannel) accessor.getPropertyValue("errorChannel"),
is(customErrorChannel));
}
//extractPayload = false
@@ -121,6 +130,12 @@ public class WebServiceInboundGatewayParserTests {
assertThat((AbstractMarshaller) accessor.getPropertyValue("unmarshaller"),
is(marshaller));
assertTrue("messaging gateway is not running", marshallingGateway.isRunning());
MessagingGatewaySupport mgs = (MessagingGatewaySupport) accessor.getPropertyValue("gatewayDelegate");
DirectFieldAccessor mgsAccessor = new DirectFieldAccessor(mgs);
assertThat(
(MessageChannel) mgsAccessor.getPropertyValue("errorChannel"),
is(customErrorChannel));
}
@Test