From 08043b541d84bbcbba270dbfab2456f2e46fb976 Mon Sep 17 00:00:00 2001 From: Mark Fisher Date: Wed, 15 Oct 2008 02:54:29 +0000 Subject: [PATCH] Moved Message into the new 'org.springframework.integration.core' package. --- .../integration/adapter/AbstractRemotingOutboundGateway.java | 2 +- .../springframework/integration/adapter/MessageHandler.java | 2 +- .../integration/adapter/MessageMappingException.java | 2 +- .../integration/adapter/RemotingInboundGatewaySupport.java | 2 +- .../event/ApplicationEventPublishingMessageConsumer.java | 2 +- .../org/springframework/integration/event/MessagingEvent.java | 2 +- .../event/ApplicationEventInboundChannelAdapterTests.java | 2 +- .../event/ApplicationEventPublishingMessageConsumerTests.java | 2 +- .../integration/file/DefaultFileNameGenerator.java | 2 +- .../springframework/integration/file/FileNameGenerator.java | 2 +- .../integration/file/FileWritingMessageConsumer.java | 2 +- .../springframework/integration/file/PollableFileSource.java | 2 +- .../file/transformer/AbstractFilePayloadTransformer.java | 2 +- .../integration/file/PollableFileSourceIntegrationTests.java | 2 +- .../integration/file/PollableFileSourceTests.java | 2 +- .../integration/file/config/CustomFileNameGenerator.java | 2 +- .../integration/ftp/AbstractDirectorySource.java | 2 +- .../integration/ftp/FtpSendingMessageConsumer.java | 2 +- .../integration/ftp/FtpSendingMessageConsumerTests.java | 2 +- .../org/springframework/integration/ftp/FtpSourceTests.java | 2 +- .../integration/ftp/config/FtpSourceIntegrationTests.java | 2 +- .../httpinvoker/HttpInvokerInboundGatewayTests.java | 2 +- .../integration/jms/ChannelPublishingJmsListener.java | 2 +- .../integration/jms/HeaderMappingMessageConverter.java | 2 +- .../integration/jms/JmsSendingMessageConsumer.java | 2 +- .../java/org/springframework/integration/jms/JmsSource.java | 2 +- .../integration/jms/DefaultJmsHeaderMapperTests.java | 2 +- .../integration/jms/config/JmsGatewayParserTests.java | 2 +- .../jms/config/JmsInboundChannelAdapterParserTests.java | 2 +- .../integration/mail/MailSendingMessageConsumer.java | 2 +- .../springframework/integration/mail/PollingMailSource.java | 2 +- .../mail/transformer/AbstractMailMessageTransformer.java | 2 +- .../mail/MailSendingMessageConsumerContextTests.java | 2 +- .../integration/mail/MailSendingMessageConsumerTests.java | 2 +- .../org/springframework/integration/mail/MailTestsHelper.java | 2 +- .../integration/mail/SubscribableMailSourceTests.java | 2 +- .../integration/rmi/RmiOutboundGatewayTests.java | 2 +- .../integration/rmi/config/RmiOutboundGatewayParserTests.java | 2 +- .../org/springframework/integration/samples/cafe/Cafe.java | 2 +- .../integration/samples/ws/WebServiceDemo.java | 2 +- .../integration/security/channel/ChannelInvocation.java | 2 +- .../integration/security/channel/TestConsumer.java | 2 +- .../security/config/SecuredChannelsParserTests.java | 2 +- .../springframework/integration/stream/ByteStreamSource.java | 2 +- .../integration/stream/ByteStreamWritingMessageConsumer.java | 2 +- .../stream/CharacterStreamWritingMessageConsumer.java | 2 +- .../integration/stream/ByteStreamSourceTests.java | 2 +- .../integration/stream/CharacterStreamSourceTests.java | 2 +- .../config/ConsoleInboundChannelAdapterParserTests.java | 2 +- .../integration/ws/AbstractWebServiceOutboundGateway.java | 2 +- .../integration/xml/router/XPathMultiChannelRouter.java | 2 +- .../integration/xml/router/XPathSingleChannelRouter.java | 2 +- .../xml/selector/BooleanTestXPathMessageSelector.java | 2 +- .../xml/selector/StringValueTestXPathMessageSelector.java | 2 +- .../integration/xml/splitter/XPathMessageSplitter.java | 2 +- .../xml/config/XmlMarshallingTransformerParserTests.java | 2 +- .../xml/config/XmlUnmarshallingTransformerParserTests.java | 2 +- .../xml/config/XsltPayloadTransformerParserTests.java | 2 +- .../integration/xml/splitter/XPathMessageSplitterTests.java | 2 +- .../integration/aggregator/AbstractMessageAggregator.java | 2 +- .../integration/aggregator/AbstractMessageBarrier.java | 2 +- .../aggregator/AbstractMessageBarrierConsumer.java | 2 +- .../integration/aggregator/AggregationBarrier.java | 2 +- .../integration/aggregator/CompletionStrategy.java | 2 +- .../integration/aggregator/CompletionStrategyAdapter.java | 2 +- .../integration/aggregator/MessageBarrier.java | 2 +- .../integration/aggregator/MessageListMethodAdapter.java | 2 +- .../integration/aggregator/MessageSequenceComparator.java | 2 +- .../integration/aggregator/MethodInvokingAggregator.java | 2 +- .../springframework/integration/aggregator/Resequencer.java | 2 +- .../integration/aggregator/ResequencingMessageBarrier.java | 2 +- .../aggregator/SequenceSizeCompletionStrategy.java | 2 +- .../org/springframework/integration/annotation/Gateway.java | 2 +- .../org/springframework/integration/annotation/Router.java | 2 +- .../integration/annotation/ServiceActivator.java | 2 +- .../org/springframework/integration/annotation/Splitter.java | 2 +- .../integration/aop/MessagePublishingInterceptor.java | 2 +- .../springframework/integration/bus/DefaultErrorChannel.java | 2 +- .../integration/channel/AbstractMessageChannel.java | 2 +- .../integration/channel/AbstractPollableChannel.java | 2 +- .../integration/channel/AbstractSubscribableChannel.java | 2 +- .../springframework/integration/channel/BlockingChannel.java | 2 +- .../integration/channel/ChannelInterceptor.java | 2 +- .../springframework/integration/channel/ChannelPurger.java | 2 +- .../springframework/integration/channel/MessageChannel.java | 2 +- .../integration/channel/MessageChannelTemplate.java | 2 +- .../org/springframework/integration/channel/NullChannel.java | 2 +- .../springframework/integration/channel/PollableChannel.java | 2 +- .../springframework/integration/channel/PriorityChannel.java | 2 +- .../org/springframework/integration/channel/QueueChannel.java | 2 +- .../integration/channel/RendezvousChannel.java | 2 +- .../integration/channel/ThreadLocalChannel.java | 2 +- .../channel/interceptor/ChannelInterceptorAdapter.java | 2 +- .../channel/interceptor/MessageSelectingInterceptor.java | 2 +- .../channel/interceptor/MessageStoringInterceptor.java | 2 +- .../integration/channel/interceptor/WireTap.java | 2 +- .../integration/{message => core}/Message.java | 4 +++- .../integration/dispatcher/AbstractDispatcher.java | 2 +- .../integration/dispatcher/BroadcastingDispatcher.java | 2 +- .../integration/dispatcher/MessageDispatcher.java | 2 +- .../integration/dispatcher/SimpleDispatcher.java | 2 +- .../integration/endpoint/AbstractMessageConsumer.java | 2 +- .../endpoint/AbstractMessageProducingEndpoint.java | 2 +- .../endpoint/AbstractReplyProducingMessageConsumer.java | 2 +- .../springframework/integration/endpoint/ChannelPoller.java | 2 +- .../integration/endpoint/MessagingGateway.java | 2 +- .../integration/endpoint/PollingConsumerEndpoint.java | 2 +- .../integration/endpoint/ReplyMessageHolder.java | 2 +- .../integration/endpoint/ServiceActivatingConsumer.java | 2 +- .../integration/endpoint/SourcePollingChannelAdapter.java | 2 +- .../org/springframework/integration/filter/MessageFilter.java | 2 +- .../integration/filter/MethodInvokingSelector.java | 2 +- .../integration/gateway/AbstractMessagingGateway.java | 2 +- .../integration/gateway/GatewayProxyFactoryBean.java | 2 +- .../integration/gateway/SimpleMessageMapper.java | 2 +- .../integration/gateway/SimpleMessagingGateway.java | 2 +- .../integration/message/InboundMessageMapper.java | 2 ++ .../springframework/integration/message/MessageBuilder.java | 1 + .../springframework/integration/message/MessageConsumer.java | 2 ++ .../integration/message/MessageDeliveryAware.java | 2 ++ .../integration/message/MessageDeliveryException.java | 2 ++ .../integration/message/MessageHandlingException.java | 2 ++ .../springframework/integration/message/MessageHeaders.java | 2 ++ .../integration/message/MessageMappingMethodInvoker.java | 1 + .../integration/message/MessageRejectedException.java | 2 ++ .../springframework/integration/message/MessageSource.java | 2 ++ .../org/springframework/integration/message/MessageStore.java | 2 ++ .../integration/message/MessagingException.java | 2 ++ .../integration/message/MethodInvokingConsumer.java | 1 + .../integration/message/MethodInvokingSource.java | 1 + .../integration/message/MethodParameterMessageMapper.java | 1 + .../integration/message/OutboundMessageMapper.java | 2 ++ .../integration/message/SimpleMessageStore.java | 1 + .../router/AbstractChannelNameResolvingMessageRouter.java | 2 +- .../integration/router/AbstractMessageRouter.java | 2 +- .../integration/router/AbstractSingleChannelNameRouter.java | 2 +- .../integration/router/AbstractSingleChannelRouter.java | 2 +- .../integration/router/ErrorMessageExceptionTypeRouter.java | 2 +- .../integration/router/MethodInvokingRouter.java | 2 +- .../springframework/integration/router/PayloadTypeRouter.java | 2 +- .../integration/router/RecipientListRouter.java | 2 +- .../springframework/integration/selector/MessageSelector.java | 2 +- .../integration/selector/MessageSelectorChain.java | 2 +- .../integration/selector/PayloadTypeSelector.java | 2 +- .../integration/selector/UnexpiredMessageSelector.java | 2 +- .../integration/splitter/AbstractMessageSplitter.java | 2 +- .../integration/splitter/DefaultMessageSplitter.java | 2 +- .../integration/splitter/MethodInvokingSplitter.java | 2 +- .../integration/transformer/AbstractHeaderTransformer.java | 2 +- .../integration/transformer/AbstractPayloadTransformer.java | 2 +- .../transformer/MessageTransformingChannelInterceptor.java | 2 +- .../integration/transformer/MessageTransformingConsumer.java | 2 +- .../integration/transformer/MethodInvokingTransformer.java | 2 +- .../springframework/integration/transformer/Transformer.java | 2 +- .../integration/aggregator/AggregationBarrierTests.java | 2 +- .../integration/aggregator/AggregatorEndpointTests.java | 2 +- .../aggregator/CompletionStrategyAdapterTests.java | 2 +- .../aggregator/MessageSequenceComparatorTests.java | 2 +- .../integration/aggregator/MethodInvokingAggregatorTests.java | 2 +- .../integration/aggregator/ResequencerTests.java | 2 +- .../aggregator/SequenceSizeCompletionStrategyTests.java | 2 +- .../integration/aop/MessagePublishingInterceptorTests.java | 2 +- .../integration/aop/PublisherAnnotationAdvisorTests.java | 2 +- .../aop/PublisherAnnotationPostProcessorTests.java | 2 +- .../integration/bus/DefaultMessageBusTests.java | 2 +- .../integration/bus/DirectChannelSubscriptionTests.java | 2 +- .../integration/channel/ChannelPurgerTests.java | 2 +- .../integration/channel/DirectChannelTests.java | 2 +- .../integration/channel/MessageChannelTemplateTests.java | 2 +- .../integration/channel/MessagePayloadTestComparator.java | 2 +- .../integration/channel/PriorityChannelTests.java | 2 +- .../integration/channel/QueueChannelTests.java | 2 +- .../integration/channel/ThreadLocalChannelTests.java | 2 +- .../integration/channel/config/ChannelParserTests.java | 2 +- .../integration/channel/config/TestSource.java | 2 +- .../integration/channel/config/TestTransformer.java | 2 +- .../channel/interceptor/ChannelInterceptorTests.java | 2 +- .../channel/interceptor/MessageSelectingInterceptorTests.java | 2 +- .../integration/channel/interceptor/WireTapTests.java | 2 +- .../integration/config/AggregatorParserTests.java | 2 +- .../integration/config/ChannelAdapterParserTests.java | 2 +- .../integration/config/EndpointParserTests.java | 2 +- .../integration/config/ExceptionThrowingTestBean.java | 2 +- .../springframework/integration/config/FilterParserTests.java | 2 +- .../PollerAnnotationChannelAdapterAdviceChainTests.java | 2 +- .../PollerAnnotationChannelAdapterTransactionalTests.java | 2 +- .../config/PollerAnnotationConsumerAdviceChainTests.java | 2 +- .../config/PollerAnnotationConsumerTransactionalTests.java | 2 +- .../integration/config/ResequencerParserTests.java | 2 +- .../integration/config/StubMessageSelector.java | 2 +- .../integration/config/TestAggregatorBean.java | 2 +- .../integration/config/TestChannelInterceptor.java | 2 +- .../integration/config/TestCompletionStrategy.java | 2 +- .../org/springframework/integration/config/TestConsumer.java | 2 +- .../org/springframework/integration/config/TestHandler.java | 2 +- .../org/springframework/integration/config/TestSelector.java | 2 +- .../org/springframework/integration/config/TestSource.java | 2 +- .../integration/config/WireTapParserTests.java | 2 +- .../config/annotation/AnnotatedEndpointActivationTests.java | 2 +- .../annotation/MessagingAnnotationPostProcessorTests.java | 2 +- .../config/annotation/RouterAnnotationPostProcessorTests.java | 2 +- .../annotation/SplitterAnnotationPostProcessorTests.java | 2 +- .../TestAnnotatedEndpointWithCompletionStrategy.java | 2 +- .../TestAnnotatedEndpointWithCustomizedAggregator.java | 2 +- .../TestAnnotatedEndpointWithDefaultAggregator.java | 2 +- .../integration/config/xml/GatewayParserTests.java | 2 +- .../integration/dispatcher/BroadcastingDispatcherTests.java | 2 +- .../integration/dispatcher/PollingTransactionTests.java | 2 +- .../integration/dispatcher/SimpleDispatcherTests.java | 2 +- .../integration/endpoint/ChannelPollerTests.java | 2 +- .../integration/endpoint/CorrelationIdTests.java | 2 +- .../integration/endpoint/ReturnAddressTests.java | 2 +- .../integration/endpoint/ServiceActivatorEndpointTests.java | 2 +- .../endpoint/ServiceActivatorMethodResolutionTests.java | 2 +- .../annotation/MessageParameterAnnotatedEndpoint.java | 2 +- .../integration/filter/FilterContextTests.java | 2 +- .../integration/filter/MessageFilterTests.java | 2 +- .../integration/filter/MethodInvokingSelectorTests.java | 2 +- .../integration/gateway/GatewayProxyFactoryBeanTests.java | 2 +- .../integration/gateway/SimpleMessagingGatewayTests.java | 2 +- .../integration/gateway/TestChannelInterceptor.java | 2 +- .../org/springframework/integration/gateway/TestHandler.java | 2 +- .../org/springframework/integration/gateway/TestService.java | 2 +- .../integration/message/MessageBuilderTests.java | 2 ++ .../integration/message/MessageMappingMethodInvokerTests.java | 2 +- .../integration/message/MethodInvokingConsumerTests.java | 1 + .../integration/message/MethodInvokingSourceTests.java | 2 +- .../message/MethodParameterMessageMapperFromMessageTests.java | 1 + .../MethodParameterMessageMapperInitializationTests.java | 2 ++ .../message/MethodParameterMessageMapperToMessageTests.java | 1 + .../integration/message/SimpleMessageStoreTests.java | 2 ++ .../org/springframework/integration/message/TestHandlers.java | 2 +- .../message/selector/UnexpiredMessageSelectorTests.java | 2 +- .../router/ErrorMessageExceptionTypeRouterTests.java | 2 +- .../integration/router/MethodInvokingRouterTests.java | 2 +- .../integration/router/MultiChannelRouterTests.java | 2 +- .../integration/router/PayloadTypeRouterTests.java | 2 +- .../integration/router/RecipientListRouterTests.java | 2 +- .../org/springframework/integration/router/RouterTests.java | 2 +- .../integration/router/SingleChannelRouterTests.java | 2 +- .../integration/router/config/RouterParserTests.java | 2 +- .../integration/router/config/SplitterAggregatorTests.java | 2 +- .../integration/router/config/SplitterParserTests.java | 2 +- .../integration/router/config/TestSplitterImpl.java | 2 +- .../integration/selector/MessageSelectorChainTests.java | 2 +- .../integration/splitter/DefaultSplitterTests.java | 2 +- .../integration/splitter/MethodInvokingSplitterTests.java | 2 +- .../integration/transformer/HeaderTransformerTests.java | 2 +- .../MessageTransformingChannelInterceptorTests.java | 2 +- .../transformer/MethodInvokingTransformerTests.java | 2 +- .../integration/transformer/PayloadTransformerTests.java | 2 +- .../integration/transformer/TransformerContextTests.java | 2 +- 252 files changed, 268 insertions(+), 229 deletions(-) rename org.springframework.integration/src/main/java/org/springframework/integration/{message => core}/Message.java (88%) diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java index 3df74bc060..d9824163b4 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/AbstractRemotingOutboundGateway.java @@ -19,9 +19,9 @@ package org.springframework.integration.adapter; import java.io.Serializable; import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ReplyMessageHolder; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageHandlingException; import org.springframework.remoting.RemoteAccessException; diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandler.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandler.java index 6e9219c8da..57a9a6464f 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandler.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHandler.java @@ -16,7 +16,7 @@ package org.springframework.integration.adapter; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Interface used for proxy-based remoting adapters (e.g. RMI and HttpInvoker). diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java index 5656647782..522f1fd7ed 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageMappingException.java @@ -16,7 +16,7 @@ package org.springframework.integration.adapter; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageHandlingException; /** diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemotingInboundGatewaySupport.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemotingInboundGatewaySupport.java index 14f6eb8206..1e8e0b6621 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemotingInboundGatewaySupport.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/RemotingInboundGatewaySupport.java @@ -16,8 +16,8 @@ package org.springframework.integration.adapter; +import org.springframework.integration.core.Message; import org.springframework.integration.gateway.SimpleMessagingGateway; -import org.springframework.integration.message.Message; /** * Support class for inbound Messaging Gateways. diff --git a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumer.java b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumer.java index cf5e1f8efa..d340b86f29 100644 --- a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumer.java +++ b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumer.java @@ -19,8 +19,8 @@ package org.springframework.integration.event; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractMessageConsumer; -import org.springframework.integration.message.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/MessagingEvent.java b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/MessagingEvent.java index 5293c44c74..0d5ef62e3e 100644 --- a/org.springframework.integration.event/src/main/java/org/springframework/integration/event/MessagingEvent.java +++ b/org.springframework.integration.event/src/main/java/org/springframework/integration/event/MessagingEvent.java @@ -17,7 +17,7 @@ package org.springframework.integration.event; import org.springframework.context.ApplicationEvent; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * A subclass of {@link ApplicationEvent} that wraps a {@link Message}. diff --git a/org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapterTests.java b/org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapterTests.java index 74cb443656..f2cf6c654a 100644 --- a/org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapterTests.java +++ b/org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapterTests.java @@ -32,7 +32,7 @@ import org.springframework.context.event.ContextStoppedEvent; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumerTests.java b/org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumerTests.java index c55f8975e5..a279b8340b 100644 --- a/org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumerTests.java +++ b/org.springframework.integration.event/src/test/java/org/springframework/integration/event/ApplicationEventPublishingMessageConsumerTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java index af6f2cf2fd..325d017284 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java @@ -18,7 +18,7 @@ package org.springframework.integration.file; import java.io.File; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.StringUtils; /** diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java index 01e2dbf603..3e0318ddef 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileNameGenerator.java @@ -16,7 +16,7 @@ package org.springframework.integration.file; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Strategy interface for generating a file name from a message. diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileWritingMessageConsumer.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileWritingMessageConsumer.java index 0cfd760f31..b13d5aea1d 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileWritingMessageConsumer.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/FileWritingMessageConsumer.java @@ -21,7 +21,7 @@ import java.io.FileOutputStream; import java.io.OutputStreamWriter; import java.nio.charset.Charset; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageHandlingException; import org.springframework.util.Assert; diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java index 9d5ce8f582..add46d61ad 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/PollableFileSource.java @@ -29,8 +29,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.io.Resource; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageDeliveryAware; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.MessagingException; diff --git a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java index 53c6c48238..8d875d2f7d 100644 --- a/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java +++ b/org.springframework.integration.file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java @@ -21,8 +21,8 @@ import java.io.File; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.integration.core.Message; import org.springframework.integration.file.FileNameGenerator; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessagingException; import org.springframework.integration.transformer.Transformer; diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java index b94cf1b264..914533a488 100644 --- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java +++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceIntegrationTests.java @@ -33,7 +33,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.test.annotation.Repeat; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java index 8e71129d6c..b961bd1916 100644 --- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java +++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/PollableFileSourceTests.java @@ -25,7 +25,7 @@ import java.io.File; import org.junit.Before; import org.junit.Test; import org.springframework.core.io.Resource; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Iwein Fuld diff --git a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java index 30ed98fa83..0c9d5680a1 100644 --- a/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java +++ b/org.springframework.integration.file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java @@ -18,8 +18,8 @@ package org.springframework.integration.file.config; import java.util.Date; +import org.springframework.integration.core.Message; import org.springframework.integration.file.FileNameGenerator; -import org.springframework.integration.message.Message; /** * @author Marius Bogoevici diff --git a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/AbstractDirectorySource.java b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/AbstractDirectorySource.java index e22b439021..fe090f444d 100644 --- a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/AbstractDirectorySource.java +++ b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/AbstractDirectorySource.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageDeliveryAware; import org.springframework.integration.message.MessageSource; diff --git a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageConsumer.java b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageConsumer.java index b16074995d..0ddff7aad8 100644 --- a/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageConsumer.java +++ b/org.springframework.integration.ftp/src/main/java/org/springframework/integration/ftp/FtpSendingMessageConsumer.java @@ -23,7 +23,7 @@ import java.io.IOException; import org.apache.commons.net.ftp.FTPClient; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.util.Assert; diff --git a/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSendingMessageConsumerTests.java b/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSendingMessageConsumerTests.java index 5992410717..1d4da691fd 100644 --- a/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSendingMessageConsumerTests.java +++ b/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSendingMessageConsumerTests.java @@ -30,8 +30,8 @@ import org.apache.commons.net.ftp.FTPClient; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageDeliveryException; /** diff --git a/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSourceTests.java b/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSourceTests.java index 241e1ee03b..b30117633a 100644 --- a/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSourceTests.java +++ b/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/FtpSourceTests.java @@ -45,7 +45,7 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Iwein Fuld diff --git a/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/config/FtpSourceIntegrationTests.java b/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/config/FtpSourceIntegrationTests.java index 54f3c9df69..5685ea5bfa 100644 --- a/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/config/FtpSourceIntegrationTests.java +++ b/org.springframework.integration.ftp/src/test/java/org/springframework/integration/ftp/config/FtpSourceIntegrationTests.java @@ -26,9 +26,9 @@ import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; +import org.springframework.integration.core.Message; import org.springframework.integration.ftp.FtpSource; import org.springframework.integration.ftp.QueuedFTPClientPool; -import org.springframework.integration.message.Message; /** * @author Iwein Fuld diff --git a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java index 850c20b100..ff1cc0920c 100644 --- a/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java +++ b/org.springframework.integration.httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java @@ -31,8 +31,8 @@ import org.junit.Test; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.httpinvoker.HttpInvokerInboundGateway; -import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java index c60074c4cf..9140fb679a 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsListener.java @@ -20,7 +20,7 @@ import javax.jms.MessageListener; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessagingException; import org.springframework.jms.support.converter.MessageConverter; diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java index b70793ecbf..416b044516 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/HeaderMappingMessageConverter.java @@ -25,7 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.adapter.MessageHeaderMapper; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessagingException; import org.springframework.jms.support.converter.MessageConversionException; diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageConsumer.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageConsumer.java index 5b89f62a3f..ecaccc7929 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageConsumer.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageConsumer.java @@ -16,7 +16,7 @@ package org.springframework.integration.jms; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; /** diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSource.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSource.java index c343d7c039..ae873884e7 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSource.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/JmsSource.java @@ -19,8 +19,8 @@ package org.springframework.integration.jms; import javax.jms.ConnectionFactory; import javax.jms.Destination; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageSource; import org.springframework.jms.core.JmsTemplate; diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java index d54cd2c673..9194836429 100644 --- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java @@ -28,9 +28,9 @@ import javax.jms.JMSException; import org.junit.Test; +import org.springframework.integration.core.Message; import org.springframework.integration.jms.DefaultJmsHeaderMapper; import org.springframework.integration.jms.JmsHeaders; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; /** diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsGatewayParserTests.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsGatewayParserTests.java index 6b275d8063..b277237c5f 100644 --- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsGatewayParserTests.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsGatewayParserTests.java @@ -27,8 +27,8 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.jms.JmsGateway; -import org.springframework.integration.message.Message; import org.springframework.jms.connection.JmsTransactionManager; import org.springframework.jms.listener.AbstractMessageListenerContainer; diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java index e93f9999bd..9878db9da0 100644 --- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java index 37a173ae57..49f2af1efc 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java @@ -21,7 +21,7 @@ import javax.mail.internet.MimeMessage; import org.springframework.core.io.ByteArrayResource; import org.springframework.integration.adapter.MessageMappingException; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageHeaders; import org.springframework.mail.MailMessage; diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java index 61882ade6b..0943534d9a 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/PollingMailSource.java @@ -22,8 +22,8 @@ import java.util.concurrent.ConcurrentLinkedQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.springframework.integration.core.Message; import org.springframework.integration.mail.monitor.MonitoringStrategy; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.MessagingException; diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java index 45ec1e95cb..d70d18e5bb 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java @@ -26,8 +26,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.adapter.MessageMappingException; +import org.springframework.integration.core.Message; import org.springframework.integration.mail.MailHeaders; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessagingException; import org.springframework.integration.transformer.Transformer; diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerContextTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerContextTests.java index 65e22257b4..d36a6afe6c 100644 --- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerContextTests.java +++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerContextTests.java @@ -72,7 +72,7 @@ public class MailSendingMessageConsumerContextTests { @Test public void byteArrayMessage() throws Exception { byte[] payload = {1, 2, 3}; - org.springframework.integration.message.Message message = + org.springframework.integration.core.Message message = MessageBuilder.withPayload(payload) .setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt") .setHeader(MailHeaders.TO, MailTestsHelper.TO) diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerTests.java index 1907d6a52a..9410e6a017 100644 --- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerTests.java +++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailSendingMessageConsumerTests.java @@ -71,7 +71,7 @@ public class MailSendingMessageConsumerTests { @Test public void byteArrayMessage() throws Exception { byte[] payload = {1, 2, 3}; - org.springframework.integration.message.Message message = + org.springframework.integration.core.Message message = MessageBuilder.withPayload(payload) .setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt") .setHeader(MailHeaders.TO, MailTestsHelper.TO) diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java index a212c99b0c..7a8c196c3c 100644 --- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java +++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java @@ -16,7 +16,7 @@ package org.springframework.integration.mail; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.mail.SimpleMailMessage; diff --git a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/SubscribableMailSourceTests.java b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/SubscribableMailSourceTests.java index a6d8853937..f8af56660b 100644 --- a/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/SubscribableMailSourceTests.java +++ b/org.springframework.integration.mail/src/test/java/org/springframework/integration/mail/SubscribableMailSourceTests.java @@ -27,7 +27,7 @@ import org.easymock.classextension.EasyMock; import org.junit.Test; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Jonas Partner diff --git a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java index 828bcd1090..29902fa4ee 100644 --- a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java +++ b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java @@ -27,8 +27,8 @@ import org.junit.Test; import org.springframework.integration.adapter.MessageHandler; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java index af59956052..ebb8a89d66 100644 --- a/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java +++ b/org.springframework.integration.rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java @@ -26,7 +26,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.rmi.RmiInboundGateway; diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java index 548d9ee11c..280b471232 100644 --- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java +++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/cafe/Cafe.java @@ -22,7 +22,7 @@ import org.springframework.integration.annotation.Gateway; * The entry point for Cafe Demo. The demo's main() method invokes the * 'placeOrder' method on a generated MessagingGateway proxy. * The gateway then passes the {@link Order} as the payload of a - * {@link org.springframework.integration.message.Message} to the + * {@link org.springframework.integration.core.Message} to the * configured requestChannel. The channel ('orders') is * defined in the 'cafeDemo.xml' file. * diff --git a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java index f14fbae72e..b83025be6d 100644 --- a/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java +++ b/org.springframework.integration.samples/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java @@ -18,7 +18,7 @@ package org.springframework.integration.samples.ws; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.ws.AbstractWebServiceOutboundGateway; diff --git a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java index 98cc6dadbf..34355329bb 100644 --- a/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java +++ b/org.springframework.integration.security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java @@ -19,7 +19,7 @@ package org.springframework.integration.security.channel; import org.aopalliance.intercept.MethodInvocation; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/TestConsumer.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/TestConsumer.java index 774be4dffc..ec668064f6 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/TestConsumer.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/channel/TestConsumer.java @@ -19,7 +19,7 @@ package org.springframework.integration.security.channel; import java.util.ArrayList; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; /** diff --git a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java index abb008458d..96ae64adb7 100644 --- a/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java +++ b/org.springframework.integration.security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java @@ -39,7 +39,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.integration.channel.AbstractPollableChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.security.channel.ChannelAccessPolicy; import org.springframework.integration.security.channel.ChannelInvocationDefinitionSource; import org.springframework.integration.security.channel.ChannelSecurityInterceptor; diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java index 0b87499bee..11fc944f8e 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamSource.java @@ -20,8 +20,8 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.MessagingException; diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageConsumer.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageConsumer.java index ce53d3592a..d2ecaedc8d 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageConsumer.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageConsumer.java @@ -23,7 +23,7 @@ import java.io.OutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessagingException; diff --git a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageConsumer.java b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageConsumer.java index 7f13d60f19..03d592651e 100644 --- a/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageConsumer.java +++ b/org.springframework.integration.stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageConsumer.java @@ -26,7 +26,7 @@ import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java index f59b543c00..9bf8715cb4 100644 --- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java +++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java @@ -23,7 +23,7 @@ import java.io.ByteArrayInputStream; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java index 8dec3f35d1..ce06dc2b6b 100644 --- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java +++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java @@ -23,7 +23,7 @@ import java.io.StringReader; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java index e438962ff8..af009ef68b 100644 --- a/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java +++ b/org.springframework.integration.stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java @@ -32,8 +32,8 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageSource; /** diff --git a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java index 7fb766ad6c..9ddc9bc369 100644 --- a/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java +++ b/org.springframework.integration.ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java @@ -20,9 +20,9 @@ import java.io.IOException; import java.net.URI; import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ReplyMessageHolder; -import org.springframework.integration.message.Message; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.WebServiceMessageFactory; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java index f3643cf00b..b3f72aa8bc 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java @@ -22,7 +22,7 @@ import java.util.Map; import org.w3c.dom.DOMException; import org.w3c.dom.Node; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.xml.XmlPayloadConverter; import org.springframework.util.Assert; import org.springframework.xml.xpath.NodeMapper; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java index 6342c58109..bd5bb16d3a 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java @@ -20,7 +20,7 @@ import java.util.Map; import org.w3c.dom.Node; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.xml.DefaultXmlPayloadConverter; import org.springframework.integration.xml.XmlPayloadConverter; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java index 0a316a208a..c374e73291 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java @@ -21,7 +21,7 @@ import java.util.Map; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; import org.springframework.xml.xpath.XPathExpression; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java index 0204e9b856..1b76eb0931 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java @@ -21,7 +21,7 @@ import java.util.Map; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; import org.springframework.xml.xpath.XPathExpression; diff --git a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java index 4327e4eac4..9f662f41a7 100644 --- a/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java +++ b/org.springframework.integration.xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java @@ -34,7 +34,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.splitter.AbstractMessageSplitter; import org.springframework.integration.xml.DefaultXmlPayloadConverter; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java index 28ec59ff8c..ea7a578766 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlMarshallingTransformerParserTests.java @@ -29,8 +29,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.xml.config.StubResultFactory.StubStringResult; import org.springframework.xml.transform.StringResult; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java index dbae6b2b09..2a79f6d968 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XmlUnmarshallingTransformerParserTests.java @@ -28,8 +28,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringSource; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java index 45d174db52..09bc8e6deb 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java @@ -29,8 +29,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.xml.config.StubResultFactory.StubStringResult; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringResult; diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java index 171865d635..a9000ee146 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java @@ -28,8 +28,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageAggregator.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageAggregator.java index 71eef17a21..3d20212696 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageAggregator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageAggregator.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrier.java index 69b80b1a75..20f41bd868 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrier.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrier.java @@ -24,7 +24,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Default implementation for a {@link MessageBarrier}. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java index b8221ea1cc..ecbb90c08c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AbstractMessageBarrierConsumer.java @@ -31,8 +31,8 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractMessageConsumer; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageProducer; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregationBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregationBarrier.java index f383803ad6..4893e635b1 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregationBarrier.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/AggregationBarrier.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * MessageBarrier implementation for message aggregation. Delegates to a diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategy.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategy.java index 6b224ae949..ecafea35e5 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategy.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategy.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Strategy for determining when a group of messages reaches a state of diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java index edd88eb99a..3b47f8f7e0 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/CompletionStrategyAdapter.java @@ -19,7 +19,7 @@ package org.springframework.integration.aggregator; import java.lang.reflect.Method; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java index 354b0074d4..28dcfef163 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageBarrier.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Common interface for routing components that release a list of diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java index 9ca3ef2504..b907a93be0 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java @@ -23,7 +23,7 @@ import java.lang.reflect.Type; import java.util.ArrayList; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.util.DefaultMethodInvoker; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java index 5e6f27f99c..b05cf27cfa 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import java.util.Comparator; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * A {@link Comparator} implementation based on the 'sequence number' diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MethodInvokingAggregator.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MethodInvokingAggregator.java index 39cf23e45a..56ae3fc7b3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MethodInvokingAggregator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/MethodInvokingAggregator.java @@ -20,8 +20,8 @@ import java.lang.reflect.Method; import java.util.List; import org.springframework.integration.annotation.Aggregator; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.util.DefaultMethodResolver; import org.springframework.integration.util.MethodResolver; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java index 044d4121a7..d994a48863 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageHeaders; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageBarrier.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageBarrier.java index 75a6157998..5e568b8dd9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageBarrier.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/ResequencingMessageBarrier.java @@ -22,7 +22,7 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * MessageBarrier implementation for resequencing. It can either diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategy.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategy.java index c64142ed61..2f71034a2e 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategy.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategy.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.CollectionUtils; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Gateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Gateway.java index 575a33b3b8..611e0ac30b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Gateway.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Gateway.java @@ -30,7 +30,7 @@ import java.lang.annotation.Target; * where the annotation attributes can override the default channel settings. * *

A method annotated with @Gateway may accept a single non-annotated - * parameter of type {@link org.springframework.integration.message.Message} + * parameter of type {@link org.springframework.integration.core.Message} * or of the intended Message payload type. Method parameters may be mapped * to individual Message header values by using the {@link Header @Header} * parameter annotation. Alternatively, to pass the entire Message headers diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java index e6e726ac6a..e03ccc8e3b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java @@ -28,7 +28,7 @@ import java.lang.annotation.Target; * based on a message, message header(s), or both. *

* A method annotated with @Router may accept a parameter of type - * {@link org.springframework.integration.message.Message} or of the expected + * {@link org.springframework.integration.core.Message} or of the expected * Message payload's type. Any type conversion supported by * {@link org.springframework.beans.SimpleTypeConverter} will be applied to * the Message payload if necessary. Header values can also be passed as diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/ServiceActivator.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/ServiceActivator.java index ea39baa9c8..353f8a2b69 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/ServiceActivator.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/ServiceActivator.java @@ -27,7 +27,7 @@ import java.lang.annotation.Target; * Indicates that a method is capable of handling a message or message payload. *

* A method annotated with @ServiceActivator may accept a parameter of type - * {@link org.springframework.integration.message.Message} or of the expected + * {@link org.springframework.integration.core.Message} or of the expected * Message payload's type. Any type conversion supported by * {@link org.springframework.beans.SimpleTypeConverter} will be applied to * the Message payload if necessary. Header values can also be passed as diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java index abce8dc5f6..c2607076d5 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java @@ -27,7 +27,7 @@ import java.lang.annotation.Target; * payload to produce multiple messages or payloads. *

* A method annotated with @Splitter may accept a parameter of type - * {@link org.springframework.integration.message.Message} or of the expected + * {@link org.springframework.integration.core.Message} or of the expected * Message payload's type. Any type conversion supported by * {@link org.springframework.beans.SimpleTypeConverter} will be applied to * the Message payload if necessary. Header values can also be passed as diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java index b06f397391..31931db713 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java index 4e00e5cd17..9b29b7f69f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/bus/DefaultErrorChannel.java @@ -22,7 +22,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.RendezvousChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * The default error channel implementation used by the {@link MessageBus}. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java index c8bb83e91f..80799920cc 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Base class for {@link MessageChannel} implementations providing common diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java index 15e6fd50d2..41da2a65d4 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java @@ -16,7 +16,7 @@ package org.springframework.integration.channel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Base class for all pollable channels. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java index 6405b98aac..a03084b09b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java @@ -16,8 +16,8 @@ package org.springframework.integration.channel; +import org.springframework.integration.core.Message; import org.springframework.integration.dispatcher.MessageDispatcher; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/BlockingChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/BlockingChannel.java index e6259a6017..c38dfba66f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/BlockingChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/BlockingChannel.java @@ -16,7 +16,7 @@ package org.springframework.integration.channel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Extends the base MessageChannel interface for channels that may block when a diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java index df6291181e..569f46de37 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java @@ -16,7 +16,7 @@ package org.springframework.integration.channel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Interface for interceptors that are able to view and/or modify the diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelPurger.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelPurger.java index 2724674c94..96e7a94da8 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelPurger.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ChannelPurger.java @@ -19,7 +19,7 @@ package org.springframework.integration.channel; import java.util.ArrayList; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java index 81fc94314e..cede16a7fc 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannel.java @@ -16,7 +16,7 @@ package org.springframework.integration.channel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Base channel interface defining common behavior for message sending and receiving. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java index 73d9dc20f7..f78108b9ef 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/MessageChannelTemplate.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.selector.MessageSelector; import org.springframework.transaction.PlatformTransactionManager; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/NullChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/NullChannel.java index f3808737f2..8492cdc702 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/NullChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/NullChannel.java @@ -21,7 +21,7 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PollableChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PollableChannel.java index 8e1c4b054d..2d11522297 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PollableChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PollableChannel.java @@ -18,7 +18,7 @@ package org.springframework.integration.channel; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java index cb2aac3a3b..c61722fec1 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java @@ -21,7 +21,7 @@ import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessagePriority; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/QueueChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/QueueChannel.java index 72e592e6be..3869e3ef62 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/QueueChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/QueueChannel.java @@ -22,7 +22,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/RendezvousChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/RendezvousChannel.java index b28fc67482..005baa0e2b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/RendezvousChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/RendezvousChannel.java @@ -18,7 +18,7 @@ package org.springframework.integration.channel; import java.util.concurrent.SynchronousQueue; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * A zero-capacity version of {@link QueueChannel} that delegates to a diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ThreadLocalChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ThreadLocalChannel.java index 5c19f354b7..7dcfcf61c4 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/ThreadLocalChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/ThreadLocalChannel.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java index 830cd442b9..21dcbf798c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java @@ -18,7 +18,7 @@ package org.springframework.integration.channel.interceptor; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * A {@link ChannelInterceptor} with no-op method implementations so that diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java index 97366fef00..3792785453 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java @@ -20,7 +20,7 @@ import java.util.Arrays; import java.util.List; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.selector.MessageSelector; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java index f022674ca1..208c0b3ea1 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/MessageStoringInterceptor.java @@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.integration.channel.BlockingChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageStore; import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java index 84f08d4e6e..d28a078840 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java @@ -23,7 +23,7 @@ import org.springframework.context.Lifecycle; import org.springframework.integration.channel.BlockingChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/Message.java b/org.springframework.integration/src/main/java/org/springframework/integration/core/Message.java similarity index 88% rename from org.springframework.integration/src/main/java/org/springframework/integration/message/Message.java rename to org.springframework.integration/src/main/java/org/springframework/integration/core/Message.java index 6e4e71a912..07db342609 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/Message.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/core/Message.java @@ -14,7 +14,9 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.core; + +import org.springframework.integration.message.MessageHeaders; /** * The central interface that any Message type must implement. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java index 05f3d81293..6a745255de 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageRejectedException; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java index e1a53dabba..6ff97f902a 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java @@ -17,7 +17,7 @@ package org.springframework.integration.dispatcher; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageConsumer; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java index 39b0b8b1f4..6a12a4df15 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java @@ -16,7 +16,7 @@ package org.springframework.integration.dispatcher; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java index d0e13925ee..3062464f10 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/dispatcher/SimpleDispatcher.java @@ -16,7 +16,7 @@ package org.springframework.integration.dispatcher; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessageRejectedException; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java index a716912208..cc729d3404 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageConsumer.java @@ -19,7 +19,7 @@ package org.springframework.integration.endpoint; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessagingException; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java index 6fefb7037d..807e9af55a 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractMessageProducingEndpoint.java @@ -19,7 +19,7 @@ package org.springframework.integration.endpoint; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java index 6161af68f2..946fdd256b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java @@ -22,7 +22,7 @@ import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageHeaders; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ChannelPoller.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ChannelPoller.java index 9f9bc5657e..9f0979e149 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ChannelPoller.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ChannelPoller.java @@ -17,7 +17,7 @@ package org.springframework.integration.endpoint; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.scheduling.Trigger; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessagingGateway.java index dcb83c87a4..c9540189f0 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessagingGateway.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/MessagingGateway.java @@ -16,7 +16,7 @@ package org.springframework.integration.endpoint; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Base interface for gateway adapters. In Spring Integration, a "gateway" is a diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumerEndpoint.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumerEndpoint.java index 7c1e17a689..96e122f520 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumerEndpoint.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/PollingConsumerEndpoint.java @@ -17,7 +17,7 @@ package org.springframework.integration.endpoint; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java index c84af169b1..c674df80d8 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ReplyMessageHolder.java @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.List; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatingConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatingConsumer.java index f2663f87f7..d38ea75c2c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatingConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/ServiceActivatingConsumer.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageMappingMethodInvoker; import org.springframework.integration.util.DefaultMethodResolver; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java index 7d9ce96246..c91eb0949f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java @@ -19,7 +19,7 @@ package org.springframework.integration.endpoint; import org.springframework.beans.factory.BeanNameAware; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageSource; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java index e46168e53a..958314bfad 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MessageFilter.java @@ -16,9 +16,9 @@ package org.springframework.integration.filter; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ReplyMessageHolder; -import org.springframework.integration.message.Message; import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java index d523ded1ae..37a6d5a0c8 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/filter/MethodInvokingSelector.java @@ -18,7 +18,7 @@ package org.springframework.integration.filter; import java.lang.reflect.Method; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageMappingMethodInvoker; import org.springframework.integration.selector.MessageSelector; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java index d1c734cb7a..78102362fa 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java @@ -22,13 +22,13 @@ import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.SubscribableChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.MessageEndpoint; import org.springframework.integration.endpoint.MessagingGateway; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.ReplyMessageHolder; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index 01d0a47c4f..9956a3a82d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -39,8 +39,8 @@ import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.config.xml.MessageBusParser; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.MessagingGateway; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MethodParameterMessageMapper; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java index dc8a3fc039..81350fb161 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.InboundMessageMapper; import org.springframework.integration.message.OutboundMessageMapper; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java index eb880d788a..44fda374ce 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.InboundMessageMapper; import org.springframework.integration.message.OutboundMessageMapper; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/InboundMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/InboundMessageMapper.java index 7a8e0500cc..9f9768dbb8 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/InboundMessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/InboundMessageMapper.java @@ -16,6 +16,8 @@ package org.springframework.integration.message; +import org.springframework.integration.core.Message; + /** * Strategy interface for mapping from an Object to a{@link Message}. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java index 85e8de589e..257cfc0555 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java @@ -22,6 +22,7 @@ import java.util.Map; import java.util.Set; import org.springframework.integration.channel.MessageChannel; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageConsumer.java index 0251ad4a90..741a7fdff6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageConsumer.java @@ -16,6 +16,8 @@ package org.springframework.integration.message; +import org.springframework.integration.core.Message; + /** * Base interface for any component that consumes Messages. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryAware.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryAware.java index 35d53ddee1..633607863c 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryAware.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryAware.java @@ -16,6 +16,8 @@ package org.springframework.integration.message; +import org.springframework.integration.core.Message; + /** * Interface that provides callback definitions for components that require * message delivery status notifications. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java index 07954ddf7e..9b3b5f474f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageDeliveryException.java @@ -16,6 +16,8 @@ package org.springframework.integration.message; +import org.springframework.integration.core.Message; + /** * Exception that indicates an error during message delivery. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java index b26603f5fd..2ae9b3f9b9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHandlingException.java @@ -16,6 +16,8 @@ package org.springframework.integration.message; +import org.springframework.integration.core.Message; + /** * Exception that indicates an error during message handling. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHeaders.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHeaders.java index a0f5a4fc1a..249d4899de 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHeaders.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHeaders.java @@ -24,6 +24,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import org.springframework.integration.core.Message; + /** * The headers for a {@link Message}. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java index 773147c0ee..165cf3f28d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageMappingMethodInvoker.java @@ -25,6 +25,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; +import org.springframework.integration.core.Message; import org.springframework.integration.util.DefaultMethodInvoker; import org.springframework.integration.util.MethodInvoker; import org.springframework.integration.util.NameResolvingMethodInvoker; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageRejectedException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageRejectedException.java index 4258d67df4..a8144a84e6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageRejectedException.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageRejectedException.java @@ -16,6 +16,8 @@ package org.springframework.integration.message; +import org.springframework.integration.core.Message; + /** * Exception that indicates a message has been rejected by a selector. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageSource.java index 347c9ddbe9..550878f166 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageSource.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageSource.java @@ -16,6 +16,8 @@ package org.springframework.integration.message; +import org.springframework.integration.core.Message; + /** * Base interface for any source of {@link Message Messages} that can be polled. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageStore.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageStore.java index 7b9f281131..ca00c0a017 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageStore.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageStore.java @@ -18,6 +18,8 @@ package org.springframework.integration.message; import java.util.List; +import org.springframework.integration.core.Message; + /** * Strategy interface for storing and retrieving messages. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagingException.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagingException.java index 4e2a69fb29..f6fdd7a741 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagingException.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagingException.java @@ -16,6 +16,8 @@ package org.springframework.integration.message; +import org.springframework.integration.core.Message; + /** * The base exception for any failures within the messaging system. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java index d71861454a..7c6397f510 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingConsumer.java @@ -18,6 +18,7 @@ package org.springframework.integration.message; import java.lang.reflect.Method; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java index db1e0d2c70..3c81e41ff4 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodInvokingSource.java @@ -20,6 +20,7 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.springframework.beans.factory.InitializingBean; +import org.springframework.integration.core.Message; import org.springframework.integration.util.DefaultMethodInvoker; import org.springframework.integration.util.MethodInvoker; import org.springframework.integration.util.MethodValidator; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java index eea69c0945..c9ae8122bb 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java @@ -28,6 +28,7 @@ import org.springframework.core.MethodParameter; import org.springframework.core.ParameterNameDiscoverer; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java index dd3c64ce01..fdd6da17e3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java @@ -16,6 +16,8 @@ package org.springframework.integration.message; +import org.springframework.integration.core.Message; + /** * Strategy interface for mapping from a {@link Message} to an Object. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/SimpleMessageStore.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/SimpleMessageStore.java index 2a335952ab..abb664fa81 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/SimpleMessageStore.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/SimpleMessageStore.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; +import org.springframework.integration.core.Message; import org.springframework.integration.util.BoundedHashMap; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java index a2fa4faf68..dfaab85ae0 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java @@ -25,7 +25,7 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.BeanFactoryChannelResolver; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java index 11079ac945..a26ebca8ef 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java @@ -20,8 +20,8 @@ import java.util.Collection; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractMessageConsumer; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageDeliveryException; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java index 7e7cb9cc78..fe5c5f0263 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java @@ -16,7 +16,7 @@ package org.springframework.integration.router; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Extends {@link AbstractChannelNameResolvingMessageRouter} to support router diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java index 32bd2acc15..dc16fc081f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java @@ -20,7 +20,7 @@ import java.util.Collection; import java.util.Collections; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Extends {@link AbstractMessageRouter} to support router implementations that diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java index e75e027222..f364ce0a0b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java index e78ad31d7f..83f1b29291 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java @@ -25,7 +25,7 @@ import java.util.List; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageMappingMethodInvoker; import org.springframework.integration.message.MessagingException; import org.springframework.util.Assert; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java index a620443e87..7ab8a7fffd 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java @@ -20,7 +20,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java b/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java index 7b645a694a..11882e2602 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/router/RecipientListRouter.java @@ -21,7 +21,7 @@ import java.util.List; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.channel.MessageChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/selector/MessageSelector.java b/org.springframework.integration/src/main/java/org/springframework/integration/selector/MessageSelector.java index 6808e96ce3..12ccc3ff21 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/selector/MessageSelector.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/selector/MessageSelector.java @@ -16,7 +16,7 @@ package org.springframework.integration.selector; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Strategy interface for message selection. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java b/org.springframework.integration/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java index 8dd3401c34..cf40a999d5 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java @@ -19,7 +19,7 @@ package org.springframework.integration.selector; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java b/org.springframework.integration/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java index 51bea33099..305c9e86b6 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java @@ -19,7 +19,7 @@ package org.springframework.integration.selector; import java.util.ArrayList; import java.util.List; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java b/org.springframework.integration/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java index 978f8cefd1..fc8c5f7bd3 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java @@ -16,7 +16,7 @@ package org.springframework.integration.selector; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * A {@link MessageSelector} that accepts {@link Message Messages} that are diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java index bdd052b011..a9761de86d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java @@ -18,9 +18,9 @@ package org.springframework.integration.splitter; import java.util.Collection; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ReplyMessageHolder; -import org.springframework.integration.message.Message; /** * Base class for Message-splitting consumers. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/DefaultMessageSplitter.java b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/DefaultMessageSplitter.java index a12df642a2..d902a50a09 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/DefaultMessageSplitter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/DefaultMessageSplitter.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.StringTokenizer; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * The default Message Splitter implementation. Returns individual Messages diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java index 2a610d91a3..9779c0a704 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/splitter/MethodInvokingSplitter.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.InitializingBean; import org.springframework.integration.annotation.Splitter; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageMappingMethodInvoker; import org.springframework.integration.util.DefaultMethodResolver; import org.springframework.integration.util.MethodResolver; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java index 1e274c5fa1..89cd990942 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractHeaderTransformer.java @@ -19,7 +19,7 @@ package org.springframework.integration.transformer; import java.util.HashMap; import java.util.Map; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessagingException; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java index 1b8dfbcdd3..8e5622a87d 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java @@ -16,7 +16,7 @@ package org.springframework.integration.transformer; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessagingException; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java index 4316b89de3..9b6edb3971 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java @@ -19,7 +19,7 @@ package org.springframework.integration.transformer; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * A {@link ChannelInterceptor} which invokes a {@link Transformer} diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java index ef01b36a0a..42a2f24d9f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MessageTransformingConsumer.java @@ -16,9 +16,9 @@ package org.springframework.integration.transformer; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ReplyMessageHolder; -import org.springframework.integration.message.Message; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java index 31148052c7..1eb42d6bd1 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/MethodInvokingTransformer.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import java.util.Map; import java.util.Properties; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageMappingMethodInvoker; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/Transformer.java b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/Transformer.java index f1cfb65792..e1a17ebe9a 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/transformer/Transformer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/transformer/Transformer.java @@ -16,7 +16,7 @@ package org.springframework.integration.transformer; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Strategy interface for transforming a {@link Message}. diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregationBarrierTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregationBarrierTests.java index 5fc4b2e32e..09715da719 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregationBarrierTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregationBarrierTests.java @@ -27,7 +27,7 @@ import org.junit.Test; import org.springframework.integration.aggregator.AggregationBarrier; import org.springframework.integration.aggregator.CompletionStrategy; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java index 73431a5fe9..de587df77d 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/AggregatorEndpointTests.java @@ -35,7 +35,7 @@ import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/CompletionStrategyAdapterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/CompletionStrategyAdapterTests.java index 47225f0f2c..b8ba12614d 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/CompletionStrategyAdapterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/CompletionStrategyAdapterTests.java @@ -25,8 +25,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; /** * @author Marius Bogoevici diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java index 427306d513..95027dd7f3 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MethodInvokingAggregatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MethodInvokingAggregatorTests.java index 7e6fd41541..48ec20432e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MethodInvokingAggregatorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/MethodInvokingAggregatorTests.java @@ -25,8 +25,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; /** * @author Marius Bogoevici diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java index 8c3dd048fc..58a37bf30f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.scheduling.TaskScheduler; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java index 278cf66b4d..73c1c8a3e8 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/SequenceSizeCompletionStrategyTests.java @@ -25,7 +25,7 @@ import java.util.List; import org.junit.Test; import org.springframework.integration.aggregator.SequenceSizeCompletionStrategy; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java index fce2715765..1e17198ccc 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java index 4e4b6fe71a..124a6c6d85 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java index c5c505e65e..ff0d89008c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aop/PublisherAnnotationPostProcessorTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java index 2119f58789..f26159fed6 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DefaultMessageBusTests.java @@ -35,6 +35,7 @@ import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.xml.MessageBusParser; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.ReplyMessageHolder; @@ -42,7 +43,6 @@ import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java index 4386847ad3..0cea6ba792 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java @@ -29,11 +29,11 @@ import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.ThreadLocalChannel; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; import org.springframework.integration.config.xml.MessageBusParser; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ReplyMessageHolder; import org.springframework.integration.endpoint.ServiceActivatingConsumer; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java index b9d5855b53..84f97c63aa 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java @@ -24,7 +24,7 @@ import java.util.List; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.MessageSelector; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelTests.java index f50cb53875..ecc79cb01e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/DirectChannelTests.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java index 1809ab94a3..010e43ec0c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessageChannelTemplateTests.java @@ -31,10 +31,10 @@ import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.bus.DefaultMessageBus; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.endpoint.ReplyMessageHolder; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java index b72e68f4f0..2acab8af88 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java @@ -18,7 +18,7 @@ package org.springframework.integration.channel; import java.util.Comparator; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java index 6de915d24f..59a676b7e4 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java @@ -24,7 +24,7 @@ import java.util.Comparator; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessagePriority; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java index 4afec61b2a..69a6dfa596 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/QueueChannelTests.java @@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.UnexpiredMessageSelector; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/ThreadLocalChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/ThreadLocalChannelTests.java index 2a48962365..8563ad8c5a 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/ThreadLocalChannelTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/ThreadLocalChannelTests.java @@ -25,7 +25,7 @@ import java.util.List; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java index 74d58ae8b6..401893f81a 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java @@ -32,8 +32,8 @@ import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.config.TestChannelInterceptor; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessagePriority; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSource.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSource.java index 6ed3aa5a0a..8f5d7b77cf 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSource.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestSource.java @@ -16,7 +16,7 @@ package org.springframework.integration.channel.config; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestTransformer.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestTransformer.java index 38c8e72864..8b33fb9805 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestTransformer.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/TestTransformer.java @@ -16,7 +16,7 @@ package org.springframework.integration.channel.config; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.transformer.Transformer; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java index 11893f8d3a..96810e6c45 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java index e098d4381d..ffd0a963ae 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.MessageSelector; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java index c16c5fbc26..ae26cb87ef 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.MessageSelector; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index 8d52894b2a..5dcd1709bb 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -33,8 +33,8 @@ import org.springframework.integration.aggregator.CompletionStrategyAdapter; import org.springframework.integration.aggregator.MethodInvokingAggregator; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.util.MethodInvoker; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java index f119c7254f..f16074b57f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java @@ -30,9 +30,9 @@ import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.config.xml.MessageBusParser; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; -import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java index 8d9197a744..a4846d2054 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/EndpointParserTests.java @@ -27,8 +27,8 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java index e165d441ee..27d02d9434 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java @@ -16,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageHandlingException; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests.java index e2b9d424e7..4af6ee7b6b 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/FilterParserTests.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.MessageSelector; import org.springframework.test.context.ContextConfiguration; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterAdviceChainTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterAdviceChainTests.java index 513275feb5..754157c9a8 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterAdviceChainTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterAdviceChainTests.java @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterTransactionalTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterTransactionalTests.java index 3cbeace163..b179f61785 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterTransactionalTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationChannelAdapterTransactionalTests.java @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.util.TestTransactionManager; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests.java index 18d4b94a1f..a532c1822e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerAdviceChainTests.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests.java index d96b7070e9..e3ca29537a 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/PollerAnnotationConsumerTransactionalTests.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestTransactionManager; import org.springframework.test.context.ContextConfiguration; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java index e94dd80fde..373c5d47ce 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/ResequencerParserTests.java @@ -33,8 +33,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.aggregator.Resequencer; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.SubscribingConsumerEndpoint; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/StubMessageSelector.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/StubMessageSelector.java index 7aec818886..5c245dc439 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/StubMessageSelector.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/StubMessageSelector.java @@ -17,7 +17,7 @@ package org.springframework.integration.config; import org.springframework.beans.factory.BeanNameAware; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregatorBean.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregatorBean.java index ecdd0ad44e..53deb69e41 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregatorBean.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestAggregatorBean.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentMap; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java index 830368f736..cd0e3c2ad1 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java index 9b513218dd..6384448e1c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestCompletionStrategy.java @@ -19,7 +19,7 @@ package org.springframework.integration.config; import java.util.List; import org.springframework.integration.aggregator.CompletionStrategy; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Marius Bogoevici diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestConsumer.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestConsumer.java index acee93cc9d..1bf79eac4e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestConsumer.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestConsumer.java @@ -16,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java index 7da1749f41..074ef2b573 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestHandler.java @@ -19,7 +19,7 @@ package org.springframework.integration.config; import java.util.concurrent.CountDownLatch; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSelector.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSelector.java index b33c9c610d..a5ef62ef20 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSelector.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSelector.java @@ -16,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.selector.MessageSelector; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSource.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSource.java index 88d965111f..d69b4ff147 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSource.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/TestSource.java @@ -16,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/WireTapParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/WireTapParserTests.java index 4d136a67f2..0e2285be9e 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/WireTapParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/WireTapParserTests.java @@ -29,7 +29,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.interceptor.WireTap; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java index dbeacb7323..78d37afb46 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java @@ -31,8 +31,8 @@ import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java index e237063b09..89e2b95dbd 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java @@ -45,8 +45,8 @@ import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.xml.MessageBusParser; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.PollingConsumerEndpoint; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java index 1d603d4cbb..c86e237511 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java @@ -28,7 +28,7 @@ import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.xml.MessageBusParser; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java index 25b60612a3..1c8fb6d8a4 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java @@ -30,7 +30,7 @@ import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.xml.MessageBusParser; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCompletionStrategy.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCompletionStrategy.java index 4a48aa999e..0bf7ab25f0 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCompletionStrategy.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCompletionStrategy.java @@ -26,7 +26,7 @@ import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.CompletionStrategy; import org.springframework.integration.annotation.MessageEndpoint; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java index e7ffb3e936..ce08645276 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java @@ -24,7 +24,7 @@ import java.util.concurrent.ConcurrentMap; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.stereotype.Component; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java index 2e329019cd..65ac4c7903 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java @@ -25,7 +25,7 @@ import java.util.concurrent.ConcurrentMap; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.MessageEndpoint; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java index 41b504ed5d..3c19b0bf53 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java @@ -26,8 +26,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.gateway.TestService; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java index 2a5dba3b06..bea41c4187 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java @@ -34,7 +34,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java index 1b9e18c3c9..1e3000b282 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.util.TestTransactionManager; import org.springframework.transaction.IllegalTransactionStateException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java index 1a1e1c7ef4..4176cdbc4d 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/dispatcher/SimpleDispatcherTests.java @@ -26,9 +26,9 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.AbstractReplyProducingMessageConsumer; import org.springframework.integration.endpoint.ServiceActivatingConsumer; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessageRejectedException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ChannelPollerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ChannelPollerTests.java index ad71df2668..ef67ed7caf 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ChannelPollerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ChannelPollerTests.java @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageConsumer; import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.scheduling.Trigger; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java index 3905cd9f23..0c69cba22f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; import org.springframework.integration.splitter.MethodInvokingSplitter; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java index b5dce559f5..3e2a5a8061 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java index 1ae467ba6b..37380dfcaf 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageRejectedException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java index 81a88b4f2b..4f2c243c4b 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java index 4b58a5af52..a040c7d386 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java @@ -18,7 +18,7 @@ package org.springframework.integration.endpoint.annotation; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterContextTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterContextTests.java index bb45e4f38d..cae519abd7 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterContextTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/filter/FilterContextTests.java @@ -25,7 +25,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java index b1a0e794a0..52f2eac935 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/filter/MessageFilterTests.java @@ -25,9 +25,9 @@ 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.endpoint.SubscribingConsumerEndpoint; import org.springframework.integration.filter.MessageFilter; -import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.MessageSelector; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java index 0ea48fd759..ec40dd6823 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java @@ -23,8 +23,8 @@ import java.lang.reflect.Method; import org.junit.Test; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java index 9238d32b0c..13a92c7e81 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java @@ -32,7 +32,7 @@ import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java index 2c9e18d9c2..8f2218aa61 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessageHeaders; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java index 48ad50ef6f..d8bba23ab9 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java @@ -20,7 +20,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestHandler.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestHandler.java index 889f06670d..ea4f76f72f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestHandler.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestHandler.java @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestService.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestService.java index e668bfbb2c..193c267992 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestService.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/TestService.java @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java index 22f592af11..fb241d99ed 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java @@ -23,6 +23,8 @@ import java.util.Date; import org.junit.Test; +import org.springframework.integration.core.Message; + /** * @author Mark Fisher */ diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java index ee85c11f0e..6baea8ff4c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageMappingMethodInvokerTests.java @@ -25,8 +25,8 @@ import java.util.Properties; import org.junit.Test; import org.springframework.integration.annotation.Header; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageMappingMethodInvoker; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java index be00c88b4d..e4d1639aa7 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingConsumerTests.java @@ -29,6 +29,7 @@ import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.bus.DefaultMessageBus; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.endpoint.PollingConsumerEndpoint; import org.springframework.integration.util.TestUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java index 7fea6555a3..ec5eebd27f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.MethodInvokingSource; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperFromMessageTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperFromMessageTests.java index c805c7fc0c..2ef2989d90 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperFromMessageTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperFromMessageTests.java @@ -28,6 +28,7 @@ import org.junit.Test; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperInitializationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperInitializationTests.java index 151f4d2a02..bc48d454ce 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperInitializationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperInitializationTests.java @@ -20,6 +20,8 @@ import java.lang.reflect.Method; import org.junit.Test; +import org.springframework.integration.core.Message; + /** * @author Mark Fisher */ diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperToMessageTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperToMessageTests.java index a5dca38900..d9410f12a4 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperToMessageTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MethodParameterMessageMapperToMessageTests.java @@ -27,6 +27,7 @@ import org.junit.Test; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; +import org.springframework.integration.core.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/SimpleMessageStoreTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/SimpleMessageStoreTests.java index a401eb2a6d..222760ea66 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/SimpleMessageStoreTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/SimpleMessageStoreTests.java @@ -24,6 +24,8 @@ import java.util.List; import org.junit.Test; +import org.springframework.integration.core.Message; + /** * @author Mark Fisher */ diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/TestHandlers.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/TestHandlers.java index d1c01bad64..aa2812a087 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/TestHandlers.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/TestHandlers.java @@ -19,7 +19,7 @@ package org.springframework.integration.message; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; /** * Factory for handler beans that are useful for testing. diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java index b699b6801c..e98fe5a3e5 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.selector.UnexpiredMessageSelector; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java index d1b6930c93..cf79c8d6a9 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java @@ -26,9 +26,9 @@ import org.junit.Test; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java index f1f6de3ff5..a0187aeb86 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java @@ -31,8 +31,8 @@ import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java index 12582e8cbd..b65f18e248 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java index 6541a886b7..6e1c3cad9c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java index d207a37077..8d561f9b1f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java @@ -30,7 +30,7 @@ import org.junit.Test; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java index 6c5e63949b..e69e94ac13 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterTests.java @@ -27,7 +27,7 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageDeliveryException; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java index aaf4e037d1..09f24b53f2 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java index 99ed814353..6f7e2541f7 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/RouterParserTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java index 902b9ef18d..5a028c6bc0 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java @@ -29,8 +29,8 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java index c328c9d658..4cfcf2cfd7 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/TestSplitterImpl.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/TestSplitterImpl.java index 501b55733a..e4a2fad0d5 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/config/TestSplitterImpl.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/config/TestSplitterImpl.java @@ -16,7 +16,7 @@ package org.springframework.integration.router.config; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.splitter.AbstractMessageSplitter; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java index 997b79a9fe..2aa443b956 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java index 1910c7381c..76e55b0404 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java @@ -27,8 +27,8 @@ 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.endpoint.SubscribingConsumerEndpoint; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java index 6e7b58097e..5cf7f21e73 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Splitter; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/HeaderTransformerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/HeaderTransformerTests.java index 5bbaf9c3f1..befd60f551 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/HeaderTransformerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/HeaderTransformerTests.java @@ -23,7 +23,7 @@ import java.util.Map; import org.junit.Test; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageBuilder; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptorTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptorTests.java index 7a1c4d52ee..0d0323ffa2 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptorTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptorTests.java @@ -22,7 +22,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java index bb5b771a10..95f6d2f73f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java @@ -27,8 +27,8 @@ import org.junit.Test; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Transformer; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java index ae95e60326..f2678f85d5 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java @@ -22,8 +22,8 @@ import java.util.Date; import org.junit.Test; +import org.springframework.integration.core.Message; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.Message; import org.springframework.integration.message.MessagingException; import org.springframework.integration.message.StringMessage; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java index 5cdf8bdd6f..7a66b94350 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java @@ -24,7 +24,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; -import org.springframework.integration.message.Message; +import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /**