diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java index c0312da256..8133e1976a 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/IntegrationNamespaceHandler.java @@ -107,6 +107,7 @@ public class IntegrationNamespaceHandler implements NamespaceHandler { registerBeanDefinitionParser("resequencer", new ResequencerParser()); registerBeanDefinitionParser("header-enricher", new StandardHeaderEnricherParser()); registerBeanDefinitionParser("object-to-string-transformer", new ObjectToStringTransformerParser()); + registerBeanDefinitionParser("payload-serializing-transformer", new PayloadSerializingTransformerParser()); registerBeanDefinitionParser("inbound-channel-adapter", new MethodInvokingInboundChannelAdapterParser()); registerBeanDefinitionParser("outbound-channel-adapter", new MethodInvokingOutboundChannelAdapterParser()); registerBeanDefinitionParser("gateway", new GatewayParser()); diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParser.java b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParser.java new file mode 100644 index 0000000000..7df110879a --- /dev/null +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParser.java @@ -0,0 +1,41 @@ +/* + * Copyright 2002-2008 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.w3c.dom.Element; + +import org.springframework.beans.factory.support.BeanDefinitionBuilder; +import org.springframework.beans.factory.xml.ParserContext; + +/** + * Parser for the 'payload-serializing-transformer' element. + * + * @author Mark Fisher + * @since 1.0.1 + */ +public class PayloadSerializingTransformerParser extends AbstractTransformerParser { + + @Override + protected String getTransformerClassName() { + return IntegrationNamespaceUtils.BASE_PACKAGE + ".transformer.PayloadSerializingTransformer"; + } + + @Override + protected void parseTransformer(Element element, ParserContext parserContext, BeanDefinitionBuilder builder) { + } + +} diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd index 7c814e319f..a312f63b70 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd +++ b/org.springframework.integration/src/main/java/org/springframework/integration/config/xml/spring-integration-1.0.xsd @@ -599,6 +599,14 @@ + + + + Defines a Transformer that serializes any Object payload that implements Serializable into a byte array. + + + + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests-context.xml b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests-context.xml new file mode 100644 index 0000000000..7e8e94e5ec --- /dev/null +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests-context.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java new file mode 100644 index 0000000000..456533fcd0 --- /dev/null +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java @@ -0,0 +1,120 @@ +/* + * Copyright 2002-2008 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 static org.junit.Assert.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.ObjectInputStream; +import java.io.Serializable; + +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.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.message.GenericMessage; +import org.springframework.integration.message.StringMessage; +import org.springframework.integration.transformer.MessageTransformationException; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +/** + * @author Mark Fisher + */ +@ContextConfiguration +@RunWith(SpringJUnit4ClassRunner.class) +public class PayloadSerializingTransformerParserTests { + + @Autowired + @Qualifier("directInput") + private MessageChannel directInput; + + @Autowired + @Qualifier("queueInput") + private MessageChannel queueInput; + + @Autowired + @Qualifier("output") + private PollableChannel output; + + + @Test + public void directChannelWithStringMessage() throws Exception { + directInput.send(new StringMessage("foo")); + Message result = output.receive(0); + assertNotNull(result); + assertTrue(result.getPayload() instanceof byte[]); + assertEquals("foo", deserialize((byte[]) result.getPayload())); + } + + @Test + public void queueChannelWithStringMessage() throws Exception { + queueInput.send(new StringMessage("foo")); + Message result = output.receive(3000); + assertNotNull(result); + assertTrue(result.getPayload() instanceof byte[]); + assertEquals("foo", deserialize((byte[]) result.getPayload())); + } + + @Test + public void directChannelWithObjectMessage() throws Exception { + directInput.send(new GenericMessage(new TestBean())); + Message result = output.receive(0); + assertNotNull(result); + assertTrue(result.getPayload() instanceof byte[]); + Object deserialized = deserialize((byte[]) result.getPayload()); + assertEquals(TestBean.class, deserialized.getClass()); + assertEquals("test", ((TestBean) deserialized).name); + } + + @Test + public void queueChannelWithObjectMessage() throws Exception { + queueInput.send(new GenericMessage(new TestBean())); + Message result = output.receive(3000); + assertTrue(result.getPayload() instanceof byte[]); + Object deserialized = deserialize((byte[]) result.getPayload()); + assertEquals(TestBean.class, deserialized.getClass()); + assertEquals("test", ((TestBean) deserialized).name); + } + + @Test(expected = MessageTransformationException.class) + public void invalidPayload() { + directInput.send(new GenericMessage(new Object())); + } + + + private static Object deserialize(byte[] bytes) throws Exception { + ByteArrayInputStream byteStream = new ByteArrayInputStream(bytes); + ObjectInputStream objectStream = new ObjectInputStream(byteStream); + return objectStream.readObject(); + } + + + @SuppressWarnings("serial") + private static class TestBean implements Serializable { + + public final String name = "test"; + + } + +}