removing cycles in poller code

spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java

@@ -31,8 +31,8 @@ import org.springframework.integration.core.PollableChannel;
 import org.springframework.integration.core.SubscribableChannel;
 import org.springframework.integration.endpoint.AbstractEndpoint;
 import org.springframework.integration.endpoint.EventDrivenConsumer;
+import org.springframework.integration.endpoint.PollerFactory;
 import org.springframework.integration.endpoint.PollingConsumer;
-import org.springframework.integration.scheduling.PollerFactory;
 import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.util.Assert;
 import org.springframework.util.StringUtils;

spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java

@@ -27,8 +27,8 @@ import org.springframework.context.SmartLifecycle;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.context.IntegrationContextUtils;
 import org.springframework.integration.core.MessageSource;
+import org.springframework.integration.endpoint.PollerFactory;
 import org.springframework.integration.endpoint.SourcePollingChannelAdapter;
-import org.springframework.integration.scheduling.PollerFactory;
 import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.util.Assert;
 

spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java

@@ -20,8 +20,6 @@ import java.util.concurrent.ScheduledFuture;
 
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.MessagingException;
-import org.springframework.integration.config.Poller;
-import org.springframework.integration.scheduling.PollerFactory;
 import org.springframework.scheduling.Trigger;
 import org.springframework.util.Assert;
 /**

spring-integration-core/src/main/java/org/springframework/integration/endpoint/AsyncInvokerAdvice.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.util;
+package org.springframework.integration.endpoint;
 
 import java.util.concurrent.Executor;
 
@@ -26,6 +26,7 @@ import org.springframework.beans.factory.InitializingBean;
 import org.springframework.integration.MessagingException;
 import org.springframework.integration.channel.MessagePublishingErrorHandler;
 import org.springframework.integration.support.channel.BeanFactoryChannelResolver;
+import org.springframework.integration.util.ErrorHandlingTaskExecutor;
 import org.springframework.util.ErrorHandler;
 
 /**

spring-integration-core/src/main/java/org/springframework/integration/endpoint/Poller.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.config;
+package org.springframework.integration.endpoint;
 
 import java.util.concurrent.Callable;
 

spring-integration-core/src/main/java/org/springframework/integration/endpoint/PollerFactory.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.springframework.integration.scheduling;
+package org.springframework.integration.endpoint;
 
 import java.util.List;
 import java.util.concurrent.Callable;
@@ -28,8 +28,7 @@ import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanClassLoaderAware;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.integration.config.Poller;
-import org.springframework.integration.util.AsyncInvokerAdvice;
+import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.integration.util.ObjectDecorator;
 import org.springframework.util.CollectionUtils;
 /**

spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerTaskTransactionDecorator.java

@@ -21,7 +21,7 @@ import org.springframework.aop.framework.Advised;
 import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.beans.factory.BeanFactoryAware;
-import org.springframework.integration.config.Poller;
+import org.springframework.integration.endpoint.Poller;
 import org.springframework.integration.util.ObjectDecorator;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.interceptor.DefaultTransactionAttribute;

spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java

@@ -34,9 +34,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.integration.Message;
 import org.springframework.integration.MessageChannel;
 import org.springframework.integration.core.PollableChannel;
+import org.springframework.integration.endpoint.PollerFactory;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.scheduling.PollerFactory;
 import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.integration.test.util.TestUtils;
 import org.springframework.integration.util.TestTransactionManager;

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

@@ -39,7 +39,6 @@ import org.springframework.integration.MessageRejectedException;
 import org.springframework.integration.core.MessageHandler;
 import org.springframework.integration.core.PollableChannel;
 import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.scheduling.PollerFactory;
 import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.TriggerContext;

spring-integration-core/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml

@@ -13,7 +13,7 @@
 
 	<bean id="testEndpoint" class="org.springframework.integration.endpoint.PollingEndpointStub">
 		<property name="pollerFactory">
-			<bean class="org.springframework.integration.scheduling.PollerFactory">
+			<bean class="org.springframework.integration.endpoint.PollerFactory">
 				<constructor-arg>
 					<bean class="org.springframework.integration.scheduling.PollerMetadata">
 						<property name="taskExecutor" ref="taskExecutor"/>

spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java

@@ -30,9 +30,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.endpoint.PollerFactory;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.scheduling.PollerFactory;
 import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.TriggerContext;

spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java

@@ -29,9 +29,9 @@ import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.integration.channel.QueueChannel;
+import org.springframework.integration.endpoint.PollerFactory;
 import org.springframework.integration.endpoint.PollingConsumer;
 import org.springframework.integration.message.GenericMessage;
-import org.springframework.integration.scheduling.PollerFactory;
 import org.springframework.integration.scheduling.PollerMetadata;
 import org.springframework.scheduling.Trigger;
 import org.springframework.scheduling.TriggerContext;