diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ConverterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ConverterParser.java new file mode 100644 index 0000000000..5940db2924 --- /dev/null +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ConverterParser.java @@ -0,0 +1,67 @@ +/* + * Copyright 2002-2010 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.BeanDefinitionHolder; +import org.springframework.beans.factory.config.RuntimeBeanReference; +import org.springframework.beans.factory.parsing.BeanComponentDefinition; +import org.springframework.beans.factory.support.AbstractBeanDefinition; +import org.springframework.beans.factory.support.BeanDefinitionBuilder; +import org.springframework.beans.factory.support.BeanDefinitionReaderUtils; +import org.springframework.beans.factory.support.ManagedList; +import org.springframework.beans.factory.xml.AbstractBeanDefinitionParser; +import org.springframework.beans.factory.xml.ParserContext; +import org.springframework.context.support.ConversionServiceFactoryBean; +import org.springframework.util.Assert; +import org.springframework.util.StringUtils; +import org.w3c.dom.Element; + +/** + * @author Oleg Zhurakousky + * @since 2.0 + */ +public class ConverterParser extends AbstractBeanDefinitionParser { + private final ManagedList converters = new ManagedList(); + private final static String CONVERSION_SERVICE = "integrationConversionService"; + + /* (non-Javadoc) + * @see org.springframework.beans.factory.xml.AbstractBeanDefinitionParser#parseInternal(org.w3c.dom.Element, org.springframework.beans.factory.xml.ParserContext) + */ + @Override + protected AbstractBeanDefinition parseInternal(Element element, ParserContext parserContext) { + if (!parserContext.getReaderContext().getRegistry().containsBeanDefinition(CONVERSION_SERVICE)){ + this.defineConversionSesrvice(parserContext); + } + BeanComponentDefinition converterDefinition = IntegrationNamespaceUtils.parseInnerHandlerDefinition(element, parserContext); + if (converterDefinition == null){ + String beanName = element.getAttribute("ref"); + Assert.isTrue(StringUtils.hasText(beanName), "'ref' attribute pointing to a Converter definition or sub-element converter definition must be provided"); + converters.add(new RuntimeBeanReference(beanName)); + } else{ + converters.add(converterDefinition); + } + return null; + } + /* + * + */ + private void defineConversionSesrvice(ParserContext parserContext){ + BeanDefinitionBuilder conversionServiceBuilder = BeanDefinitionBuilder.rootBeanDefinition(ConversionServiceFactoryBean.class); + conversionServiceBuilder.addPropertyValue("converters", converters); + BeanDefinitionHolder bdHolder = new BeanDefinitionHolder(conversionServiceBuilder.getBeanDefinition(), CONVERSION_SERVICE); + BeanDefinitionReaderUtils.registerBeanDefinition(bdHolder, parserContext.getRegistry()); + } +} 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 0ca91d1b1b..e5886cf43f 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 @@ -61,6 +61,7 @@ public class IntegrationNamespaceHandler extends AbstractIntegrationNamespaceHan registerBeanDefinitionParser("application-event-multicaster", new ApplicationEventMulticasterParser()); registerBeanDefinitionParser("publisher", new PublisherParser()); registerBeanDefinitionParser("channel-interceptor", new GlobalChannelInterceptorParser()); + registerBeanDefinitionParser("converter", new ConverterParser()); } } 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 fa1566b20c..143825667f 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 @@ -1024,7 +1024,7 @@ - + @@ -2326,5 +2326,27 @@ + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests-context.xml new file mode 100644 index 0000000000..c50aa2153e --- /dev/null +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests-context.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java new file mode 100644 index 0000000000..12a34a8271 --- /dev/null +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java @@ -0,0 +1,212 @@ +/* + * Copyright 2002-2010 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 static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.core.convert.converter.Converter; +import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.message.MessageBuilder; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + + +/** + * @author Oleg Zhurakousky + * + */ +@ContextConfiguration +@RunWith(SpringJUnit4ClassRunner.class) +public class ConverterParserTests { + + @Autowired + @Qualifier("serviceActivatorChannel") + private MessageChannel serviceActivatorChannel; + + @Autowired + @Qualifier("serviceActivatorChannel3") + private MessageChannel serviceActivatorChannel3; + + @Autowired + private MessageChannel transformerChannel; + + @Autowired + private MessageChannel splitterChannel; + + @Autowired + private MessageChannel filterChannel; + + @Autowired + private MessageChannel routerChannel; + + @Autowired + @Qualifier("ROUTER_TARGET_CHANNEL") + private PollableChannel routerTargetChannel; + + + @Test + public void serviceActivator() { + QueueChannel replyChannel = new QueueChannel(); + Message message = MessageBuilder.withPayload(new TestBean1("service-test")) + .setReplyChannel(replyChannel).build(); + this.serviceActivatorChannel.send(message); + Message result = replyChannel.receive(0); + assertNotNull(result); + assertNotNull(result.getPayload()); + assertEquals(TestBean2.class, result.getPayload().getClass()); + assertEquals("SERVICE-TEST", ((TestBean2) result.getPayload()).text); + } + + @Test + public void serviceActivatorUsingInnerConverterDefinition() { + QueueChannel replyChannel = new QueueChannel(); + Message message = MessageBuilder.withPayload(new TestBean1("service-test")) + .setReplyChannel(replyChannel).build(); + this.serviceActivatorChannel3.send(message); + Message result = replyChannel.receive(0); + assertNotNull(result); + assertNotNull(result.getPayload()); + assertEquals(TestBean3.class, result.getPayload().getClass()); + assertEquals("SERVICE-TEST", ((TestBean3) result.getPayload()).text); + } + + @Test + public void transformer() { + QueueChannel replyChannel = new QueueChannel(); + Message message = MessageBuilder.withPayload(new TestBean1("transformer-test")) + .setReplyChannel(replyChannel).build(); + this.transformerChannel.send(message); + Message result = replyChannel.receive(0); + assertNotNull(result); + assertNotNull(result.getPayload()); + assertEquals(TestBean2.class, result.getPayload().getClass()); + assertEquals("TRANSFORMER-TEST", ((TestBean2) result.getPayload()).text); + } + + @Test + public void splitter() { + QueueChannel replyChannel = new QueueChannel(); + Message message = MessageBuilder.withPayload(new TestBean1("splitter-test")) + .setReplyChannel(replyChannel).build(); + this.splitterChannel.send(message); + Message result = replyChannel.receive(0); + assertNotNull(result); + assertNotNull(result.getPayload()); + assertEquals(TestBean2.class, result.getPayload().getClass()); + assertEquals("SPLITTER-TEST", ((TestBean2) result.getPayload()).text); + } + + @Test + public void filter() { + QueueChannel replyChannel = new QueueChannel(); + Message message = MessageBuilder.withPayload(new TestBean1("filter-test")) + .setReplyChannel(replyChannel).build(); + this.filterChannel.send(message); + Message result = replyChannel.receive(0); + assertNotNull(result); + assertNotNull(result.getPayload()); + assertEquals(TestBean1.class, result.getPayload().getClass()); + assertEquals("filter-test", ((TestBean1) result.getPayload()).text); + } + + @Test + public void router() { + Message message = MessageBuilder.withPayload(new TestBean1("router-test")).build(); + this.routerChannel.send(message); + Message result = this.routerTargetChannel.receive(0); + assertNotNull(result); + assertNotNull(result.getPayload()); + assertEquals(TestBean1.class, result.getPayload().getClass()); + assertEquals("router-test", ((TestBean1) result.getPayload()).text); + } + + + @SuppressWarnings("unused") + private static class TestService { + + public Object test(TestBean2 bean) { + return bean; + } + + public Object test3(TestBean3 bean) { + return bean; + } + + public boolean filter(TestBean2 bean) { + return true; + } + } + + private static class TestBean1 { + + private String text; + + public TestBean1(String text) { + this.text = text; + } + } + + + private static class TestBean2 { + + private String text; + + public TestBean2(String text) { + this.text = text; + } + + // called by router for channel name + public String toString() { + return this.text.replace("-TEST", "_TARGET_CHANNEL"); + } + } + private static class TestBean3 { + + private String text; + + public TestBean3(String text) { + this.text = text; + } + + // called by router for channel name + public String toString() { + return this.text.replace("-TEST", "_TARGET_CHANNEL"); + } + } + + @SuppressWarnings("unused") + private static class TestConverter implements Converter { + + public TestBean2 convert(TestBean1 source) { + return new TestBean2(source.text.toUpperCase()); + } + } + @SuppressWarnings("unused") + private static class TestConverter3 implements Converter { + + public TestBean3 convert(TestBean1 source) { + return new TestBean3(source.text.toUpperCase()); + } + } +}