Refactored existing Message-consuming endpoints to only implement MessageConsumer (not MessageEndpoint). Now, either a PollingConsumerEndpoint or SubscribingConsumerEndpoint delegates to the MessageConsumer thereby separating the Lifecycle responsibilities and configuration settings (trigger, transactions, etc) since they are different for polling vs. subscribing and not relevant for simply consuming Messages. Essentially all MessageConsumers are now "event-driven" since a "polling consumer" is actually handled by the PollingConsumerEndpoint class. The next refactoring step involves renaming several components to clarify this endpoint vs. consumer distinction.

org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests.java

@@ -27,7 +27,7 @@ import org.junit.runner.RunWith;
 import org.springframework.beans.DirectFieldAccessor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.integration.endpoint.OutboundChannelAdapter;
+import org.springframework.integration.endpoint.SubscribingConsumerEndpoint;
 import org.springframework.integration.file.DefaultFileNameGenerator;
 import org.springframework.integration.file.FileWritingMessageConsumer;
 import org.springframework.test.context.ContextConfiguration;
@@ -43,11 +43,11 @@ public class FileOutboundChannelAdapterParserTests {
 
 	@Autowired
 	@Qualifier("simpleAdapter")
-	OutboundChannelAdapter simpleAdapter;
+	SubscribingConsumerEndpoint simpleAdapter;
 
 	@Autowired
 	@Qualifier("adapterWithCustomNameGenerator")
-	OutboundChannelAdapter adapterWithCustomNameGenerator;
+	SubscribingConsumerEndpoint adapterWithCustomNameGenerator;
 
 
 	@Test