diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractRouterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractRouterParser.java index 002d1c8c10..6f6079d288 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractRouterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractRouterParser.java @@ -62,14 +62,7 @@ public abstract class AbstractRouterParser extends AbstractConsumerEndpointParse if (childElements != null && childElements.size() > 0) { ManagedMap channelMap = new ManagedMap(); for (Element childElement : childElements) { - String beanClassName = beanDefinition.getBeanClassName(); - String key = null; - if (beanClassName.endsWith("PayloadTypeRouter")){ - key = childElement.getAttribute("type"); - } - else { - key = childElement.getAttribute("value"); - } + String key = childElement.getAttribute(this.getMappingKeyAttributeValue()); channelMap.put(key, childElement.getAttribute("channel")); } beanDefinition.getPropertyValues().add("channelIdentifierMap", channelMap); @@ -79,5 +72,9 @@ public abstract class AbstractRouterParser extends AbstractConsumerEndpointParse } protected abstract BeanDefinition doParseRouter(Element element, ParserContext parserContext); + + protected String getMappingKeyAttributeValue(){ + return "value"; + } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParser.java new file mode 100644 index 0000000000..6086db8033 --- /dev/null +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParser.java @@ -0,0 +1,44 @@ +/* + * Copyright 2002-2011 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.config.xml; + +import org.springframework.beans.factory.config.BeanDefinition; +import org.springframework.beans.factory.support.BeanDefinitionBuilder; +import org.springframework.beans.factory.xml.ParserContext; +import org.w3c.dom.Element; + +/** + * Parser for the <exception-type-router/> element. + * + * @author Oleg Zhurakousky + * @since 2.0.4 + */ +public class ErrorMessageExceptionTypeRouterParser extends AbstractRouterParser { + + @Override + protected BeanDefinition doParseRouter(Element element, + ParserContext parserContext) { + BeanDefinitionBuilder payloadTypeRouterBuilder = BeanDefinitionBuilder.genericBeanDefinition( + IntegrationNamespaceUtils.BASE_PACKAGE + ".router.ErrorMessageExceptionTypeRouter"); + return payloadTypeRouterBuilder.getBeanDefinition(); + } + + @Override + protected String getMappingKeyAttributeValue(){ + return "exception-type"; + } +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java index ae428f17eb..5734883550 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java @@ -34,6 +34,7 @@ public class IntegrationNamespaceHandler extends AbstractIntegrationNamespaceHan registerBeanDefinitionParser("router", new DefaultRouterParser()); registerBeanDefinitionParser("header-value-router", new HeaderValueRouterParser()); registerBeanDefinitionParser("payload-type-router", new PayloadTypeRouterParser()); + registerBeanDefinitionParser("exception-type-router", new ErrorMessageExceptionTypeRouterParser()); registerBeanDefinitionParser("recipient-list-router", new RecipientListRouterParser()); registerBeanDefinitionParser("splitter", new SplitterParser()); registerBeanDefinitionParser("aggregator", new AggregatorParser()); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java index e831d633fd..3c3f565014 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PayloadTypeRouterParser.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2009 the original author or authors. + * Copyright 2002-2011 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. @@ -37,4 +37,9 @@ public class PayloadTypeRouterParser extends AbstractRouterParser { IntegrationNamespaceUtils.BASE_PACKAGE + ".router.PayloadTypeRouter"); return payloadTypeRouterBuilder.getBeanDefinition(); } + + @Override + protected String getMappingKeyAttributeValue(){ + return "type"; + } } diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd index e120d76d11..c7d036b384 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-2.0.xsd @@ -2103,6 +2103,46 @@ Name of the header whose value will be used to route messages + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests-context.xml new file mode 100644 index 0000000000..6760232b36 --- /dev/null +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests-context.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java new file mode 100644 index 0000000000..a7fdc8da39 --- /dev/null +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java @@ -0,0 +1,58 @@ +/* + * Copyright 2002-2011 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.springframework.integration.router.config; + +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertTrue; + +import org.junit.Test; + +import org.springframework.context.ApplicationContext; +import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.Message; +import org.springframework.integration.MessageChannel; +import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.message.GenericMessage; + +/** + * @author Oleg Zhurakousky + * + */ +public class ExceptionTypeRouterParserTests { + + @SuppressWarnings("unchecked") + @Test + public void testExceptionTypeRouterConfig(){ + ApplicationContext context = new ClassPathXmlApplicationContext("ExceptionTypeRouterParserTests-context.xml", this.getClass()); + MessageChannel inputChannel = context.getBean("inChannel", MessageChannel.class); + + inputChannel.send(new GenericMessage(new NullPointerException())); + QueueChannel nullPointerChannel = context.getBean("nullPointerChannel", QueueChannel.class); + Message npeMessage = (Message) nullPointerChannel.receive(1000); + assertNotNull(npeMessage); + assertTrue(npeMessage.getPayload() instanceof NullPointerException); + + inputChannel.send(new GenericMessage(new IllegalArgumentException())); + QueueChannel illegalArgumentChannel = context.getBean("illegalArgumentChannel", QueueChannel.class); + Message iaMessage = (Message) illegalArgumentChannel.receive(1000); + assertNotNull(iaMessage); + assertTrue(iaMessage.getPayload() instanceof IllegalArgumentException); + + inputChannel.send(new GenericMessage("Hello")); + QueueChannel outputChannel = context.getBean("outputChannel", QueueChannel.class); + assertNotNull(outputChannel.receive(1000)); + } +}