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

INT-1623 replaced 'exception-mapper' with 'error-channel' on 'gateway' and JMS 'inbound-gateway' elements

Browse Source
This commit is contained in:
Mark Fisher
2010-11-15 23:57:58 -05:00
parent 498fcd8c3c
commit c6d68c9e2a
11 changed files with 133 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests-context.xml
View File

@@ -16,19 +16,14 @@
default-request-channel="routingChannel"
service-interface="org.springframework.integration.gateway.GatewayInvokingMessageHandlerTests$SimpleGateway"/>
<si:gateway id="gatewayWithErrorAndMapper"
default-request-channel="routingChannel"
service-interface="org.springframework.integration.gateway.GatewayInvokingMessageHandlerTests$SimpleGateway"
exception-mapper="exceptionMapper"/>
<si:gateway id="gatewayWithErrorAsync"
default-request-channel="routingChannel"
service-interface="org.springframework.integration.gateway.GatewayInvokingMessageHandlerTests$SimpleGateway"/>
<si:gateway id="gatewayWithErrorAsyncAndMapper"
<si:gateway id="gatewayWithErrorChannelAndTransformer"
default-request-channel="routingChannel"
service-interface="org.springframework.integration.gateway.GatewayInvokingMessageHandlerTests$SimpleGateway"
exception-mapper="exceptionMapper"/>
error-channel="errorTransformationChannel"/>
<si:router input-channel="routingChannel" expression="payload"/>
@@ -67,8 +62,6 @@
<si:gateway request-channel="inputC"/>
</si:chain>
<si:chain input-channel="inputC">
<si:header-enricher>
<si:header name="name" value="oleg" />
@@ -87,7 +80,9 @@
<bean class="org.springframework.integration.gateway.GatewayInvokingMessageHandlerTests$SimpleService" />
</si:service-activator>
</si:chain>
<si:transformer input-channel="errorTransformationChannel" ref="errorTransformer"/>
<bean id="exceptionMapper" class="org.springframework.integration.gateway.GatewayInvokingMessageHandlerTests$SampleExceptionMapper"/>
<bean id="errorTransformer" class="org.springframework.integration.gateway.GatewayInvokingMessageHandlerTests$SampleErrorTransformer"/>
</beans>

67
spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java
View File

@@ -27,7 +27,6 @@ import org.springframework.integration.Message;
import org.springframework.integration.MessageHandlingException;
import org.springframework.integration.core.MessageHandler;
import org.springframework.integration.core.SubscribableChannel;
import org.springframework.integration.mapping.InboundMessageMapper;
import org.springframework.integration.message.GenericMessage;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.test.context.ContextConfiguration;
@@ -53,21 +52,14 @@ public class GatewayInvokingMessageHandlerTests {
@Qualifier("gatewayWithError")
SimpleGateway gatewayWithError;
@Autowired
@Qualifier("gatewayWithErrorAndMapper")
SimpleGateway gatewayWithErrorAndMapper;
@Autowired
@Qualifier("gatewayWithErrorAsync")
SimpleGateway gatewayWithErrorAsync;
@Autowired
@Qualifier("gatewayWithErrorAsyncAndMapper")
SimpleGateway gatewayWithErrorAsyncAndMapper;
@Qualifier("gatewayWithErrorChannelAndTransformer")
SimpleGateway gatewayWithErrorChannelAndTransformer;
@Autowired
@Qualifier("inputB")
SubscribableChannel output;
@@ -93,38 +85,43 @@ public class GatewayInvokingMessageHandlerTests {
Assert.assertEquals("oleg", message.getHeaders().get("name"));
}
});
String result = gateway.sendRecieve("hello");
String result = gateway.process("hello");
Assert.assertEquals("echo:echo:echo:hello", result);
}
@Test
public void validateGatewayWithErrorMessageReturned() {
try {
String result = gatewayWithErrorAndMapper.sendRecieve("echoWithRuntimeExceptionChannel");
String result = gatewayWithErrorChannelAndTransformer.process("echoWithRuntimeExceptionChannel");
Assert.assertNotNull(result);
Assert.assertEquals("Error happened in message: echoWithRuntimeExceptionChannel", result);
} catch (Exception e) {
}
catch (Exception e) {
Assert.fail();
}
try {
gatewayWithError.sendRecieve("echoWithRuntimeExceptionChannel");
gatewayWithError.process("echoWithRuntimeExceptionChannel");
Assert.fail();
} catch (MessageHandlingException e) {
}
catch (MessageHandlingException e) {
Assert.assertEquals("echoWithRuntimeExceptionChannel", e.getFailedMessage().getPayload());
}
try {
gatewayWithError.sendRecieve("echoWithMessagingExceptionChannel");
gatewayWithError.process("echoWithMessagingExceptionChannel");
Assert.fail();
} catch (MessageHandlingException e) {
}
catch (MessageHandlingException e) {
Assert.assertEquals("echoWithMessagingExceptionChannel", e.getFailedMessage().getPayload());
}
try {
String result = gatewayWithErrorAndMapper.sendRecieve("echoWithMessagingExceptionChannel");
String result = gatewayWithErrorChannelAndTransformer.process("echoWithMessagingExceptionChannel");
Assert.assertNotNull(result);
Assert.assertEquals("Error happened in message: echoWithMessagingExceptionChannel", result);
} catch (Exception e) {
}
catch (Exception e) {
Assert.fail();
}
}
@@ -132,25 +129,27 @@ public class GatewayInvokingMessageHandlerTests {
@Test
public void validateGatewayWithErrorAsync() {
try {
gatewayWithErrorAsync.sendRecieve("echoWithErrorAsyncChannel");
gatewayWithErrorAsync.process("echoWithErrorAsyncChannel");
Assert.fail();
} catch (Exception e) {
}
catch (Exception e) {
Assert.assertTrue(e instanceof MessageHandlingException);
}
}
@Test
public void validateGatewayWithErrorAsyncAndMaper() {
public void validateGatewayWithErrorFlowReturningMessage() {
try {
Object result = gatewayWithErrorAsyncAndMapper.sendRecieve("echoWithErrorAsyncChannel");
Object result = gatewayWithErrorChannelAndTransformer.process("echoWithErrorAsyncChannel");
Assert.assertEquals("Error happened in message: echoWithErrorAsyncChannel", result);
} catch (Exception e) {
}
catch (Exception e) {
Assert.fail();
}
}
public static class SampleExceptionMapper implements InboundMessageMapper<Throwable>{
public static class SampleErrorTransformer {
public Message<?> toMessage(Throwable object) throws Exception {
MessageHandlingException ex = (MessageHandlingException) object;
return MessageBuilder.withPayload("Error happened in message: " + ex.getFailedMessage().getPayload()).build();
@@ -158,10 +157,12 @@ public class GatewayInvokingMessageHandlerTests {
}
public static interface SimpleGateway {
public String sendRecieve(String str);
public String process(String str);
}
public static class SimpleService {
public String echo(String value) {
return "echo:" + value;
@@ -176,9 +177,9 @@ public class GatewayInvokingMessageHandlerTests {
public RuntimeException echoWithErrorAsync(String value) {
throw new RuntimeException(value);
}
}
@SuppressWarnings("serial")
public static class SampleCheckedException extends Exception {
public SampleCheckedException(String message){