diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java index ec41550b4f..fdda4f8f91 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java @@ -20,7 +20,6 @@ import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; import org.springframework.beans.factory.BeanNameAware; -import org.springframework.integration.dispatcher.DispatcherPolicy; import org.springframework.integration.message.Message; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DispatcherPolicy.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/DispatcherPolicy.java similarity index 97% rename from spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DispatcherPolicy.java rename to spring-integration-core/src/main/java/org/springframework/integration/channel/DispatcherPolicy.java index c8f78999a8..de31b3a0a5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DispatcherPolicy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/DispatcherPolicy.java @@ -14,8 +14,9 @@ * limitations under the License. */ -package org.springframework.integration.dispatcher; +package org.springframework.integration.channel; +import org.springframework.integration.dispatcher.MessageDispatcher; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannel.java index 95794478a8..61a2ef35f0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessageChannel.java @@ -18,7 +18,6 @@ package org.springframework.integration.channel; import java.util.List; -import org.springframework.integration.dispatcher.DispatcherPolicy; import org.springframework.integration.message.Message; import org.springframework.integration.message.selector.MessageSelector; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/SimpleChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/SimpleChannel.java index 67997bdeb9..9cc0bddbc1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/SimpleChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/SimpleChannel.java @@ -23,7 +23,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.TimeUnit; -import org.springframework.integration.dispatcher.DispatcherPolicy; import org.springframework.integration.message.Message; import org.springframework.integration.message.selector.MessageSelector; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java index 3e3a43673a..6b68b056d6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/ChannelParser.java @@ -28,9 +28,9 @@ import org.springframework.beans.factory.support.ManagedList; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.xml.BeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.channel.interceptor.MessageSelectingInterceptor; -import org.springframework.integration.dispatcher.DispatcherPolicy; import org.springframework.integration.message.selector.MessageSelector; import org.springframework.integration.message.selector.PayloadTypeSelector; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DefaultMessageDistributor.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DefaultMessageDistributor.java index 83202f4ead..53e77b6674 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DefaultMessageDistributor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/DefaultMessageDistributor.java @@ -24,6 +24,7 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.MessageHandlerNotRunningException; import org.springframework.integration.message.Message; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetAdapterTests.java index 1485b30f75..fde0d7db1b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetAdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/stream/ByteStreamTargetAdapterTests.java @@ -23,9 +23,9 @@ import java.io.IOException; import org.junit.Test; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.dispatcher.DefaultMessageDispatcher; -import org.springframework.integration.dispatcher.DispatcherPolicy; import org.springframework.integration.dispatcher.MessageDispatcher; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapterTests.java index 6b3241362d..f5b24e11ce 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapterTests.java @@ -22,10 +22,10 @@ import java.io.ByteArrayOutputStream; import org.junit.Test; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.dispatcher.DefaultMessageDispatcher; -import org.springframework.integration.dispatcher.DispatcherPolicy; import org.springframework.integration.dispatcher.MessageDispatcher; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java index 971769256c..8891b07bbf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/MessageBusTests.java @@ -33,9 +33,9 @@ import org.springframework.integration.MessagingConfigurationException; import org.springframework.integration.adapter.PollableSource; import org.springframework.integration.adapter.PollingSourceAdapter; import org.springframework.integration.adapter.SourceAdapter; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.SimpleChannel; -import org.springframework.integration.dispatcher.DispatcherPolicy; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelParserTests.java index 52f5e42a40..fe55cc6006 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelParserTests.java @@ -29,9 +29,9 @@ import org.junit.Test; import org.springframework.beans.FatalBeanException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.dispatcher.DefaultMessageDispatcher; -import org.springframework.integration.dispatcher.DispatcherPolicy; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/ChannelPollingMessageRetrieverTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/ChannelPollingMessageRetrieverTests.java index 1973ea4a58..94ca5bb3e0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/ChannelPollingMessageRetrieverTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/ChannelPollingMessageRetrieverTests.java @@ -24,6 +24,7 @@ import java.util.Iterator; import org.junit.Test; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.message.Message; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDispatcherTests.java index 056e298ef8..9d0ec76a8f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDispatcherTests.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.dispatcher.DefaultMessageDispatcher; import org.springframework.integration.endpoint.ConcurrencyPolicy; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDistributorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDistributorTests.java index 71e4685ff3..fd88f11b02 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDistributorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/DefaultMessageDistributorTests.java @@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; +import org.springframework.integration.channel.DispatcherPolicy; import org.springframework.integration.handler.TestHandlers; import org.springframework.integration.message.StringMessage;