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

Added Splitter strategy interface, and refactored Message-splitting support in general to avoid MessageHandler.

Browse Source
This commit is contained in:
Mark Fisher
2008-08-27 23:00:27 +00:00
parent 59c3d5c9e3
commit 5fd3ed90d3
12 changed files with 879 additions and 180 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
org.springframework.integration/src/test/java/org/springframework/integration/handler/CorrelationIdTests.java
View File

@@ -22,11 +22,11 @@ import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.springframework.integration.channel.QueueChannel;
import org.springframework.integration.endpoint.DefaultEndpoint;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.StringMessage;
import org.springframework.integration.splitter.SplitterMessageHandler;
import org.springframework.integration.splitter.MethodInvokingSplitter;
import org.springframework.integration.splitter.SplitterEndpoint;
/**
* @author Mark Fisher
@@ -99,10 +99,10 @@ public class CorrelationIdTests {
public void testCorrelationIdWithSplitter() throws Exception {
Message<?> message = new StringMessage("test1,test2");
QueueChannel testChannel = new QueueChannel();
SplitterMessageHandler splitter = new SplitterMessageHandler(
MethodInvokingSplitter splitter = new MethodInvokingSplitter(
new TestBean(), TestBean.class.getMethod("split", String.class));
DefaultEndpoint<SplitterMessageHandler> endpoint = new DefaultEndpoint<SplitterMessageHandler>(splitter);
endpoint.setOutputChannel(testChannel);
SplitterEndpoint endpoint = new SplitterEndpoint(splitter);
endpoint.setTarget(testChannel);
splitter.afterPropertiesSet();
endpoint.send(message);
Message<?> reply1 = testChannel.receive(100);

71
org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java Normal file
View File

@@ -0,0 +1,71 @@
/*
* 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.splitter;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import java.util.Arrays;
import java.util.List;
import org.junit.Test;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageBuilder;
/**
* @author Mark Fisher
*/
public class DefaultSplitterTests {
@Test
public void splitMessageWithArrayPayload() throws Exception {
String[] payload = new String[] { "x", "y", "z" };
Message<String[]> message = MessageBuilder.fromPayload(payload).build();
DefaultSplitter splitter = new DefaultSplitter();
List<Message<?>> replies = splitter.split(message);
assertEquals(3, replies.size());
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("x", reply1.getPayload());
Message<?> reply2 = replies.get(1);
assertNotNull(reply2);
assertEquals("y", reply2.getPayload());
Message<?> reply3 = replies.get(2);
assertNotNull(reply3);
assertEquals("z", reply3.getPayload());
}
@Test
public void splitMessageWithCollectionPayload() throws Exception {
List<String> payload = Arrays.asList(new String[] { "x", "y", "z" });
Message<List<String>> message = MessageBuilder.fromPayload(payload).build();
DefaultSplitter splitter = new DefaultSplitter();
List<Message<?>> replies = splitter.split(message);
assertEquals(3, replies.size());
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("x", reply1.getPayload());
Message<?> reply2 = replies.get(1);
assertNotNull(reply2);
assertEquals("y", reply2.getPayload());
Message<?> reply3 = replies.get(2);
assertNotNull(reply3);
assertEquals("z", reply3.getPayload());
}
}

127
org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterMessageHandlerTests.java → org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java
View File

@@ -27,7 +27,6 @@ import java.util.List;
import org.junit.Test;
import org.springframework.integration.annotation.Header;
import org.springframework.integration.message.CompositeMessage;
import org.springframework.integration.message.Message;
import org.springframework.integration.message.MessageBuilder;
import org.springframework.integration.message.StringMessage;
@@ -35,52 +34,16 @@ import org.springframework.integration.message.StringMessage;
/**
* @author Mark Fisher
*/
public class SplitterMessageHandlerTests {
public class MethodInvokingSplitterTests {
private SplitterTestBean testBean = new SplitterTestBean();
@Test
public void splitMessageWithArrayPayload() throws Exception {
String[] payload = new String[] { "x", "y", "z" };
Message<String[]> message = MessageBuilder.fromPayload(payload).build();
SplitterMessageHandler handler = new SplitterMessageHandler();
List<Message<?>> replies = invokeHandler(handler, message);
assertEquals(3, replies.size());
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("x", reply1.getPayload());
Message<?> reply2 = replies.get(1);
assertNotNull(reply2);
assertEquals("y", reply2.getPayload());
Message<?> reply3 = replies.get(2);
assertNotNull(reply3);
assertEquals("z", reply3.getPayload());
}
@Test
public void splitMessageWithCollectionPayload() throws Exception {
List<String> payload = Arrays.asList(new String[] { "x", "y", "z" });
Message<List<String>> message = MessageBuilder.fromPayload(payload).build();
SplitterMessageHandler handler = new SplitterMessageHandler();
List<Message<?>> replies = invokeHandler(handler, message);
assertEquals(3, replies.size());
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("x", reply1.getPayload());
Message<?> reply2 = replies.get(1);
assertNotNull(reply2);
assertEquals("y", reply2.getPayload());
Message<?> reply3 = replies.get(2);
assertNotNull(reply3);
assertEquals("z", reply3.getPayload());
}
@Test
public void splitStringToStringArray() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("stringToStringArray");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("stringToStringArray");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -92,8 +55,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitStringToStringList() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("stringToStringList");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("stringToStringList");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -105,8 +68,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitMessageToStringArray() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("messageToStringArray");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("messageToStringArray");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -118,8 +81,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitMessageToStringList() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("messageToStringList");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("messageToStringList");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -131,8 +94,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitMessageToMessageArray() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("messageToMessageArray");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("messageToMessageArray");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -144,8 +107,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitMessageToMessageList() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("messageToMessageList");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("messageToMessageList");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -157,8 +120,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitStringToMessageArray() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("stringToMessageArray");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("stringToMessageArray");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -170,8 +133,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitStringToMessageList() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("stringToMessageList");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("stringToMessageList");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -183,8 +146,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitStringToStringArrayConfiguredByMethodName() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = new SplitterMessageHandler(testBean, "stringToStringArray");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "stringToStringArray");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -196,8 +159,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitStringToStringListConfiguredByMethodName() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = new SplitterMessageHandler(testBean, "stringToStringList");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "stringToStringList");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -209,8 +172,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitMessageToStringArrayConfiguredByMethodName() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = new SplitterMessageHandler(testBean, "messageToStringArray");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "messageToStringArray");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -222,8 +185,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitMessageToStringListConfiguredByMethodName() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = new SplitterMessageHandler(testBean, "messageToStringList");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "messageToStringList");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -235,8 +198,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitMessageToMessageArrayConfiguredByMethodName() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = new SplitterMessageHandler(testBean, "messageToMessageArray");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "messageToMessageArray");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -248,8 +211,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitMessageToMessageListConfiguredByMethodName() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = new SplitterMessageHandler(testBean, "messageToMessageList");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "messageToMessageList");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -261,8 +224,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitStringToMessageArrayConfiguredByMethodName() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = new SplitterMessageHandler(testBean, "stringToMessageArray");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "stringToMessageArray");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -274,8 +237,8 @@ public class SplitterMessageHandlerTests {
@Test
public void splitStringToMessageListConfiguredByMethodName() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = new SplitterMessageHandler(testBean, "stringToMessageList");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "stringToMessageList");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -287,8 +250,8 @@ public class SplitterMessageHandlerTests {
@Test
public void testHeaderForObjectReturnValues() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("stringToStringArray");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("stringToStringArray");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals(new Integer(2), reply1.getHeaders().getSequenceSize());
@@ -304,8 +267,8 @@ public class SplitterMessageHandlerTests {
@Test
public void testHeaderForMessageReturnValues() throws Exception {
StringMessage message = new StringMessage("foo.bar");
SplitterMessageHandler handler = this.getHandler("messageToMessageList");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("messageToMessageList");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals(new Integer(2), reply1.getHeaders().getSequenceSize());
@@ -322,8 +285,8 @@ public class SplitterMessageHandlerTests {
public void splitMessageHeader() throws Exception {
Message<String> message = MessageBuilder.fromPayload("ignored")
.setHeader("testHeader", "foo.bar").build();
SplitterMessageHandler handler = this.getHandler("splitHeader");
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = this.getSplitter("splitHeader");
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("foo", reply1.getPayload());
@@ -337,8 +300,8 @@ public class SplitterMessageHandlerTests {
Message<String> message = MessageBuilder.fromPayload("a.b")
.setHeader("testHeader", "c.d").build();
Method splittingMethod = this.testBean.getClass().getMethod("splitPayloadAndHeader", String.class, String.class);
SplitterMessageHandler handler = new SplitterMessageHandler(testBean, splittingMethod);
List<Message<?>> replies = invokeHandler(handler, message);
MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, splittingMethod);
List<Message<?>> replies = splitter.split(message);
Message<?> reply1 = replies.get(0);
assertNotNull(reply1);
assertEquals("a", reply1.getPayload());
@@ -354,14 +317,10 @@ public class SplitterMessageHandlerTests {
}
private SplitterMessageHandler getHandler(String methodName) throws Exception {
private MethodInvokingSplitter getSplitter(String methodName) throws Exception {
Class<?> paramType = methodName.startsWith("message") ? Message.class : String.class;
Method splittingMethod = this.testBean.getClass().getMethod(methodName, paramType);
return new SplitterMessageHandler(testBean, splittingMethod);
}
private static List<Message<?>> invokeHandler(SplitterMessageHandler handler, Message<?> message) {
return ((CompositeMessage) handler.handle(message)).getPayload();
return new MethodInvokingSplitter(testBean, splittingMethod);
}