Removed Splitter interface and added AbstractMessageSplitter base class. The MethodInvokingSplitter is now capable of resolving methods when only an Object is provided to its constructor - either a single method containing the @Splitter annotation or a single public Method as a fallback (or if neither is satisifed, an IllegalArgumentException will be thrown).

org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java

@@ -23,12 +23,10 @@ import org.junit.Test;
 
 import org.springframework.integration.channel.DirectChannel;
 import org.springframework.integration.channel.QueueChannel;
-import org.springframework.integration.endpoint.ServiceActivatorEndpoint;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.StringMessage;
 import org.springframework.integration.splitter.MethodInvokingSplitter;
-import org.springframework.integration.splitter.SplitterEndpoint;
 
 /**
  * @author Mark Fisher
@@ -118,10 +116,9 @@ public class CorrelationIdTests {
 		QueueChannel testChannel = new QueueChannel();
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(
 				new TestBean(), TestBean.class.getMethod("split", String.class));
-		SplitterEndpoint endpoint = new SplitterEndpoint(splitter);
-		endpoint.setOutputChannel(testChannel);
+		splitter.setOutputChannel(testChannel);
 		splitter.afterPropertiesSet();
-		endpoint.onMessage(message);
+		splitter.onMessage(message);
 		Message<?> reply1 = testChannel.receive(100);
 		Message<?> reply2 = testChannel.receive(100);
 		assertEquals(message.getHeaders().getId(), reply1.getHeaders().getCorrelationId());

org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java

@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.junit.Test;
 
+import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;
 
@@ -36,8 +37,11 @@ public class DefaultSplitterTests {
 	public void splitMessageWithArrayPayload() throws Exception {
 		String[] payload = new String[] { "x", "y", "z" };
 		Message<String[]> message = MessageBuilder.withPayload(payload).build();
-		DefaultSplitter splitter = new DefaultSplitter();
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		DefaultMessageSplitter splitter = new DefaultMessageSplitter();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		assertEquals(3, replies.size());
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
@@ -54,8 +58,11 @@ public class DefaultSplitterTests {
 	public void splitMessageWithCollectionPayload() throws Exception {
 		List<String> payload = Arrays.asList(new String[] { "x", "y", "z" });
 		Message<List<String>> message = MessageBuilder.withPayload(payload).build();
-		DefaultSplitter splitter = new DefaultSplitter();
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		DefaultMessageSplitter splitter = new DefaultMessageSplitter();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		assertEquals(3, replies.size());
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);

org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java

@@ -27,6 +27,8 @@ import java.util.List;
 import org.junit.Test;
 
 import org.springframework.integration.annotation.Header;
+import org.springframework.integration.annotation.Splitter;
+import org.springframework.integration.channel.QueueChannel;
 import org.springframework.integration.message.Message;
 import org.springframework.integration.message.MessageBuilder;
 import org.springframework.integration.message.StringMessage;
@@ -43,7 +45,10 @@ public class MethodInvokingSplitterTests {
 	public void splitStringToStringArray() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("stringToStringArray");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -56,7 +61,10 @@ public class MethodInvokingSplitterTests {
 	public void splitStringToStringList() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("stringToStringList");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -69,7 +77,10 @@ public class MethodInvokingSplitterTests {
 	public void splitMessageToStringArray() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("messageToStringArray");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -82,7 +93,10 @@ public class MethodInvokingSplitterTests {
 	public void splitMessageToStringList() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("messageToStringList");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -95,7 +109,10 @@ public class MethodInvokingSplitterTests {
 	public void splitMessageToMessageArray() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("messageToMessageArray");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -108,7 +125,10 @@ public class MethodInvokingSplitterTests {
 	public void splitMessageToMessageList() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("messageToMessageList");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -121,7 +141,10 @@ public class MethodInvokingSplitterTests {
 	public void splitStringToMessageArray() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("stringToMessageArray");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -134,7 +157,10 @@ public class MethodInvokingSplitterTests {
 	public void splitStringToMessageList() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("stringToMessageList");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -147,7 +173,10 @@ public class MethodInvokingSplitterTests {
 	public void splitStringToStringArrayConfiguredByMethodName() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "stringToStringArray");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -160,7 +189,10 @@ public class MethodInvokingSplitterTests {
 	public void splitStringToStringListConfiguredByMethodName() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "stringToStringList");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -173,7 +205,10 @@ public class MethodInvokingSplitterTests {
 	public void splitMessageToStringArrayConfiguredByMethodName() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "messageToStringArray");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -186,7 +221,10 @@ public class MethodInvokingSplitterTests {
 	public void splitMessageToStringListConfiguredByMethodName() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "messageToStringList");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -199,7 +237,10 @@ public class MethodInvokingSplitterTests {
 	public void splitMessageToMessageArrayConfiguredByMethodName() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "messageToMessageArray");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -212,7 +253,10 @@ public class MethodInvokingSplitterTests {
 	public void splitMessageToMessageListConfiguredByMethodName() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "messageToMessageList");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -225,7 +269,10 @@ public class MethodInvokingSplitterTests {
 	public void splitStringToMessageArrayConfiguredByMethodName() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "stringToMessageArray");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -238,7 +285,10 @@ public class MethodInvokingSplitterTests {
 	public void splitStringToMessageListConfiguredByMethodName() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, "stringToMessageList");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -248,10 +298,13 @@ public class MethodInvokingSplitterTests {
 	}
 
 	@Test
-	public void testHeaderForObjectReturnValues() throws Exception {
+	public void headerForObjectReturnValues() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("stringToStringArray");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals(new Integer(2), reply1.getHeaders().getSequenceSize());
@@ -265,10 +318,13 @@ public class MethodInvokingSplitterTests {
 	}
 
 	@Test
-	public void testHeaderForMessageReturnValues() throws Exception {
+	public void headerForMessageReturnValues() throws Exception {
 		StringMessage message = new StringMessage("foo.bar");
 		MethodInvokingSplitter splitter = this.getSplitter("messageToMessageList");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals(new Integer(2), reply1.getHeaders().getSequenceSize());
@@ -286,7 +342,10 @@ public class MethodInvokingSplitterTests {
 		Message<String> message = MessageBuilder.withPayload("ignored")
 				.setHeader("testHeader", "foo.bar").build();
 		MethodInvokingSplitter splitter = this.getSplitter("splitHeader");
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("foo", reply1.getPayload());
@@ -301,7 +360,10 @@ public class MethodInvokingSplitterTests {
 				.setHeader("testHeader", "c.d").build();
 		Method splittingMethod = this.testBean.getClass().getMethod("splitPayloadAndHeader", String.class, String.class);
 		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean, splittingMethod);
-		List<Message<?>> replies = splitter.split(message);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
 		Message<?> reply1 = replies.get(0);
 		assertNotNull(reply1);
 		assertEquals("a", reply1.getPayload());
@@ -316,6 +378,50 @@ public class MethodInvokingSplitterTests {
 		assertEquals("d", reply4.getPayload());
 	}
 
+	@Test
+	public void singleAnnotation() {
+		StringMessage message = new StringMessage("foo.bar");
+		SingleAnnotationTestBean annotatedBean = new SingleAnnotationTestBean();
+		MethodInvokingSplitter splitter = new MethodInvokingSplitter(annotatedBean);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
+		Message<?> reply1 = replies.get(0);
+		assertNotNull(reply1);
+		assertEquals("foo", reply1.getPayload());
+		Message<?> reply2 = replies.get(1);
+		assertNotNull(reply2);
+		assertEquals("bar", reply2.getPayload());
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void multipleAnnotations() {
+		new MethodInvokingSplitter(new MultipleAnnotationTestBean());
+	}
+
+	@Test
+	public void singlePublicMethod() {
+		StringMessage message = new StringMessage("foo.bar");
+		SinglePublicMethodTestBean testBean = new SinglePublicMethodTestBean();
+		MethodInvokingSplitter splitter = new MethodInvokingSplitter(testBean);
+		QueueChannel replyChannel = new QueueChannel();
+		splitter.setOutputChannel(replyChannel);
+		splitter.onMessage(message);
+		List<Message<?>> replies = replyChannel.clear();
+		Message<?> reply1 = replies.get(0);
+		assertNotNull(reply1);
+		assertEquals("foo", reply1.getPayload());
+		Message<?> reply2 = replies.get(1);
+		assertNotNull(reply2);
+		assertEquals("bar", reply2.getPayload());
+	}
+
+	@Test(expected = IllegalArgumentException.class)
+	public void multiplePublicMethods() {
+		new MethodInvokingSplitter(new MultiplePublicMethodTestBean());
+	}
+
 
 	private MethodInvokingSplitter getSplitter(String methodName) throws Exception {
 		Class<?> paramType = methodName.startsWith("message") ? Message.class : String.class;
@@ -395,4 +501,55 @@ public class MethodInvokingSplitterTests {
 		}
 	}
 
+
+	public static class SingleAnnotationTestBean {
+
+		@Splitter
+		public String[] annotatedMethod(String input) {
+			return input.split("\\.");
+		}
+
+		public String[] anotherMethod(String input) {
+			throw new UnsupportedOperationException("incorrect test invocation");
+		}
+	}
+
+
+	public static class MultipleAnnotationTestBean {
+
+		@Splitter
+		public String[] method1(String input) {
+			throw new UnsupportedOperationException("incorrect test invocation");
+		}
+
+		@Splitter
+		public String[] method2(String input) {
+			throw new UnsupportedOperationException("incorrect test invocation");
+		}
+	}
+
+
+	public static class SinglePublicMethodTestBean {
+
+		public String[] publicMethod(String input) {
+			return input.split("\\.");
+		}
+
+		String[] anotherMethod(String input) {
+			throw new UnsupportedOperationException("incorrect test invocation");
+		}
+	}
+
+
+	public static class MultiplePublicMethodTestBean {
+
+		public String[] method1(String input) {
+			throw new UnsupportedOperationException("incorrect test invocation");
+		}
+
+		public String[] method2(String input) {
+			throw new UnsupportedOperationException("incorrect test invocation");
+		}
+	}
+
 }