Now enforcing that a message endpoint must contain a handler method (INT-177).

spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTests.xml

@@ -8,9 +8,7 @@
 		<property name="autoStartup" value="false"/>
 	</bean>
 
-	<bean id="inputChannel" class="org.springframework.integration.channel.SimpleChannel"/>
-
-	<bean id="outputChannel" class="org.springframework.integration.channel.SimpleChannel"/>
+	<bean id="channel" class="org.springframework.integration.channel.SimpleChannel"/>
 
 	<bean id="sourceAdapter" class="org.springframework.integration.adapter.PollingSourceAdapter">
 		<constructor-arg>
@@ -21,7 +19,7 @@
 				<property name="method" value="foo"/>
 			</bean>
 		</constructor-arg>
-		<property name="channel" ref="inputChannel"/>
+		<property name="channel" ref="channel"/>
 	</bean>
 
 	<bean id="targetAdapter" class="org.springframework.integration.adapter.DefaultTargetAdapter">
@@ -37,20 +35,11 @@
 		<constructor-arg ref="targetAdapter"/>
 		<property name="subscription">
 			<bean class="org.springframework.integration.scheduling.Subscription">
-				<constructor-arg ref="outputChannel"/>
+				<constructor-arg ref="channel"/>
 			</bean>
 		</property>
 	</bean>
 
 	<bean id="sink" class="org.springframework.integration.adapter.TestSink"/>
 
-	<bean class="org.springframework.integration.endpoint.DefaultMessageEndpoint">
-		<property name="subscription">
-			<bean class="org.springframework.integration.scheduling.Subscription">
-				<constructor-arg ref="inputChannel"/>
-			</bean>
-		</property>
-		<property name="defaultOutputChannelName" value="outputChannel"/>
-	</bean>
-
 </beans>

spring-integration-core/src/test/java/org/springframework/integration/adapter/adapterTestsWithNamespace.xml

@@ -9,15 +9,11 @@
 
 	<si:message-bus auto-startup="false"/>
 
-	<si:channel id="inputChannel"/>
+	<si:channel id="channel"/>
 
-	<si:channel id="outputChannel"/>
+	<si:source-adapter ref="source" method="foo" channel="channel" period="100"/>
 
-	<si:source-adapter ref="source" method="foo" channel="inputChannel" period="100"/>
-
-	<si:target-adapter ref="sink" method="store" channel="outputChannel"/>
-
-	<si:endpoint input-channel="inputChannel" default-output-channel="outputChannel"/>
+	<si:target-adapter ref="sink" method="store" channel="channel"/>
 
 	<bean id="source" class="org.springframework.integration.adapter.TestSource"/>
 

spring-integration-core/src/test/java/org/springframework/integration/bus/messageBusTests.xml

@@ -11,6 +11,7 @@
 	<bean id="targetChannel" class="org.springframework.integration.channel.SimpleChannel"/>
 
 	<bean id="endpoint" class="org.springframework.integration.endpoint.DefaultMessageEndpoint">
+		<constructor-arg ref="handler"/>
 		<property name="subscription">
 			<bean class="org.springframework.integration.scheduling.Subscription">
 				<constructor-arg ref="sourceChannel"/>
@@ -18,5 +19,7 @@
 		</property>
 		<property name="defaultOutputChannelName" value="targetChannel"/>
 	</bean>
+
+	<bean id="handler" class="org.springframework.integration.handler.TestHandlers" factory-method="echoHandler"/>
 
 </beans>

spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageEndpointAnnotationPostProcessorTests.java

@@ -28,6 +28,7 @@ import org.junit.Test;
 import org.springframework.aop.framework.ProxyFactory;
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.integration.ConfigurationException;
 import org.springframework.integration.annotation.Concurrency;
 import org.springframework.integration.annotation.DefaultOutput;
 import org.springframework.integration.annotation.Handler;
@@ -93,6 +94,7 @@ public class MessageEndpointAnnotationPostProcessorTests {
 		messageBus.registerChannel("testChannel", testChannel);
 		MessageEndpointAnnotationPostProcessor postProcessor =
 				new MessageEndpointAnnotationPostProcessor(messageBus);
+		postProcessor.afterPropertiesSet();
 		PolledAnnotationTestBean testBean = new PolledAnnotationTestBean();
 		postProcessor.postProcessAfterInitialization(testBean, "testBean");
 		messageBus.start();
@@ -108,6 +110,7 @@ public class MessageEndpointAnnotationPostProcessorTests {
 		messageBus.registerChannel("testChannel", testChannel);
 		MessageEndpointAnnotationPostProcessor postProcessor =
 				new MessageEndpointAnnotationPostProcessor(messageBus);
+		postProcessor.afterPropertiesSet();
 		CountDownLatch latch = new CountDownLatch(1);
 		DefaultOutputAnnotationTestBean testBean = new DefaultOutputAnnotationTestBean(latch);
 		postProcessor.postProcessAfterInitialization(testBean, "testBean");
@@ -124,6 +127,7 @@ public class MessageEndpointAnnotationPostProcessorTests {
 		MessageBus messageBus = new MessageBus();
 		MessageEndpointAnnotationPostProcessor postProcessor =
 				new MessageEndpointAnnotationPostProcessor(messageBus);
+		postProcessor.afterPropertiesSet();
 		ConcurrencyAnnotationTestBean testBean = new ConcurrencyAnnotationTestBean();
 		postProcessor.postProcessAfterInitialization(testBean, "testBean");
 		DefaultMessageEndpoint endpoint = (DefaultMessageEndpoint) messageBus.lookupEndpoint("testBean-endpoint");
@@ -144,6 +148,7 @@ public class MessageEndpointAnnotationPostProcessorTests {
 		MessageBus messageBus = new MessageBus();
 		MessageEndpointAnnotationPostProcessor postProcessor =
 				new MessageEndpointAnnotationPostProcessor(messageBus);
+		postProcessor.afterPropertiesSet();
 		ChannelRegistryAwareTestBean testBean = new ChannelRegistryAwareTestBean();
 		assertNull(testBean.getChannelRegistry());
 		postProcessor.postProcessAfterInitialization(testBean, "testBean");
@@ -285,6 +290,18 @@ public class MessageEndpointAnnotationPostProcessorTests {
 		assertNull(output.receive(500));
 	}
 
+	@Test(expected=ConfigurationException.class)
+	public void testEndpointWithNoHandlerMethod() {
+		MessageBus messageBus = new MessageBus();
+		SimpleChannel testChannel = new SimpleChannel();
+		messageBus.registerChannel("testChannel", testChannel);
+		MessageEndpointAnnotationPostProcessor postProcessor =
+				new MessageEndpointAnnotationPostProcessor(messageBus);
+		postProcessor.afterPropertiesSet();
+		AnnotatedEndpointWithNoHandlerMethod endpoint = new AnnotatedEndpointWithNoHandlerMethod();
+		postProcessor.postProcessAfterInitialization(endpoint, "endpoint");
+	}
+
 
 	@MessageEndpoint(defaultOutput="testChannel")
 	private static class PolledAnnotationTestBean {
@@ -293,6 +310,11 @@ public class MessageEndpointAnnotationPostProcessorTests {
 		public String poller() {
 			return "test";
 		}
+
+		@Handler
+		public Message<?> handle(Message<?> message) {
+			return message;
+		}
 	}
 
 
@@ -312,6 +334,11 @@ public class MessageEndpointAnnotationPostProcessorTests {
 			return this.messageText;
 		}
 
+		@Handler
+		public Message<?> handle(Message<?> message) {
+			return message;
+		}
+
 		@DefaultOutput
 		public void countdown(String input) {
 			this.messageText = input;
@@ -323,6 +350,11 @@ public class MessageEndpointAnnotationPostProcessorTests {
 	@MessageEndpoint(input="inputChannel")
 	@Concurrency(coreSize=17, maxSize=42, keepAliveSeconds=123, queueCapacity=11)
 	private static class ConcurrencyAnnotationTestBean {
+
+		@Handler
+		public Message<?> handle(Message<?> message) {
+			return null;
+		}
 	}
 
 
@@ -338,6 +370,11 @@ public class MessageEndpointAnnotationPostProcessorTests {
 		public ChannelRegistry getChannelRegistry() {
 			return this.channelRegistry;
 		}
+
+		@Handler
+		public Message<?> handle(Message<?> message) {
+			return null;
+		}
 	}
 
 
@@ -369,4 +406,9 @@ public class MessageEndpointAnnotationPostProcessorTests {
 		}
 	}
 
+
+	@MessageEndpoint(input="testChannel")
+	private static class AnnotatedEndpointWithNoHandlerMethod {
+	}
+
 }

spring-integration-core/src/test/java/org/springframework/integration/handler/TestHandlers.java

@@ -40,6 +40,17 @@ public abstract class TestHandlers {
 		};
 	}
 
+	/**
+	 * Create a {@link MessageHandler} that simply returns the {@link Message} it receives.
+	 */
+	public final static MessageHandler echoHandler() {
+		return new MessageHandler() {
+			public Message<?> handle(Message<?> message) {
+				return message;
+			}
+		};
+	}
+
 	/**
 	 * Create a {@link MessageHandler} that throws a {@link MessageHandlerRejectedExecutionException}.
 	 */