diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessagingConfigurationException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessagingConfigurationException.java index da834b6bf0..b32efdb15b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessagingConfigurationException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessagingConfigurationException.java @@ -24,12 +24,12 @@ package org.springframework.integration; @SuppressWarnings("serial") public class MessagingConfigurationException extends MessagingException { - public MessagingConfigurationException(String message) { - super(message); + public MessagingConfigurationException(String description) { + super(description); } - public MessagingConfigurationException(String message, Throwable cause) { - super(message, cause); + public MessagingConfigurationException(String description, Throwable cause) { + super(description, cause); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java index 14c889c630..e1ba2371b7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java @@ -28,12 +28,12 @@ public class MessagingException extends RuntimeException { super(); } - public MessagingException(String message) { - super(message); + public MessagingException(String description) { + super(description); } - public MessagingException(String message, Throwable cause) { - super(message, cause); + public MessagingException(String description, Throwable cause) { + super(description, cause); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/PollingSourceAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/PollingSourceAdapter.java index d0fa26fe5e..7b8a638689 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/PollingSourceAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/PollingSourceAdapter.java @@ -19,8 +19,8 @@ package org.springframework.integration.adapter; import java.util.Collection; import org.springframework.context.Lifecycle; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageMapper; import org.springframework.integration.scheduling.MessagingTask; import org.springframework.integration.scheduling.MessagingTaskScheduler; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/AbstractFileMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/AbstractFileMapper.java index e36d8520d9..bad06e5111 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/AbstractFileMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/AbstractFileMapper.java @@ -23,10 +23,10 @@ import java.io.FileWriter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.message.AbstractMessageMapper; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/FileSource.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/FileSource.java index 4c65794dea..5cdc2ed54a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/FileSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/file/FileSource.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.adapter.PollableSource; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java index 9dab5306b0..70b84af3c0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/jms/ChannelPublishingJmsListener.java @@ -19,10 +19,10 @@ package org.springframework.integration.adapter.jms; import javax.jms.JMSException; import javax.jms.MessageListener; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessagingConfigurationException; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessageMapper; import org.springframework.integration.message.SimplePayloadMessageMapper; import org.springframework.jms.support.converter.MessageConverter; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java index cf55bd5f96..0637bd6f02 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamSource.java @@ -23,8 +23,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.adapter.PollableSource; +import org.springframework.integration.message.MessageDeliveryException; /** * A pollable source for receiving bytes from an {@link InputStream}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTargetAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTargetAdapter.java index c7033b433a..8e87911e07 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTargetAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/ByteStreamTargetAdapter.java @@ -20,8 +20,8 @@ import java.io.BufferedOutputStream; import java.io.IOException; import java.io.OutputStream; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.adapter.AbstractTargetAdapter; +import org.springframework.integration.message.MessageHandlingException; /** * A target adapter that writes a byte array to an {@link OutputStream}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java index 9d779c1ab6..0e71df1ce4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamSource.java @@ -24,8 +24,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.adapter.PollableSource; +import org.springframework.integration.message.MessageDeliveryException; /** * A pollable source for text-based {@link InputStream InputStreams}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapter.java index f9305d945a..e5cace6b03 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/adapter/stream/CharacterStreamTargetAdapter.java @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.OutputStream; import java.io.OutputStreamWriter; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.adapter.AbstractTargetAdapter; +import org.springframework.integration.message.MessageHandlingException; /** * A target adapter that writes to an {@link OutputStream}. String-based diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java index 0502eefaf2..410a64d52c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java @@ -19,9 +19,9 @@ package org.springframework.integration.channel.interceptor; import java.util.Arrays; import java.util.List; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.selector.MessageSelector; /** 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 353199e554..83202f4ead 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,11 +24,11 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.MessageHandlerNotRunningException; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageDeliveryException; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.selector.MessageSelectorRejectedException; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ConcurrentHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ConcurrentHandler.java similarity index 89% rename from spring-integration-core/src/main/java/org/springframework/integration/handler/ConcurrentHandler.java rename to spring-integration-core/src/main/java/org/springframework/integration/endpoint/ConcurrentHandler.java index b716d3c4b1..9d53b56224 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ConcurrentHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/ConcurrentHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.handler; +package org.springframework.integration.endpoint; import java.util.concurrent.ExecutorService; @@ -22,6 +22,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.DisposableBean; +import org.springframework.integration.handler.MessageHandler; +import org.springframework.integration.handler.MessageHandlerNotRunningException; +import org.springframework.integration.handler.MessageHandlerRejectedExecutionException; +import org.springframework.integration.handler.ReplyHandler; import org.springframework.integration.message.Message; import org.springframework.integration.util.ErrorHandler; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/DefaultMessageEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/DefaultMessageEndpoint.java index 4fc35d6db5..9d82af319f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/DefaultMessageEndpoint.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/DefaultMessageEndpoint.java @@ -28,17 +28,16 @@ import java.util.concurrent.TimeUnit; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.Lifecycle; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessagingConfigurationException; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.handler.ConcurrentHandler; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.MessageHandlerNotRunningException; import org.springframework.integration.handler.MessageHandlerRejectedExecutionException; import org.springframework.integration.handler.ReplyHandler; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageHeader; import org.springframework.integration.message.selector.MessageSelector; import org.springframework.integration.message.selector.MessageSelectorRejectedException; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerNotRunningException.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerNotRunningException.java index b72b582502..85df94cd12 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerNotRunningException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerNotRunningException.java @@ -16,7 +16,7 @@ package org.springframework.integration.handler; -import org.springframework.integration.MessageHandlingException; +import org.springframework.integration.message.MessageHandlingException; /** * An exception indicating that a handler is not currently running. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java index ebd4ac608b..bdfde73f65 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerRejectedExecutionException.java @@ -16,7 +16,7 @@ package org.springframework.integration.handler; -import org.springframework.integration.MessageHandlingException; +import org.springframework.integration.message.MessageHandlingException; /** * An exception indicating that a message was rejected by a handler; typically diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageDeliveryException.java similarity index 93% rename from spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java rename to spring-integration-core/src/main/java/org/springframework/integration/message/MessageDeliveryException.java index 8a7e8c5866..2b282129af 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageDeliveryException.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.springframework.integration; +package org.springframework.integration.message; -import org.springframework.integration.message.Message; +import org.springframework.integration.MessagingException; /** * Exception that indicates an error during message delivery. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageHandlingException.java similarity index 90% rename from spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java rename to spring-integration-core/src/main/java/org/springframework/integration/message/MessageHandlingException.java index 7f7c9280bd..21af3caf63 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageHandlingException.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.springframework.integration; +package org.springframework.integration.message; + +import org.springframework.integration.MessagingException; /** * Exception that indicates an error during message handling. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelectorRejectedException.java b/spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelectorRejectedException.java index d6f1b3d8b6..d6e669e1ac 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelectorRejectedException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/selector/MessageSelectorRejectedException.java @@ -16,7 +16,7 @@ package org.springframework.integration.message.selector; -import org.springframework.integration.MessageHandlingException; +import org.springframework.integration.message.MessageHandlingException; /** * An exception indicating that a message was rejected by an implementation of diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractRoutingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractRoutingMessageHandler.java index c9cd9e93a6..d9a77eb7b8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractRoutingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractRoutingMessageHandler.java @@ -22,13 +22,13 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessagingConfigurationException; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageHandlingException; /** * Base class for message router implementations. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java index 9a02c457df..92a2255ad5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AggregatingMessageHandler.java @@ -18,9 +18,9 @@ package org.springframework.integration.router; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java index a91ab89ad1..5ecd3964b0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/RouterMessageHandlerAdapter.java @@ -20,7 +20,6 @@ import java.lang.reflect.Method; import java.util.Collection; import java.util.Map; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessagingConfigurationException; import org.springframework.integration.annotation.Router; import org.springframework.integration.channel.ChannelRegistry; @@ -28,6 +27,7 @@ import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.handler.AbstractMessageHandlerAdapter; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.util.SimpleMethodInvoker; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/SimpleMethodInvoker.java b/spring-integration-core/src/main/java/org/springframework/integration/util/SimpleMethodInvoker.java index 1c480ef88b..512e3e177a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/SimpleMethodInvoker.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/SimpleMethodInvoker.java @@ -18,7 +18,7 @@ package org.springframework.integration.util; import java.lang.reflect.InvocationTargetException; -import org.springframework.integration.MessageDeliveryException; +import org.springframework.integration.MessagingException; import org.springframework.util.Assert; import org.springframework.util.MethodInvoker; import org.springframework.util.ObjectUtils; @@ -62,11 +62,11 @@ public class SimpleMethodInvoker { return methodInvoker.invoke(); } catch (InvocationTargetException e) { - throw new MessageDeliveryException( + throw new MessagingException( "Method '" + this.method + "' threw exception", e.getTargetException()); } catch (Throwable e) { - throw new MessageDeliveryException("Failed to invoke method '" + this.method + + throw new MessagingException("Failed to invoke method '" + this.method + "' with arguments " + ObjectUtils.nullSafeToString(args), e); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java index 9b8f97d4a1..41912c5840 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingSourceTests.java @@ -23,7 +23,7 @@ import java.util.Collection; import org.junit.Test; -import org.springframework.integration.MessageDeliveryException; +import org.springframework.integration.message.MessageDeliveryException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java b/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java index ce5e7ba86b..f1ad085f65 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/MethodInvokingTargetTests.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.MessageDeliveryException; +import org.springframework.integration.message.MessageDeliveryException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/adapter/PollingSourceAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/adapter/PollingSourceAdapterTests.java index 8ef5d141e8..cb0d3ea50c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/adapter/PollingSourceAdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/adapter/PollingSourceAdapterTests.java @@ -27,9 +27,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageHandlingException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java index c93d0c9e1d..843b3e0148 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java @@ -23,9 +23,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.message.selector.MessageSelector; 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 c5fa2929d7..52f5e42a40 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,13 +29,13 @@ import org.junit.Test; import org.springframework.beans.FatalBeanException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageDeliveryException; 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; +import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.StringMessage; /** 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 1b7bf5cdae..056e298ef8 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,18 +29,18 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.dispatcher.DefaultMessageDispatcher; import org.springframework.integration.endpoint.ConcurrencyPolicy; +import org.springframework.integration.endpoint.ConcurrentHandler; import org.springframework.integration.endpoint.DefaultMessageEndpoint; -import org.springframework.integration.handler.ConcurrentHandler; import org.springframework.integration.handler.InterceptingMessageHandler; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.MessageHandlerRejectedExecutionException; import org.springframework.integration.handler.TestHandlers; import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.message.selector.PayloadTypeSelector; import org.springframework.integration.scheduling.MessagePublishingErrorHandler; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/DefaultMessageEndpointTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/DefaultMessageEndpointTests.java index adec715a28..8006f27dc8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/DefaultMessageEndpointTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/DefaultMessageEndpointTests.java @@ -34,7 +34,6 @@ import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.DefaultChannelRegistry; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.SimpleChannel; -import org.springframework.integration.handler.ConcurrentHandler; import org.springframework.integration.handler.MessageHandler; import org.springframework.integration.handler.MessageHandlerNotRunningException; import org.springframework.integration.handler.TestHandlers; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java index 776301c014..8493082ad0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/AggregatingMessageHandlerTests.java @@ -28,10 +28,10 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java index 19489653b5..105432c94a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java @@ -23,13 +23,13 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessagingConfigurationException; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.DefaultChannelRegistry; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java index f6869e9310..27b8d3cb83 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java @@ -21,13 +21,13 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessagingConfigurationException; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.DefaultChannelRegistry; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.SimpleChannel; import org.springframework.integration.message.Message; +import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; /**