diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java index bc9daf6de9..1af3a2b14a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java @@ -16,8 +16,6 @@ package org.springframework.integration.core; -import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageRejectedException; /** * Base interface for any component that handles Messages. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageHandlingException.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandlingException.java similarity index 88% rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageHandlingException.java rename to spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandlingException.java index 7570d1ebf9..6a375e99e6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageHandlingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandlingException.java @@ -14,10 +14,8 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.core; -import org.springframework.integration.core.Message; -import org.springframework.integration.core.MessagingException; /** * Exception that indicates an error during message handling. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageRejectedException.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageRejectedException.java similarity index 92% rename from spring-integration-core/src/main/java/org/springframework/integration/message/MessageRejectedException.java rename to spring-integration-core/src/main/java/org/springframework/integration/core/MessageRejectedException.java index a8144a84e6..b3d01dc1a5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageRejectedException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageRejectedException.java @@ -14,9 +14,8 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.core; -import org.springframework.integration.core.Message; /** * Exception that indicates a message has been rejected by a selector. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java index e3bd3d40e5..4eab8bd68a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java @@ -21,9 +21,9 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java index 579cdea2de..b87d0451fa 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java @@ -21,8 +21,8 @@ import java.io.Serializable; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.remoting.RemoteAccessException; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java index 9c496531ac..6a0b5ed744 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java @@ -25,8 +25,8 @@ import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java index 954652303d..c0bfb88270 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java @@ -22,7 +22,7 @@ import org.springframework.expression.Expression; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.expression.spel.support.StandardTypeConverter; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.core.MessageHandlingException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java index e42b69d187..83a08d3f3b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java @@ -21,10 +21,10 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractScriptExecutingMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractScriptExecutingMessageProcessor.java index 0360299579..979bd681d2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractScriptExecutingMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractScriptExecutingMessageProcessor.java @@ -17,7 +17,7 @@ package org.springframework.integration.handler; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.scripting.ScriptSource; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java index 96f1d7f96a..3a78a5a92a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java @@ -33,9 +33,9 @@ import org.springframework.integration.core.ErrorMessage; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.store.MessageStore; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.scheduling.TaskScheduler; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java index 65f7b2a8ac..ff4913a8d1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java @@ -24,9 +24,9 @@ import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.filter.MessageFilter; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java index a202327e7e..f9a0b6d9a7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java @@ -44,8 +44,8 @@ import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.util.ClassUtils; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java index b86dd761c3..d22a134f42 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.core.MessageHandlingException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java index baddb57970..54e2f78bf5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java @@ -17,6 +17,7 @@ package org.springframework.integration.message; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageHandlingException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java index 7153421630..c50bf293db 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java @@ -29,9 +29,9 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageStore; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java index dbc1843db0..4ecb142944 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java @@ -35,9 +35,9 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageStore; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java index 22462a8ad2..c8a5e76eb4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java @@ -40,8 +40,8 @@ import org.mockito.runners.MockitoJUnitRunner; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.store.SimpleMessageStore; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java index bddffed249..96ec22a610 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java @@ -29,9 +29,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; import org.springframework.integration.dispatcher.UnicastingDispatcher; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java index 27d02d9434..5e7df4e937 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java @@ -17,7 +17,7 @@ package org.springframework.integration.config; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.core.MessageHandlingException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java index e8a0274498..2a71c38c48 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java @@ -27,9 +27,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java index 3c4d48fc2b..9a93f7fc32 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java @@ -32,8 +32,8 @@ import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java index d11a3c69e2..e4a40d5d6a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java @@ -28,8 +28,8 @@ import org.junit.Test; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.handler.ServiceActivatingHandler; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.message.TestHandlers; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java index 5b45124aa4..b6211d5721 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java @@ -22,7 +22,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.message.MessageRejectedException; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import java.util.concurrent.CountDownLatch; 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 8c21fa2521..6da03480e4 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 @@ -36,8 +36,8 @@ import org.junit.Test; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; import org.springframework.scheduling.Trigger; import org.springframework.scheduling.TriggerContext; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java index 5b013d84aa..9e8f46f8f5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java @@ -27,9 +27,9 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; import org.springframework.integration.handler.ServiceActivatingHandler; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java index 6ca87d47e3..d3818d427a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java @@ -26,10 +26,10 @@ import org.junit.Test; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.filter.MessageFilter; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java index 24757334cd..c8d8f12db2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java @@ -25,9 +25,9 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java index 2a0a278ee2..14ee70fef1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java @@ -25,8 +25,8 @@ import org.junit.Test; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageMatcher; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java index c304af07df..ec1eb2a5aa 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java @@ -35,7 +35,7 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.message.StringMessage; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java index a2e9c290f7..cc27a9b1f2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java @@ -32,8 +32,8 @@ import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java index f1d8145aea..d82d9a497c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java @@ -38,7 +38,7 @@ import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java index bd3dfe6c51..78b3ee4632 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java @@ -38,8 +38,8 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageRejectedException; +import org.springframework.integration.core.MessageHandlingException; +import org.springframework.integration.core.MessageRejectedException; /** * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java index 41f48f8067..0267752427 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java @@ -30,7 +30,7 @@ import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java index 37ac579ced..458a73d06f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java @@ -30,7 +30,7 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java index 93dd9c11b5..2e513a42fe 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java @@ -38,11 +38,11 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.AbstractPollingEndpoint; import org.springframework.integration.history.NamedComponent; -import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java index f12cc4b0e5..016a839ba8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java @@ -29,8 +29,8 @@ import org.springframework.integration.annotation.Transformer; import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.handler.MethodInvokingMessageProcessor; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java index 187b052e4c..cfe8a80761 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java @@ -21,8 +21,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java index 765eb469f5..c58c49d31b 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java @@ -23,7 +23,7 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.message.MessageHandlingException; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.util.FileCopyUtils; import java.io.File; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java index 0a8636fa8c..10ca02fc81 100755 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java @@ -29,10 +29,10 @@ import org.springframework.http.converter.HttpMessageConverter; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.message.HeaderMapper; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.util.Assert; import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java index 46a6b0a196..47074d42fc 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java @@ -21,10 +21,10 @@ import java.net.SocketException; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageDeliveryException; +import org.springframework.integration.core.MessageHandlingException; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.ip.AbstractInternetProtocolSendingMessageHandler; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageMappingException; -import org.springframework.integration.message.MessageRejectedException; /** * Abstract class for TCP sending message handlers. Implementations diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java index c7ed31b8b1..792d6d95b2 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java @@ -20,9 +20,9 @@ import java.io.UnsupportedEncodingException; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.OutboundMessageMapper; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java index 6e38737808..70527fe79f 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java @@ -24,15 +24,15 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory; import org.springframework.integration.ip.tcp.connection.ConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpConnection; import org.springframework.integration.ip.tcp.connection.TcpSender; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageMappingException; -import org.springframework.integration.message.MessageRejectedException; /** * Tcp outbound channel adapter using a TcpConnection to diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java index 152f5c5de9..d789ae74a3 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java @@ -19,9 +19,9 @@ import java.io.UnsupportedEncodingException; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.OutboundMessageMapper; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java index 0f5bdc55f0..7a45bfe798 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java @@ -25,11 +25,11 @@ import java.util.regex.Pattern; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.util.RegexUtils; import org.springframework.integration.message.InboundMessageMapper; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageMappingException; import org.springframework.integration.message.OutboundMessageMapper; import org.springframework.util.Assert; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java index c3dac785ed..e3e409c1f7 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java @@ -36,10 +36,10 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessagingException; import org.springframework.integration.ip.AbstractInternetProtocolSendingMessageHandler; -import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.util.Assert; /** diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java index 8d4a18216a..8d8be79249 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java @@ -18,8 +18,8 @@ import javax.sql.DataSource; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageRejectedException; +import org.springframework.integration.core.MessageHandlingException; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.jdbc.core.JdbcOperations; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.core.simple.SimpleJdbcOperations; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java index d04d9c3e16..bf54170b1e 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java @@ -32,8 +32,8 @@ import javax.jms.Topic; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageTimeoutException; import org.springframework.jms.connection.ConnectionFactoryUtils; import org.springframework.jms.support.JmsUtils; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java index b9d0dae5ac..a55836bca0 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java @@ -29,7 +29,9 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessagingException; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.core.SubscribableChannel; @@ -37,8 +39,6 @@ import org.springframework.integration.history.MessageHistory; import org.springframework.integration.history.MessageHistoryEvent; import org.springframework.integration.history.NamedComponent; import org.springframework.integration.jms.DefaultJmsHeaderMapper; -import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; import org.springframework.util.StringUtils; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java index 731e3c6496..a5e4868cd8 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java @@ -33,9 +33,9 @@ import javax.management.ObjectName; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.jmx.support.ObjectNameManager; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java index d247324544..a3945b9037 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java @@ -22,8 +22,8 @@ import javax.mail.internet.MimeMessage; import org.springframework.core.io.ByteArrayResource; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessageHeaders; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageMappingException; import org.springframework.mail.MailMessage; import org.springframework.mail.SimpleMailMessage; diff --git a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java index fd61be6e2d..b01f12da21 100644 --- a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java +++ b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java @@ -29,8 +29,8 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; +import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.gateway.RequestReplyExchanger; -import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.rmi.RmiOutboundGateway; import org.springframework.remoting.RemoteLookupFailureException; diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java index dee4a7cd96..3ee4e699e4 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java @@ -36,11 +36,11 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.AbstractPollingEndpoint; import org.springframework.integration.history.NamedComponent; -import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageRejectedException; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.util.Assert; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java index 278415cb3d..f20a9976c6 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java @@ -8,8 +8,8 @@ import org.springframework.context.Lifecycle; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageRejectedException; +import org.springframework.integration.core.MessageHandlingException; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.message.OutboundMessageMapper; /** diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java index a02aea9cc6..d1e90b1f29 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java @@ -29,6 +29,8 @@ import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; +import org.springframework.integration.core.MessageHandlingException; +import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.message.*;