From c8073076228fa1d506db2bc26302d5c48e8cdaed Mon Sep 17 00:00:00 2001
From: Mark Fisher <markfisher@vmware.com>
Date: Fri, 24 Sep 2010 16:34:00 -0400
Subject: [PATCH] removing cycles in poller code

---
 .../integration/config/ConsumerEndpointFactoryBean.java      | 2 +-
 .../config/SourcePollingChannelAdapterFactoryBean.java       | 2 +-
 .../integration/endpoint/AbstractPollingEndpoint.java        | 2 --
 .../integration/{util => endpoint}/AsyncInvokerAdvice.java   | 3 ++-
 .../integration/{config => endpoint}/Poller.java             | 2 +-
 .../integration/{scheduling => endpoint}/PollerFactory.java  | 5 ++---
 .../scheduling/PollerTaskTransactionDecorator.java           | 2 +-
 .../integration/dispatcher/PollingTransactionTests.java      | 2 +-
 .../integration/endpoint/PollingConsumerEndpointTests.java   | 1 -
 .../endpoint/pollingEndpointErrorHandlingTests.xml           | 2 +-
 .../stream/ByteStreamWritingMessageHandlerTests.java         | 2 +-
 .../stream/CharacterStreamWritingMessageHandlerTests.java    | 2 +-
 12 files changed, 12 insertions(+), 15 deletions(-)
 rename spring-integration-core/src/main/java/org/springframework/integration/{util => endpoint}/AsyncInvokerAdvice.java (96%)
 rename spring-integration-core/src/main/java/org/springframework/integration/{config => endpoint}/Poller.java (97%)
 rename spring-integration-core/src/main/java/org/springframework/integration/{scheduling => endpoint}/PollerFactory.java (96%)

diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
index ef70d76563..37f5d3a6bd 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java
+++ b/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;
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
index ce736fc142..3c6af7b3fd 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java
+++ b/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;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
index 1b7c90eaf0..9f94557e2e 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java
+++ b/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;
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/AsyncInvokerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AsyncInvokerAdvice.java
similarity index 96%
rename from spring-integration-core/src/main/java/org/springframework/integration/util/AsyncInvokerAdvice.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/AsyncInvokerAdvice.java
index 9803445de3..18290f889f 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/util/AsyncInvokerAdvice.java
+++ b/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;
 
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/Poller.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/Poller.java
similarity index 97%
rename from spring-integration-core/src/main/java/org/springframework/integration/config/Poller.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/Poller.java
index 5862e11c05..2ab9ed2916 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/config/Poller.java
+++ b/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;
 
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerFactory.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/PollerFactory.java
similarity index 96%
rename from spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerFactory.java
rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/PollerFactory.java
index 2cde1a42df..a2c82f2bfe 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerFactory.java
+++ b/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;
 /**
diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerTaskTransactionDecorator.java b/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerTaskTransactionDecorator.java
index 62b5588fde..1dbf049a3b 100644
--- a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/PollerTaskTransactionDecorator.java
+++ b/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;
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java
index fe0e698153..8fef13f285 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java
+++ b/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;
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java
index 26f4264606..9701ec7bdd 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java
+++ b/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;
diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
index 02917f66d6..391c1c56fa 100644
--- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/pollingEndpointErrorHandlingTests.xml
+++ b/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"/>
diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java
index 3dc0b03408..2d17debbcb 100644
--- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamWritingMessageHandlerTests.java
+++ b/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;
diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java
index 53b8231b40..f28615222c 100644
--- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandlerTests.java
+++ b/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;