From 28ab8394de25a0e87baa5459a2c61b59fa0a60cd Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Tue, 10 Sep 2013 13:35:53 +0100 Subject: [PATCH] Build on top of Spring 4's new messaging types This commit updates Spring Integration to depend upon Spring 4, making use of the message types that have moved from Spring Integration into Spring's new spring-messaging module. The default message converter no longer supports conversion of a message that is null, throwing an IllegalArgumentException if an attempt is made to convert null. Furthermore, GenericMessagingTemplate does not support sending null, again throwing an IllegalArgumentException. Previously, MessagingTemplate had no-oped an attempt to send null. ConcurrentAggregatorTests and AggregatorTests both had a single test that was specifically testing the behaviour of an aggregator that returns null for its message. These tests have been removed. CorrelatingMessageHandlerTests have been updated to specify some additional behaviour for its mocks so that null messages are not returned. These are the only functional changes that have been made. All other changes are simply for moving to the repackaged and/or renamed types. In the move to being part of core Spring, a number of constants and header accessor methods have moved from MessageHeaders to MessageHeaderAccessor. This commit continues this pattern for the enterprise integration headers that are specific to Spring Integration. A new class, EiMessageHeaderAccessor, has been created. This class provides constants and methods for working with SI-specific headers. The main code and tests have been updated to use this new class. --- build.gradle | 3 +- gradle.properties | 2 +- .../integration/amqp/AmqpHeaders.java | 2 +- .../amqp/channel/AbstractAmqpChannel.java | 2 +- .../AbstractSubscribableAmqpChannel.java | 10 +- .../amqp/channel/PollableAmqpChannel.java | 4 +- .../amqp/channel/package-info.java | 2 +- .../integration/amqp/config/package-info.java | 2 +- .../amqp/inbound/AmqpInboundGateway.java | 4 +- .../amqp/inbound/package-info.java | 2 +- .../amqp/outbound/AmqpOutboundEndpoint.java | 4 +- .../amqp/outbound/package-info.java | 2 +- .../integration/amqp/package-info.java | 2 +- .../amqp/support/DefaultAmqpHeaderMapper.java | 6 +- .../amqp/support/package-info.java | 2 +- .../config/spring-integration-amqp-3.0.xsd | 20 +- .../DispatcherHasNoSubscribersTests.java | 2 +- .../amqp/config/AmqpChannelParserTests.java | 2 +- .../AmqpInboundChannelAdapterParserTests.java | 9 +- .../config/AmqpInboundGatewayParserTests.java | 10 +- ...AmqpOutboundChannelAdapterParserTests.java | 8 +- .../AmqpOutboundGatewayParserTests.java | 4 +- .../amqp/config/OutboundGatewayTests.java | 2 +- .../amqp/outbound/OutboundEndpointTests.java | 6 +- .../support/DefaultAmqpHeaderMapperTests.java | 2 +- .../integration/EiMessageHeaderAccessor.java | 82 +++ .../springframework/integration/Message.java | 31 - .../integration/MessageChannel.java | 54 -- .../integration/MessageDeliveryException.java | 43 -- .../MessageDispatchingException.java | 2 + .../integration/MessageHandlingException.java | 5 +- .../integration/MessageHeaders.java | 305 -------- .../integration/MessageRejectedException.java | 4 +- .../integration/MessageTimeoutException.java | 7 +- .../integration/MessagingException.java | 69 -- ...tractAggregatingMessageGroupProcessor.java | 19 +- .../AbstractCorrelatingMessageHandler.java | 24 +- .../aggregator/AggregatingMessageHandler.java | 2 +- .../aggregator/CorrelatingMessageBarrier.java | 2 +- .../aggregator/CorrelationStrategy.java | 2 +- ...faultAggregatingMessageGroupProcessor.java | 2 +- ...pressionEvaluatingCorrelationStrategy.java | 2 +- ...essionEvaluatingMessageGroupProcessor.java | 3 +- ...ressionEvaluatingMessageListProcessor.java | 2 +- .../HeaderAttributeCorrelationStrategy.java | 2 +- .../aggregator/MessageListProcessor.java | 4 +- .../aggregator/MessageSequenceComparator.java | 9 +- .../MethodInvokingCorrelationStrategy.java | 2 +- .../MethodInvokingMessageGroupProcessor.java | 2 +- .../MethodInvokingMessageListProcessor.java | 2 +- .../ResequencingMessageGroupProcessor.java | 5 +- .../ResequencingMessageHandler.java | 25 +- .../aggregator/SequenceNumberComparator.java | 19 +- .../SequenceSizeReleaseStrategy.java | 27 +- ...meoutCountSequenceSizeReleaseStrategy.java | 2 +- .../integration/aggregator/package-info.java | 2 +- .../integration/annotation/Filter.java | 2 +- .../integration/annotation/Gateway.java | 2 +- .../integration/annotation/Router.java | 4 +- .../annotation/ServiceActivator.java | 2 +- .../integration/annotation/Splitter.java | 2 +- .../integration/annotation/package-info.java | 2 +- .../aop/MessagePublishingInterceptor.java | 19 +- .../aop/PublisherAnnotationAdvisor.java | 7 +- .../PublisherAnnotationBeanPostProcessor.java | 2 +- .../integration/aop/package-info.java | 2 +- .../channel/AbstractMessageChannel.java | 8 +- .../channel/AbstractPollableChannel.java | 4 +- .../channel/AbstractSubscribableChannel.java | 10 +- .../channel/ChannelInterceptor.java | 4 +- .../integration/channel/ChannelPurger.java | 2 +- .../integration/channel/ExecutorChannel.java | 6 +- .../MessagePublishingErrorHandler.java | 26 +- .../integration/channel/NullChannel.java | 4 +- .../integration/channel/PriorityChannel.java | 25 +- .../channel/PublishSubscribeChannel.java | 4 +- .../integration/channel/QueueChannel.java | 2 +- .../channel/QueueChannelOperations.java | 2 +- .../channel/RendezvousChannel.java | 2 +- .../ChannelInterceptorAdapter.java | 4 +- ...alChannelInterceptorBeanPostProcessor.java | 2 +- .../MessageSelectingInterceptor.java | 8 +- .../channel/interceptor/WireTap.java | 4 +- .../channel/interceptor/package-info.java | 2 +- .../integration/channel/package-info.java | 2 +- .../channel/registry/ChannelRegistry.java | 2 +- .../registry/LocalChannelRegistry.java | 4 +- ...stractSimpleMessageHandlerFactoryBean.java | 4 +- ...ractStandardMessageHandlerFactoryBean.java | 2 +- .../config/ConsumerEndpointFactoryBean.java | 8 +- .../CorrelationStrategyFactoryBean.java | 14 +- .../ExpressionControlBusFactoryBean.java | 2 +- .../integration/config/FilterFactoryBean.java | 4 +- .../config/IdGeneratorConfigurer.java | 4 +- .../integration/config/RouterFactoryBean.java | 16 +- .../config/ServiceActivatorFactoryBean.java | 4 +- ...ourcePollingChannelAdapterFactoryBean.java | 2 +- .../config/SplitterFactoryBean.java | 2 +- .../config/TransformerFactoryBean.java | 2 +- ...AbstractMethodAnnotationPostProcessor.java | 17 +- .../AggregatorAnnotationPostProcessor.java | 10 +- .../FilterAnnotationPostProcessor.java | 4 +- .../RouterAnnotationPostProcessor.java | 6 +- ...rviceActivatorAnnotationPostProcessor.java | 6 +- .../SplitterAnnotationPostProcessor.java | 4 +- .../TransformerAnnotationPostProcessor.java | 4 +- .../config/annotation/package-info.java | 2 +- .../integration/config/package-info.java | 2 +- .../xml/AbstractChannelAdapterParser.java | 2 +- .../AbstractOutboundChannelAdapterParser.java | 2 +- .../config/xml/ChannelInitializer.java | 2 +- ...ltConfiguringBeanFactoryPostProcessor.java | 13 +- .../xml/PublishingInterceptorParser.java | 18 +- .../xml/StandardHeaderEnricherParser.java | 11 +- .../integration/config/xml/package-info.java | 2 +- .../context/IntegrationContextUtils.java | 2 +- .../integration/context/package-info.java | 2 +- .../core/AsyncMessagingOperations.java | 6 +- .../core/AsyncMessagingTemplate.java | 9 +- .../integration/core/MessageHandler.java | 50 -- .../core/MessagePostProcessor.java | 44 -- .../integration/core/MessageProducer.java | 2 +- .../integration/core/MessageSelector.java | 2 +- .../integration/core/MessageSource.java | 2 +- .../integration/core/MessagingOperations.java | 335 --------- .../integration/core/MessagingTemplate.java | 462 ------------ .../integration/core/PollableChannel.java | 47 -- .../integration/core/SubscribableChannel.java | 40 - .../integration/core/package-info.java | 2 +- .../dispatcher/AbstractDispatcher.java | 2 +- .../AggregateMessageDeliveryException.java | 10 +- .../dispatcher/BroadcastingDispatcher.java | 6 +- .../dispatcher/LoadBalancingStrategy.java | 4 +- .../dispatcher/MessageDispatcher.java | 4 +- .../RoundRobinLoadBalancingStrategy.java | 4 +- .../dispatcher/UnicastingDispatcher.java | 8 +- .../integration/dispatcher/package-info.java | 2 +- .../endpoint/AbstractMessageSource.java | 4 +- .../endpoint/AbstractPollingEndpoint.java | 11 +- .../endpoint/EventDrivenConsumer.java | 4 +- .../endpoint/MessageProducerSupport.java | 16 +- .../endpoint/MethodInvokingMessageSource.java | 2 +- .../integration/endpoint/PollingConsumer.java | 6 +- .../endpoint/SourcePollingChannelAdapter.java | 10 +- .../integration/endpoint/package-info.java | 2 +- .../integration/expression/package-info.java | 2 +- .../AbstractMessageProcessingSelector.java | 2 +- .../integration/filter/MessageFilter.java | 4 +- .../integration/filter/package-info.java | 2 +- .../GatewayMethodInboundMessageMapper.java | 4 +- .../gateway/GatewayProxyFactoryBean.java | 16 +- .../gateway/MessagingGatewaySupport.java | 30 +- .../gateway/RequestReplyExchanger.java | 2 +- .../RequestReplyMessageHandlerAdapter.java | 4 +- .../integration/gateway/package-info.java | 2 +- .../handler/AbstractMessageHandler.java | 6 +- .../handler/AbstractMessageProcessor.java | 2 +- .../AbstractReplyProducingMessageHandler.java | 30 +- ...ProducingPostProcessingMessageHandler.java | 2 +- .../integration/handler/BridgeHandler.java | 2 +- .../integration/handler/DelayHandler.java | 6 +- .../ExpressionCommandMessageProcessor.java | 4 +- .../ExpressionEvaluatingMessageHandler.java | 2 +- .../ExpressionEvaluatingMessageProcessor.java | 2 +- .../integration/handler/LoggingHandler.java | 2 +- .../handler/MessageHandlerChain.java | 16 +- .../integration/handler/MessageProcessor.java | 2 +- .../handler/MethodInvokingMessageHandler.java | 6 +- .../MethodInvokingMessageProcessor.java | 2 +- .../handler/PostProcessingMessageHandler.java | 4 +- .../handler/ReplyRequiredException.java | 4 +- .../handler/ServiceActivatingHandler.java | 2 +- .../advice/AbstractRequestHandlerAdvice.java | 4 +- .../advice/ErrorMessageSendingRecoverer.java | 14 +- ...ressionEvaluatingRequestHandlerAdvice.java | 16 +- .../RequestHandlerCircuitBreakerAdvice.java | 2 +- .../advice/RequestHandlerRetryAdvice.java | 4 +- .../handler/advice/RetryStateGenerator.java | 2 +- .../SpelExpressionRetryStateGenerator.java | 2 +- .../handler/advice/package-info.java | 4 +- .../integration/handler/package-info.java | 2 +- .../HistoryWritingMessagePostProcessor.java | 6 +- .../integration/history/MessageHistory.java | 4 +- .../integration/history/package-info.java | 2 +- .../json/ObjectToJsonTransformer.java | 4 +- .../integration/json/package-info.java | 2 +- .../mapping/AbstractHeaderMapper.java | 2 +- .../integration/mapping/HeaderMapper.java | 2 +- .../mapping/InboundMessageMapper.java | 2 +- .../mapping/MessageMappingException.java | 4 +- .../mapping/OutboundMessageMapper.java | 2 +- .../mapping/RequestReplyHeaderMapper.java | 2 +- .../integration/mapping/package-info.java | 2 +- .../integration/message/AdviceMessage.java | 2 +- .../integration/message/ErrorMessage.java | 40 - .../integration/message/GenericMessage.java | 66 +- .../integration/message/package-info.java | 4 +- .../integration/package-info.java | 2 +- .../ResourceRetrievingMessageSource.java | 2 +- .../integration/resource/package-info.java | 2 +- .../router/AbstractMappingMessageRouter.java | 28 +- .../AbstractMessageProcessingRouter.java | 2 +- .../router/AbstractMessageRouter.java | 16 +- .../ErrorMessageExceptionTypeRouter.java | 4 +- .../integration/router/HeaderValueRouter.java | 2 +- .../MappingMessageRouterManagement.java | 2 +- .../router/MethodInvokingRouter.java | 1 - .../integration/router/PayloadTypeRouter.java | 4 +- .../router/RecipientListRouter.java | 4 +- .../integration/router/package-info.java | 2 +- .../integration/scheduling/package-info.java | 2 +- .../selector/MessageSelectorChain.java | 2 +- .../selector/PayloadTypeSelector.java | 2 +- .../selector/UnexpiredMessageSelector.java | 7 +- .../integration/selector/package-info.java | 2 +- .../AbstractMessageProcessingSplitter.java | 2 +- .../splitter/AbstractMessageSplitter.java | 4 +- .../splitter/DefaultMessageSplitter.java | 2 +- .../integration/splitter/package-info.java | 2 +- .../store/AbstractKeyValueMessageStore.java | 4 +- .../store/AbstractMessageGroupStore.java | 2 +- .../integration/store/MessageGroup.java | 2 +- .../store/MessageGroupMetadata.java | 2 +- .../integration/store/MessageGroupQueue.java | 2 +- .../integration/store/MessageGroupStore.java | 4 +- .../integration/store/MessageStore.java | 2 +- .../store/MessageStoreException.java | 4 +- .../integration/store/SimpleMessageGroup.java | 7 +- .../integration/store/SimpleMessageStore.java | 4 +- .../store/metadata/package-info.java | 2 +- .../integration/store/package-info.java | 2 +- .../integration/support/IdGenerators.java | 52 ++ .../integration/support/MessageBuilder.java | 169 ++--- .../channel/BeanFactoryChannelResolver.java | 80 -- .../channel/ChannelResolutionException.java | 47 -- .../support/channel/ChannelResolver.java | 33 - .../support/channel/package-info.java | 4 - .../converter/MapMessageConverter.java | 8 +- .../converter/MessageConversionException.java | 37 - .../support/converter/MessageConverter.java | 31 - .../converter/SimpleMessageConverter.java | 10 +- .../support/converter/package-info.java | 2 +- .../AbstractJacksonJsonMessageParser.java | 2 +- .../AbstractJsonInboundMessageMapper.java | 12 +- .../json/Jackson2JsonMessageParser.java | 2 +- .../json/JacksonJsonMessageParser.java | 2 +- .../json/JsonInboundMessageMapper.java | 2 +- .../json/JsonOutboundMessageMapper.java | 3 +- .../integration/support/package-info.java | 2 +- ...ngTransactionSynchronizationProcessor.java | 4 +- .../IntegrationResourceHolder.java | 4 +- .../transaction/PseudoTransactionManager.java | 2 +- .../TransactionSynchronizationProcessor.java | 2 +- .../AbstractMessageProcessingTransformer.java | 2 +- .../AbstractPayloadTransformer.java | 2 +- .../transformer/AbstractTransformer.java | 2 +- .../transformer/ClaimCheckInTransformer.java | 2 +- .../transformer/ClaimCheckOutTransformer.java | 2 +- .../transformer/ContentEnricher.java | 4 +- .../transformer/HeaderEnricher.java | 4 +- .../integration/transformer/HeaderFilter.java | 2 +- .../MessageTransformationException.java | 4 +- ...MessageTransformingChannelInterceptor.java | 4 +- .../MessageTransformingHandler.java | 6 +- .../integration/transformer/Transformer.java | 2 +- .../integration/transformer/package-info.java | 2 +- ...EvaluatingHeaderValueMessageProcessor.java | 2 +- ...ProcessingHeaderValueMessageProcessor.java | 2 +- .../StaticHeaderValueMessageProcessor.java | 2 +- .../util/AbstractExpressionEvaluator.java | 2 +- .../util/AcceptOnceCollectionFilter.java | 2 +- .../util/BeanFactoryTypeConverter.java | 4 +- .../integration/util/DefaultLockRegistry.java | 2 +- .../util/MessagingMethodInvokerHelper.java | 6 +- .../util/PassThruLockRegistry.java | 2 +- .../integration/util/SimplePool.java | 2 +- .../integration/util/UniqueMethodFilter.java | 2 +- .../util/WhileLockedProcessor.java | 2 +- .../integration/util/package-info.java | 2 +- .../config/xml/spring-integration-3.0.xsd | 50 +- ...bstractCorrelatingMessageHandlerTests.java | 4 +- ...atingMessageGroupProcessorHeaderTests.java | 2 +- .../aggregator/AggregatorTests.java | 27 +- .../aggregator/ConcurrentAggregatorTests.java | 37 +- .../CorrelatingMessageBarrierTests.java | 4 +- ...elatingMessageHandlerIntegrationTests.java | 4 +- .../CorrelatingMessageHandlerTests.java | 29 +- .../CorrelationStrategyAdapterTests.java | 2 +- ...ionEvaluatingCorrelationStrategyTests.java | 4 +- ...nEvaluatingMessageGroupProcessorTests.java | 2 +- ...aderAttributeCorrelationStrategyTests.java | 2 +- .../MessageSequenceComparatorTests.java | 2 +- ...hodInvokingMessageGroupProcessorTests.java | 2 +- .../MethodInvokingReleaseStrategyTests.java | 9 +- .../aggregator/ResequencerTests.java | 48 +- ...esequencingMessageGroupProcessorTests.java | 2 +- .../SequenceSizeReleaseStrategyTests.java | 2 +- ...CountSequenceSizeReleaseStrategyTests.java | 2 +- .../AggregatorExpressionIntegrationTests.java | 12 +- .../AggregatorIntegrationTests.java | 34 +- .../AnnotationAggregatorTests.java | 4 +- ...aultMessageAggregatorIntegrationTests.java | 12 +- ...vokingAggregatorReturningMessageTests.java | 4 +- .../ResequencerIntegrationTests.java | 49 +- .../scenarios/AggregationResendTests.java | 2 +- .../AggregatorReplyChannelTests.java | 6 +- ...regatorWithCustomReleaseStrategyTests.java | 4 +- .../scenarios/NestedAggregationTests.java | 8 +- .../PartialSequencesWithGapsTests.java | 15 +- .../AnnotationConfigRegistrationTests.java | 2 +- ...MessagePublishingAnnotationUsageTests.java | 2 +- .../MessagePublishingInterceptorTests.java | 11 +- ...ublishingInterceptorUsageTests-context.xml | 2 +- ...essagePublishingInterceptorUsageTests.java | 2 +- .../aop/PublisherAnnotationAdvisorTests.java | 2 +- .../aop/PublisherExpressionTests.java | 2 +- .../ApplicationContextMessageBusTests.java | 9 +- .../bus/DirectChannelSubscriptionTests.java | 6 +- .../BeanFactoryChannelResolverTests.java | 55 -- .../channel/ChannelPurgerTests.java | 2 +- .../channel/DatatypeChannelTests.java | 8 +- .../channel/DirectChannelTests.java | 6 +- .../DispatcherHasNoSubscribersTests.java | 4 +- .../DispatchingChannelErrorHandlingTests.java | 10 +- .../channel/ExecutorChannelTests.java | 4 +- .../channel/MessagePayloadTestComparator.java | 2 +- ...dDispatcherConfigurationScenarioTests.java | 4 +- .../integration/channel/P2pChannelTests.java | 2 +- .../channel/PriorityChannelTests.java | 2 +- .../channel/QueueChannelTests.java | 2 +- .../channel/TestChannelResolver.java | 8 +- ...ctionSynchronizationQueueChannelTests.java | 4 +- .../channel/config/ChannelParserTests.java | 8 +- .../config/DispatchingChannelParserTests.java | 2 +- .../config/RendezvousChannelParserTests.java | 2 +- .../channel/config/TestSource.java | 2 +- .../channel/config/TestTransformer.java | 2 +- .../config/ThreadLocalChannelParserTests.java | 2 +- .../interceptor/ChannelInterceptorTests.java | 4 +- ...obalChannelInterceptorSubElementTests.java | 6 +- .../GlobalChannelInterceptorTests.java | 4 +- .../interceptor/GlobalWireTapTests.java | 6 +- .../MessageSelectingInterceptorTests.java | 5 +- .../channel/interceptor/WireTapTests.java | 2 +- .../registry/LocalChannelRegistryTests.java | 16 +- .../config/AggregatorParserTests.java | 28 +- ...ggregatorWithCorrelationStrategyTests.java | 6 +- ...AggregatorWithMessageStoreParserTests.java | 4 +- .../integration/config/ChainParserTests.java | 11 +- .../config/ChannelAdapterParserTests.java | 32 +- .../ChannelWithMessageStoreParserTests.java | 6 +- .../config/EndpointParserTests.java | 2 +- .../config/ExceptionThrowingTestBean.java | 2 +- .../integration/config/FilterParserTests.java | 6 +- .../config/MessageBusParserTests.java | 11 +- .../config/ResequencerParserTests.java | 4 +- ...esequencerWithMessageStoreParserTests.java | 21 +- .../RouterFactoryBeanDelegationTests.java | 4 +- .../config/SelectorChainParserTests.java | 2 +- ...ActivatorAnnotationPostProcessorTests.java | 2 +- ...PollingChannelAdapterFactoryBeanTests.java | 2 +- .../config/StubMessageSelector.java | 2 +- .../config/TestAggregatorBean.java | 5 +- .../config/TestChannelInterceptor.java | 4 +- .../integration/config/TestConsumer.java | 4 +- .../config/TestCorrelationStrategy.java | 2 +- .../integration/config/TestHandler.java | 2 +- .../integration/config/TestSelector.java | 2 +- .../integration/config/TestSource.java | 2 +- .../config/WireTapParserTests.java | 6 +- .../annotation/AggregatorAnnotationTests.java | 26 +- .../AnnotatedEndpointActivationTests.java | 9 +- .../FilterAnnotationPostProcessorTests.java | 2 +- ...ationPostProcessorAopIntegrationTests.java | 8 +- ...MessagingAnnotationPostProcessorTests.java | 15 +- .../RouterAnnotationPostProcessorTests.java | 2 +- .../SplitterAnnotationPostProcessorTests.java | 2 +- .../annotation/SubscriberOrderTests.java | 4 +- ...tatedEndpointWithCustomizedAggregator.java | 9 +- ...nnotatedEndpointWithDefaultAggregator.java | 5 +- ...tAnnotatedEndpointWithReleaseStrategy.java | 5 +- .../config/xml/BridgeParserTests.java | 13 +- .../config/xml/ChannelAutoCreationTests.java | 2 +- .../config/xml/ClaimCheckParserTests.java | 6 +- .../config/xml/ControlBusChainTests.java | 6 +- .../xml/ControlBusExplicitPollerTests.java | 6 +- .../config/xml/ControlBusPollerTests.java | 6 +- .../config/xml/ControlBusTests.java | 6 +- .../config/xml/ConverterParserTests.java | 6 +- ...serWithExistingConversionServiceTests.java | 1 + .../config/xml/DelayerUsageTests.java | 6 +- .../xml/DelegatingConsumerParserTests.java | 9 +- ...herMaxSubscribersOverrideDefaultTests.java | 8 +- .../xml/DispatcherMaxSubscribersTests.java | 4 +- .../config/xml/EnricherParserTests.java | 10 +- .../config/xml/EnricherParserTests3.java | 6 +- ...icherParserTestsWithoutRequestChannel.java | 6 +- ...rserWithRequestPayloadExpressionTests.java | 8 +- .../xml/ErrorChannelAutoCreationTests.java | 2 +- ...MessageExceptionTypeRouterParserTests.java | 4 +- .../config/xml/GatewayParserTests.java | 6 +- .../HeaderEnricherMethodInvokingTests.java | 4 +- .../xml/HeaderEnricherOverwriteTests.java | 17 +- .../config/xml/HeaderEnricherParserTests.java | 4 +- .../xml/HeaderEnricherTests-context.xml | 2 +- .../config/xml/HeaderEnricherTests.java | 57 +- .../config/xml/HeaderFilterParserTests.java | 4 +- .../xml/IdGeneratorConfigurerTests.java | 9 +- ...nitionHandlerAwareEndpointParserTests.java | 16 +- .../MapToObjectTransformerParserTests.java | 6 +- .../MethodInvokingSelectorParserTests.java | 2 +- .../config/xml/NestedChainParserTests.java | 2 +- .../ObjectToMapTransformerParserTests.java | 6 +- .../ObjectToStringTransformerParserTests.java | 6 +- ...adDeserializingTransformerParserTests.java | 6 +- ...loadSerializingTransformerParserTests.java | 6 +- .../xml/PollerWithErrorChannelTests.java | 10 +- .../xml/PublishingInterceptorParserTests.java | 6 +- .../xml/ServiceActivatorParserTests.java | 10 +- .../xml/SyslogTransformerParserTests.java | 4 +- ...tionSynchronizationFactoryParserTests.java | 2 +- .../core/AsyncMessagingTemplateTests.java | 30 +- .../integration/core/MessageHistoryTests.java | 2 +- .../core/MessageIdGenerationTests.java | 6 +- .../core/MessagingTemplateTests.java | 697 ------------------ .../core/TimeBasedUUIDGenerator.java | 2 +- ...ggregateMessageDeliveryExceptionTests.java | 7 +- .../BroadcastingDispatcherTests.java | 35 +- .../dispatcher/FailOverDispatcherTests.java | 7 +- .../dispatcher/PollingTransactionTests.java | 6 +- .../RoundRobinDispatcherConcurrentTests.java | 6 +- .../dispatcher/RoundRobinDispatcherTests.java | 6 +- .../dispatcher/UnicastingDispatcherTests.java | 13 +- .../endpoint/CorrelationIdTests.java | 28 +- ...aluatingMessageSourceIntegrationTests.java | 2 +- ...xpressionEvaluatingMessageSourceTests.java | 2 +- .../endpoint/MessageProducerSupportTests.java | 16 +- .../PollingConsumerEndpointTests.java | 6 +- .../PollingEndpointErrorHandlingTests.java | 6 +- .../endpoint/PollingEndpointStub.java | 2 +- .../endpoint/PollingLifecycleTests.java | 6 +- ...PseudoTransactionalMessageSourceTests.java | 4 +- .../endpoint/ReturnAddressTests.java | 11 +- .../ServiceActivatorEndpointTests.java | 14 +- ...ServiceActivatorMethodResolutionTests.java | 2 +- .../MessageParameterAnnotatedEndpoint.java | 2 +- .../expression/ParentContextTests.java | 4 +- ...namicExpressionFilterIntegrationTests.java | 4 +- ...FilterAnnotationMethodResolutionTests.java | 4 +- .../filter/FilterContextTests.java | 6 +- .../filter/MessageFilterTests.java | 2 +- .../filter/MethodInvokingSelectorTests.java | 2 +- .../filter/SpelFilterIntegrationTests.java | 4 +- .../gateway/AsyncGatewayTests.java | 6 +- .../gateway/GatewayInterfaceTests.java | 4 +- .../GatewayInvokingMessageHandlerTests.java | 6 +- ...hodInboundMessageMapperToMessageTests.java | 2 +- .../gateway/GatewayProxyFactoryBeanTests.java | 8 +- .../GatewayProxyMessageMappingTests.java | 4 +- .../gateway/GatewayWithHeaderAnnotations.java | 5 +- .../GatewayWithPayloadExpressionTests.java | 4 +- .../gateway/HeaderEnrichedGatewayTests.java | 4 +- .../gateway/InnerGatewayWithChainTests.java | 6 +- .../gateway/MessagingGatewayTests.java | 27 +- .../gateway/MultipleEndpointGatewayTests.java | 2 +- .../gateway/NestedGatewayTests.java | 2 +- .../gateway/TestChannelInterceptor.java | 4 +- .../integration/gateway/TestHandler.java | 2 +- .../integration/gateway/TestService.java | 2 +- ...ractReplyProducingMessageHandlerTests.java | 6 +- .../handler/BridgeHandlerTests.java | 9 +- .../handler/CollectionAndArrayTests.java | 4 +- ...CustomConverterMessageProcessingTests.java | 6 +- .../handler/DelayHandlerTests.java | 6 +- ...essionEvaluatingMessageProcessorTests.java | 2 +- .../HeaderAnnotationTransformerTests.java | 13 +- .../handler/LoggingHandlerTests.java | 2 +- .../handler/MessageHandlerChainTests.java | 7 +- .../MethodInvokingHeaderEnricherTests.java | 2 +- ...vokingMessageProcessorAnnotationTests.java | 6 +- .../MethodInvokingMessageProcessorTests.java | 2 +- .../integration/handler/MockHandlerTests.java | 4 +- ...eActivatorDefaultFrameworkMethodTests.java | 6 +- .../advice/AdvisedMessageHandlerTests.java | 10 +- ...pelExpressionRetryStateGeneratorTests.java | 2 +- .../integration/history/AnnotatedAdapter.java | 2 +- .../integration/history/AnotatedTests.java | 6 +- .../MessageHistoryIntegrationTests.java | 20 +- ...AbstractJsonInboundMessageMapperTests.java | 2 +- ...actJsonSymmetricalMessageMappingTests.java | 2 +- .../json/JsonOutboundMessageMapperTests.java | 8 +- .../integration/json/JsonPathTests.java | 14 +- .../JsonToObjectTransformerParserTests.java | 6 +- .../ObjectToJsonTransformerParserTests.java | 6 +- .../json/ObjectToJsonTransformerTests.java | 4 +- .../integration/json/TestChildBean.java | 2 +- ...pressionEvaluatingMessageHandlerTests.java | 6 +- .../message/GenericMessageTests.java | 10 +- .../message/MessageBuilderTests.java | 43 +- .../message/MessageHeadersTests.java | 2 +- .../integration/message/MessageMatcher.java | 6 +- .../MethodInvokingMessageHandlerTests.java | 4 +- .../MethodInvokingMessageSourceTests.java | 4 +- .../message/PayloadAndHeaderMappingTests.java | 4 +- .../integration/message/TestHandlers.java | 2 +- .../selector/PayloadTypeSelectorTests.java | 4 +- .../UnexpiredMessageSelectorTests.java | 2 +- ...ourceInboundChannelAdapterParserTests.java | 2 +- .../ErrorMessageExceptionTypeRouterTests.java | 13 +- .../router/HeaderValueRouterTests.java | 20 +- .../router/MethodInvokingRouterTests.java | 63 +- .../router/MultiChannelRouterTests.java | 4 +- .../router/PayloadTypeRouterTests.java | 2 +- .../router/RecipientListRouterTests.java | 33 +- .../router/RouterConcurrencyTest.java | 4 +- .../integration/router/RouterTests.java | 23 +- ...namicExpressionRouterIntegrationTests.java | 6 +- .../ExceptionTypeRouterParserTests.java | 4 +- ...HeaderValueRouterConvertibleTypeTests.java | 6 +- .../config/HeaderValueRouterParserTests.java | 4 +- .../config/PayloadTypeRouterParserTests.java | 39 +- .../RecipientListRouterParserTests.java | 6 +- .../router/config/RfbFixRouter.java | 4 +- .../router/config/RouterParserTests.java | 46 +- .../router/config/RouterWithMappingTests.java | 6 +- .../config/SpelRouterIntegrationTests.java | 6 +- .../config/SplitterAggregatorTests.java | 6 +- .../router/config/SplitterParserTests.java | 13 +- .../router/config/TestSplitterImpl.java | 2 +- .../selector/MessageSelectorChainTests.java | 2 +- .../splitter/DefaultSplitterTests.java | 5 +- ...micExpressionSplitterIntegrationTests.java | 6 +- .../splitter/MethodInvokingSplitterTests.java | 27 +- .../SpelSplitterIntegrationTests.java | 6 +- .../splitter/SplitterIntegrationTests.java | 4 +- .../store/MessageGroupQueueTests.java | 2 +- .../integration/store/MessageStoreTests.java | 2 +- .../store/SimpleMessageGroupTests.java | 2 +- .../store/SimpleMessageStoreTests.java | 4 +- .../converter/MapMessageConverterTests.java | 10 +- .../integration/test/util/TestUtils.java | 12 +- .../ClaimCheckTransformerTests.java | 2 +- .../transformer/ContentEnricherTests.java | 4 +- ...ressionHeaderEnricherIntegrationTests.java | 6 +- ...ExpressionTransformerIntegrationTests.java | 6 +- .../transformer/HeaderFilterTests.java | 5 +- .../MapToObjectTransformerTests.java | 2 +- .../MessageHistoryParameterTests.java | 6 +- ...geTransformingChannelInterceptorTests.java | 2 +- .../MethodInvokingTransformerTests.java | 2 +- .../ObjectToMapTransformerTests.java | 2 +- .../ObjectToStringTransformerTests.java | 2 +- .../PayloadDeserializingTransformerTests.java | 2 +- .../PayloadSerializingTransformerTests.java | 2 +- .../transformer/PayloadTransformerTests.java | 4 +- .../SpelHeaderEnricherIntegrationTests.java | 6 +- ...pelTransformerIntegrationTests-context.xml | 2 +- .../SpelTransformerIntegrationTests.java | 6 +- .../transformer/TransformerContextTests.java | 8 +- .../util/BeanFactoryTypeConverterTests.java | 4 +- .../util/DefaultLockRegistryTests.java | 2 +- .../integration/util/SimplePoolTests.java | 2 +- .../event/config/package-info.java | 2 +- .../event/core/MessagingEvent.java | 2 +- .../integration/event/core/package-info.java | 2 +- ...licationEventListeningMessageProducer.java | 2 +- .../event/inbound/package-info.java | 2 +- ...licationEventPublishingMessageHandler.java | 4 +- .../event/outbound/package-info.java | 2 +- .../config/spring-integration-event-3.0.xsd | 2 +- ...EventInboundChannelAdapterParserTests.java | 6 +- ...ventOutboundChannelAdapterParserTests.java | 4 +- ...ionEventListeningMessageProducerTests.java | 4 +- ...ionEventPublishingMessageHandlerTests.java | 2 +- .../integration/feed/config/package-info.java | 2 +- .../feed/inbound/FeedEntryMessageSource.java | 4 +- .../feed/inbound/package-info.java | 2 +- .../FeedInboundChannelAdapterParserTests.java | 8 +- .../inbound/FeedEntryMessageSourceTests.java | 2 +- .../file/DefaultDirectoryScanner.java | 2 +- .../file/DefaultFileNameGenerator.java | 2 +- .../integration/file/FileMessageHolder.java | 2 +- .../integration/file/FileNameGenerator.java | 2 +- .../file/FileReadingMessageSource.java | 6 +- .../file/FileWritingMessageHandler.java | 4 +- ...eTailInboundChannelAdapterFactoryBean.java | 2 +- .../integration/file/config/package-info.java | 2 +- .../file/filters/package-info.java | 2 +- .../file/locking/NioFileLocker.java | 2 +- .../file/locking/package-info.java | 2 +- .../integration/file/package-info.java | 2 +- .../AbstractRemoteFileOutboundGateway.java | 4 +- .../file/remote/gateway/package-info.java | 2 +- .../FileTransferringMessageHandler.java | 8 +- .../file/remote/handler/package-info.java | 2 +- .../integration/file/remote/package-info.java | 2 +- .../file/remote/session/package-info.java | 2 +- .../AbstractInboundFileSynchronizer.java | 2 +- ...InboundFileSynchronizingMessageSource.java | 4 +- .../remote/synchronizer/package-info.java | 2 +- .../FileTailingMessageProducerSupport.java | 2 +- ...SDelegatingFileTailingMessageProducer.java | 2 +- .../integration/file/tail/package-info.java | 2 +- .../integration/file/test/BigMGetTests.java | 6 +- .../AbstractFilePayloadTransformer.java | 4 +- .../file/transformer/package-info.java | 2 +- .../config/spring-integration-file-3.0.xsd | 12 +- .../file/DefaultFileNameGeneratorTests.java | 2 +- .../file/FileInboundTransactionTests.java | 10 +- ...utboundChannelAdapterInsideChainTests.java | 4 +- ...utboundChannelAdapterIntegrationTests.java | 4 +- .../FileOutboundGatewayIntegrationTests.java | 7 +- ...eReadingMessageSourceIntegrationTests.java | 2 +- .../file/FileReadingMessageSourceTests.java | 2 +- .../file/FileToChannelIntegrationTests.java | 4 +- .../file/FileWritingMessageHandlerTests.java | 2 +- .../file/config/CustomFileNameGenerator.java | 2 +- .../file/config/FileMessageHistoryTests.java | 4 +- ...FileOutboundChannelAdapterParserTests.java | 6 +- .../FileOutboundGatewayParserTests.java | 23 +- ...nelAdapterWithRecursiveDirectoryTests.java | 5 +- .../RemoteFileOutboundGatewayTests.java | 6 +- .../FileTransferringMessageHandlerTests.java | 2 +- .../tail/FileTailingMessageProducerTests.java | 2 +- .../AbstractFilePayloadTransformerTests.java | 2 +- .../FileToByteArrayTransformerTests.java | 2 +- .../FileToStringTransformerTests.java | 2 +- .../integration/ftp/config/package-info.java | 2 +- .../integration/ftp/filters/package-info.java | 2 +- .../integration/ftp/gateway/package-info.java | 2 +- .../integration/ftp/inbound/package-info.java | 2 +- .../session/AbstractFtpSessionFactory.java | 2 +- .../integration/ftp/session/package-info.java | 2 +- .../ftp/config/spring-integration-ftp-3.0.xsd | 6 +- .../ftp/FtpParserInboundTests.java | 2 +- .../FtpInboundChannelAdapterParserTests.java | 2 +- .../FtpInboundOutboundSanitySample.java | 2 +- .../FtpOutboundChannelAdapterParserTests.java | 4 +- .../config/FtpOutboundGatewayParserTests.java | 2 +- ...oundRemoteFileSystemSynchronizerTests.java | 2 +- .../ftp/outbound/FtpOutboundTests.java | 6 +- .../ftp/session/SessionFactoryTests.java | 2 +- .../gemfire/config/xml/package-info.java | 2 +- .../ContinuousQueryMessageProducer.java | 2 +- .../gemfire/inbound/package-info.java | 2 +- .../outbound/CacheWritingMessageHandler.java | 4 +- .../gemfire/outbound/package-info.java | 2 +- .../gemfire/store/package-info.java | 2 +- .../xml/spring-integration-gemfire-3.0.xsd | 4 +- ...fireOutboundChannelAdapterParserTests.java | 4 +- .../CacheListeningMessageProducerTests.java | 2 +- .../ContinuousQueryMessageProducerTests.java | 10 +- .../inbound/CqInboundChannelAdapterTests.java | 4 +- .../GemfireInboundChannelAdapterTests.java | 37 +- .../CacheWritingMessageHandlerTests.java | 2 +- .../GemfireOutboundChannelAdapterTests.java | 4 +- ...ayerHandlerRescheduleIntegrationTests.java | 6 +- .../gemfire/store/GemfireGroupStoreTests.java | 4 +- .../store/GemfireMessageStoreTests.java | 2 +- .../groovy/GroovyCommandMessageProcessor.java | 2 +- ...GroovyScriptExecutingMessageProcessor.java | 6 +- .../config/GroovyControlBusFactoryBean.java | 4 +- .../groovy/config/package-info.java | 2 +- .../integration/groovy/package-info.java | 2 +- .../GroovyControlBusIntegrationTests.java | 6 +- ...yScriptExecutingMessageProcessorTests.java | 2 +- ...ovyScriptPayloadMessageProcessorTests.java | 2 +- .../integration/groovy/RepeatProcessor.java | 2 +- .../groovy/config/GroovyControlBusTests.java | 6 +- .../groovy/config/GroovyFilterTests.java | 6 +- .../config/GroovyHeaderEnricherTests.java | 2 +- .../groovy/config/GroovyRefreshTests.java | 2 +- .../groovy/config/GroovyRouterTests.java | 8 +- .../config/GroovyServiceActivatorTests.java | 9 +- .../groovy/config/GroovySplitterTests.java | 6 +- .../groovy/config/GroovyTransformerTests.java | 6 +- .../integration/http/config/package-info.java | 2 +- .../http/converter/package-info.java | 2 +- .../HttpRequestHandlingController.java | 2 +- .../HttpRequestHandlingEndpointSupport.java | 8 +- .../HttpRequestHandlingMessagingGateway.java | 4 +- .../http/inbound/package-info.java | 2 +- .../http/multipart/package-info.java | 2 +- .../HttpRequestExecutingMessageHandler.java | 6 +- .../http/outbound/package-info.java | 2 +- .../integration/http/package-info.java | 2 +- .../http/support/DefaultHttpHeaderMapper.java | 2 +- .../http/support/package-info.java | 2 +- .../config/spring-integration-http-3.0.xsd | 6 +- .../http/HttpProxyScenarioTests.java | 6 +- .../HttpInboundChannelAdapterParserTests.java | 6 +- .../config/HttpInboundGatewayParserTests.java | 18 +- ...HttpOutboundChannelAdapterParserTests.java | 4 +- .../HttpOutboundGatewayParserTests.java | 4 +- ...tpOutboundGatewayWithMethodExpression.java | 4 +- .../config/OutboundResponseTypeTests.java | 4 +- .../HttpRequestHandlingControllerTests.java | 2 +- ...pRequestHandlingMessagingGatewayTests.java | 2 +- ...gMessagingGatewayWithPathMappingTests.java | 8 +- .../http/outbound/CookieTests.java | 3 +- ...tpRequestExecutingMessageHandlerTests.java | 6 +- .../outbound/UriVariableExpressionTests.java | 2 +- ...tpHeaderMapperFromMessageInboundTests.java | 2 +- ...pHeaderMapperFromMessageOutboundTests.java | 4 +- .../integration/ip/config/package-info.java | 2 +- .../integration/ip/package-info.java | 2 +- .../integration/ip/tcp/TcpInboundGateway.java | 4 +- .../ip/tcp/TcpOutboundGateway.java | 8 +- .../ip/tcp/TcpReceivingChannelAdapter.java | 4 +- .../ip/tcp/TcpSendingMessageHandler.java | 6 +- .../connection/AbstractConnectionFactory.java | 2 +- .../CachingClientConnectionFactory.java | 6 +- .../FailoverClientConnectionFactory.java | 4 +- .../MessageConvertingTcpMessageMapper.java | 10 +- .../ip/tcp/connection/TcpConnection.java | 2 +- ...nnectionEventListeningMessageProducer.java | 2 +- .../connection/TcpConnectionInterceptor.java | 2 +- .../TcpConnectionInterceptorSupport.java | 4 +- .../tcp/connection/TcpConnectionSupport.java | 4 +- .../ip/tcp/connection/TcpListener.java | 4 +- .../ip/tcp/connection/TcpMessageMapper.java | 3 +- .../ip/tcp/connection/TcpNetConnection.java | 2 +- .../ip/tcp/connection/TcpNioConnection.java | 4 +- .../tcp/connection/TcpNioSSLConnection.java | 2 +- .../ip/tcp/connection/TcpSender.java | 2 +- .../integration/ip/tcp/package-info.java | 2 +- .../ip/udp/DatagramPacketMessageMapper.java | 4 +- .../udp/MulticastReceivingChannelAdapter.java | 2 +- .../udp/MulticastSendingMessageHandler.java | 2 +- .../udp/UnicastReceivingChannelAdapter.java | 6 +- .../ip/udp/UnicastSendingMessageHandler.java | 8 +- .../integration/ip/udp/package-info.java | 2 +- .../integration/ip/util/package-info.java | 2 +- .../ip/config/spring-integration-ip-3.0.xsd | 25 +- .../ip/config/ParserUnitTests.java | 12 +- .../ip/tcp/ConnectionToConnectionTests.java | 2 +- .../tcp/InterceptedSharedConnectionTests.java | 4 +- .../ip/tcp/SharedConnectionTests.java | 4 +- .../ip/tcp/TcpConfigOutboundGatewayTests.java | 8 +- .../ip/tcp/TcpInboundGatewayTests.java | 20 +- .../ip/tcp/TcpOutboundGatewayTests.java | 5 +- .../tcp/TcpReceivingChannelAdapterTests.java | 4 +- .../ip/tcp/TcpSendingMessageHandlerTests.java | 8 +- .../ip/tcp/TcpSendingNoSocketTests.java | 2 +- .../CachingClientConnectionFactoryTests.java | 8 +- .../ConnectionFactoryShutDownTests.java | 2 +- .../connection/ConnectionFactoryTests.java | 2 +- .../connection/ConnectionTimeoutTests.java | 4 +- .../FailoverClientConnectionFactoryTests.java | 10 +- .../tcp/connection/HelloWorldInterceptor.java | 4 +- .../ip/tcp/connection/SocketSupportTests.java | 2 +- .../TcpConnectionEventListenerTests.java | 2 +- .../tcp/connection/TcpMessageMapperTests.java | 22 +- .../tcp/connection/TcpNetConnectionTests.java | 4 +- .../connection/TcpNioConnectionReadTests.java | 2 +- .../tcp/connection/TcpNioConnectionTests.java | 2 +- .../udp/DatagramPacketMessageMapperTests.java | 2 +- .../DatagramPacketSendingHandlerTests.java | 2 +- .../integration/ip/udp/MultiClientTests.java | 2 +- .../ip/udp/UdpChannelAdapterTests.java | 4 +- .../ip/udp/UdpMulticastEndToEndTests.java | 27 +- .../ip/udp/UdpUnicastEndToEndTests.java | 14 +- .../integration/jdbc/JdbcMessageHandler.java | 4 +- .../integration/jdbc/JdbcMessageStore.java | 6 +- .../integration/jdbc/JdbcOutboundGateway.java | 2 +- .../jdbc/JdbcPollingChannelAdapter.java | 2 +- .../integration/jdbc/StoredProcExecutor.java | 4 +- .../jdbc/StoredProcMessageHandler.java | 2 +- .../jdbc/StoredProcOutboundGateway.java | 4 +- .../jdbc/StoredProcPollingChannelAdapter.java | 4 +- .../integration/jdbc/config/package-info.java | 2 +- .../integration/jdbc/package-info.java | 2 +- .../jdbc/store/JdbcChannelMessageStore.java | 6 +- .../jdbc/store/channel/MessageRowMapper.java | 2 +- .../jdbc/store/channel/package-info.java | 2 +- .../integration/jdbc/store/package-info.java | 2 +- .../jdbc/storedproc/package-info.java | 2 +- .../config/spring-integration-jdbc-3.0.xsd | 12 +- ...ayerHandlerRescheduleIntegrationTests.java | 10 +- .../JdbcMessageHandlerIntegrationTests.java | 4 +- .../jdbc/JdbcMessageStoreChannelTests.java | 2 +- .../jdbc/JdbcMessageStoreTests.java | 24 +- ...PollingChannelAdapterIntegrationTests.java | 4 +- .../jdbc/MessageGroupQueueTests.java | 2 +- .../jdbc/StoredProcJmxManagedBeanTests.java | 2 +- ...utboundChannelAdapterWithinChainTests.java | 4 +- ...dGatewayWithNamespaceIntegrationTests.java | 9 +- ...tboundGatewayWithSpelIntegrationTests.java | 4 +- ...ewayWithSpringContextIntegrationTests.java | 2 +- ...AdapterWithNamespace2IntegrationTests.java | 2 +- ...lAdapterWithNamespaceIntegrationTests.java | 2 +- ...pterWithSpringContextIntegrationTests.java | 2 +- .../config/JdbcMessageHandlerParserTests.java | 4 +- .../config/JdbcMessageStoreParserTests.java | 2 +- .../JdbcOutboundGatewayParserTests.java | 19 +- .../JdbcPollingChannelAdapterParserTests.java | 13 +- .../config/StoredProcInvalidConfigsTests.java | 20 - .../StoredProcMessageHandlerParserTests.java | 4 +- .../StoredProcOutboundGatewayParserTests.java | 8 +- ...dProcPollingChannelAdapterParserTests.java | 2 +- ...lJdbcMessageStoreMultipleChannelTests.java | 9 +- .../mysql/MySqlJdbcMessageStoreTests.java | 22 +- .../AbstractJdbcChannelMessageStoreTests.java | 2 +- .../AbstractTxTimeoutMessageStoreTests.java | 4 +- .../jdbc/store/channel/TestService.java | 2 +- .../integration/jms/AbstractJmsChannel.java | 5 +- .../ChannelPublishingJmsMessageListener.java | 4 +- .../jms/DefaultJmsHeaderMapper.java | 2 +- .../jms/JmsDestinationPollingSource.java | 4 +- .../integration/jms/JmsOutboundGateway.java | 11 +- .../jms/JmsSendingMessageHandler.java | 11 +- .../integration/jms/PollableJmsChannel.java | 4 +- .../jms/SubscribableJmsChannel.java | 10 +- .../integration/jms/config/package-info.java | 2 +- .../integration/jms/package-info.java | 2 +- .../jms/config/spring-integration-jms-3.0.xsd | 22 +- ...nnelPublishingJmsMessageListenerTests.java | 6 +- .../jms/DefaultJmsHeaderMapperTests.java | 4 +- .../jms/JmsOutboundInsideChainTests.java | 6 +- .../jms/PollableJmsChannelTests.java | 4 +- .../jms/SubscribableJmsChannelTests.java | 6 +- .../ExceptionHandlingSiConsumerTests.java | 2 +- .../ExtractRequestReplyPayloadTests.java | 38 +- .../jms/config/InboundOneWayErrorTests.java | 4 +- .../jms/config/JmsChannelHistoryTests.java | 6 +- .../jms/config/JmsChannelParserTests.java | 2 +- .../config/JmsDynamicDestinationTests.java | 13 +- .../jms/config/JmsHeaderEnricherTests.java | 6 +- .../JmsInboundChannelAdapterParserTests.java | 4 +- .../config/JmsInboundGatewayParserTests.java | 4 +- ...essageDrivenChannelAdapterParserTests.java | 4 +- .../jms/config/JmsMessageHistoryTests.java | 8 +- .../JmsOutboundChannelAdapterParserTests.java | 4 +- .../config/JmsOutboundGatewayParserTests.java | 17 +- .../jms/config/JmsPriorityTests.java | 6 +- ...sWithMarshallingMessageConverterTests.java | 8 +- .../jms/config/TestJmsHeaderMapper.java | 2 +- ...eplyScenariosWithCachedConsumersTests.java | 6 +- ...yScenariosWithNonCachedConsumersTests.java | 8 +- ...eplyScenariosWithTempReplyQueuesTests.java | 2 +- .../jmx/AttributePollingMessageSource.java | 2 +- .../jmx/DefaultNotificationMapper.java | 2 +- .../jmx/MBeanTreePollingMessageSource.java | 2 +- .../NotificationListeningMessageProducer.java | 2 +- .../NotificationPublishingMessageHandler.java | 2 +- .../jmx/OperationInvokingMessageHandler.java | 317 ++++---- .../integration/jmx/config/package-info.java | 2 +- .../integration/jmx/package-info.java | 2 +- .../monitor/DirectChannelMetrics.java | 4 +- .../monitor/IntegrationMBeanExporter.java | 8 +- .../monitor/PollableChannelMetrics.java | 2 +- .../monitor/SimpleMessageHandlerMetrics.java | 4 +- .../integration/monitor/package-info.java | 2 +- .../AttributePollingMessageSourceTests.java | 2 +- .../jmx/MBeanAttributeFilterTests.java | 5 +- ...ficationListeningMessageProducerTests.java | 2 +- ...ficationPublishingMessageHandlerTests.java | 2 +- .../OperationInvokingMessageHandlerTests.java | 4 +- .../integration/jmx/UpdateMappingsTests.java | 6 +- ...ibutePollingChannelAdapterParserTests.java | 6 +- .../jmx/config/ControlBusParserTests.java | 12 +- .../jmx/config/DynamicRouterTests.java | 2 +- ...nTreePollingChannelAdapterParserTests.java | 5 +- .../jmx/config/MethodInvokerTests.java | 10 +- ...ionListeningChannelAdapterParserTests.java | 6 +- ...onPublishingChannelAdapterParserTests.java | 6 +- ...tionInvokingChannelAdapterParserTests.java | 6 +- ...OperationInvokingOutboundGatewayTests.java | 9 +- .../jmx/config/PriorityChannelTests.java | 2 +- .../monitor/ChannelIntegrationTests.java | 4 +- .../HandlerMonitoringIntegrationTests.java | 2 +- .../MBeanExporterIntegrationTests.java | 4 +- ...essageChannelsMonitorIntegrationTests.java | 4 +- .../monitor/MessageMetricsAdviceTests.java | 8 +- ...ssageSourceMonitoringIntegrationTests.java | 2 +- .../monitor/RemoteMBeanServerTests.java | 6 +- .../jpa/config/xml/package-info.java | 2 +- .../integration/jpa/core/JpaExecutor.java | 4 +- .../integration/jpa/core/package-info.java | 2 +- .../jpa/inbound/JpaPollingChannelAdapter.java | 2 +- .../integration/jpa/inbound/package-info.java | 2 +- .../jpa/outbound/JpaOutboundGateway.java | 2 +- .../JpaOutboundGatewayFactoryBean.java | 4 +- .../jpa/outbound/package-info.java | 2 +- .../integration/jpa/package-info.java | 2 +- .../config/xml/spring-integration-jpa-3.0.xsd | 2 +- .../xml/JpaMessageHandlerParserTests.java | 4 +- .../xml/JpaOutboundGatewayParserTests.java | 7 +- .../jpa/core/JpaExecutorTests.java | 5 +- .../JpaPollingChannelAdapterTests.java | 4 +- .../JpaOutboundChannelAdapterTests.java | 4 +- ...boundChannelAdapterTransactionalTests.java | 4 +- .../JpaOutboundGatewayIntegrationTests.java | 8 +- .../jpa/outbound/JpaOutboundGatewayTests.java | 2 +- .../integration/jpa/test/Consumer.java | 2 +- .../integration/jpa/test/JpaTestUtils.java | 2 +- .../mail/AbstractMailReceiver.java | 2 +- .../mail/ImapIdleChannelAdapter.java | 4 +- .../mail/MailReceivingMessageSource.java | 4 +- .../mail/MailSendingMessageHandler.java | 8 +- .../integration/mail/config/package-info.java | 2 +- .../integration/mail/package-info.java | 2 +- .../AbstractMailMessageTransformer.java | 4 +- .../mail/transformer/package-info.java | 2 +- .../config/spring-integration-mail-3.0.xsd | 6 +- .../mail/ImapMailReceiverTests.java | 8 +- ...MailSendingMessageHandlerContextTests.java | 4 +- .../mail/MailSendingMessageHandlerTests.java | 2 +- .../integration/mail/MailTestsHelper.java | 2 +- .../ImapIdleChannelAdapterParserTests.java | 2 +- .../InboundChannelAdapterParserTests.java | 2 +- .../mail/config/MailHeaderEnricherTests.java | 13 +- ...MailOutboundChannelAdapterParserTests.java | 4 +- .../MailToStringTransformerParserTests.java | 17 +- .../config/MessageWithContentTypeTests.java | 4 +- .../config/MongoDbNamespaceHandler.java | 2 +- .../MongoDbOutboundChannelAdapterParser.java | 2 +- .../mongodb/config/package-info.java | 2 +- .../mongodb/inbound/MongoDbMessageSource.java | 2 +- .../mongodb/inbound/package-info.java | 2 +- .../MongoDbStoringMessageHandler.java | 4 +- .../mongodb/outbound/package-info.java | 2 +- .../mongodb/store/MongoDbMessageStore.java | 4 +- .../mongodb/store/package-info.java | 2 +- .../mongodb/support/package-info.java | 2 +- ...InboundChannelAdapterIntegrationTests.java | 2 +- ...utboundChannelAdapterIntegrationTests.java | 4 +- ...goDbOutboundChannelAdapterParserTests.java | 2 +- .../MongoDbStoringMessageHandlerTests.java | 2 +- ...ayerHandlerRescheduleIntegrationTests.java | 9 +- .../store/MongoDbMessageGroupStoreTests.java | 4 +- ...essageStoreClaimCheckIntegrationTests.java | 2 +- .../store/MongoDbMessageStoreTests.java | 2 +- .../channel/SubscribableRedisChannel.java | 19 +- .../redis/channel/package-info.java | 2 +- .../redis/config/RedisNamespaceHandler.java | 2 +- .../redis/config/package-info.java | 2 +- .../inbound/RedisInboundChannelAdapter.java | 6 +- .../inbound/RedisStoreMessageSource.java | 2 +- .../redis/inbound/package-info.java | 2 +- .../RedisPublishingMessageHandler.java | 8 +- .../RedisStoreWritingMessageHandler.java | 4 +- .../redis/outbound/package-info.java | 2 +- .../integration/redis/store/package-info.java | 2 +- .../redis/support/package-info.java | 2 +- .../config/spring-integration-redis-3.0.xsd | 2 +- .../SubscribableRedisChannelTests.java | 4 +- .../redis/config/RedisChannelParserTests.java | 8 +- ...RedisInboundChannelAdapterParserTests.java | 2 +- ...edisOutboundChannelAdapterParserTests.java | 4 +- .../RedisInboundChannelAdapterTests.java | 2 +- ...InboundChannelAdapterIntegrationTests.java | 2 +- ...utboundChannelAdapterIntegrationTests.java | 4 +- .../RedisStoreWritingMessageHandlerTests.java | 2 +- ...ayerHandlerRescheduleIntegrationTests.java | 6 +- .../store/RedisMessageGroupStoreTests.java | 4 +- .../redis/store/RedisMessageStoreTests.java | 2 +- .../integration/rmi/RmiInboundGateway.java | 8 +- .../integration/rmi/RmiOutboundGateway.java | 6 +- .../integration/rmi/config/package-info.java | 2 +- .../integration/rmi/package-info.java | 2 +- .../rmi/config/spring-integration-rmi-3.0.xsd | 6 +- .../integration/rmi/BackToBackTests.java | 7 +- .../rmi/RmiOutboundGatewayTests.java | 4 +- .../config/RmiInboundGatewayParserTests.java | 9 +- .../config/RmiOutboundGatewayParserTests.java | 6 +- ...stractScriptExecutingMessageProcessor.java | 2 +- .../DefaultScriptVariableGenerator.java | 2 +- .../scripting/ScriptVariableGenerator.java | 2 +- .../scripting/ScriptingException.java | 2 +- .../scripting/config/jsr223/package-info.java | 2 +- .../scripting/config/package-info.java | 2 +- .../ScriptExecutingMessageProcessor.java | 2 +- .../scripting/jsr223/package-info.java | 2 +- .../integration/scripting/package-info.java | 2 +- .../config/jsr223/Jsr223FilterTests.java | 4 +- .../jsr223/Jsr223HeaderEnricherTests.java | 2 +- .../Jsr223InboundChannelAdapterTests.java | 9 +- .../config/jsr223/Jsr223RefreshTests.java | 2 +- .../config/jsr223/Jsr223RouterTests.java | 6 +- .../jsr223/Jsr223ServiceActivatorTests.java | 4 +- .../config/jsr223/Jsr223SplitterTests.java | 4 +- .../config/jsr223/Jsr223TransformerTests.java | 4 +- ...3ScriptExecutingMessageProcessorTests.java | 2 +- .../security/channel/ChannelInvocation.java | 4 +- .../ChannelSecurityMetadataSource.java | 4 +- .../security/channel/package-info.java | 2 +- ...lSecurityInterceptorBeanPostProcessor.java | 2 +- .../config/SecuredChannelsParser.java | 2 +- .../security/config/package-info.java | 2 +- .../spring-integration-security-3.0.xsd | 2 +- ...hannelAdapterSecurityIntegrationTests.java | 2 +- ...rityInterceptorBeanPostProcessorTests.java | 2 +- .../ChannelSecurityInterceptorTests.java | 2 +- .../security/channel/TestHandler.java | 4 +- .../config/SecuredChannelsParserTests.java | 4 +- .../integration/sftp/config/package-info.java | 2 +- .../sftp/filters/package-info.java | 2 +- .../sftp/gateway/package-info.java | 2 +- .../sftp/inbound/package-info.java | 2 +- .../sftp/session/package-info.java | 2 +- .../config/spring-integration-sftp-3.0.xsd | 6 +- .../InboundChannelAdapterParserTests.java | 4 +- .../OutboundChannelAdapterParserTests.java | 4 +- .../SftpInboundOutboundSanitySample.java | 2 +- .../SftpOutboundGatewayParserTests.java | 2 +- .../config/SftpOutboundTransferSample.java | 4 +- ...oundRemoteFileSystemSynchronizerTests.java | 2 +- .../sftp/outbound/SftpOutboundTests.java | 6 +- .../ByteStreamReadingMessageSource.java | 4 +- .../ByteStreamWritingMessageHandler.java | 6 +- .../CharacterStreamReadingMessageSource.java | 4 +- .../CharacterStreamWritingMessageHandler.java | 6 +- .../stream/config/package-info.java | 2 +- .../integration/stream/package-info.java | 2 +- .../stream/ByteStreamSourceTests.java | 2 +- .../stream/CharacterStreamSourceTests.java | 2 +- ...nsoleInboundChannelAdapterParserTests.java | 2 +- ...soleOutboundChannelAdapterParserTests.java | 4 +- .../syslog/DefaultMessageConverter.java | 2 +- .../integration/syslog/MessageConverter.java | 2 +- ...logReceivingChannelAdapterFactoryBean.java | 2 +- .../syslog/config/package-info.java | 2 +- .../SyslogReceivingChannelAdapterSupport.java | 4 +- .../TcpSyslogReceivingChannelAdapter.java | 2 +- .../UdpSyslogReceivingChannelAdapter.java | 6 +- .../syslog/inbound/package-info.java | 2 +- .../integration/syslog/package-info.java | 2 +- .../config/spring-integration-syslog-3.0.xsd | 2 +- ...logReceivingChannelAdapterParserTests.java | 5 +- .../SyslogReceivingChannelAdapterTests.java | 4 +- .../test/matcher/HeaderMatcher.java | 25 +- .../test/matcher/MockitoMessageMatchers.java | 2 +- .../test/matcher/PayloadAndHeaderMatcher.java | 6 +- .../test/matcher/PayloadMatcher.java | 4 +- .../test/matcher/package-info.java | 2 +- .../AbstractRequestResponseScenarioTests.java | 8 +- .../support/AbstractResponseValidator.java | 6 +- .../test/support/MessageValidator.java | 2 +- .../test/support/RequestResponseScenario.java | 2 +- .../test/support/package-info.java | 2 +- .../integration/test/util/TestUtils.java | 12 +- .../integration/test/util/package-info.java | 2 +- .../test/matcher/HeaderMatcherTests.java | 2 +- .../matcher/MockitoMessageMatchersTests.java | 6 +- .../test/matcher/PayloadMatcherTests.java | 2 +- .../ServiceActivatorOnMockitoMockTests.java | 4 +- .../test/support/MessageScenariosTests.java | 2 +- .../twitter/config/package-info.java | 2 +- .../twitter/core/package-info.java | 2 +- .../inbound/AbstractTwitterMessageSource.java | 4 +- .../twitter/inbound/package-info.java | 2 +- .../DirectMessageSendingMessageHandler.java | 2 +- .../StatusUpdatingMessageHandler.java | 2 +- .../twitter/outbound/package-info.java | 2 +- .../TestSendingMessageHandlerParserTests.java | 4 +- .../ignored/TestSendingDMsUsingNamespace.java | 2 +- .../TestSendingUpdatesUsingNamespace.java | 11 +- .../twitter/ignored/TwitterAnnouncer.java | 2 +- ...ectMessageReceivingMessageSourceTests.java | 2 +- .../SearchReceivingMessageSourceTests.java | 2 +- ...hReceivingMessageSourceWithRedisTests.java | 5 +- .../TimelineReceivingMessageSourceTests.java | 2 +- ...rectMessageSendingMessageHandlerTests.java | 2 +- .../StatusUpdatingMessageHandlerTests.java | 2 +- .../ws/AbstractWebServiceInboundGateway.java | 4 +- .../ws/AbstractWebServiceOutboundGateway.java | 6 +- .../MarshallingWebServiceInboundGateway.java | 2 +- .../MarshallingWebServiceOutboundGateway.java | 2 +- .../ws/SimpleWebServiceInboundGateway.java | 2 +- .../ws/SimpleWebServiceOutboundGateway.java | 4 +- .../integration/ws/config/package-info.java | 2 +- .../integration/ws/package-info.java | 2 +- .../ws/config/spring-integration-ws-3.0.xsd | 14 +- .../SimpleWebServiceInboundGatewayTests.java | 7 +- .../SimpleWebServiceOutboundGatewayTests.java | 6 +- .../ws/config/UriVariableTests.java | 8 +- .../config/WebServiceHeaderEnricherTests.java | 13 +- .../WebServiceInboundGatewayParserTests.java | 8 +- .../WebServiceOutboundGatewayParserTests.java | 6 +- ...eOutboundGatewayWithHeaderMapperTests.java | 4 +- .../xml/DefaultXmlPayloadConverter.java | 2 +- .../integration/xml/config/package-info.java | 2 +- .../integration/xml/package-info.java | 2 +- .../xml/result/DomResultFactory.java | 2 +- .../integration/xml/result/package-info.java | 2 +- .../integration/xml/router/XPathRouter.java | 2 +- .../integration/xml/router/package-info.java | 2 +- .../BooleanTestXPathMessageSelector.java | 2 +- .../RegexTestXPathMessageSelector.java | 2 +- .../StringValueTestXPathMessageSelector.java | 2 +- .../XmlValidatingMessageSelector.java | 2 +- .../xml/selector/package-info.java | 2 +- .../xml/source/DomSourceFactory.java | 2 +- .../xml/source/StringSourceFactory.java | 2 +- .../integration/xml/source/package-info.java | 2 +- .../xml/splitter/XPathMessageSplitter.java | 4 +- .../xml/splitter/package-info.java | 2 +- .../transformer/MarshallingTransformer.java | 4 +- .../ResultToDocumentTransformer.java | 2 +- .../ResultToStringTransformer.java | 2 +- .../transformer/UnmarshallingTransformer.java | 2 +- .../xml/transformer/XPathHeaderEnricher.java | 2 +- .../xml/transformer/XPathTransformer.java | 2 +- .../transformer/XsltPayloadTransformer.java | 6 +- .../xml/transformer/package-info.java | 2 +- .../integration/xml/xpath/package-info.java | 2 +- .../xml/config/spring-integration-xml-3.0.xsd | 10 +- .../xml/DefaultXmlPayloadConverterTests.java | 2 +- .../MarshallingTransformerParserTests.java | 6 +- ...lver.java => StubDestinationResolver.java} | 12 +- .../UnmarshallingTransformerParserTests.java | 8 +- .../xml/config/XPathFilterParserTests.java | 6 +- .../XPathHeaderEnricherParserTests.java | 6 +- .../XPathMessageSplitterParserTests.java | 4 +- .../xml/config/XPathRouterParserTests.java | 16 +- .../config/XPathTransformerParserTests.java | 6 +- ...XmlPayloadValidatingFilterParserTests.java | 4 +- .../XsltPayloadTransformerParserTests.java | 6 +- .../xml/config/validationTestsSchema.xsd | 2 +- .../xml/router/XPathRouterTests.java | 2 +- .../xml/router/validationTestsSchema.xsd | 2 +- .../xml/source/DomSourceFactoryTests.java | 2 +- .../xml/source/StringSourceTests.java | 2 +- .../splitter/XPathMessageSplitterTests.java | 4 +- .../MarshallingTransformerTests.java | 2 +- .../ResultToDocumentTransformerTests.java | 2 +- .../ResultToStringTransformerTests.java | 2 +- .../UnmarshallingTransformerTests.java | 2 +- .../transformer/XPathHeaderEnricherTests.java | 4 +- .../transformer/XPathTransformerTests.java | 2 +- .../XsltPayloadTransformerTests.java | 4 +- .../xml/transformer/XsltTransformerTests.java | 4 +- .../JaxbMarshallingIntegrationTests.java | 4 +- .../integration/xmpp/XmppHeaders.java | 2 +- .../integration/xmpp/config/package-info.java | 2 +- .../AbstractXmppConnectionAwareEndpoint.java | 2 +- .../integration/xmpp/core/package-info.java | 2 +- .../inbound/PresenceListeningEndpoint.java | 2 +- .../ChatMessageSendingMessageHandler.java | 2 +- .../PresenceSendingMessageHandler.java | 2 +- .../integration/xmpp/package-info.java | 2 +- .../xmpp/support/XmppHeaderMapper.java | 2 +- .../xmpp/support/package-info.java | 2 +- .../config/spring-integration-xmpp-3.0.xsd | 4 +- ...ssageInboundChannelAdapterParserTests.java | 4 +- ...sageOutboundChannelAdapterParserTests.java | 8 +- ...enceOutboundChannelAdapterParserTests.java | 6 +- .../config/XmppHeaderEnricherParserTests.java | 8 +- .../xmpp/ignore/SmackMessageSampleTests.java | 4 +- .../xmpp/ignore/XmppMessageProducer.java | 2 +- .../ChatMessageListeningEndpointTests.java | 10 +- .../PresenceListeningEndpointTests.java | 12 +- ...ChatMessageSendingMessageHandlerTests.java | 2 +- .../support/DefaultXmppHeaderMapperTests.java | 2 +- src/reference/docbook/service-activator.xml | 2 +- 1156 files changed, 3332 insertions(+), 5834 deletions(-) create mode 100644 spring-integration-core/src/main/java/org/springframework/integration/EiMessageHeaderAccessor.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/Message.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/MessageChannel.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/core/MessagePostProcessor.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/core/MessagingOperations.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/core/PollableChannel.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/core/SubscribableChannel.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/message/ErrorMessage.java create mode 100644 spring-integration-core/src/main/java/org/springframework/integration/support/IdGenerators.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/support/channel/ChannelResolutionException.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/support/channel/ChannelResolver.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/support/channel/package-info.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/support/converter/MessageConversionException.java delete mode 100644 spring-integration-core/src/main/java/org/springframework/integration/support/converter/MessageConverter.java delete mode 100644 spring-integration-core/src/test/java/org/springframework/integration/channel/BeanFactoryChannelResolverTests.java delete mode 100644 spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java rename spring-integration-xml/src/test/java/org/springframework/integration/xml/config/{StubChannelResolver.java => StubDestinationResolver.java} (72%) diff --git a/build.gradle b/build.gradle index 45c8df665d..6b619f3877 100644 --- a/build.gradle +++ b/build.gradle @@ -58,7 +58,7 @@ subprojects { subproject -> mockitoVersion = '1.9.5' eaioUUIDVersion = '3.2' - springVersionDefault = '3.1.4.RELEASE' + springVersionDefault = '4.0.0.M3' springVersion = project.hasProperty('springVersion') ? getProperty('springVersion') : springVersionDefault springAmqpVersion = '1.2.0.RELEASE' @@ -189,6 +189,7 @@ project('spring-integration-core') { dependencies { compile "org.springframework:spring-aop:$springVersion" compile "org.springframework:spring-context:$springVersion" + compile "org.springframework:spring-messaging:$springVersion" compile "org.springframework:spring-tx:$springVersion" compile "org.springframework.retry:spring-retry:$springRetryVersion" compile "com.eaio.uuid:uuid:$eaioUUIDVersion" diff --git a/gradle.properties b/gradle.properties index 7645a9fa6f..2db7ae75f2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=3.0.0.BUILD-SNAPSHOT +version=4.0.0.BUILD-SNAPSHOT diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/AmqpHeaders.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/AmqpHeaders.java index db901a5ab3..0b17413950 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/AmqpHeaders.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/AmqpHeaders.java @@ -16,7 +16,7 @@ package org.springframework.integration.amqp; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper; /** diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractAmqpChannel.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractAmqpChannel.java index dc5f2a8c33..d3c10fb720 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractAmqpChannel.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractAmqpChannel.java @@ -17,7 +17,7 @@ package org.springframework.integration.amqp.channel; import org.springframework.amqp.core.AmqpTemplate; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.util.Assert; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractSubscribableAmqpChannel.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractSubscribableAmqpChannel.java index ba204e081c..4e83ee3ef0 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractSubscribableAmqpChannel.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/AbstractSubscribableAmqpChannel.java @@ -29,15 +29,15 @@ import org.springframework.amqp.support.converter.MessageConverter; import org.springframework.amqp.support.converter.SimpleMessageConverter; import org.springframework.beans.factory.DisposableBean; import org.springframework.context.SmartLifecycle; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageDispatchingException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.dispatcher.AbstractDispatcher; import org.springframework.integration.dispatcher.MessageDispatcher; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.SubscribableChannel; import org.springframework.util.Assert; /** diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java index f806e139b2..ad7589da6e 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/PollableAmqpChannel.java @@ -21,8 +21,8 @@ import org.springframework.amqp.core.AmqpTemplate; import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.core.RabbitAdmin; import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/package-info.java index 75e2f1cdfa..945ae15b22 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/package-info.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/channel/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to AMQP-backed channels. */ -package org.springframework.integration.amqp.channel; \ No newline at end of file +package org.springframework.integration.amqp.channel; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/package-info.java index 233be860b3..f59c25bdd8 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/package-info.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers, factory beans. */ -package org.springframework.integration.amqp.config; \ No newline at end of file +package org.springframework.integration.amqp.config; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java index 442fd1d96a..fee1bad43c 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/AmqpInboundGateway.java @@ -82,9 +82,9 @@ public class AmqpInboundGateway extends MessagingGatewaySupport { public void onMessage(Message message) { Object payload = amqpMessageConverter.fromMessage(message); Map headers = headerMapper.toHeadersFromRequest(message.getMessageProperties()); - org.springframework.integration.Message request = + org.springframework.messaging.Message request = MessageBuilder.withPayload(payload).copyHeaders(headers).build(); - final org.springframework.integration.Message reply = sendAndReceiveMessage(request); + final org.springframework.messaging.Message reply = sendAndReceiveMessage(request); if (reply != null) { // TODO: fallback to a reply address property of this gateway Address replyTo = message.getMessageProperties().getReplyToAddress(); diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/package-info.java index fd336d396c..2a77ed1d3f 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/package-info.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting inbound endpoints. */ -package org.springframework.integration.amqp.inbound; \ No newline at end of file +package org.springframework.integration.amqp.inbound; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java index 5387b7c2e6..9ee1f3937f 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/AmqpOutboundEndpoint.java @@ -28,8 +28,8 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.amqp.AmqpHeaders; import org.springframework.integration.amqp.support.AmqpHeaderMapper; import org.springframework.integration.amqp.support.DefaultAmqpHeaderMapper; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/package-info.java index 8a9cab221d..15fde0205e 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/package-info.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/outbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting outbound endpoints. */ -package org.springframework.integration.amqp.outbound; \ No newline at end of file +package org.springframework.integration.amqp.outbound; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/package-info.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/package-info.java index cf440ffb2e..40c8fedf09 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/package-info.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/package-info.java @@ -1,4 +1,4 @@ /** * Base package for AMQP support. */ -package org.springframework.integration.amqp; \ No newline at end of file +package org.springframework.integration.amqp; diff --git a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java index 781bdd1d0e..a6b5081dc6 100644 --- a/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java +++ b/spring-integration-amqp/src/main/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapper.java @@ -24,7 +24,7 @@ import java.util.Map; import org.springframework.amqp.core.MessageDeliveryMode; import org.springframework.amqp.core.MessageProperties; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.amqp.AmqpHeaders; import org.springframework.integration.mapping.AbstractHeaderMapper; import org.springframework.util.StringUtils; @@ -127,7 +127,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper 0) { - headers.put(MessageHeaders.PRIORITY, priority); + headers.put(EiMessageHeaderAccessor.PRIORITY, priority); } String receivedExchange = amqpMessageProperties.getReceivedExchange(); if (StringUtils.hasText(receivedExchange)) { @@ -240,7 +240,7 @@ public class DefaultAmqpHeaderMapper extends AbstractHeaderMapper + type="org.springframework.messaging.MessageChannel" /> @@ -65,7 +65,7 @@ ]]> - + @@ -81,7 +81,7 @@ ]]> - + @@ -109,7 +109,7 @@ - + @@ -144,7 +144,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -157,7 +157,7 @@ + type="org.springframework.messaging.MessageChannel"/> @@ -230,7 +230,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -459,7 +459,7 @@ property set to TRUE. ]]> - + @@ -487,7 +487,7 @@ property set to TRUE. - + diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java index 80f159c717..c09276f9c6 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/channel/DispatcherHasNoSubscribersTests.java @@ -42,8 +42,8 @@ import org.springframework.amqp.rabbit.connection.Connection; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.listener.SimpleMessageListenerContainer; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.MessageDeliveryException; import com.rabbitmq.client.Channel; diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests.java index ee1fa56b8e..7f8ddf178d 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpChannelParserTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java index 2844f021f0..c061f391e1 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundChannelAdapterParserTests.java @@ -22,7 +22,6 @@ import org.springframework.amqp.core.Message; import org.springframework.amqp.core.MessageListener; import org.springframework.amqp.core.MessageProperties; import org.springframework.amqp.rabbit.listener.AbstractMessageListenerContainer; -import org.springframework.beans.BeansException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; @@ -87,7 +86,7 @@ public class AmqpInboundChannelAdapterParserTests { Message amqpMessage = new Message("hello".getBytes(), amqpProperties); listener.onMessage(amqpMessage); QueueChannel requestChannel = context.getBean("requestChannel", QueueChannel.class); - org.springframework.integration.Message siMessage = requestChannel.receive(0); + org.springframework.messaging.Message siMessage = requestChannel.receive(0); assertEquals("foo", siMessage.getHeaders().get("foo")); assertNull(siMessage.getHeaders().get("bar")); assertNotNull(siMessage.getHeaders().get(AmqpHeaders.CONTENT_ENCODING)); @@ -114,7 +113,7 @@ public class AmqpInboundChannelAdapterParserTests { Message amqpMessage = new Message("hello".getBytes(), amqpProperties); listener.onMessage(amqpMessage); QueueChannel requestChannel = context.getBean("requestChannel", QueueChannel.class); - org.springframework.integration.Message siMessage = requestChannel.receive(0); + org.springframework.messaging.Message siMessage = requestChannel.receive(0); assertEquals("foo", siMessage.getHeaders().get("foo")); assertNull(siMessage.getHeaders().get("bar")); assertNull(siMessage.getHeaders().get(AmqpHeaders.CONTENT_ENCODING)); @@ -142,7 +141,7 @@ public class AmqpInboundChannelAdapterParserTests { listener.onMessage(amqpMessage); QueueChannel requestChannel = context.getBean("requestChannel", QueueChannel.class); - org.springframework.integration.Message siMessage = requestChannel.receive(0); + org.springframework.messaging.Message siMessage = requestChannel.receive(0); assertNull(siMessage.getHeaders().get("foo")); assertNull(siMessage.getHeaders().get("bar")); assertNull(siMessage.getHeaders().get(AmqpHeaders.CONTENT_ENCODING)); @@ -169,7 +168,7 @@ public class AmqpInboundChannelAdapterParserTests { Message amqpMessage = new Message("hello".getBytes(), amqpProperties); listener.onMessage(amqpMessage); QueueChannel requestChannel = context.getBean("requestChannel", QueueChannel.class); - org.springframework.integration.Message siMessage = requestChannel.receive(0); + org.springframework.messaging.Message siMessage = requestChannel.receive(0); assertNull(siMessage.getHeaders().get("bar")); assertNull(siMessage.getHeaders().get("foo")); assertNotNull(siMessage.getHeaders().get(AmqpHeaders.CONTENT_ENCODING)); diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java index 439ce344dd..7ea1dbe428 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpInboundGatewayParserTests.java @@ -39,11 +39,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.amqp.inbound.AmqpInboundGateway; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; @@ -87,9 +87,9 @@ public class AmqpInboundGatewayParserTests { public void verifyUsageWithHeaderMapper() throws Exception{ DirectChannel requestChannel = context.getBean("requestChannel", DirectChannel.class); requestChannel.subscribe(new MessageHandler() { - public void handleMessage(org.springframework.integration.Message siMessage) + public void handleMessage(org.springframework.messaging.Message siMessage) throws MessagingException { - org.springframework.integration.Message replyMessage = MessageBuilder.fromMessage(siMessage).setHeader("bar", "bar").build(); + org.springframework.messaging.Message replyMessage = MessageBuilder.fromMessage(siMessage).setHeader("bar", "bar").build(); MessageChannel replyChannel = (MessageChannel) siMessage.getHeaders().getReplyChannel(); replyChannel.send(replyMessage); } diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java index 5a9b950c4f..e41d0b3c3c 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundChannelAdapterParserTests.java @@ -50,15 +50,15 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.amqp.AmqpHeaders; import org.springframework.integration.amqp.outbound.AmqpOutboundEndpoint; import org.springframework.integration.amqp.support.AmqpHeaderMapper; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.NullChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java index 73a33b8c37..786801b4a2 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/AmqpOutboundGatewayParserTests.java @@ -34,8 +34,8 @@ import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.amqp.AmqpHeaders; import org.springframework.integration.amqp.outbound.AmqpOutboundEndpoint; import org.springframework.integration.channel.QueueChannel; diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests.java index 28c65f167e..3f7703c11e 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/config/OutboundGatewayTests.java @@ -33,13 +33,13 @@ import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; import org.springframework.integration.amqp.outbound.AmqpOutboundEndpoint; import org.springframework.integration.config.IntegrationEvaluationContextFactoryBean; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; import org.springframework.test.util.ReflectionTestUtils; import org.springframework.util.ClassUtils; diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java index d78a57d224..9006bdd197 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/outbound/OutboundEndpointTests.java @@ -34,7 +34,7 @@ import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.connection.ConnectionFactory; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.support.CorrelationData; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.support.MessageBuilder; /** @@ -59,7 +59,7 @@ public class OutboundEndpointTests { } }).when(amqpTemplate).send(anyString(), anyString(), any(Message.class), any(CorrelationData.class)); - org.springframework.integration.Message message = MessageBuilder.withPayload("foo") + org.springframework.messaging.Message message = MessageBuilder.withPayload("foo") .setHeader(MessageHeaders.CONTENT_TYPE, "bar") .build(); endpoint.handleMessage(message); @@ -83,7 +83,7 @@ public class OutboundEndpointTests { return null; } }).when(amqpTemplate).doSendAndReceiveWithTemporary(anyString(), anyString(), any(Message.class)); - org.springframework.integration.Message message = MessageBuilder.withPayload("foo") + org.springframework.messaging.Message message = MessageBuilder.withPayload("foo") .setHeader(MessageHeaders.CONTENT_TYPE, "bar") .build(); endpoint.handleMessage(message); diff --git a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java index 26068f2c07..de29700bb7 100644 --- a/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java +++ b/spring-integration-amqp/src/test/java/org/springframework/integration/amqp/support/DefaultAmqpHeaderMapperTests.java @@ -30,7 +30,7 @@ import org.springframework.amqp.core.MessageDeliveryMode; import org.springframework.amqp.core.MessageProperties; import org.springframework.amqp.support.converter.JsonMessageConverter; import org.springframework.http.MediaType; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.amqp.AmqpHeaders; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/EiMessageHeaderAccessor.java b/spring-integration-core/src/main/java/org/springframework/integration/EiMessageHeaderAccessor.java new file mode 100644 index 0000000000..e0d0f05f61 --- /dev/null +++ b/spring-integration-core/src/main/java/org/springframework/integration/EiMessageHeaderAccessor.java @@ -0,0 +1,82 @@ +package org.springframework.integration; + +import java.util.Date; + +import org.springframework.messaging.Message; +import org.springframework.messaging.support.MessageHeaderAccessor; +import org.springframework.util.Assert; + +public class EiMessageHeaderAccessor extends MessageHeaderAccessor { + + public static final String CORRELATION_ID = "correlationId"; + + public static final String EXPIRATION_DATE = "expirationDate"; + + public static final String PRIORITY = "priority"; + + public static final String SEQUENCE_NUMBER = "sequenceNumber"; + + public static final String SEQUENCE_SIZE = "sequenceSize"; + + public static final String SEQUENCE_DETAILS = "sequenceDetails"; + + public static final String POSTPROCESS_RESULT = "postProcessResult"; + + public EiMessageHeaderAccessor(Message message) { + super(message); + } + + public Long getExpirationDate() { + return this.getHeader(EXPIRATION_DATE, Long.class); + } + + public Object getCorrelationId() { + return this.getHeader(CORRELATION_ID); + } + + public Integer getSequenceNumber() { + Integer sequenceNumber = this.getHeader(SEQUENCE_NUMBER, Integer.class); + return (sequenceNumber != null ? sequenceNumber : 0); + } + + public Integer getSequenceSize() { + Integer sequenceSize = this.getHeader(SEQUENCE_SIZE, Integer.class); + return (sequenceSize != null ? sequenceSize : 0); + } + + public Integer getPriority() { + return this.getHeader(PRIORITY, Integer.class); + } + + @SuppressWarnings("unchecked") + public T getHeader(String key, Class type) { + Object value = getHeader(key); + if (value == null) { + return null; + } + if (!type.isAssignableFrom(value.getClass())) { + throw new IllegalArgumentException("Incorrect type specified for header '" + key + "'. Expected [" + type + + "] but actual type is [" + value.getClass() + "]"); + } + return (T) value; + } + + protected void verifyType(String headerName, Object headerValue) { + if (headerName != null && headerValue != null) { + super.verifyType(headerName, headerValue); + if (EiMessageHeaderAccessor.EXPIRATION_DATE.equals(headerName)) { + Assert.isTrue(headerValue instanceof Date || headerValue instanceof Long, "The '" + headerName + + "' header value must be a Date or Long."); + } + else if (EiMessageHeaderAccessor.SEQUENCE_NUMBER.equals(headerName) + || EiMessageHeaderAccessor.SEQUENCE_SIZE.equals(headerName)) { + Assert.isTrue(Integer.class.isAssignableFrom(headerValue.getClass()), "The '" + headerName + + "' header value must be an Integer."); + } + else if (EiMessageHeaderAccessor.PRIORITY.equals(headerName)) { + Assert.isTrue(Integer.class.isAssignableFrom(headerValue.getClass()), "The '" + headerName + + "' header value must be an Integer."); + } + } + } +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/Message.java b/spring-integration-core/src/main/java/org/springframework/integration/Message.java deleted file mode 100644 index c6c03c6af8..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/Message.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration; - -/** - * The central interface that any Message type must implement. - * - * @author Mark Fisher - * @author Arjen Poutsma - */ -public interface Message { - - MessageHeaders getHeaders(); - - T getPayload(); - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageChannel.java deleted file mode 100644 index 33991b1fbe..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageChannel.java +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration; - -/** - * Base channel interface defining common behavior for sending messages. - * - * @author Mark Fisher - */ -public interface MessageChannel { - - /** - * Send a {@link Message} to this channel. May throw a RuntimeException for - * non-recoverable errors. Otherwise, if the Message cannot be sent for a - * non-fatal reason this method will return 'false', and if the Message is - * sent successfully, it will return 'true'. - * - *

Depending on the implementation, this method may block indefinitely. - * To provide a maximum wait time, use {@link #send(Message, long)}. - * - * @param message the {@link Message} to send - * - * @return whether or not the Message has been sent successfully - */ - boolean send(Message message); - - /** - * Send a message, blocking until either the message is accepted or the - * specified timeout period elapses. - * - * @param message the {@link Message} to send - * @param timeout the timeout in milliseconds - * - * @return true if the message is sent successfully, - * false if the specified timeout period elapses or - * the send is interrupted - */ - boolean send(Message message, long timeout); - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java deleted file mode 100644 index 106883ac4a..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageDeliveryException.java +++ /dev/null @@ -1,43 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration; - -/** - * Exception that indicates an error occurred during message delivery. - * - * @author Mark Fisher - */ -@SuppressWarnings("serial") -public class MessageDeliveryException extends MessagingException { - - public MessageDeliveryException(String description) { - super(description); - } - - public MessageDeliveryException(Message undeliveredMessage) { - super(undeliveredMessage); - } - - public MessageDeliveryException(Message undeliveredMessage, String description) { - super(undeliveredMessage, description); - } - - public MessageDeliveryException(Message undeliveredMessage, String description, Throwable cause) { - super(undeliveredMessage, description, cause); - } - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageDispatchingException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageDispatchingException.java index 50b85945e5..68ae53a45a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageDispatchingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageDispatchingException.java @@ -16,6 +16,8 @@ package org.springframework.integration; import org.springframework.integration.dispatcher.MessageDispatcher; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; /** * Exception that indicates an internal error occurred within diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java index 02238d184e..6f35b88cfc 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageHandlingException.java @@ -16,9 +16,12 @@ package org.springframework.integration; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; + /** * Exception that indicates an error occurred during message handling. - * + * * @author Mark Fisher */ @SuppressWarnings("serial") diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java deleted file mode 100644 index c71a1ee1c9..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java +++ /dev/null @@ -1,305 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration; - -import java.io.IOException; -import java.io.ObjectInputStream; -import java.io.ObjectOutputStream; -import java.io.Serializable; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.atomic.AtomicLong; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import com.eaio.uuid.UUIDGen; - -/** - * The headers for a {@link Message}.
- * IMPORTANT: MessageHeaders are immutable. Any mutating operation (e.g., put(..), putAll(..) etc.) - * will result in {@link UnsupportedOperationException} - * To create MessageHeaders instance use fluent MessageBuilder API - * 

- * MessageBuilder.withPayload("foo").setHeader("key1", "value1").setHeader("key2", "value2");
- *
- * or create an instance of GenericMessage passing payload as {@link Object} and headers as a regular {@link Map} - * 
- * Map headers = new HashMap();
- * headers.put("key1", "value1");
- * headers.put("key2", "value2");
- * new GenericMessage("foo", headers);
- *
- * - * @author Arjen Poutsma - * @author Mark Fisher - * @author Oleg Zhurakousky - * @author Gary Russell - */ -public final class MessageHeaders implements Map, Serializable { - - private static final long serialVersionUID = 6901029029524535147L; - - private static final Log logger = LogFactory.getLog(MessageHeaders.class); - - private static volatile IdGenerator idGenerator = null; - - /** - * The key for the Message ID. This is an automatically generated UUID and - * should never be explicitly set in the header map except in the - * case of Message deserialization where the serialized Message's generated - * UUID is being restored. - */ - public static final String ID = "id"; - - public static final String TIMESTAMP = "timestamp"; - - public static final String CORRELATION_ID = "correlationId"; - - public static final String REPLY_CHANNEL = "replyChannel"; - - public static final String ERROR_CHANNEL = "errorChannel"; - - public static final String EXPIRATION_DATE = "expirationDate"; - - public static final String PRIORITY = "priority"; - - public static final String SEQUENCE_NUMBER = "sequenceNumber"; - - public static final String SEQUENCE_SIZE = "sequenceSize"; - - public static final String SEQUENCE_DETAILS = "sequenceDetails"; - - public static final String CONTENT_TYPE = "content-type"; - - public static final String POSTPROCESS_RESULT = "postProcessResult"; - - - private final Map headers; - - - public MessageHeaders(Map headers) { - this.headers = (headers != null) ? new HashMap(headers) : new HashMap(); - if (MessageHeaders.idGenerator == null) { - UUID uuid = new UUID(UUIDGen.newTime(), UUIDGen.getClockSeqAndNode()); - this.headers.put(ID, uuid); - } - else { - this.headers.put(ID, MessageHeaders.idGenerator.generateId()); - } - - this.headers.put(TIMESTAMP, new Long(System.currentTimeMillis())); - } - - public UUID getId() { - return this.get(ID, UUID.class); - } - - public Long getTimestamp() { - return this.get(TIMESTAMP, Long.class); - } - - public Long getExpirationDate() { - return this.get(EXPIRATION_DATE, Long.class); - } - - public Object getCorrelationId() { - return this.get(CORRELATION_ID); - } - - public Object getReplyChannel() { - return this.get(REPLY_CHANNEL); - } - - public Object getErrorChannel() { - return this.get(ERROR_CHANNEL); - } - - public Integer getSequenceNumber() { - Integer sequenceNumber = this.get(SEQUENCE_NUMBER, Integer.class); - return (sequenceNumber != null ? sequenceNumber : 0); - } - - public Integer getSequenceSize() { - Integer sequenceSize = this.get(SEQUENCE_SIZE, Integer.class); - return (sequenceSize != null ? sequenceSize : 0); - } - - public Integer getPriority() { - return this.get(PRIORITY, Integer.class); - } - - @SuppressWarnings("unchecked") - public T get(Object key, Class type) { - Object value = this.headers.get(key); - if (value == null) { - return null; - } - if (!type.isAssignableFrom(value.getClass())) { - throw new IllegalArgumentException("Incorrect type specified for header '" + key + "'. Expected [" + type - + "] but actual type is [" + value.getClass() + "]"); - } - return (T) value; - } - - @Override - public int hashCode() { - return this.headers.hashCode(); - } - - @Override - public boolean equals(Object object) { - if (this == object) { - return true; - } - if (object != null && object instanceof MessageHeaders) { - MessageHeaders other = (MessageHeaders) object; - return this.headers.equals(other.headers); - } - return false; - } - - @Override - public String toString() { - return this.headers.toString(); - } - - /* - * Map implementation - */ - - public boolean containsKey(Object key) { - return this.headers.containsKey(key); - } - - public boolean containsValue(Object value) { - return this.headers.containsValue(value); - } - - public Set> entrySet() { - return Collections.unmodifiableSet(this.headers.entrySet()); - } - - public Object get(Object key) { - return this.headers.get(key); - } - - public boolean isEmpty() { - return this.headers.isEmpty(); - } - - public Set keySet() { - return Collections.unmodifiableSet(this.headers.keySet()); - } - - public int size() { - return this.headers.size(); - } - - public Collection values() { - return Collections.unmodifiableCollection(this.headers.values()); - } - - /* - * Unsupported operations - */ - /** - * Since MessageHeaders are immutable the call to this method will result in {@link UnsupportedOperationException} - */ - public Object put(String key, Object value) { - throw new UnsupportedOperationException("MessageHeaders is immutable."); - } - /** - * Since MessageHeaders are immutable the call to this method will result in {@link UnsupportedOperationException} - */ - public void putAll(Map t) { - throw new UnsupportedOperationException("MessageHeaders is immutable."); - } - /** - * Since MessageHeaders are immutable the call to this method will result in {@link UnsupportedOperationException} - */ - public Object remove(Object key) { - throw new UnsupportedOperationException("MessageHeaders is immutable."); - } - /** - * Since MessageHeaders are immutable the call to this method will result in {@link UnsupportedOperationException} - */ - public void clear() { - throw new UnsupportedOperationException("MessageHeaders is immutable."); - } - - /* - * Serialization methods - */ - - private void writeObject(ObjectOutputStream out) throws IOException { - List keysToRemove = new ArrayList(); - for (Map.Entry entry : this.headers.entrySet()) { - if (!(entry.getValue() instanceof Serializable)) { - keysToRemove.add(entry.getKey()); - } - } - for (String key : keysToRemove) { - if (logger.isInfoEnabled()) { - logger.info("removing non-serializable header: " + key); - } - this.headers.remove(key); - } - out.defaultWriteObject(); - } - - private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException { - in.defaultReadObject(); - } - - public static interface IdGenerator { - UUID generateId(); - } - - public static class JdkIdGenerator implements IdGenerator { - - @Override - public UUID generateId() { - return UUID.randomUUID(); - } - - } - - public static class SimpleIncrementingIdGenerator implements IdGenerator { - - private final AtomicLong topBits = new AtomicLong(); - - private final AtomicLong bottomBits = new AtomicLong(); - - @Override - public UUID generateId() { - long bottomBits = this.bottomBits.incrementAndGet(); - if (bottomBits == 0) { - this.topBits.incrementAndGet(); - } - return new UUID(this.topBits.get(), bottomBits); - } - - } - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageRejectedException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageRejectedException.java index 47e3e542dd..920a4a5d90 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageRejectedException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageRejectedException.java @@ -16,9 +16,11 @@ package org.springframework.integration; +import org.springframework.messaging.Message; + /** * Exception that indicates a message has been rejected by a selector. - * + * * @author Mark Fisher */ @SuppressWarnings("serial") diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessageTimeoutException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageTimeoutException.java index d4ffbedabd..33d1586a03 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessageTimeoutException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageTimeoutException.java @@ -16,14 +16,17 @@ package org.springframework.integration; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; + /** * Exception that indicates a timeout elapsed prior to successful message delivery. - * + * * @author Mark Fisher */ @SuppressWarnings("serial") public class MessageTimeoutException extends MessageDeliveryException { - + public MessageTimeoutException(String description) { super(description); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java b/spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java deleted file mode 100644 index 99db40ed26..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/MessagingException.java +++ /dev/null @@ -1,69 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration; - -/** - * The base exception for any failures related to messaging. - * - * @author Mark Fisher - * @author Gary Russell - */ -@SuppressWarnings("serial") -public class MessagingException extends RuntimeException { - - private volatile Message failedMessage; - - - public MessagingException(Message message) { - super(); - this.failedMessage = message; - } - - public MessagingException(String description) { - super(description); - this.failedMessage = null; - } - - public MessagingException(String description, Throwable cause) { - super(description, cause); - this.failedMessage = null; - } - - public MessagingException(Message message, String description) { - super(description); - this.failedMessage = message; - } - - public MessagingException(Message message, Throwable cause) { - super(cause); - this.failedMessage = message; - } - - public MessagingException(Message message, String description, Throwable cause) { - super(description, cause); - this.failedMessage = message; - } - - public Message getFailedMessage() { - return this.failedMessage; - } - - public void setFailedMessage(Message message) { - this.failedMessage = message; - } - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractAggregatingMessageGroupProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractAggregatingMessageGroupProcessor.java index f863df4e33..f185a9bbe7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractAggregatingMessageGroupProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractAggregatingMessageGroupProcessor.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2010 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -20,15 +20,16 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.util.Assert; /** * Base class for MessageGroupProcessor implementations that aggregate the group of Messages into a single Message. - * + * * @author Iwein Fuld * @author Alexander Peters * @author Mark Fisher @@ -41,7 +42,7 @@ public abstract class AbstractAggregatingMessageGroupProcessor implements Messag public final Object processMessageGroup(MessageGroup group) { Assert.notNull(group, "MessageGroup must not be null"); - + Map headers = this.aggregateHeaders(group); Object payload = this.aggregatePayloads(group, headers); MessageBuilder builder; @@ -51,7 +52,7 @@ public abstract class AbstractAggregatingMessageGroupProcessor implements Messag else { builder = MessageBuilder.withPayload(payload).copyHeadersIfAbsent(headers); } - + return builder.popSequenceDetails().build(); } @@ -67,7 +68,7 @@ public abstract class AbstractAggregatingMessageGroupProcessor implements Messag MessageHeaders currentHeaders = message.getHeaders(); for (String key : currentHeaders.keySet()) { if (MessageHeaders.ID.equals(key) || MessageHeaders.TIMESTAMP.equals(key) - || MessageHeaders.SEQUENCE_SIZE.equals(key) || MessageHeaders.SEQUENCE_NUMBER.equals(key)) { + || EiMessageHeaderAccessor.SEQUENCE_SIZE.equals(key) || EiMessageHeaderAccessor.SEQUENCE_NUMBER.equals(key)) { continue; } Object value = currentHeaders.get(key); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java index d6dacb8e9a..37dd1d7542 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandler.java @@ -22,13 +22,9 @@ import java.util.concurrent.locks.Lock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessagingException; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.NullChannel; import org.springframework.integration.core.MessageProducer; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; @@ -36,9 +32,14 @@ import org.springframework.integration.store.MessageGroupStore.MessageGroupCallb import org.springframework.integration.store.MessageStore; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.store.SimpleMessageStore; +import org.springframework.integration.support.converter.SimpleMessageConverter; import org.springframework.integration.util.DefaultLockRegistry; import org.springframework.integration.util.LockRegistry; import org.springframework.integration.util.UUIDConverter; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -80,7 +81,7 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageH private MessageChannel outputChannel; - private final MessagingTemplate messagingTemplate = new MessagingTemplate(); + private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); private volatile MessageChannel discardChannel = new NullChannel(); @@ -102,7 +103,7 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageH setMessageStore(store); this.outputProcessor = processor; this.correlationStrategy = correlationStrategy == null ? - new HeaderAttributeCorrelationStrategy(MessageHeaders.CORRELATION_ID) : correlationStrategy; + new HeaderAttributeCorrelationStrategy(EiMessageHeaderAccessor.CORRELATION_ID) : correlationStrategy; this.releaseStrategy = releaseStrategy == null ? new SequenceSizeReleaseStrategy() : releaseStrategy; this.messagingTemplate.setSendTimeout(DEFAULT_SEND_TIMEOUT); sequenceAware = this.releaseStrategy instanceof SequenceSizeReleaseStrategy; @@ -329,7 +330,7 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageH Message lastReleasedMessage = sorted.get(partialSequence.size()-1); - return lastReleasedMessage.getHeaders().getSequenceNumber(); + return new EiMessageHeaderAccessor(lastReleasedMessage).getSequenceNumber(); } private MessageGroup store(Object correlationKey, Message message) { @@ -449,9 +450,10 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageH if (this.size() == 0) { return true; } - Integer messageSequenceNumber = message.getHeaders().getSequenceNumber(); + EiMessageHeaderAccessor messageHeaderAccessor = new EiMessageHeaderAccessor(message); + Integer messageSequenceNumber = messageHeaderAccessor.getSequenceNumber(); if (messageSequenceNumber != null && messageSequenceNumber > 0) { - Integer messageSequenceSize = message.getHeaders().getSequenceSize(); + Integer messageSequenceSize = messageHeaderAccessor.getSequenceSize(); if (!messageSequenceSize.equals(this.getSequenceSize())) { return false; } @@ -464,7 +466,7 @@ public abstract class AbstractCorrelatingMessageHandler extends AbstractMessageH private boolean containsSequenceNumber(Collection> messages, Integer messageSequenceNumber) { for (Message member : messages) { - Integer memberSequenceNumber = member.getHeaders().getSequenceNumber(); + Integer memberSequenceNumber = new EiMessageHeaderAccessor(member).getSequenceNumber(); if (messageSequenceNumber.equals(memberSequenceNumber)) { return true; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AggregatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AggregatingMessageHandler.java index 4421497a40..7fd9125f1c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AggregatingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/AggregatingMessageHandler.java @@ -15,7 +15,7 @@ package org.springframework.integration.aggregator; import java.util.Collection; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java index 68b1267d10..41bd82bfc7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageBarrier.java @@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSource; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.store.MessageGroup; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelationStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelationStrategy.java index 1edeba3e57..422dd11ad9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelationStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelationStrategy.java @@ -16,7 +16,7 @@ package org.springframework.integration.aggregator; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Strategy for determining how messages can be correlated. Implementations diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/DefaultAggregatingMessageGroupProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/DefaultAggregatingMessageGroupProcessor.java index 6e83bc6f5d..137b68cc86 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/DefaultAggregatingMessageGroupProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/DefaultAggregatingMessageGroupProcessor.java @@ -21,7 +21,7 @@ import java.util.Collection; import java.util.List; import java.util.Map; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.MessageGroup; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategy.java index f1d9549997..afd5c448f8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategy.java @@ -24,7 +24,7 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessor.java index 6ad9edd276..62c316d15c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessor.java @@ -21,14 +21,13 @@ import java.util.Map; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.store.MessageGroup; /** * A {@link MessageGroupProcessor} implementation that evaluates a SpEL expression. The SpEL context root is the list of * all Messages in the group. The evaluation result can be any Object and is send as new Message payload to the output * channel. - * + * * @author Alex Peters * @author Dave Syer */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageListProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageListProcessor.java index 9f20326833..2ec511ef4a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageListProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageListProcessor.java @@ -23,7 +23,7 @@ import org.springframework.expression.ExpressionParser; import org.springframework.expression.ParseException; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.util.AbstractExpressionEvaluator; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategy.java index 0f8f1dce07..1110944707 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategy.java @@ -16,7 +16,7 @@ package org.springframework.integration.aggregator; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Default implementation of {@link CorrelationStrategy}. Uses a header diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageListProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageListProcessor.java index c686d23aa3..dbafed5d18 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageListProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageListProcessor.java @@ -17,7 +17,7 @@ package org.springframework.integration.aggregator; import java.util.Collection; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * @author Dave Syer @@ -27,4 +27,4 @@ public interface MessageListProcessor { Object process(Collection> messages); -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java index 82d9f830df..de8baa05a9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageSequenceComparator.java @@ -18,19 +18,20 @@ package org.springframework.integration.aggregator; import java.util.Comparator; -import org.springframework.integration.Message; +import org.springframework.integration.EiMessageHeaderAccessor; +import org.springframework.messaging.Message; /** * A {@link Comparator} implementation based on the 'sequence number' * property of a {@link Message Message's} header. - * + * * @author Mark Fisher */ public class MessageSequenceComparator implements Comparator> { public int compare(Message message1, Message message2) { - Integer s1 = message1.getHeaders().getSequenceNumber(); - Integer s2 = message2.getHeaders().getSequenceNumber(); + Integer s1 = new EiMessageHeaderAccessor(message1).getSequenceNumber(); + Integer s2 = new EiMessageHeaderAccessor(message2).getSequenceNumber(); if (s1 == null) { s1 = 0; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingCorrelationStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingCorrelationStrategy.java index 2e4f970e1a..16b9d127ee 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingCorrelationStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingCorrelationStrategy.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import java.lang.reflect.Method; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.MethodInvokingMessageProcessor; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessor.java index 2706e67672..439ba31afb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessor.java @@ -22,7 +22,7 @@ import java.util.Map; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.store.MessageGroup; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageListProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageListProcessor.java index 2c0d0aa786..89872231ae 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageListProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MethodInvokingMessageListProcessor.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Map; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.util.AbstractExpressionEvaluator; import org.springframework.integration.util.MessagingMethodInvokerHelper; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.java index e58ab8c690..64bf62c6d5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessor.java @@ -19,7 +19,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.store.MessageGroup; /** @@ -59,6 +60,6 @@ public class ResequencingMessageGroupProcessor implements MessageGroupProcessor } private Integer extractSequenceNumber(Message message) { - return message.getHeaders().getSequenceNumber(); + return new EiMessageHeaderAccessor(message).getSequenceNumber(); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageHandler.java index 62944d8891..73598dfabd 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/ResequencingMessageHandler.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -15,13 +15,14 @@ package org.springframework.integration.aggregator; import java.util.Collection; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; /** - * Resequencer specific implementation of {@link AbstractCorrelatingMessageHandler}. - * Will remove {@link MessageGroup}s only if 'sequenceSize' is provided and reached. + * Resequencer specific implementation of {@link AbstractCorrelatingMessageHandler}. + * Will remove {@link MessageGroup}s only if 'sequenceSize' is provided and reached. * * @author Oleg Zhurakousky * @since 2.1 @@ -34,32 +35,32 @@ public class ResequencingMessageHandler extends AbstractCorrelatingMessageHandle super(processor, store, correlationStrategy, releaseStrategy); } - + public ResequencingMessageHandler(MessageGroupProcessor processor, MessageGroupStore store) { super(processor, store); } - + public ResequencingMessageHandler(MessageGroupProcessor processor) { super(processor); } - + @Override protected void afterRelease(MessageGroup messageGroup, Collection> completedMessages) { - + int size = messageGroup.getMessages().size(); int sequenceSize = 0; Message message = messageGroup.getOne(); if (message != null){ - sequenceSize = message.getHeaders().getSequenceSize(); + sequenceSize = new EiMessageHeaderAccessor(message).getSequenceSize(); } // If there is no sequence then it must be incomplete or unbounded if (sequenceSize > 0 && sequenceSize == size){ remove(messageGroup); } else { - if (completedMessages != null){ + if (completedMessages != null){ int lastReleasedSequenceNumber = this.findLastReleasedSequenceNumber(messageGroup.getGroupId(), completedMessages); messageStore.setLastReleasedSequenceNumberForGroup(messageGroup.getGroupId(), lastReleasedSequenceNumber); for (Message msg : completedMessages) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/SequenceNumberComparator.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/SequenceNumberComparator.java index 426bc6b85c..a4854c73cb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/SequenceNumberComparator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/SequenceNumberComparator.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2010 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -15,13 +15,14 @@ package org.springframework.integration.aggregator; import java.util.Comparator; -import org.springframework.integration.Message; +import org.springframework.integration.EiMessageHeaderAccessor; +import org.springframework.messaging.Message; /** * @author Dave Syer - * + * * @since 2.0 - * + * */ public class SequenceNumberComparator implements Comparator> { @@ -31,8 +32,8 @@ public class SequenceNumberComparator implements Comparator> { * rank. */ public int compare(Message o1, Message o2) { - Integer sequenceNumber1 = o1.getHeaders().getSequenceNumber(); - Integer sequenceNumber2 = o2.getHeaders().getSequenceNumber(); + Integer sequenceNumber1 = new EiMessageHeaderAccessor(o1).getSequenceNumber(); + Integer sequenceNumber2 = new EiMessageHeaderAccessor(o2).getSequenceNumber(); if (sequenceNumber1 == sequenceNumber2) { return 0; } @@ -45,4 +46,4 @@ public class SequenceNumberComparator implements Comparator> { return sequenceNumber1.compareTo(sequenceNumber2); } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategy.java index e36d632559..0fcf0284d7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategy.java @@ -24,13 +24,14 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.store.MessageGroup; /** * An implementation of {@link ReleaseStrategy} that simply compares the current size of the message list to the * expected 'sequenceSize'. - * + * * @author Mark Fisher * @author Marius Bogoevici * @author Dave Syer @@ -56,7 +57,7 @@ public class SequenceSizeReleaseStrategy implements ReleaseStrategy { /** * Flag that determines if partial sequences are allowed. If true then as soon as enough messages arrive that can be * ordered they will be released, provided they all have sequence numbers greater than those already released. - * + * * @param releasePartialSequences */ public void setReleasePartialSequences(boolean releasePartialSequences) { @@ -66,38 +67,38 @@ public class SequenceSizeReleaseStrategy implements ReleaseStrategy { public boolean canRelease(MessageGroup messageGroup) { boolean canRelease = false; - + Collection> messages = messageGroup.getMessages(); - + if (releasePartialSequences && !messages.isEmpty()) { - + if (logger.isTraceEnabled()) { logger.trace("Considering partial release of group [" + messageGroup + "]"); } List> sorted = new ArrayList>(messages); Collections.sort(sorted, comparator); - - int nextSequenceNumber = sorted.get(0).getHeaders().getSequenceNumber(); + + int nextSequenceNumber = new EiMessageHeaderAccessor(sorted.get(0)).getSequenceNumber(); int lastReleasedMessageSequence = messageGroup.getLastReleasedMessageSequenceNumber(); - + if (nextSequenceNumber - lastReleasedMessageSequence == 1){ canRelease = true;; - } + } } else { int size = messages.size(); - + if (size == 0){ canRelease = true; } else { - int sequenceSize = messageGroup.getOne().getHeaders().getSequenceSize(); + int sequenceSize = new EiMessageHeaderAccessor(messageGroup.getOne()).getSequenceSize(); // If there is no sequence then it must be incomplete.... if (sequenceSize == size){ canRelease = true; } } - } + } return canRelease; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategy.java index 34a60fdaed..89f50a7521 100755 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategy.java @@ -13,7 +13,7 @@ package org.springframework.integration.aggregator; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.MessageGroup; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/package-info.java index 65cf228442..2ac1aa5380 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to message aggregation. */ -package org.springframework.integration.aggregator; \ No newline at end of file +package org.springframework.integration.aggregator; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filter.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filter.java index 0be38ec475..5dc286f62b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Filter.java @@ -26,7 +26,7 @@ import java.lang.annotation.Target; * Indicates that a method is capable of playing the role of a Message Filter. *

* A method annotated with @Filter may accept a parameter of type - * {@link org.springframework.integration.Message} or of the expected + * {@link org.springframework.messaging.Message} or of the expected * Message payload's type. Any type conversion supported by default or any * Converters registered with the "integrationConversionService" bean will be * applied to the Message payload if necessary. Header values can also be passed diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Gateway.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Gateway.java index b0c15a1f65..39f8e782f2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Gateway.java +++ b/spring-integration-core/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} + * parameter of type {@link org.springframework.messaging.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/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java index b5bc69f02d..305d988f29 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Router.java +++ b/spring-integration-core/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} or of the expected + * {@link org.springframework.messaging.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 @@ -36,7 +36,7 @@ import java.lang.annotation.Target; *

* Return values from the annotated method may be either a Collection or Array * whose elements are either - * {@link org.springframework.integration.MessageChannel channels} or + * {@link org.springframework.messaging.MessageChannel channels} or * Strings. In the latter case, the endpoint hosting this router will attempt * to resolve each channel name with the Channel Registry. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivator.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivator.java index 0229c9d217..af38b3b7b1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivator.java +++ b/spring-integration-core/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} or of the expected + * {@link org.springframework.messaging.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/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java index 9054227726..7f56adfb82 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/Splitter.java +++ b/spring-integration-core/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} or of the expected + * {@link org.springframework.messaging.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/spring-integration-core/src/main/java/org/springframework/integration/annotation/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/package-info.java index 4da0c1f9da..7fcadb2b4f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/annotation/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/annotation/package-info.java @@ -1,4 +1,4 @@ /** * Provides annotations for annotation-based configuration. */ -package org.springframework.integration.annotation; \ No newline at end of file +package org.springframework.integration.annotation; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java index ddc02255df..bac6dda64a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java @@ -22,7 +22,6 @@ import java.util.Map; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; - import org.springframework.aop.support.AopUtils; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; @@ -36,12 +35,12 @@ import org.springframework.expression.ParseException; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.DestinationResolver; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -56,13 +55,13 @@ import org.springframework.util.StringUtils; */ public class MessagePublishingInterceptor implements MethodInterceptor, BeanFactoryAware { - private final MessagingTemplate messagingTemplate = new MessagingTemplate(); + private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); private volatile PublisherMetadataSource metadataSource; private final ExpressionParser parser = new SpelExpressionParser(new SpelParserConfiguration(true, true)); - private volatile ChannelResolver channelResolver; + private volatile DestinationResolver channelResolver; private volatile BeanFactory beanFactory; @@ -81,10 +80,10 @@ public class MessagePublishingInterceptor implements MethodInterceptor, BeanFact } public void setDefaultChannel(MessageChannel defaultChannel) { - this.messagingTemplate.setDefaultChannel(defaultChannel); + this.messagingTemplate.setDefaultDestination(defaultChannel); } - public void setChannelResolver(ChannelResolver channelResolver) { + public void setChannelResolver(DestinationResolver channelResolver) { this.channelResolver = channelResolver; } @@ -150,7 +149,7 @@ public class MessagePublishingInterceptor implements MethodInterceptor, BeanFact MessageChannel channel = null; if (channelName != null) { Assert.state(this.channelResolver != null, "ChannelResolver is required to resolve channel names."); - channel = this.channelResolver.resolveChannelName(channelName); + channel = this.channelResolver.resolveDestination(channelName); } if (channel != null) { this.messagingTemplate.send(channel, message); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java index 35b454afcc..54829be0b2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationAdvisor.java @@ -23,7 +23,6 @@ import java.util.HashSet; import java.util.Set; import org.aopalliance.aop.Advice; - import org.springframework.aop.ClassFilter; import org.springframework.aop.MethodMatcher; import org.springframework.aop.Pointcut; @@ -35,9 +34,9 @@ import org.springframework.aop.support.annotation.AnnotationMethodMatcher; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.integration.MessageChannel; import org.springframework.integration.annotation.Publisher; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; import org.springframework.util.Assert; /** @@ -73,7 +72,7 @@ public class PublisherAnnotationAdvisor extends AbstractPointcutAdvisor implemen } public void setBeanFactory(BeanFactory beanFactory) { - this.interceptor.setChannelResolver(new BeanFactoryChannelResolver(beanFactory)); + this.interceptor.setChannelResolver(new BeanFactoryMessageChannelDestinationResolver(beanFactory)); this.interceptor.setBeanFactory(beanFactory); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationBeanPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationBeanPostProcessor.java index bf8ed38658..426df1c6ed 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationBeanPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/PublisherAnnotationBeanPostProcessor.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.Ordered; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.annotation.Publisher; import org.springframework.util.ClassUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aop/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/package-info.java index c037795b5b..094047f5c1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aop/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aop/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes to support message publication using AOP. */ -package org.springframework.integration.aop; \ No newline at end of file +package org.springframework.integration.aop; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java index a43aca54fc..77df588968 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractMessageChannel.java @@ -24,14 +24,14 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.OrderComparator; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.history.TrackableComponent; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java index 211e6eb171..cafb45250d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractPollableChannel.java @@ -16,8 +16,8 @@ package org.springframework.integration.channel; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; /** * Base class for all pollable channels. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java index a054ff578e..7bbb21b476 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/AbstractSubscribableChannel.java @@ -18,14 +18,14 @@ package org.springframework.integration.channel; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageDispatchingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.dispatcher.AbstractDispatcher; import org.springframework.integration.dispatcher.MessageDispatcher; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java index eb5049b679..31c6d86364 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelInterceptor.java @@ -16,8 +16,8 @@ package org.springframework.integration.channel; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; /** * Interface for interceptors that are able to view and/or modify the diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java index eb3c272ddc..bc40afe5f6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/ChannelPurger.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java index 3449aeb2ba..419eedb6e4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/ExecutorChannel.java @@ -18,11 +18,11 @@ package org.springframework.integration.channel; import java.util.concurrent.Executor; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; import org.springframework.integration.dispatcher.LoadBalancingStrategy; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; import org.springframework.integration.dispatcher.UnicastingDispatcher; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.util.ErrorHandlingTaskExecutor; import org.springframework.util.Assert; import org.springframework.util.ErrorHandler; @@ -111,7 +111,7 @@ public class ExecutorChannel extends AbstractSubscribableChannel { public final void onInit() { if (!(this.executor instanceof ErrorHandlingTaskExecutor)) { ErrorHandler errorHandler = new MessagePublishingErrorHandler( - new BeanFactoryChannelResolver(this.getBeanFactory())); + new BeanFactoryMessageChannelDestinationResolver(this.getBeanFactory())); this.executor = new ErrorHandlingTaskExecutor(this.executor, errorHandler); } this.dispatcher = new UnicastingDispatcher(this.executor); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java index 712d6705ca..cbc4d339fe 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java @@ -21,20 +21,20 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.message.ErrorMessage; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolver; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.util.Assert; import org.springframework.util.ErrorHandler; /** * {@link ErrorHandler} implementation that sends an {@link ErrorMessage} to a * {@link MessageChannel}. - * + * * @author Mark Fisher * @author Iwein Fuld * @author Oleg Zhurakousky @@ -43,7 +43,7 @@ public class MessagePublishingErrorHandler implements ErrorHandler, BeanFactoryA private final Log logger = LogFactory.getLog(this.getClass()); - private volatile ChannelResolver channelResolver; + private volatile DestinationResolver channelResolver; private volatile MessageChannel defaultErrorChannel; @@ -53,7 +53,7 @@ public class MessagePublishingErrorHandler implements ErrorHandler, BeanFactoryA public MessagePublishingErrorHandler() { } - public MessagePublishingErrorHandler(ChannelResolver channelResolver) { + public MessagePublishingErrorHandler(DestinationResolver channelResolver) { Assert.notNull(channelResolver, "channelResolver must not be null"); this.channelResolver = channelResolver; } @@ -70,7 +70,7 @@ public class MessagePublishingErrorHandler implements ErrorHandler, BeanFactoryA public void setBeanFactory(BeanFactory beanFactory) { Assert.notNull(beanFactory, "beanFactory must not be null"); if (this.channelResolver == null) { - this.channelResolver = new BeanFactoryChannelResolver(beanFactory); + this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory); } } @@ -108,10 +108,10 @@ public class MessagePublishingErrorHandler implements ErrorHandler, BeanFactoryA Message failedMessage = (t instanceof MessagingException) ? ((MessagingException) t).getFailedMessage() : null; if (this.defaultErrorChannel == null && this.channelResolver != null) { - this.defaultErrorChannel = this.channelResolver.resolveChannelName( + this.defaultErrorChannel = this.channelResolver.resolveDestination( IntegrationContextUtils.ERROR_CHANNEL_BEAN_NAME); } - + if (failedMessage == null || failedMessage.getHeaders().getErrorChannel() == null) { return this.defaultErrorChannel; } @@ -122,7 +122,7 @@ public class MessagePublishingErrorHandler implements ErrorHandler, BeanFactoryA Assert.isInstanceOf(String.class, errorChannelHeader, "Unsupported error channel header type. Expected MessageChannel or String, but actual type is [" + errorChannelHeader.getClass() + "]"); - return this.channelResolver.resolveChannelName((String) errorChannelHeader); + return this.channelResolver.resolveDestination((String) errorChannelHeader); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java index 7c8d3e4aac..619f507941 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/NullChannel.java @@ -19,8 +19,8 @@ package org.springframework.integration.channel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; /** * A channel implementation that essentially behaves like "/dev/null". diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/PriorityChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/PriorityChannel.java index e110483f2f..796a57f9b3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/PriorityChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/PriorityChannel.java @@ -20,21 +20,22 @@ import java.util.Comparator; import java.util.concurrent.PriorityBlockingQueue; import java.util.concurrent.atomic.AtomicLong; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.util.UpperBound; /** * A message channel that prioritizes messages based on a {@link Comparator}. * The default comparator is based upon the message header's 'priority'. - * + * * @author Mark Fisher * @author Oleg Zhurakousky */ public class PriorityChannel extends QueueChannel { private final UpperBound upperBound; - + private final AtomicLong sequenceCounter = new AtomicLong(); /** @@ -93,11 +94,11 @@ public class PriorityChannel extends QueueChannel { } return message; } - + private static class SequenceFallbackComparator implements Comparator> { - + private final Comparator> targetComparator; - + public SequenceFallbackComparator(Comparator> targetComparator){ this.targetComparator = targetComparator; } @@ -108,14 +109,14 @@ public class PriorityChannel extends QueueChannel { compareResult = this.targetComparator.compare(message1, message2); } else { - Integer priority1 = message1.getHeaders().getPriority(); - Integer priority2 = message2.getHeaders().getPriority(); - + Integer priority1 = new EiMessageHeaderAccessor(message1).getPriority(); + Integer priority2 = new EiMessageHeaderAccessor(message2).getPriority(); + priority1 = priority1 != null ? priority1 : 0; priority2 = priority2 != null ? priority2 : 0; compareResult = priority2.compareTo(priority1); } - + if (compareResult == 0){ Long sequence1 = ((MessageWrapper) message1).getSequence(); Long sequence2 = ((MessageWrapper) message2).getSequence(); @@ -124,7 +125,7 @@ public class PriorityChannel extends QueueChannel { return compareResult; } } - + //we need this because of INT-2508 private class MessageWrapper implements Message{ private final Message rootMessage; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java index e80dbf70b8..81e098c735 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/PublishSubscribeChannel.java @@ -19,8 +19,8 @@ package org.springframework.integration.channel; import java.util.concurrent.Executor; import org.springframework.integration.dispatcher.BroadcastingDispatcher; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.util.ErrorHandlingTaskExecutor; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; import org.springframework.util.ErrorHandler; /** @@ -139,7 +139,7 @@ public class PublishSubscribeChannel extends AbstractSubscribableChannel { if (!(this.executor instanceof ErrorHandlingTaskExecutor)) { if (this.errorHandler == null) { this.errorHandler = new MessagePublishingErrorHandler( - new BeanFactoryChannelResolver(this.getBeanFactory())); + new BeanFactoryMessageChannelDestinationResolver(this.getBeanFactory())); } this.executor = new ErrorHandlingTaskExecutor(this.executor, this.errorHandler); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java index b3ddd0a804..7d2b47ad4e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannel.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannelOperations.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannelOperations.java index dad36c15a2..7a3d68602d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannelOperations.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/QueueChannelOperations.java @@ -17,7 +17,7 @@ package org.springframework.integration.channel; import java.util.List; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/RendezvousChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/RendezvousChannel.java index 91680a3309..7dd23a86ca 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/RendezvousChannel.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; /** * A zero-capacity version of {@link QueueChannel} that delegates to a diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java index 5554b3674c..619782ffb8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/ChannelInterceptorAdapter.java @@ -16,8 +16,8 @@ package org.springframework.integration.channel.interceptor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.ChannelInterceptor; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorBeanPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorBeanPostProcessor.java index 51f571459f..c36849e58f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorBeanPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorBeanPostProcessor.java @@ -33,7 +33,7 @@ import org.springframework.beans.NotReadablePropertyException; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.BeanPostProcessor; import org.springframework.core.OrderComparator; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.util.PatternMatchUtils; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java index 846aebc9d8..78c6835200 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptor.java @@ -19,16 +19,16 @@ package org.springframework.integration.channel.interceptor; import java.util.Arrays; import java.util.List; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.core.MessageSelector; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; /** * A {@link org.springframework.integration.channel.ChannelInterceptor} that * delegates to a list of {@link MessageSelector MessageSelectors} to decide * whether a {@link Message} should be accepted on the {@link MessageChannel}. - * + * * @author Mark Fisher */ public class MessageSelectingInterceptor extends ChannelInterceptorAdapter { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java index 20a8d5e3ab..d991bfc212 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/WireTap.java @@ -19,8 +19,8 @@ package org.springframework.integration.channel.interceptor; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.Lifecycle; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.core.MessageSelector; import org.springframework.jmx.export.annotation.ManagedAttribute; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/package-info.java index b9030334af..c2becaaab8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to channel interception. */ -package org.springframework.integration.channel.interceptor; \ No newline at end of file +package org.springframework.integration.channel.interceptor; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/package-info.java index f256861dbc..ef7cb20443 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes representing various channel types. */ -package org.springframework.integration.channel; \ No newline at end of file +package org.springframework.integration.channel; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/ChannelRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/ChannelRegistry.java index 6cc15c015d..6cff673b4e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/ChannelRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/ChannelRegistry.java @@ -13,7 +13,7 @@ package org.springframework.integration.channel.registry; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; /** * A strategy interface used to bind a {@link MessageChannel} to a logical name. The name diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/LocalChannelRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/LocalChannelRegistry.java index 35c960b6a0..49f70a3a82 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/LocalChannelRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/registry/LocalChannelRegistry.java @@ -18,12 +18,12 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.channel.interceptor.WireTap; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.handler.BridgeHandler; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java index e97104d579..57457b34ac 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractSimpleMessageHandlerFactoryBean.java @@ -25,12 +25,12 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.MessageChannel; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.context.Orderable; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java index 2c4a3f1b8b..9fa35003ae 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/AbstractStandardMessageHandlerFactoryBean.java @@ -22,9 +22,9 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.MessageProcessor; +import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java index fd5ab55024..2ee7557f6c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/ConsumerEndpointFactoryBean.java @@ -33,11 +33,11 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.SmartLifecycle; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.context.IntegrationObjectSupport; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/CorrelationStrategyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/CorrelationStrategyFactoryBean.java index e455386c37..ee89bb05f6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/CorrelationStrategyFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/CorrelationStrategyFactoryBean.java @@ -18,26 +18,26 @@ package org.springframework.integration.config; import java.lang.reflect.Method; import org.springframework.beans.factory.FactoryBean; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.aggregator.CorrelationStrategy; -import org.springframework.integration.aggregator.MethodInvokingCorrelationStrategy; import org.springframework.integration.aggregator.HeaderAttributeCorrelationStrategy; +import org.springframework.integration.aggregator.MethodInvokingCorrelationStrategy; import org.springframework.util.StringUtils; /** * Convenience factory for XML configuration of a {@link CorrelationStrategy}. Encapsulates the knowledge of the default * strategy and search algorithms for POJO and annotated methods. - * + * * @author Dave Syer - * + * */ public class CorrelationStrategyFactoryBean implements FactoryBean { - private CorrelationStrategy delegate = new HeaderAttributeCorrelationStrategy(MessageHeaders.CORRELATION_ID); + private CorrelationStrategy delegate = new HeaderAttributeCorrelationStrategy(EiMessageHeaderAccessor.CORRELATION_ID); /** * Create a factory and set up the delegate which clients of the factory will see as its product. - * + * * @param target the target object (null if default strategy is acceptable) */ public CorrelationStrategyFactoryBean(Object target) { @@ -46,7 +46,7 @@ public class CorrelationStrategyFactoryBean implements FactoryBean>>>>>> Further Spring 4 updates. * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at @@ -17,16 +21,15 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.expression.Expression; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.router.AbstractMappingMessageRouter; import org.springframework.integration.router.AbstractMessageRouter; import org.springframework.integration.router.ExpressionEvaluatingRouter; import org.springframework.integration.router.MethodInvokingRouter; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.DestinationResolver; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -55,10 +58,9 @@ public class RouterFactoryBean extends AbstractStandardMessageHandlerFactoryBean private volatile Boolean ignoreSendFailures; - private volatile ChannelResolver channelResolver; + private volatile DestinationResolver channelResolver; - - public void setChannelResolver(ChannelResolver channelResolver) { + public void setChannelResolver(DestinationResolver channelResolver) { this.channelResolver = channelResolver; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/ServiceActivatorFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/ServiceActivatorFactoryBean.java index 77932a7973..d5d6b9a574 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/ServiceActivatorFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/ServiceActivatorFactoryBean.java @@ -17,12 +17,12 @@ package org.springframework.integration.config; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.handler.ServiceActivatingHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.util.StringUtils; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java index 5ade341e0d..b41e5c3035 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBean.java @@ -24,7 +24,7 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.context.SmartLifecycle; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.scheduling.PollerMetadata; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java index e3791c870d..cffe8f9438 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/SplitterFactoryBean.java @@ -17,12 +17,12 @@ package org.springframework.integration.config; import org.springframework.expression.Expression; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.splitter.AbstractMessageSplitter; import org.springframework.integration.splitter.DefaultMessageSplitter; import org.springframework.integration.splitter.ExpressionEvaluatingSplitter; import org.springframework.integration.splitter.MethodInvokingSplitter; +import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/TransformerFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/config/TransformerFactoryBean.java index b8bb21be3a..9590700005 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/TransformerFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/TransformerFactoryBean.java @@ -17,12 +17,12 @@ package org.springframework.integration.config; import org.springframework.expression.Expression; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.transformer.ExpressionEvaluatingTransformer; import org.springframework.integration.transformer.MessageTransformingHandler; import org.springframework.integration.transformer.MethodInvokingTransformer; import org.springframework.integration.transformer.Transformer; +import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java index 4b3e52b0af..8eada78a11 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/AbstractMethodAnnotationPostProcessor.java @@ -23,22 +23,21 @@ import java.util.Collection; import java.util.List; import org.aopalliance.aop.Advice; - import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.core.annotation.Order; -import org.springframework.integration.MessageChannel; import org.springframework.integration.context.Orderable; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolver; import org.springframework.util.Assert; import org.springframework.util.StringUtils; @@ -57,13 +56,13 @@ public abstract class AbstractMethodAnnotationPostProcessor channelResolver; public AbstractMethodAnnotationPostProcessor(ListableBeanFactory beanFactory) { Assert.notNull(beanFactory, "BeanFactory must not be null"); this.beanFactory = beanFactory; - this.channelResolver = new BeanFactoryChannelResolver(beanFactory); + this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory); } @@ -128,7 +127,7 @@ public abstract class AbstractMethodAnnotationPostProcessor { @@ -41,7 +41,7 @@ public class ServiceActivatorAnnotationPostProcessor extends AbstractMethodAnnot ServiceActivatingHandler serviceActivator = new ServiceActivatingHandler(bean, method); String outputChannelName = annotation.outputChannel(); if (StringUtils.hasText(outputChannelName)) { - serviceActivator.setOutputChannel(this.channelResolver.resolveChannelName(outputChannelName)); + serviceActivator.setOutputChannel(this.channelResolver.resolveDestination(outputChannelName)); } return serviceActivator; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessor.java index 51a7456374..e506154a61 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessor.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.integration.annotation.Splitter; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.splitter.MethodInvokingSplitter; import org.springframework.util.StringUtils; @@ -41,7 +41,7 @@ public class SplitterAnnotationPostProcessor extends AbstractMethodAnnotationPos MethodInvokingSplitter splitter = new MethodInvokingSplitter(bean, method); String outputChannelName = annotation.outputChannel(); if (StringUtils.hasText(outputChannelName)) { - splitter.setOutputChannel(this.channelResolver.resolveChannelName(outputChannelName)); + splitter.setOutputChannel(this.channelResolver.resolveDestination(outputChannelName)); } return splitter; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java index 30efbd0a36..d2db77dab2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/TransformerAnnotationPostProcessor.java @@ -20,7 +20,7 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.integration.annotation.Transformer; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.transformer.MessageTransformingHandler; import org.springframework.integration.transformer.MethodInvokingTransformer; import org.springframework.util.StringUtils; @@ -43,7 +43,7 @@ public class TransformerAnnotationPostProcessor extends AbstractMethodAnnotation MessageTransformingHandler handler = new MessageTransformingHandler(transformer); String outputChannelName = annotation.outputChannel(); if (StringUtils.hasText(outputChannelName)) { - handler.setOutputChannel(this.channelResolver.resolveChannelName(outputChannelName)); + handler.setOutputChannel(this.channelResolver.resolveDestination(outputChannelName)); } return handler; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/package-info.java index 5d4651e249..34352df4f2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/annotation/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting annotation-based configuration. */ -package org.springframework.integration.config.annotation; \ No newline at end of file +package org.springframework.integration.config.annotation; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/config/package-info.java index 1f1d949c99..477d8329fb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/package-info.java @@ -1,4 +1,4 @@ /** * Base package for configuration. */ -package org.springframework.integration.config; \ No newline at end of file +package org.springframework.integration.config; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java index dd54c51aac..46061d4784 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractChannelAdapterParser.java @@ -33,7 +33,7 @@ import org.springframework.util.StringUtils; /** * Base parser for Channel Adapters. *

- * Includes logic to determine {@link org.springframework.integration.MessageChannel}: + * Includes logic to determine {@link org.springframework.messaging.MessageChannel}: * if 'channel' attribute is defined - uses its value as 'channelName'; * if 'id' attribute is defined - creates {@link DirectChannel} at runtime and uses id's value as 'channelName'; * if current component is defined as nested element inside any other components e.g. <chain> diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java index 614bbf922c..0c10c3dd6c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/AbstractOutboundChannelAdapterParser.java @@ -36,7 +36,7 @@ import org.springframework.util.xml.DomUtils; * If this component is defined as the top-level element in the Spring application context it will produce * an {@link org.springframework.integration.endpoint.AbstractEndpoint} depending on the channel type. * If this component is defined as nested element (e.g., inside of the chain) it will produce - * a {@link org.springframework.integration.core.MessageHandler}. + * a {@link org.springframework.messaging.MessageHandler}. * * @author Mark Fisher * @author Gary Russell diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInitializer.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInitializer.java index f00baeb651..6db3947d5f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInitializer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/ChannelInitializer.java @@ -136,4 +136,4 @@ final class ChannelInitializer implements BeanFactoryAware, InitializingBean { return channelNames; } } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessor.java index 92a3f211d2..cfb8c06e70 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/DefaultConfiguringBeanFactoryPostProcessor.java @@ -73,23 +73,26 @@ class DefaultConfiguringBeanFactoryPostProcessor implements BeanFactoryPostProce } } - private void registerIdGeneratorConfigurer(BeanDefinitionRegistry registry) { - String listenerClassName = "org.springframework.integration.config.IdGeneratorConfigurer"; + private void registerInfrastructureBean(BeanDefinitionRegistry registry, String className) { String[] definitionNames = registry.getBeanDefinitionNames(); for (String definitionName : definitionNames) { BeanDefinition definition = registry.getBeanDefinition(definitionName); - if (listenerClassName.equals(definition.getBeanClassName())) { + if (className.equals(definition.getBeanClassName())) { if (logger.isInfoEnabled()) { - logger.info(listenerClassName + " is already registered and will be used"); + logger.info(className + " is already registered and will be used"); } return; } } - RootBeanDefinition beanDefinition = new RootBeanDefinition(listenerClassName); + RootBeanDefinition beanDefinition = new RootBeanDefinition(className); beanDefinition.setRole(BeanDefinition.ROLE_INFRASTRUCTURE); BeanDefinitionReaderUtils.registerWithGeneratedName(beanDefinition, registry); } + private void registerIdGeneratorConfigurer(BeanDefinitionRegistry registry) { + registerInfrastructureBean(registry, "org.springframework.integration.config.IdGeneratorConfigurer"); + } + /** * Register a null channel in the given BeanDefinitionRegistry. The bean name is defined by the constant * {@link IntegrationContextUtils#NULL_CHANNEL_BEAN_NAME}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PublishingInterceptorParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PublishingInterceptorParser.java index ad8bb45fd8..3e52c76c27 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PublishingInterceptorParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/PublishingInterceptorParser.java @@ -35,7 +35,7 @@ import org.springframework.util.xml.DomUtils; /** * Parser for the <publishing-interceptor> element. - * + * * @author Oleg Zhurakousky * @author Mark Fisher * @since 2.0 @@ -52,14 +52,16 @@ public class PublishingInterceptorParser extends AbstractBeanDefinitionParser { if (mappings.get("headers") != null) { spelSourceBuilder.addPropertyValue("headerExpressionMap", mappings.get("headers")); } + BeanDefinitionBuilder chResolverBuilder = BeanDefinitionBuilder.genericBeanDefinition( - "org.springframework.integration.support.channel.BeanFactoryChannelResolver"); + "org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver"); + if (mappings.get("channels") != null){ spelSourceBuilder.addPropertyValue("channelMap", mappings.get("channels")); } - String chResolverName = + String chResolverName = BeanDefinitionReaderUtils.registerWithGeneratedName(chResolverBuilder.getBeanDefinition(), parserContext.getRegistry()); - String defaultChannel = StringUtils.hasText(element.getAttribute("default-channel")) ? + String defaultChannel = StringUtils.hasText(element.getAttribute("default-channel")) ? element.getAttribute("default-channel") : IntegrationContextUtils.NULL_CHANNEL_BEAN_NAME; rootBuilder.addConstructorArgValue(spelSourceBuilder.getBeanDefinition()); rootBuilder.addPropertyReference("channelResolver", chResolverName); @@ -74,12 +76,12 @@ public class PublishingInterceptorParser extends AbstractBeanDefinitionParser { Map> headersExpressionMap = new HashMap>(); Map channelMap = new HashMap(); ManagedMap resolvableChannelMap = new ManagedMap(); - if (mappings != null && mappings.size() > 0) { + if (mappings != null && mappings.size() > 0) { for (Element mapping : mappings) { // set payloadMap - String methodPattern = StringUtils.hasText(mapping.getAttribute("pattern")) ? + String methodPattern = StringUtils.hasText(mapping.getAttribute("pattern")) ? mapping.getAttribute("pattern") : "*"; - String payloadExpression = StringUtils.hasText(mapping.getAttribute("payload")) ? + String payloadExpression = StringUtils.hasText(mapping.getAttribute("payload")) ? mapping.getAttribute("payload") : "#return"; payloadExpressionMap.put(methodPattern, payloadExpression); @@ -117,7 +119,7 @@ public class PublishingInterceptorParser extends AbstractBeanDefinitionParser { channelMap.put(methodPattern, channel); resolvableChannelMap.put(channel, new RuntimeBeanReference(channel)); } - } + } if (payloadExpressionMap.size() == 0) { payloadExpressionMap.put("*", "#return"); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/StandardHeaderEnricherParser.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/StandardHeaderEnricherParser.java index a87265bdf4..625357df22 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/StandardHeaderEnricherParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/StandardHeaderEnricherParser.java @@ -20,7 +20,8 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; +import org.springframework.messaging.MessageHeaders; import org.springframework.util.StringUtils; /** @@ -29,7 +30,7 @@ import org.springframework.util.StringUtils; * configurable {@link MessageHeaders}, such as 'reply-channel', 'priority', * and 'correlation-id'. It will also accept custom header values (or bean * references) if provided as 'header' sub-elements. - * + * * @author Mark Fisher * @author Oleg Zhurakousky */ @@ -38,9 +39,9 @@ public class StandardHeaderEnricherParser extends HeaderEnricherParserSupport { public StandardHeaderEnricherParser() { this.addElementToHeaderMapping("reply-channel", MessageHeaders.REPLY_CHANNEL); this.addElementToHeaderMapping("error-channel", MessageHeaders.ERROR_CHANNEL); - this.addElementToHeaderMapping("correlation-id", MessageHeaders.CORRELATION_ID); - this.addElementToHeaderMapping("expiration-date", MessageHeaders.EXPIRATION_DATE, Long.class); - this.addElementToHeaderMapping("priority", MessageHeaders.PRIORITY, Integer.class); + this.addElementToHeaderMapping("correlation-id", EiMessageHeaderAccessor.CORRELATION_ID); + this.addElementToHeaderMapping("expiration-date", EiMessageHeaderAccessor.EXPIRATION_DATE, Long.class); + this.addElementToHeaderMapping("priority", EiMessageHeaderAccessor.PRIORITY, Integer.class); } @Override diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/package-info.java index ff7024ec27..dea2310f51 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/xml/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/xml/package-info.java @@ -1,4 +1,4 @@ /** * Provides supporting XML-based configuration - parsers, namespace handlers. */ -package org.springframework.integration.config.xml; \ No newline at end of file +package org.springframework.integration.config.xml; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java index 184513990f..9e80a68860 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationContextUtils.java @@ -19,8 +19,8 @@ package org.springframework.integration.context; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.convert.ConversionService; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.MessageChannel; import org.springframework.integration.store.metadata.MetadataStore; +import org.springframework.messaging.MessageChannel; import org.springframework.scheduling.TaskScheduler; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/context/package-info.java index 6766d37a52..1acc7924df 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/context/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/context/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes relating to application context configuration. */ -package org.springframework.integration.context; \ No newline at end of file +package org.springframework.integration.context; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingOperations.java b/spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingOperations.java index 4d735344be..e34b38c321 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingOperations.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingOperations.java @@ -18,8 +18,10 @@ package org.springframework.integration.core; import java.util.concurrent.Future; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.MessagePostProcessor; /** * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingTemplate.java b/spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingTemplate.java index 6118cea71d..91a73eee80 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingTemplate.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/AsyncMessagingTemplate.java @@ -23,15 +23,18 @@ import java.util.concurrent.Future; import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.support.TaskExecutorAdapter; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; +import org.springframework.messaging.core.MessagePostProcessor; import org.springframework.util.Assert; /** * @author Mark Fisher * @since 2.0 */ -public class AsyncMessagingTemplate extends MessagingTemplate implements AsyncMessagingOperations { +public class AsyncMessagingTemplate extends GenericMessagingTemplate implements AsyncMessagingOperations { private volatile AsyncTaskExecutor executor = new SimpleAsyncTaskExecutor(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java deleted file mode 100644 index c5e168fa70..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.core; - -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; - -/** - * Base interface for any component that handles Messages. - * - * @author Mark Fisher - * @author Iwein Fuld - */ -public interface MessageHandler { - - /** - * Handles the message if possible. If the handler cannot deal with the - * message this will result in a MessageRejectedException e.g. - * in case of a Selective Consumer. When a consumer tries to handle a - * message, but fails to do so, a MessageHandlingException is - * thrown. In the last case it is recommended to treat the message as tainted - * and go into an error scenario. - *

- * When the handling results in a failure of another message being sent - * (e.g. a "reply" message), that failure will trigger a - * MessageDeliveryException. - * - * @param message the message to be handled - * @throws org.springframework.integration.MessageRejectedException if the handler doesn't accept the message - * @throws org.springframework.integration.MessageHandlingException when something fails during the handling - * @throws org.springframework.integration.MessageDeliveryException when this handler failed to deliver the - * reply related to the handling of the message - */ - void handleMessage(Message message) throws MessagingException; - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagePostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessagePostProcessor.java deleted file mode 100644 index fc7d6f58a7..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagePostProcessor.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.core; - -import org.springframework.integration.Message; - -/** - * To be used with MessagingTemplate's send method that converts an object to a message. - * It allows for further modification of the message after it has been processed - * by the converter. - * - *

This is often implemented as an anonymous class within a method implementation. - * - * @author Mark Fisher - * @since 2.0 - * @see MessagingTemplate#convertAndSend(String, Object, MessagePostProcessor) - * @see MessagingTemplate#convertAndSend(org.springframework.integration.MessageChannel, Object, MessagePostProcessor) - * @see org.springframework.integration.support.converter.MessageConverter - */ -public interface MessagePostProcessor { - - /** - * Apply a MessagePostProcessor to the message. The returned message is - * typically a modified version of the original. - * @param message the message returned from the MessageConverter - * @return the modified version of the Message - */ - Message postProcessMessage(Message message); - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageProducer.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageProducer.java index 98e967dea9..ea25231a5a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageProducer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageProducer.java @@ -16,7 +16,7 @@ package org.springframework.integration.core; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; /** * Base interface for any component that is capable of sending diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSelector.java index 0cb791abf0..bdd25735b6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSelector.java @@ -16,7 +16,7 @@ package org.springframework.integration.core; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Strategy interface for message selection. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSource.java index 8ba2540068..e806f1f538 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageSource.java @@ -16,7 +16,7 @@ package org.springframework.integration.core; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Base interface for any source of {@link Message Messages} that can be polled. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingOperations.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingOperations.java deleted file mode 100644 index a15183dd2b..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingOperations.java +++ /dev/null @@ -1,335 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.core; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.support.channel.ChannelResolutionException; -import org.springframework.integration.support.channel.ChannelResolver; - -/** - * Specifies a basic set of messaging operations. - * - *

Implemented by {@link MessagingTemplate}. Even though most calling code - * will depend on the template directly (e.g. to access setter methods), this - * interface is a useful option to enhance testability, as it can easily be mocked - * or stubbed. - * - *

Defines a variety of methods for sending and receiving {@link Message}s - * across {@link MessageChannel}s including the use of converters where necessary. - * Convenience methods also support sending and receiving based on channel name, - * where the template will delegate to its {@link ChannelResolver} to locate the - * actual {@link MessageChannel} instance. - * - * @author Mark Fisher - * @since 2.0 - * @see MessagingTemplate - */ -public interface MessagingOperations { - - //------------------------------------------------------------------------- - // Convenience methods for sending messages - //------------------------------------------------------------------------- - - /** - * Send a message to the default channel. - *

This will only work with a default channel specified! - * @param message the message to send - * @throws MessagingException if an error occurs during message sending - */ -

void send(Message

message) throws MessagingException; - - /** - * Send a message to the specified channel. - * @param channel the channel to which the message will be sent - * @param message the message to send - * @throws MessagingException if an error occurs during message sending - */ -

void send(MessageChannel channel, Message

message) throws MessagingException; - - /** - * Send a message to the specified channel. - * @param channelName the name of the channel to which the message will be sent - * (to be resolved to an actual channel by a ChannelResolver) - * @param message the message to send - * @throws ChannelResolutionException if the channel name cannot be resolved - * @throws MessagingException if an error occurs during message sending - */ -

void send(String channelName, Message

message) throws MessagingException; - - - //------------------------------------------------------------------------- - // Convenience methods for sending auto-converted messages - //------------------------------------------------------------------------- - - /** - * Send the given object to the default channel, converting the object - * to a message with a configured MessageConverter. - *

This will only work with a default channel specified! - * @param message the object to convert to a message - * @throws MessagingException if an error occurs - */ - void convertAndSend(T message) throws MessagingException; - - /** - * Send the given object to the specified channel, converting the object - * to a message with a configured MessageConverter. - * @param channel the channel to send this message to - * @param message the object to convert to a message - * @throws MessagingException if an error occurs - */ - void convertAndSend(MessageChannel channel, T message) throws MessagingException; - - /** - * Send the given object to the specified channel, converting the object - * to a message with a configured MessageConverter. - * @param channelName the name of the channel to send this message to - * (to be resolved to an actual channel by a ChannelResolver) - * @param message the object to convert to a message - * @throws MessagingException if an error occurs - */ - void convertAndSend(String channelName, T message) throws MessagingException; - - /** - * Send the given object to the default channel, converting the object - * to a message with a configured MessageConverter. The MessagePostProcessor - * callback allows for modification of the message after conversion. - *

This will only work with a default channel specified! - * @param message the object to convert to a message - * @param postProcessor the callback to modify the message - * @throws MessagingException if an error occurs - */ - void convertAndSend(T message, MessagePostProcessor postProcessor) throws MessagingException; - - /** - * Send the given object to the specified channel, converting the object - * to a message with a configured MessageConverter. The MessagePostProcessor - * callback allows for modification of the message after conversion. - * @param channel the channel to which the message will be sent - * @param message the object to convert to a message - * @param postProcessor the callback to modify the message - * @throws MessagingException if an error occurs - */ - void convertAndSend(MessageChannel channel, T message, MessagePostProcessor postProcessor) throws MessagingException; - - /** - * Send the given object to the specified channel, converting the object - * to a message with a configured MessageConverter. The MessagePostProcessor - * callback allows for modification of the message after conversion. - * @param channelName the name of the channel to which the message will be sent - * (to be resolved to an actual channel by a ChannelResolver) - * @param message the object to convert to a message - * @param postProcessor the callback to modify the message - * @throws MessagingException if an error occurs - */ - void convertAndSend(String channelName, T message, MessagePostProcessor postProcessor) throws MessagingException; - - - //------------------------------------------------------------------------- - // Convenience methods for receiving messages - //------------------------------------------------------------------------- - - /** - * Receive a message synchronously from the default channel, but only - * wait up to a specified time for delivery. - *

This method should be used carefully, since it will block the thread - * until the message becomes available or until the timeout value is exceeded. - *

This will only work with a default channel specified! - * @return the message received from the default channel or null if the timeout expires - * @throws MessagingException if an error occurs during message reception - */ -

Message

receive() throws MessagingException; - - /** - * Receive a message synchronously from the specified channel, but only - * wait up to a specified time for delivery. - *

This method should be used carefully, since it will block the thread - * until the message becomes available or until the timeout value is exceeded. - * @param channel the channel from which a message should be received - * @return the message received from the channel or null if the timeout expires - * @throws MessagingException if an error occurs during message reception - */ -

Message

receive(PollableChannel channel) throws MessagingException; - - /** - * Receive a message synchronously from the specified channel, but only - * wait up to a specified time for delivery. - *

This method should be used carefully, since it will block the thread - * until the message becomes available or until the timeout value is exceeded. - * @param channelName the name of the channel from which a message should be received - * (to be resolved to an actual channel by a ChannelResolver) - * @return the message received from the channel or null if the timeout expires - * @throws ChannelResolutionException if the channel name cannot be resolved - * @throws MessagingException if an error occurs during message reception - */ -

Message

receive(String channelName) throws MessagingException; - - - //------------------------------------------------------------------------- - // Convenience methods for receiving auto-converted messages - //------------------------------------------------------------------------- - - /** - * Receive a message synchronously from the default channel, but only - * wait up to a specified time for delivery. Convert the message into an - * object with a configured MessageConverter. - *

This method should be used carefully, since it will block the thread - * until the message becomes available or until the timeout value is exceeded. - *

This will only work with a default channel specified! - * @return the message received from the channel or null if the timeout expires. - * @throws MessagingException if an error occurs during message reception - */ - Object receiveAndConvert() throws MessagingException; - - /** - * Receive a message synchronously from the specified channel, but only - * wait up to a specified time for delivery. Convert the message into an - * object with a configured MessageConverter. - *

This method should be used carefully, since it will block the thread - * until the message becomes available or until the timeout value is exceeded. - * @param channel the channel from which a message should be received - * @return the message received from the channel or null if the timeout expires. - * @throws MessagingException if an error occurs during message reception - */ - Object receiveAndConvert(PollableChannel channel) throws MessagingException; - - /** - * Receive a message synchronously from the specified channel, but only - * wait up to a specified time for delivery. Convert the message into an - * object with a configured MessageConverter. - *

This method should be used carefully, since it will block the thread - * until the message becomes available or until the timeout value is exceeded. - * @param channelName the name of the channel from which a message should be received - * (to be resolved to an actual channel by a ChannelResolver) - * @return the message received from the channel or null if the timeout expires. - * @throws MessagingException if an error occurs during message reception - */ - Object receiveAndConvert(String channelName) throws MessagingException; - - - //------------------------------------------------------------------------- - // Convenience methods for sending request and receiving reply messages - //------------------------------------------------------------------------- - - /** - * Send a message to the default channel and receive a reply. - *

This will only work with a default channel specified! - * @param requestMessage the message to send - * @return the reply Message if received within the receive timeout. - * @throws MessagingException if an error occurs - */ - Message sendAndReceive(Message requestMessage); - - /** - * Send a message to the specified channel and receive a reply. - * @param channel the channel to which the request Message will be sent - * @param requestMessage the message to send - * @return the reply Message if received within the receive timeout. - * @throws MessagingException if an error occurs - */ - Message sendAndReceive(MessageChannel channel, Message requestMessage); - - /** - * Send a message to the specified channel and receive a reply. - * @param channelName the name of the channel to which the request Message will be sent - * (to be resolved to an actual channel by a ChannelResolver) - * @param requestMessage the message to send - * @return the reply Message if received within the receive timeout. - * @throws ChannelResolutionException if the channel name cannot be resolved - * @throws MessagingException if an error occurs - */ - Message sendAndReceive(String channelName, Message requestMessage); - - /** - * Send the given request object to the default channel, converting the object - * to a message with a configured MessageConverter. If a reply Message is - * received within the receive timeout, it will be converted and returned. - *

This will only work with a default channel specified! - * @param request the object to convert to a request message - * @return the result of converting the reply Message - * @throws MessagingException if an error occurs - */ - Object convertSendAndReceive(Object request); - - /** - * Send the given request object to the specified channel, converting the object - * to a message with a configured MessageConverter. If a reply Message is - * received within the receive timeout, it will be converted and returned. - * @param channel the channel to which the request message will be sent - * @param request the object to convert to a request message - * @return the result of converting the reply Message - * @throws MessagingException if an error occurs - */ - Object convertSendAndReceive(MessageChannel channel, Object request); - - /** - * Send the given request object to the specified channel, converting the object - * to a message with a configured MessageConverter. If a reply Message is - * received within the receive timeout, it will be converted and returned. - * @param channelName the name of the channel to which the request message will be sent - * (to be resolved to an actual channel by a ChannelResolver) - * @param request the object to convert to a request message - * @return the result of converting the reply Message - * @throws MessagingException if an error occurs - */ - Object convertSendAndReceive(String channelName, Object request); - - /** - * Send the given request object to the default channel, converting the object - * to a message with a configured MessageConverter. The MessagePostProcessor - * callback allows for modification of the request message after conversion. - * If a reply Message is received within the receive timeout, it will be - * converted and returned. - *

This will only work with a default channel specified! - * @param request the object to convert to a request message - * @param requestPostProcessor the callback to modify the request message - * @return the result of converting the reply Message - * @throws MessagingException if an error occurs - */ - Object convertSendAndReceive(Object request, MessagePostProcessor requestPostProcessor); - - /** - * Send the given request object to the specified channel, converting the object - * to a message with a configured MessageConverter. The MessagePostProcessor - * callback allows for modification of the request message after conversion. - * If a reply Message is received within the receive timeout, it will be - * converted and returned. - * @param channel the channel to which the request message will be sent - * @param request the object to convert to a request message - * @param requestPostProcessor the callback to modify the request message - * @return the result of converting the reply Message - * @throws MessagingException if an error occurs - */ - Object convertSendAndReceive(MessageChannel channel, Object request, MessagePostProcessor requestPostProcessor); - - /** - * Send the given request object to the specified channel, converting the object - * to a message with a configured MessageConverter. The MessagePostProcessor - * callback allows for modification of the request message after conversion. - * If a reply Message is received within the receive timeout, it will be - * converted and returned. - * @param channelName the name of the channel to which the request message will be sent - * (to be resolved to an actual channel by a ChannelResolver) - * @param request the object to convert to a request message - * @param requestPostProcessor the callback to modify the request message - * @return the result of converting the reply Message - * @throws MessagingException if an error occurs - */ - Object convertSendAndReceive(String channelName, Object request, MessagePostProcessor requestPostProcessor); - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java deleted file mode 100644 index 41df197255..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingTemplate.java +++ /dev/null @@ -1,462 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.core; - -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessagingException; -import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolutionException; -import org.springframework.integration.support.channel.ChannelResolver; -import org.springframework.integration.support.converter.MessageConverter; -import org.springframework.integration.support.converter.SimpleMessageConverter; -import org.springframework.util.Assert; - -/** - * This is the central class for invoking message exchange operations across - * {@link MessageChannel}s. It supports one-way send and receive calls as well - * as request/reply. - * - * @author Mark Fisher - * @author Oleg Zhurakousky - * @author Gary Russell - */ -public class MessagingTemplate implements MessagingOperations, BeanFactoryAware, InitializingBean { - - protected final Log logger = LogFactory.getLog(this.getClass()); - - private volatile MessageChannel defaultChannel; - - private volatile ChannelResolver channelResolver; - - private volatile MessageConverter messageConverter = new SimpleMessageConverter(); - - private volatile long sendTimeout = -1; - - private volatile long receiveTimeout = -1; - - private volatile boolean initialized; - - private final Object initializationMonitor = new Object(); - - private volatile boolean throwExceptionOnLateReply = false; - - - /** - * Create a MessagingTemplate with no default channel. Note, that one - * may be provided by invoking {@link #setDefaultChannel(MessageChannel)}. - */ - public MessagingTemplate() { - } - - /** - * Create a MessagingTemplate with the given default channel. - */ - public MessagingTemplate(MessageChannel defaultChannel) { - this.defaultChannel = defaultChannel; - } - - - /** - * Specify the default MessageChannel to use when invoking the send and/or - * receive methods that do not expect a channel parameter. - */ - public void setDefaultChannel(MessageChannel defaultChannel) { - this.defaultChannel = defaultChannel; - } - - /** - * Set the {@link ChannelResolver} that is to be used to resolve - * {@link MessageChannel} references for this template. - *

When running within an application context, the default resolver is a - * {@link BeanFactoryChannelResolver}. - */ - public void setChannelResolver(ChannelResolver channelResolver) { - Assert.notNull(channelResolver, "'channelResolver' must not be null"); - this.channelResolver = channelResolver; - } - - /** - * Set the {@link MessageConverter} that is to be used to convert - * between Messages and objects for this template. - *

The default is {@link SimpleMessageConverter}. - */ - public void setMessageConverter(MessageConverter messageConverter) { - Assert.notNull(messageConverter, "'messageConverter' must not be null"); - this.messageConverter = messageConverter; - } - - /** - * Specify the timeout value to use for send operations. - * - * @param sendTimeout the send timeout in milliseconds - */ - public void setSendTimeout(long sendTimeout) { - this.sendTimeout = sendTimeout; - } - - /** - * Specify the timeout value to use for receive operations. - * - * @param receiveTimeout the receive timeout in milliseconds - */ - public void setReceiveTimeout(long receiveTimeout) { - this.receiveTimeout = receiveTimeout; - } - - public void setBeanFactory(BeanFactory beanFactory) { - if (this.channelResolver == null && beanFactory != null) { - this.channelResolver = new BeanFactoryChannelResolver(beanFactory); - } - } - - /** - * Specify whether or not an attempt to send on the reply channel throws an exception - * if no receiving thread will actually receive the reply. This can occur - * if the receiving thread has already timed out, or will never call receive() - * because it caught an exception, or has already received a reply. - * (default false - just a WARN log is emitted in these cases). - * @param throwExceptionOnLateReply TRUE or FALSE. - */ - public void setThrowExceptionOnLateReply(boolean throwExceptionOnLateReply) { - this.throwExceptionOnLateReply = throwExceptionOnLateReply; - } - - public void afterPropertiesSet() { - synchronized (this.initializationMonitor) { - if (this.initialized) { - return; - } - this.initialized = true; - } - } - - public

void send(final Message

message) { - this.send(this.getRequiredDefaultChannel(), message); - } - - public

void send(final MessageChannel channel, final Message

message) { - this.doSend(channel, message); - } - - public

void send(final String channelName, final Message

message) { - this.send(this.resolveChannelName(channelName), message); - } - - public void convertAndSend(T object) { - Message message = this.messageConverter.toMessage(object); - if (message != null) { - this.send(message); - } - } - - public void convertAndSend(MessageChannel channel, T object) { - Message message = this.messageConverter.toMessage(object); - if (message != null) { - this.send(channel, message); - } - } - - public void convertAndSend(String channelName, T object) { - Message message = this.messageConverter.toMessage(object); - if (message != null) { - this.send(channelName, message); - } - } - - public void convertAndSend(T object, MessagePostProcessor postProcessor) { - Message message = this.messageConverter.toMessage(object); - message = postProcessor.postProcessMessage(message); - if (message != null) { - this.send(message); - } - } - - public void convertAndSend(MessageChannel channel, T object, MessagePostProcessor postProcessor) { - Message message = this.messageConverter.toMessage(object); - message = postProcessor.postProcessMessage(message); - if (message != null) { - this.send(channel, message); - } - } - - public void convertAndSend(String channelName, T object, MessagePostProcessor postProcessor) { - Message message = this.messageConverter.toMessage(object); - message = postProcessor.postProcessMessage(message); - if (message != null) { - this.send(channelName, message); - } - } - - public

Message

receive() { - MessageChannel channel = this.getRequiredDefaultChannel(); - Assert.state(channel instanceof PollableChannel, - "The 'defaultChannel' must be a PollableChannel for receive operations."); - return this.receive((PollableChannel) channel); - } - - public

Message

receive(final PollableChannel channel) { - return this.doReceive(channel); - } - - public

Message

receive(String channelName) { - MessageChannel channel = this.resolveChannelName(channelName); - Assert.isInstanceOf(PollableChannel.class, channel, - "A PollableChannel is required for receive operations. "); - return this.receive((PollableChannel) channel); - } - - public Object receiveAndConvert() throws MessagingException { - Message message = this.receive(); - return (message != null) ? this.messageConverter.fromMessage(message) : null; - } - - public Object receiveAndConvert(PollableChannel channel) throws MessagingException { - Message message = this.receive(channel); - return (message != null) ? this.messageConverter.fromMessage(message) : null; - } - - public Object receiveAndConvert(String channelName) throws MessagingException { - Message message = this.receive(channelName); - return (message != null) ? this.messageConverter.fromMessage(message) : null; - } - - public Message sendAndReceive(final Message requestMessage) { - return this.sendAndReceive(this.getRequiredDefaultChannel(), requestMessage); - } - - public Message sendAndReceive(final MessageChannel channel, final Message requestMessage) { - return this.doSendAndReceive(channel, requestMessage); - } - - public Message sendAndReceive(final String channelName, final Message requestMessage) { - return this.sendAndReceive(this.resolveChannelName(channelName), requestMessage); - } - - public Object convertSendAndReceive(final Object request) { - Message requestMessage = this.messageConverter.toMessage(request); - Message replyMessage = this.sendAndReceive(requestMessage); - return this.messageConverter.fromMessage(replyMessage); - } - - public Object convertSendAndReceive(final MessageChannel channel, final Object request) { - Message requestMessage = this.messageConverter.toMessage(request); - Message replyMessage = this.sendAndReceive(channel, requestMessage); - return this.messageConverter.fromMessage(replyMessage); - } - - public Object convertSendAndReceive(final String channelName, final Object request) { - Message requestMessage = this.messageConverter.toMessage(request); - Message replyMessage = this.sendAndReceive(channelName, requestMessage); - return this.messageConverter.fromMessage(replyMessage); - } - - public Object convertSendAndReceive(final Object request, MessagePostProcessor requestPostProcessor) { - Message requestMessage = this.messageConverter.toMessage(request); - requestMessage = requestPostProcessor.postProcessMessage(requestMessage); - Message replyMessage = this.sendAndReceive(requestMessage); - return this.messageConverter.fromMessage(replyMessage); - } - - public Object convertSendAndReceive(final MessageChannel channel, final Object request, MessagePostProcessor requestPostProcessor) { - Message requestMessage = this.messageConverter.toMessage(request); - requestMessage = requestPostProcessor.postProcessMessage(requestMessage); - Message replyMessage = this.sendAndReceive(channel, requestMessage); - return this.messageConverter.fromMessage(replyMessage); - } - - public Object convertSendAndReceive(final String channelName, final Object request, MessagePostProcessor requestPostProcessor) { - Message requestMessage = this.messageConverter.toMessage(request); - requestMessage = requestPostProcessor.postProcessMessage(requestMessage); - Message replyMessage = this.sendAndReceive(channelName, requestMessage); - return this.messageConverter.fromMessage(replyMessage); - } - - private void doSend(MessageChannel channel, Message message) { - Assert.notNull(channel, "channel must not be null"); - long timeout = this.sendTimeout; - boolean sent = (timeout >= 0) - ? channel.send(message, timeout) - : channel.send(message); - if (!sent) { - throw new MessageDeliveryException(message, - "failed to send message to channel '" + channel + "' within timeout: " + timeout); - } - } - - @SuppressWarnings("unchecked") - private

Message

doReceive(PollableChannel channel) { - Assert.notNull(channel, "channel must not be null"); - long timeout = this.receiveTimeout; - Message message = (timeout >= 0) - ? channel.receive(timeout) - : channel.receive(); - if (message == null && this.logger.isTraceEnabled()) { - this.logger.trace("failed to receive message from channel '" + channel + "' within timeout: " + timeout); - } - return (Message

) message; - } - - private Message doSendAndReceive(MessageChannel channel, Message requestMessage) { - Object originalReplyChannelHeader = requestMessage.getHeaders().getReplyChannel(); - Object originalErrorChannelHeader = requestMessage.getHeaders().getErrorChannel(); - TemporaryReplyChannel replyChannel = new TemporaryReplyChannel(this.receiveTimeout, this.throwExceptionOnLateReply); - requestMessage = MessageBuilder.fromMessage(requestMessage) - .setReplyChannel(replyChannel) - .setErrorChannel(replyChannel) - .build(); - try { - this.doSend(channel, requestMessage); - } - catch (RuntimeException e) { - replyChannel.setClientWontReceive(true); - throw e; - } - Message reply = this.doReceive(replyChannel); - if (reply != null) { - reply = MessageBuilder.fromMessage(reply) - .setHeader(MessageHeaders.REPLY_CHANNEL, originalReplyChannelHeader) - .setHeader(MessageHeaders.ERROR_CHANNEL, originalErrorChannelHeader) - .build(); - } - return reply; - } - - private MessageChannel getRequiredDefaultChannel() { - Assert.state(this.defaultChannel != null, - "No 'defaultChannel' specified for MessagingTemplate. " - + "Unable to invoke methods without an explicit channel argument."); - return this.defaultChannel; - } - - private ChannelResolver getRequiredChannelResolver() { - Assert.state(this.channelResolver != null, - "No 'channelResolver' specified for MessagingTemplate. " - + "Unable to invoke methods with a channel name argument."); - return this.channelResolver; - } - - /** - * Resolve the given channel name into a {@link MessageChannel}, - * via this template's {@link ChannelResolver} if available. - * @param channelName the name of the channel - * @return the resolved {@link MessageChannel} - * @throws IllegalStateException if this template does not have a ChannelResolver - * @throws ChannelResolutionException if the channel name cannot be resolved - * @see #setChannelResolver - */ - protected MessageChannel resolveChannelName(String channelName) { - return getRequiredChannelResolver().resolveChannelName(channelName); - } - - - private static class TemporaryReplyChannel implements PollableChannel { - - private static final Log logger = LogFactory.getLog(TemporaryReplyChannel.class); - - private volatile Message message; - - private final long receiveTimeout; - - private final CountDownLatch latch = new CountDownLatch(1); - - private final boolean throwExceptionOnLateReply; - - private volatile boolean clientTimedOut; - - private volatile boolean clientWontReceive; - - private volatile boolean clientHasReceived; - - - public TemporaryReplyChannel(long receiveTimeout, boolean throwExceptionOnLateReply) { - this.receiveTimeout = receiveTimeout; - this.throwExceptionOnLateReply = throwExceptionOnLateReply; - } - - public void setClientWontReceive(boolean clientWontReceive) { - this.clientWontReceive = clientWontReceive; - } - - - public Message receive() { - return this.receive(-1); - } - - public Message receive(long timeout) { - try { - if (this.receiveTimeout < 0) { - this.latch.await(); - this.clientHasReceived = true; - } - else { - if (this.latch.await(this.receiveTimeout, TimeUnit.MILLISECONDS)) { - this.clientHasReceived = true; - } - else { - this.clientTimedOut = true; - } - } - } - catch (InterruptedException e) { - Thread.currentThread().interrupt(); - } - return this.message; - } - - public boolean send(Message message) { - return this.send(message, -1); - } - - public boolean send(Message message, long timeout) { - this.message = message; - this.latch.countDown(); - if (this.clientTimedOut || this.clientHasReceived || this.clientWontReceive) { - String exceptionMessage = ""; - if (this.clientTimedOut) { - exceptionMessage = "Reply message being sent, but the receiving thread has already timed out"; - } - else if (this.clientHasReceived) { - exceptionMessage = "Reply message being sent, but the receiving thread has already received a reply"; - } - else if (this.clientWontReceive) { - exceptionMessage = "Reply message being sent, but the receiving thread has already caught an exception and won't receive"; - } - - if (logger.isWarnEnabled()) { - logger.warn(exceptionMessage + ":" + message); - } - if (this.throwExceptionOnLateReply) { - throw new MessageDeliveryException(message, exceptionMessage); - } - } - return true; - } - } -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/PollableChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/core/PollableChannel.java deleted file mode 100644 index c6df5edcdf..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/PollableChannel.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.core; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; - -/** - * Interface for Message Channels from which Messages may be actively received through polling. - * - * @author Mark Fisher - */ -public interface PollableChannel extends MessageChannel { - - /** - * Receive a message from this channel, blocking indefinitely if necessary. - * - * @return the next available {@link Message} or null if interrupted - */ - Message receive(); - - /** - * Receive a message from this channel, blocking until either a message is - * available or the specified timeout period elapses. - * - * @param timeout the timeout in milliseconds - * - * @return the next available {@link Message} or null if the - * specified timeout period elapses or the message reception is interrupted - */ - Message receive(long timeout); - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/SubscribableChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/core/SubscribableChannel.java deleted file mode 100644 index 641df47430..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/SubscribableChannel.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.core; - -import org.springframework.integration.MessageChannel; - -/** - * Interface for any MessageChannel implementation that accepts subscribers. - * The subscribers must implement the {@link MessageHandler} interface and - * will be invoked when a Message is available. - * - * @author Mark Fisher - */ -public interface SubscribableChannel extends MessageChannel { - - /** - * Register a {@link MessageHandler} as a subscriber to this channel. - */ - boolean subscribe(MessageHandler handler); - - /** - * Remove a {@link MessageHandler} from the subscribers of this channel. - */ - boolean unsubscribe(MessageHandler handler); - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/core/package-info.java index 17d77270e4..b6f850c488 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/package-info.java @@ -1,4 +1,4 @@ /** * Provides core classes. */ -package org.springframework.integration.core; \ No newline at end of file +package org.springframework.integration.core; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java index 59c9ab5fe5..9b3b8524bd 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AbstractDispatcher.java @@ -20,7 +20,7 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java index 07a1202f9c..548f425e74 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryException.java @@ -16,17 +16,17 @@ package org.springframework.integration.dispatcher; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.util.StringUtils; - import java.util.Collections; import java.util.List; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.util.StringUtils; + /** * An Exception that encapsulates an aggregated group of Exceptions for use by dispatchers * that may try multiple handler invocations within a single dispatch operation. - * + * * @author Mark Fisher * @since 1.0.3 */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java index b17c4cdfd6..22ec337091 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/BroadcastingDispatcher.java @@ -19,11 +19,11 @@ package org.springframework.integration.dispatcher; import java.util.Collection; import java.util.concurrent.Executor; -import org.springframework.integration.Message; import org.springframework.integration.MessageDispatchingException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; /** * A broadcasting dispatcher implementation. If the 'ignoreFailures' property is set to false (the diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/LoadBalancingStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/LoadBalancingStrategy.java index d7e9744bd1..31b678b0e6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/LoadBalancingStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/LoadBalancingStrategy.java @@ -18,8 +18,8 @@ package org.springframework.integration.dispatcher; import java.util.Collection; import java.util.Iterator; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; /** * Strategy for determining the iteration order of a MessageHandler list. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java index bd8a26fd17..5419a42211 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/MessageDispatcher.java @@ -16,8 +16,8 @@ package org.springframework.integration.dispatcher; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; /** * Strategy interface for dispatching messages to handlers. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/RoundRobinLoadBalancingStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/RoundRobinLoadBalancingStrategy.java index 36531f659f..41e15d24c8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/RoundRobinLoadBalancingStrategy.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/RoundRobinLoadBalancingStrategy.java @@ -20,8 +20,8 @@ import java.util.Collection; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; /** * Round-robin implementation of {@link LoadBalancingStrategy}. This diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java index 669278a4bf..b14a7a8b91 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/UnicastingDispatcher.java @@ -23,11 +23,11 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageDispatchingException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; /** * Implementation of {@link MessageDispatcher} that will attempt to send a diff --git a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/package-info.java index e23dc44523..126e182014 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/dispatcher/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to dispatching messages. */ -package org.springframework.integration.dispatcher; \ No newline at end of file +package org.springframework.integration.dispatcher; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractMessageSource.java index 34490dfafd..c27353b76e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractMessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractMessageSource.java @@ -21,8 +21,8 @@ import java.util.HashMap; import java.util.Map; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.core.MessageSource; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.util.AbstractExpressionEvaluator; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java index 603fda3c71..344a702290 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/AbstractPollingEndpoint.java @@ -22,19 +22,20 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledFuture; import org.aopalliance.aop.Advice; + import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.core.task.SyncTaskExecutor; -import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.MessagePublishingErrorHandler; -import org.springframework.integration.message.ErrorMessage; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor; import org.springframework.integration.transaction.IntegrationResourceHolder; import org.springframework.integration.transaction.TransactionSynchronizationFactory; import org.springframework.integration.util.ErrorHandlingTaskExecutor; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.scheduling.Trigger; import org.springframework.scheduling.support.PeriodicTrigger; import org.springframework.transaction.support.TransactionSynchronizationManager; @@ -120,7 +121,7 @@ public abstract class AbstractPollingEndpoint extends AbstractEndpoint implement if (this.errorHandler == null) { Assert.notNull(this.getBeanFactory(), "BeanFactory is required"); this.errorHandler = new MessagePublishingErrorHandler( - new BeanFactoryChannelResolver(getBeanFactory())); + new BeanFactoryMessageChannelDestinationResolver(getBeanFactory())); } this.taskExecutor = new ErrorHandlingTaskExecutor(this.taskExecutor, this.errorHandler); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/EventDrivenConsumer.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/EventDrivenConsumer.java index 4ab36be2f1..bcd4057b3a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/EventDrivenConsumer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/EventDrivenConsumer.java @@ -18,9 +18,9 @@ package org.springframework.integration.endpoint; import org.springframework.context.Lifecycle; import org.springframework.integration.context.IntegrationObjectSupport; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.support.context.NamedComponent; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java index 6e47a8de2f..727732fa69 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MessageProducerSupport.java @@ -16,21 +16,21 @@ package org.springframework.integration.endpoint; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageProducer; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.history.TrackableComponent; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.GenericMessagingTemplate; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.util.Assert; /** * A support class for producer endpoints that provides a setter for the * output channel and a convenience method for sending Messages. - * + * * @author Mark Fisher */ public abstract class MessageProducerSupport extends AbstractEndpoint implements MessageProducer, TrackableComponent { @@ -41,7 +41,7 @@ public abstract class MessageProducerSupport extends AbstractEndpoint implements private volatile boolean shouldTrack = false; - private final MessagingTemplate messagingTemplate = new MessagingTemplate(); + private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); public void setOutputChannel(MessageChannel outputChannel) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodInvokingMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodInvokingMessageSource.java index 1f00a94831..dacb3cb607 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodInvokingMessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/MethodInvokingMessageSource.java @@ -19,7 +19,7 @@ package org.springframework.integration.endpoint; import java.lang.reflect.Method; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.core.MessageSource; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/PollingConsumer.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/PollingConsumer.java index 5e0e4328ed..8cca2b4b68 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/PollingConsumer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/PollingConsumer.java @@ -17,9 +17,9 @@ package org.springframework.integration.endpoint; import org.springframework.context.Lifecycle; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.transaction.IntegrationResourceHolder; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java index 2250e40527..e03bf6504f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/SourcePollingChannelAdapter.java @@ -16,15 +16,15 @@ package org.springframework.integration.endpoint; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageSource; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.history.TrackableComponent; import org.springframework.integration.support.context.NamedComponent; import org.springframework.integration.transaction.IntegrationResourceHolder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.util.Assert; /** @@ -44,7 +44,7 @@ public class SourcePollingChannelAdapter extends AbstractPollingEndpoint private volatile boolean shouldTrack; - private final MessagingTemplate messagingTemplate = new MessagingTemplate(); + private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); /** * Specify the source to be polled for Messages. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/package-info.java index 6775816a8a..7d9c387e5e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/endpoint/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/endpoint/package-info.java @@ -1,4 +1,4 @@ /** * Provides core classes related to Endpoints. */ -package org.springframework.integration.endpoint; \ No newline at end of file +package org.springframework.integration.endpoint; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/expression/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/expression/package-info.java index fafb782014..46da20b571 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/expression/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/expression/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting SpEL expressions. */ -package org.springframework.integration.expression; \ No newline at end of file +package org.springframework.integration.expression; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java index b4e8170aa4..a755938bfe 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/AbstractMessageProcessingSelector.java @@ -20,7 +20,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.AbstractMessageProcessor; import org.springframework.integration.handler.MessageProcessor; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java index a40e1fe12a..0a95cbff97 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/MessageFilter.java @@ -17,8 +17,8 @@ package org.springframework.integration.filter; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.AbstractReplyProducingPostProcessingMessageHandler; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/filter/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/filter/package-info.java index 3261828323..2b1d4190e6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/filter/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/filter/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting the filter pattern. */ -package org.springframework.integration.filter; \ No newline at end of file +package org.springframework.integration.filter; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java index 074cb4c675..8594363ad3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapper.java @@ -35,8 +35,8 @@ import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java index 5a36590be8..991bb6c442 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/GatewayProxyFactoryBean.java @@ -40,16 +40,16 @@ import org.springframework.core.task.AsyncTaskExecutor; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.support.TaskExecutorAdapter; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.annotation.Gateway; import org.springframework.integration.annotation.Payload; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.history.TrackableComponent; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolver; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.CollectionUtils; @@ -82,7 +82,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab private volatile Long defaultReplyTimeout; - private volatile ChannelResolver channelResolver; + private volatile DestinationResolver channelResolver; private volatile boolean shouldTrack = false; @@ -216,7 +216,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab } BeanFactory beanFactory = this.getBeanFactory(); if (this.channelResolver == null && beanFactory != null) { - this.channelResolver = new BeanFactoryChannelResolver(beanFactory); + this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory); } Class proxyInterface = this.determineServiceInterface(); Method[] methods = ReflectionUtils.getAllDeclaredMethods(proxyInterface); @@ -424,7 +424,7 @@ public class GatewayProxyFactoryBean extends AbstractEndpoint implements Trackab private MessageChannel resolveChannelName(String channelName) { Assert.state(this.channelResolver != null, "ChannelResolver is required"); - MessageChannel channel = this.channelResolver.resolveChannelName(channelName); + MessageChannel channel = this.channelResolver.resolveDestination(channelName); Assert.notNull(channel, "failed to resolve channel '" + channelName + "'"); return channel; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java index 809770fa1d..828941294e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/MessagingGatewaySupport.java @@ -16,13 +16,6 @@ package org.springframework.integration.gateway; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; @@ -31,9 +24,16 @@ import org.springframework.integration.history.HistoryWritingMessagePostProcesso import org.springframework.integration.history.TrackableComponent; import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.integration.mapping.OutboundMessageMapper; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.converter.SimpleMessageConverter; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.util.Assert; /** @@ -41,7 +41,7 @@ import org.springframework.util.Assert; * {@link MessageChannel}s for sending, receiving, or request-reply operations. * Exposes setters for configuring request and reply {@link MessageChannel}s as * well as the timeout values for sending and receiving Messages. - * + * * @author Mark Fisher */ public abstract class MessagingGatewaySupport extends AbstractEndpoint implements TrackableComponent { @@ -62,7 +62,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement private final SimpleMessageConverter messageConverter = new SimpleMessageConverter(); - private final MessagingTemplate messagingTemplate; + private final GenericMessagingTemplate messagingTemplate; private final HistoryWritingMessagePostProcessor historyWritingPostProcessor = new HistoryWritingMessagePostProcessor(); @@ -74,7 +74,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement public MessagingGatewaySupport() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); template.setMessageConverter(this.messageConverter); template.setSendTimeout(DEFAULT_TIMEOUT); template.setReceiveTimeout(this.replyTimeout); @@ -84,7 +84,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement /** * Set the request channel. - * + * * @param requestChannel the channel to which request messages will be sent */ public void setRequestChannel(MessageChannel requestChannel) { @@ -94,7 +94,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement /** * Set the reply channel. If no reply channel is provided, this gateway will * always use an anonymous, temporary channel for handling replies. - * + * * @param replyChannel the channel from which reply messages will be received */ public void setReplyChannel(MessageChannel replyChannel) { @@ -113,7 +113,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement /** * Set the timeout value for sending request messages. If not * explicitly configured, the default is one second. - * + * * @param requestTimeout the timeout value in milliseconds */ public void setRequestTimeout(long requestTimeout) { @@ -123,7 +123,7 @@ public abstract class MessagingGatewaySupport extends AbstractEndpoint implement /** * Set the timeout value for receiving reply messages. If not * explicitly configured, the default is one second. - * + * * @param replyTimeout the timeout value in milliseconds */ public void setReplyTimeout(long replyTimeout) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyExchanger.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyExchanger.java index 3e1d22742c..cc15ccb216 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyExchanger.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyExchanger.java @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Interface for a request/reply Message exchange. This will be used as a default diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyMessageHandlerAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyMessageHandlerAdapter.java index 124b693560..4cce94cb89 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyMessageHandlerAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RequestReplyMessageHandlerAdapter.java @@ -16,8 +16,8 @@ package org.springframework.integration.gateway; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/package-info.java index 6fea0d3a98..443b036544 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting messaging gateways. */ -package org.springframework.integration.gateway; \ No newline at end of file +package org.springframework.integration.gateway; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java index 11c707421d..e189b6ae3d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageHandler.java @@ -17,12 +17,12 @@ package org.springframework.integration.handler; import org.springframework.core.Ordered; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.context.Orderable; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.history.TrackableComponent; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java index 929bc5c0a3..4b8959c7ea 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractMessageProcessor.java @@ -16,7 +16,7 @@ package org.springframework.integration.handler; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.util.AbstractExpressionEvaluator; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java index a16f66d383..95ab54ba3b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandler.java @@ -21,15 +21,15 @@ import java.util.List; import org.aopalliance.aop.Advice; import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.BeanClassLoaderAware; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageProducer; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.ChannelResolutionException; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.core.DestinationResolutionException; +import org.springframework.messaging.core.DestinationResolver; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.CollectionUtils; @@ -49,7 +49,7 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa private volatile boolean requiresReply = false; - private final MessagingTemplate messagingTemplate; + private final GenericMessagingTemplate messagingTemplate; private volatile RequestHandler advisedRequestHandler; @@ -60,7 +60,7 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa public AbstractReplyProducingMessageHandler() { - this.messagingTemplate = new MessagingTemplate(); + this.messagingTemplate = new GenericMessagingTemplate(); } @@ -76,11 +76,11 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa } /** - * Set the ChannelResolver to be used when there is no default output channel. + * Set the DestinationResolver to be used when there is no default output channel. */ - public void setChannelResolver(ChannelResolver channelResolver) { + public void setChannelResolver(DestinationResolver channelResolver) { Assert.notNull(channelResolver, "'channelResolver' must not be null"); - this.messagingTemplate.setChannelResolver(channelResolver); + this.messagingTemplate.setDestinationResolver(channelResolver); } /** @@ -92,9 +92,9 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa } /** - * Provides access to the {@link MessagingTemplate} for subclasses. + * Provides access to the {@link GenericMessagingTemplate} for subclasses. */ - protected MessagingTemplate getMessagingTemplate() { + protected GenericMessagingTemplate getMessagingTemplate() { return this.messagingTemplate; } @@ -210,7 +210,7 @@ public abstract class AbstractReplyProducingMessageHandler extends AbstractMessa this.sendMessage(replyMessage, replyChannelHeaderValue); } else { - throw new ChannelResolutionException("no output-channel or replyChannel header available"); + throw new DestinationResolutionException("no output-channel or replyChannel header available"); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingPostProcessingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingPostProcessingMessageHandler.java index a6a4a9f871..3677a55c7b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingPostProcessingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractReplyProducingPostProcessingMessageHandler.java @@ -15,7 +15,7 @@ */ package org.springframework.integration.handler; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * @author Gary Russell diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/BridgeHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/BridgeHandler.java index 576ed298c7..6cc290a3f5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/BridgeHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/BridgeHandler.java @@ -16,7 +16,7 @@ package org.springframework.integration.handler; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * A simple MessageHandler implementation that passes the request Message diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java index 304fdb9edb..bc532b9ce1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java @@ -32,11 +32,8 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; import org.springframework.integration.context.IntegrationObjectSupport; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; @@ -44,6 +41,9 @@ import org.springframework.integration.store.MessageStore; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.jmx.export.annotation.ManagedResource; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionCommandMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionCommandMessageProcessor.java index 5a373c50bf..d4342d6dcd 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionCommandMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionCommandMessageProcessor.java @@ -28,7 +28,7 @@ import org.springframework.expression.MethodExecutor; import org.springframework.expression.MethodFilter; import org.springframework.expression.MethodResolver; import org.springframework.expression.spel.support.ReflectiveMethodResolver; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * A MessageProcessor implementation that expects an Expression or expressionString @@ -114,4 +114,4 @@ public class ExpressionCommandMessageProcessor extends AbstractMessageProcessor< } } -} +} \ No newline at end of file diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java index 4fa5ca6f3e..802fc434bb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageHandler.java @@ -1 +1 @@ -/* * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.springframework.integration.handler; import org.springframework.expression.Expression; import org.springframework.integration.Message; import org.springframework.util.Assert; /** * A {@link org.springframework.integration.core.MessageHandler} that evaluates * the provided {@link Expression} expecting a void return. * * @author Artem Bilan * @see MethodInvokingMessageHandler * @since 2.1 */ public class ExpressionEvaluatingMessageHandler extends AbstractMessageHandler { private volatile ExpressionEvaluatingMessageProcessor processor; private volatile String componentType; public ExpressionEvaluatingMessageHandler(Expression expression) { Assert.notNull(expression, "Expression must not be null"); this.processor = new ExpressionEvaluatingMessageProcessor( expression, Void.class); } public void setComponentType(String componentType) { this.componentType = componentType; } @Override public String getComponentType() { return this.componentType; } @Override protected void onInit() throws Exception { this.processor.setBeanFactory(getBeanFactory()); } @Override protected void handleMessageInternal(Message message) throws Exception { this.processor.processMessage(message); } } \ No newline at end of file +/* * Copyright 2002-2011 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.springframework.integration.handler; import org.springframework.expression.Expression; import org.springframework.messaging.Message; import org.springframework.util.Assert; /** * A {@link org.springframework.messaging.MessageHandler} that evaluates * the provided {@link Expression} expecting a void return. * * @author Artem Bilan * @see MethodInvokingMessageHandler * @since 2.1 */ public class ExpressionEvaluatingMessageHandler extends AbstractMessageHandler { private volatile ExpressionEvaluatingMessageProcessor processor; private volatile String componentType; public ExpressionEvaluatingMessageHandler(Expression expression) { Assert.notNull(expression, "Expression must not be null"); this.processor = new ExpressionEvaluatingMessageProcessor( expression, Void.class); } public void setComponentType(String componentType) { this.componentType = componentType; } @Override public String getComponentType() { return this.componentType; } @Override protected void onInit() throws Exception { this.processor.setBeanFactory(getBeanFactory()); } @Override protected void handleMessageInternal(Message message) throws Exception { this.processor.processMessage(message); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessor.java index b2281cf2e0..361e3ec8a8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessor.java @@ -18,7 +18,7 @@ package org.springframework.integration.handler; import org.springframework.expression.Expression; import org.springframework.expression.ParseException; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java index 2264ee586a..c85073ae95 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/LoggingHandler.java @@ -22,9 +22,9 @@ import org.apache.commons.logging.LogFactory; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; import org.springframework.integration.dispatcher.AggregateMessageDeliveryException; import org.springframework.integration.expression.ExpressionUtils; +import org.springframework.messaging.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java index 3d891ceb2b..5f7d7bea7a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageHandlerChain.java @@ -23,14 +23,14 @@ import java.util.concurrent.locks.ReentrantLock; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.Lifecycle; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.filter.MessageFilter; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolver; import org.springframework.util.Assert; /** @@ -79,7 +79,7 @@ public class MessageHandlerChain extends AbstractMessageHandler implements Messa */ private volatile Long sendTimeout = null; - private volatile ChannelResolver channelResolver; + private volatile DestinationResolver channelResolver; private volatile boolean initialized; @@ -114,7 +114,7 @@ public class MessageHandlerChain extends AbstractMessageHandler implements Messa this.configureChain(); BeanFactory beanFactory = this.getBeanFactory(); if (this.channelResolver == null && beanFactory != null) { - this.channelResolver = new BeanFactoryChannelResolver(beanFactory); + this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory); } this.initialized = true; } @@ -263,7 +263,7 @@ public class MessageHandlerChain extends AbstractMessageHandler implements Messa } else if (replyChannelHeader instanceof String) { Assert.notNull(channelResolver, "ChannelResolver is required"); - replyChannel = channelResolver.resolveChannelName((String) replyChannelHeader); + replyChannel = channelResolver.resolveDestination((String) replyChannelHeader); } else { throw new MessageHandlingException(message, diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageProcessor.java index b9758eb943..7b23de55a3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MessageProcessor.java @@ -16,7 +16,7 @@ package org.springframework.integration.handler; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * This defines the lowest-level strategy of processing a Message and returning diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java index f5e01e5b51..1e62e41dc7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageHandler.java @@ -18,9 +18,9 @@ package org.springframework.integration.handler; import java.lang.reflect.Method; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java index a71b2acfc9..71d166aebe 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/MethodInvokingMessageProcessor.java @@ -21,7 +21,7 @@ import java.lang.reflect.Method; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.util.MessagingMethodInvokerHelper; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/PostProcessingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/PostProcessingMessageHandler.java index e4b28463a8..18a1e9b78b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/PostProcessingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/PostProcessingMessageHandler.java @@ -15,13 +15,13 @@ */ package org.springframework.integration.handler; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Implementations of this interface are subclasses of * {@link AbstractMessageHandler} that perform post processing after the - * {@link AbstractMessageHandler#handleMessageInternal(org.springframework.integration.Message)} + * {@link AbstractMessageHandler#handleMessageInternal(org.springframework.messaging.Message)} * call. * * @author Gary Russell diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ReplyRequiredException.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ReplyRequiredException.java index e3fd26a2b3..54f3f99b11 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ReplyRequiredException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ReplyRequiredException.java @@ -16,8 +16,8 @@ package org.springframework.integration.handler; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** * Exception that indicates no reply message is produced by a handler diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java index 5f8ea86936..06f884687a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ServiceActivatingHandler.java @@ -18,7 +18,7 @@ package org.springframework.integration.handler; import java.lang.reflect.Method; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.annotation.ServiceActivator; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java index 966481785f..a085bd1ee1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/AbstractRequestHandlerAdvice.java @@ -23,9 +23,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.aop.ProxyMethodInvocation; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.context.IntegrationObjectSupport; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java index b42a66d9f9..da0fb1efa3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ErrorMessageSendingRecoverer.java @@ -18,11 +18,11 @@ package org.springframework.integration.handler.advice; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.GenericMessagingTemplate; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.retry.RecoveryCallback; import org.springframework.retry.RetryContext; import org.springframework.util.Assert; @@ -40,11 +40,11 @@ public class ErrorMessageSendingRecoverer implements RecoveryCallback { private final static Log logger = LogFactory.getLog(ErrorMessageSendingRecoverer.class); - private final MessagingTemplate messagingTemplate = new MessagingTemplate(); + private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); public ErrorMessageSendingRecoverer(MessageChannel channel) { Assert.notNull(channel, "channel cannot be null"); - this.messagingTemplate.setDefaultChannel(channel); + this.messagingTemplate.setDefaultDestination(channel); } public void setSendTimeout(long sendTimeout) { diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java index c00647cd76..271c45f6fb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/ExpressionEvaluatingRequestHandlerAdvice.java @@ -19,15 +19,15 @@ import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.message.AdviceMessage; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.GenericMessagingTemplate; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.util.Assert; /** @@ -51,7 +51,7 @@ public class ExpressionEvaluatingRequestHandlerAdvice extends AbstractRequestHan private volatile MessageChannel failureChannel; - private final MessagingTemplate messagingTemplate = new MessagingTemplate(); + private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); private volatile boolean trapException = false; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerCircuitBreakerAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerCircuitBreakerAdvice.java index 8d75c74d7e..cb080d1de3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerCircuitBreakerAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerCircuitBreakerAdvice.java @@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * A circuit breaker that stops calling a failing service after threshold diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerRetryAdvice.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerRetryAdvice.java index 111232ed64..6d8ca8c547 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerRetryAdvice.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RequestHandlerRetryAdvice.java @@ -15,8 +15,8 @@ */ package org.springframework.integration.handler.advice; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.retry.RecoveryCallback; import org.springframework.retry.RetryCallback; import org.springframework.retry.RetryContext; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RetryStateGenerator.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RetryStateGenerator.java index a25a172d04..8f5375ef0f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RetryStateGenerator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/RetryStateGenerator.java @@ -15,7 +15,7 @@ */ package org.springframework.integration.handler.advice; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.retry.RetryState; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGenerator.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGenerator.java index a6b447c4c0..0420ed5c88 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGenerator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGenerator.java @@ -22,7 +22,7 @@ import org.springframework.classify.Classifier; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.retry.RetryState; import org.springframework.retry.support.DefaultRetryState; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/package-info.java index 3c3dbb01fd..01236b5247 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/advice/package-info.java @@ -1,6 +1,6 @@ /** * Provides classes that are used to advise - * {@link org.springframework.integration.core.MessageHandler}s with + * {@link org.springframework.messaging.MessageHandler}s with * cross-cutting concerns. */ -package org.springframework.integration.handler.advice; \ No newline at end of file +package org.springframework.integration.handler.advice; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/package-info.java index 2cd4cb6315..0b725c19d7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes implementing various types of message handler. */ -package org.springframework.integration.handler; \ No newline at end of file +package org.springframework.integration.handler; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/HistoryWritingMessagePostProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/history/HistoryWritingMessagePostProcessor.java index 99d503309b..d441a11e1d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/history/HistoryWritingMessagePostProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/history/HistoryWritingMessagePostProcessor.java @@ -16,8 +16,8 @@ package org.springframework.integration.history; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessagePostProcessor; +import org.springframework.messaging.Message; +import org.springframework.messaging.core.MessagePostProcessor; import org.springframework.util.Assert; /** @@ -54,5 +54,5 @@ public class HistoryWritingMessagePostProcessor implements MessagePostProcessor } return message; } - + } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java index 107463385a..49f2ad59ab 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/history/MessageHistory.java @@ -25,7 +25,7 @@ import java.util.List; import java.util.ListIterator; import java.util.Properties; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.context.NamedComponent; import org.springframework.util.Assert; @@ -88,7 +88,7 @@ public class MessageHistory implements List, Serializable { public boolean contains(Object o) { return this.components.contains(o); } - + public boolean containsAll(Collection c) { return this.components.containsAll(c); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/history/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/history/package-info.java index 9cf8c9bf91..bb452b4b98 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/history/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/history/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting the capture of message history. */ -package org.springframework.integration.history; \ No newline at end of file +package org.springframework.integration.history; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/ObjectToJsonTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/json/ObjectToJsonTransformer.java index 402d64fb2a..b9e0c37185 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/ObjectToJsonTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/ObjectToJsonTransformer.java @@ -15,8 +15,8 @@ */ package org.springframework.integration.json; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.json.JacksonJsonObjectMapper; import org.springframework.integration.support.json.JacksonJsonObjectMapperProvider; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/json/package-info.java index 810cc0eda1..766e51de8f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting JSON in Spring Integration. */ -package org.springframework.integration.json; \ No newline at end of file +package org.springframework.integration.json; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java index de3cc0326d..c91a3b9d33 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/AbstractHeaderMapper.java @@ -26,7 +26,7 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.ObjectUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/HeaderMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/HeaderMapper.java index 6561dc923d..0f7d3852cf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/HeaderMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/HeaderMapper.java @@ -18,7 +18,7 @@ package org.springframework.integration.mapping; import java.util.Map; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; /** * Generic strategy interface for mapping {@link MessageHeaders} to and from other diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/InboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/InboundMessageMapper.java index 3c5e6b3679..30796ca9b4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/InboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/InboundMessageMapper.java @@ -16,7 +16,7 @@ package org.springframework.integration.mapping; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Strategy interface for mapping from an Object to a{@link Message}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/MessageMappingException.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/MessageMappingException.java index e4de83b16b..b75004921c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/MessageMappingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/MessageMappingException.java @@ -16,8 +16,8 @@ package org.springframework.integration.mapping; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** * Exception that indicates an error during message mapping. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java index e6fe9ba33b..4b1db2a20b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/OutboundMessageMapper.java @@ -16,7 +16,7 @@ package org.springframework.integration.mapping; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Strategy interface for mapping from a {@link Message} to an Object. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/RequestReplyHeaderMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/RequestReplyHeaderMapper.java index eec796d0e1..0da2c0e60e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/RequestReplyHeaderMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/RequestReplyHeaderMapper.java @@ -17,7 +17,7 @@ package org.springframework.integration.mapping; import java.util.Map; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; /** * Request/Reply strategy interface for mapping {@link MessageHeaders} to and from other diff --git a/spring-integration-core/src/main/java/org/springframework/integration/mapping/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/mapping/package-info.java index 695cad782e..09733195d6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/mapping/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/mapping/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to mapping to/from message headers. */ -package org.springframework.integration.mapping; \ No newline at end of file +package org.springframework.integration.mapping; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/AdviceMessage.java b/spring-integration-core/src/main/java/org/springframework/integration/message/AdviceMessage.java index 6f1b768968..ea66007da3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/AdviceMessage.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/AdviceMessage.java @@ -18,7 +18,7 @@ package org.springframework.integration.message; import java.util.Map; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * A message implementation that is produced by an advice after diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/ErrorMessage.java b/spring-integration-core/src/main/java/org/springframework/integration/message/ErrorMessage.java deleted file mode 100644 index 9a96d11718..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/ErrorMessage.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.message; - -import java.util.Map; - -/** - * A message implementation that accepts a {@link Throwable} payload. - * Once created this object is immutable. - * - * @author Mark Fisher - * @author Oleg Zhurakousky - */ -public class ErrorMessage extends GenericMessage { - - private static final long serialVersionUID = 6413675958959141186L; - - public ErrorMessage(Throwable payload) { - super(payload); - } - - public ErrorMessage(Throwable payload, Map headers) { - super(payload, headers); - } - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/GenericMessage.java b/spring-integration-core/src/main/java/org/springframework/integration/message/GenericMessage.java index 4874feabd2..1eecfd2fb0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/GenericMessage.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/GenericMessage.java @@ -16,33 +16,25 @@ package org.springframework.integration.message; -import java.io.Serializable; -import java.util.HashMap; import java.util.Map; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; -import org.springframework.util.Assert; -import org.springframework.util.ObjectUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; /** * Base Message class defining common properties such as id, payload, and headers. * Once created this object is immutable. - * + * * @author Mark Fisher */ -public class GenericMessage implements Message, Serializable { +// TODO This class only exists so that it can make its super-class's constructors public. +public class GenericMessage extends org.springframework.messaging.support.GenericMessage implements Message { private static final long serialVersionUID = 3649200745084232821L; - private final T payload; - - private final MessageHeaders headers; - - /** * Create a new message with the given payload. - * + * * @param payload the message payload */ public GenericMessage(T payload) { @@ -52,53 +44,21 @@ public class GenericMessage implements Message, Serializable { /** * Create a new message with the given payload. The provided map * will be used to populate the message headers - * + * * @param payload the message payload * @param headers message headers * @see MessageHeaders */ public GenericMessage(T payload, Map headers) { - Assert.notNull(payload, "payload must not be null"); - if (headers == null) { - headers = new HashMap(); - } - else { - headers = new HashMap(headers); - } - this.headers = new MessageHeaders(headers); - this.payload = payload; + super(payload, headers); } + protected MessageHeaders createMessageHeaders(Map headers) { + return new MessageHeaders(headers); + } + @Override public MessageHeaders getHeaders() { - return this.headers; + return (MessageHeaders)super.getHeaders(); } - - public T getPayload() { - return this.payload; - } - - public String toString() { - return "[Payload=" + this.payload + "][Headers=" + this.headers + "]"; - } - - public int hashCode() { - return this.headers.hashCode() * 23 + ObjectUtils.nullSafeHashCode(this.payload); - } - - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (obj != null && obj instanceof GenericMessage) { - GenericMessage other = (GenericMessage) obj; - if (!this.headers.getId().equals(other.headers.getId())) { - return false; - } - return this.headers.equals(other.headers) - && this.payload.equals(other.payload); - } - return false; - } - } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/message/package-info.java index b4247cd4f0..7143b029a9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/package-info.java @@ -1,4 +1,4 @@ /** - * Provides concrete {@link org.springframework.integration.Message} implementations. + * Provides concrete {@link org.springframework.messaging.Message} implementations. */ -package org.springframework.integration.message; \ No newline at end of file +package org.springframework.integration.message; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/package-info.java index 52b64440fe..155d92e138 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/package-info.java @@ -3,4 +3,4 @@ * * Provides fundamental classes. */ -package org.springframework.integration; \ No newline at end of file +package org.springframework.integration; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/resource/ResourceRetrievingMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/resource/ResourceRetrievingMessageSource.java index 47fae1d0f5..ffdd112285 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/resource/ResourceRetrievingMessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/resource/ResourceRetrievingMessageSource.java @@ -25,7 +25,7 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.MessageSource; import org.springframework.core.io.Resource; import org.springframework.core.io.support.ResourcePatternResolver; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.endpoint.AbstractMessageSource; import org.springframework.integration.util.CollectionFilter; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/resource/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/resource/package-info.java index aa4b302f1b..33906e4bce 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/resource/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/resource/package-info.java @@ -2,4 +2,4 @@ * Provides classes related to messaging * using Spring {@link org.springframework.core.io.Resource}s */ -package org.springframework.integration.resource; \ No newline at end of file +package org.springframework.integration.resource; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java index 25a243bd7c..5402e1963a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMappingMessageRouter.java @@ -25,20 +25,20 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolutionException; -import org.springframework.integration.support.channel.ChannelResolver; import org.springframework.jmx.export.annotation.ManagedOperation; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolutionException; +import org.springframework.messaging.core.DestinationResolver; import org.springframework.util.Assert; import org.springframework.util.StringUtils; /** * Base class for all Message Routers that support mapping from arbitrary String values * to Message Channel names. - * + * * @author Mark Fisher * @author Oleg Zhurakousky * @author Gunnar Hillert @@ -49,7 +49,7 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter private volatile Map channelMappings = new ConcurrentHashMap(); - private volatile ChannelResolver channelResolver; + private volatile DestinationResolver channelResolver; private volatile String prefix; @@ -74,12 +74,12 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter } /** - * Specify the {@link ChannelResolver} strategy to use. - * The default is a BeanFactoryChannelResolver. + * Specify the {@link DestinationResolver} strategy to use. + * The default is a BeanFactoryMessageChannelDestinationResolver. * This is considered an infrastructural configuration option and * as of 2.1 has been deprecated as a configuration-driven attribute. */ - public void setChannelResolver(ChannelResolver channelResolver) { + public void setChannelResolver(DestinationResolver channelResolver) { Assert.notNull(channelResolver, "'channelResolver' must not be null"); this.channelResolver = channelResolver; } @@ -134,7 +134,7 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter public void onInit() { BeanFactory beanFactory = this.getBeanFactory(); if (this.channelResolver == null && beanFactory != null) { - this.channelResolver = new BeanFactoryChannelResolver(beanFactory); + this.channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory); } } @@ -161,9 +161,9 @@ public abstract class AbstractMappingMessageRouter extends AbstractMessageRouter Assert.state(this.channelResolver != null, "unable to resolve channel names, no ChannelResolver available"); MessageChannel channel = null; try { - channel = this.channelResolver.resolveChannelName(channelName); + channel = this.channelResolver.resolveDestination(channelName); } - catch (ChannelResolutionException e) { + catch (DestinationResolutionException e) { if (this.resolutionRequired) { throw new MessagingException(message, "failed to resolve channel name '" + channelName + "'", e); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageProcessingRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageProcessingRouter.java index a46e0d5312..0af9afc5cb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageProcessingRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageProcessingRouter.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.List; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.AbstractMessageProcessor; import org.springframework.integration.handler.MessageProcessor; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java index 4a97b82c52..25dbb2af40 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractMessageRouter.java @@ -20,15 +20,15 @@ import java.util.Collection; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.NullChannel; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.support.MessageBuilder; import org.springframework.jmx.export.annotation.ManagedResource; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.GenericMessagingTemplate; /** * Base class for all Message Routers. @@ -48,7 +48,7 @@ public abstract class AbstractMessageRouter extends AbstractMessageHandler { private volatile boolean applySequence; - private final MessagingTemplate messagingTemplate = new MessagingTemplate(); + private final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); /** @@ -96,9 +96,9 @@ public abstract class AbstractMessageRouter extends AbstractMessageHandler { } /** - * Provides {@link MessagingTemplate} access for subclasses. + * Provides {@link GenericMessagingTemplate} access for subclasses. */ - protected MessagingTemplate getMessagingTemplate() { + protected GenericMessagingTemplate getMessagingTemplate() { return this.messagingTemplate; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java index 30bc6260a9..3d441e0796 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouter.java @@ -19,8 +19,8 @@ package org.springframework.integration.router; import java.util.Collections; import java.util.List; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; /** * A Message Router that resolves the target {@link MessageChannel} for diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/HeaderValueRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/HeaderValueRouter.java index 7c14c415e5..a27daca046 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/HeaderValueRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/HeaderValueRouter.java @@ -19,7 +19,7 @@ package org.springframework.integration.router; import java.util.Collections; import java.util.List; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/MappingMessageRouterManagement.java b/spring-integration-core/src/main/java/org/springframework/integration/router/MappingMessageRouterManagement.java index 08ed86e7bf..66f3eb5559 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/MappingMessageRouterManagement.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/MappingMessageRouterManagement.java @@ -36,4 +36,4 @@ public interface MappingMessageRouterManagement { @ManagedOperation public abstract void removeChannelMapping(String key); -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java index 02c4081232..ea2c112192 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/MethodInvokingRouter.java @@ -21,7 +21,6 @@ import java.lang.reflect.Method; import org.springframework.integration.annotation.Router; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.handler.MethodInvokingMessageProcessor; -import org.springframework.integration.support.channel.ChannelResolver; /** * A Message Router that invokes the specified method on the given object. The diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java index 0a333bf218..1cd35d1aea 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/PayloadTypeRouter.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.util.CollectionUtils; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java index 3e89c93921..06b523acbf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/RecipientListRouter.java @@ -21,8 +21,8 @@ import java.util.Collection; import java.util.List; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/router/package-info.java index bb5ee45e99..53ed711dea 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting the router pattern. */ -package org.springframework.integration.router; \ No newline at end of file +package org.springframework.integration.router; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/scheduling/package-info.java index 1df7e603d6..6e17dbaee8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/scheduling/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/scheduling/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to task scheduling. */ -package org.springframework.integration.scheduling; \ No newline at end of file +package org.springframework.integration.scheduling; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java index 095e3ef950..ebcd7ea2d1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/MessageSelectorChain.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java index d2d03978b1..08cfd698e3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/PayloadTypeSelector.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java index 892e2384ad..9a297178a6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/UnexpiredMessageSelector.java @@ -16,20 +16,21 @@ package org.springframework.integration.selector; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.core.MessageSelector; /** * A {@link MessageSelector} that accepts {@link Message Messages} that are * not yet expired. If a Message's expiration date header is * null, that Message never expires. - * + * * @author Mark Fisher */ public class UnexpiredMessageSelector implements MessageSelector { public boolean accept(Message message) { - Long expirationDate = message.getHeaders().getExpirationDate(); + Long expirationDate = new EiMessageHeaderAccessor(message).getExpirationDate(); if (expirationDate == null) { return true; } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/selector/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/selector/package-info.java index 0684079d67..ada7381ff3 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/selector/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/selector/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to message selection. */ -package org.springframework.integration.selector; \ No newline at end of file +package org.springframework.integration.selector; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageProcessingSplitter.java b/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageProcessingSplitter.java index 2966fc1773..f7fc3f66ec 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageProcessingSplitter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageProcessingSplitter.java @@ -20,7 +20,7 @@ import java.util.Collection; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.AbstractMessageProcessor; import org.springframework.integration.handler.MessageProcessor; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java b/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java index 9369ad6d44..64c51699b6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/splitter/AbstractMessageSplitter.java @@ -20,8 +20,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.CollectionUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/splitter/DefaultMessageSplitter.java b/spring-integration-core/src/main/java/org/springframework/integration/splitter/DefaultMessageSplitter.java index 98bbd17cfa..0f21565d41 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/splitter/DefaultMessageSplitter.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; /** * The default Message Splitter implementation. Returns individual Messages diff --git a/spring-integration-core/src/main/java/org/springframework/integration/splitter/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/splitter/package-info.java index 538f270250..343b690966 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/splitter/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/splitter/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting the splitter pattern. */ -package org.springframework.integration.splitter; \ No newline at end of file +package org.springframework.integration.splitter; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractKeyValueMessageStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractKeyValueMessageStore.java index 58dab17ccd..19ae1a7b97 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractKeyValueMessageStore.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractKeyValueMessageStore.java @@ -25,8 +25,8 @@ import java.util.Set; import java.util.UUID; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java index a8f106f846..29b5160313 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/AbstractMessageGroupStore.java @@ -128,4 +128,4 @@ public abstract class AbstractMessageGroupStore implements MessageGroupStore, It } } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroup.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroup.java index 5acd4d725c..ea39dc9b06 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroup.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroup.java @@ -18,7 +18,7 @@ package org.springframework.integration.store; import java.util.Collection; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * A group of messages that are correlated with each other and should be processed in the same context. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupMetadata.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupMetadata.java index 2d1445afc0..67009a00b5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupMetadata.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupMetadata.java @@ -22,7 +22,7 @@ import java.util.LinkedList; import java.util.List; import java.util.UUID; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupQueue.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupQueue.java index e60a975f12..eb25db2e84 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupQueue.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupQueue.java @@ -28,7 +28,7 @@ import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupStore.java index 41026f3914..4ff5ca0172 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupStore.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageGroupStore.java @@ -14,7 +14,7 @@ package org.springframework.integration.store; import java.util.Iterator; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.jmx.export.annotation.ManagedAttribute; /** @@ -140,4 +140,4 @@ public interface MessageGroupStore { } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStore.java index 35e323856f..f6ddf67ac2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStore.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStore.java @@ -18,7 +18,7 @@ package org.springframework.integration.store; import java.util.UUID; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.jmx.export.annotation.ManagedAttribute; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStoreException.java b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStoreException.java index 128f1f7820..6e8db54891 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStoreException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/MessageStoreException.java @@ -16,8 +16,8 @@ package org.springframework.integration.store; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** * Exception for problems that occur when using a {@link MessageStore} implementation. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroup.java b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroup.java index bb266a1ea3..c7d5c9d371 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroup.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageGroup.java @@ -18,7 +18,8 @@ import java.util.Collections; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.springframework.integration.Message; +import org.springframework.integration.EiMessageHeaderAccessor; +import org.springframework.messaging.Message; /** * Represents a mutable group of correlated messages that is bound to a certain {@link MessageStore} and group id. The @@ -123,7 +124,7 @@ public class SimpleMessageGroup implements MessageGroup { if (size() == 0) { return 0; } - return getOne().getHeaders().getSequenceSize(); + return new EiMessageHeaderAccessor(getOne()).getSequenceSize(); } public int size() { @@ -148,4 +149,4 @@ public class SimpleMessageGroup implements MessageGroup { ", lastModified=" + lastModified + '}'; } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java index dc102aa592..f248004bdd 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/SimpleMessageStore.java @@ -21,8 +21,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.locks.Lock; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.util.DefaultLockRegistry; import org.springframework.integration.util.LockRegistry; import org.springframework.integration.util.UpperBound; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/metadata/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/store/metadata/package-info.java index 18bee7d3e5..0cfc461d34 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/metadata/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/metadata/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting metadata stores. */ -package org.springframework.integration.store.metadata; \ No newline at end of file +package org.springframework.integration.store.metadata; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/store/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/store/package-info.java index a96e1b379c..330e060fd9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/store/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/store/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes releated to storing messages. */ -package org.springframework.integration.store; \ No newline at end of file +package org.springframework.integration.store; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/IdGenerators.java b/spring-integration-core/src/main/java/org/springframework/integration/support/IdGenerators.java new file mode 100644 index 0000000000..be42ddae2e --- /dev/null +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/IdGenerators.java @@ -0,0 +1,52 @@ +/* + * Copyright 2002-2013 the original author or authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.integration.support; + +import java.util.UUID; +import java.util.concurrent.atomic.AtomicLong; + +import org.springframework.messaging.MessageHeaders.IdGenerator; + +// TODO Discuss and agree where these should go. In SI or in Spring 4? +public class IdGenerators { + + public static class JdkIdGenerator implements IdGenerator { + + @Override + public UUID generateId() { + return UUID.randomUUID(); + } + + } + + public static class SimpleIncrementingIdGenerator implements IdGenerator { + + private final AtomicLong topBits = new AtomicLong(); + + private final AtomicLong bottomBits = new AtomicLong(); + + @Override + public UUID generateId() { + long bottomBits = this.bottomBits.incrementAndGet(); + if (bottomBits == 0) { + this.topBits.incrementAndGet(); + } + return new UUID(this.topBits.get(), bottomBits); + } + + } +} \ No newline at end of file diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java b/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java index 3a343a1347..a6b8b85c29 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/MessageBuilder.java @@ -20,20 +20,16 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; -import java.util.UUID; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.util.Assert; -import org.springframework.util.PatternMatchUtils; -import org.springframework.util.StringUtils; /** * @author Arjen Poutsma @@ -45,7 +41,7 @@ public final class MessageBuilder { private final T payload; - private final Map headers = new HashMap(); + private final EiMessageHeaderAccessor headerAccessor; private final Message originalMessage; @@ -58,8 +54,8 @@ public final class MessageBuilder { Assert.notNull(payload, "payload must not be null"); this.payload = payload; this.originalMessage = originalMessage; + this.headerAccessor = new EiMessageHeaderAccessor(originalMessage); if (originalMessage != null) { - this.copyHeaders(originalMessage.getHeaders()); this.modified = (!this.payload.equals(originalMessage.getPayload())); } } @@ -67,7 +63,7 @@ public final class MessageBuilder { /** * Create a builder for a new {@link Message} instance pre-populated with all of the headers copied from the * provided message. The payload of the provided Message will also be used as the payload for the new message. - * + * * @param message the Message from which the payload and all headers will be copied */ public static MessageBuilder fromMessage(Message message) { @@ -78,7 +74,7 @@ public final class MessageBuilder { /** * Create a builder for a new {@link Message} instance with the provided payload. - * + * * @param payload the payload for the new message */ public static MessageBuilder withPayload(T payload) { @@ -90,23 +86,7 @@ public final class MessageBuilder { * Set the value for the given header name. If the provided value is null, the header will be removed. */ public MessageBuilder setHeader(String headerName, Object headerValue) { - Assert.isTrue(!this.isReadOnly(headerName), "The '" + headerName + "' header is read-only."); - if (StringUtils.hasLength(headerName) && !headerName.equals(MessageHeaders.ID) - && !headerName.equals(MessageHeaders.TIMESTAMP)) { - this.verifyType(headerName, headerValue); - if (headerValue == null) { - Object removedValue = this.headers.remove(headerName); - if (removedValue != null) { - this.modified = true; - } - } - else { - Object replacedValue = this.headers.put(headerName, headerValue); - if (!headerValue.equals(replacedValue)) { - this.modified = true; - } - } - } + this.headerAccessor.setHeader(headerName, headerValue); return this; } @@ -114,51 +94,26 @@ public final class MessageBuilder { * Set the value for the given header name only if the header name is not already associated with a value. */ public MessageBuilder setHeaderIfAbsent(String headerName, Object headerValue) { - if (this.headers.get(headerName) == null) { - this.setHeader(headerName, headerValue); - } + this.headerAccessor.setHeaderIfAbsent(headerName, headerValue); return this; } /** * Removes all headers provided via array of 'headerPatterns'. As the name suggests the array - * may contain simple matching patterns for header names. Supported pattern styles are: + * may contain simple matching patterns for header names. Supported pattern styles are: * "xxx*", "*xxx", "*xxx*" and "xxx*yyy". - * + * * @param headerPatterns */ public MessageBuilder removeHeaders(String... headerPatterns) { - List headersToRemove = new ArrayList(); - for (String pattern : headerPatterns) { - if (StringUtils.hasLength(pattern)){ - if (pattern.contains("*")){ - for (String headerName : this.headers.keySet()) { - if (PatternMatchUtils.simpleMatch(pattern, headerName)){ - headersToRemove.add(headerName); - } - } - } - else { - headersToRemove.add(pattern); - } - } - } - for (String headerToRemove : headersToRemove) { - this.removeHeader(headerToRemove); - } + this.headerAccessor.removeHeaders(headerPatterns); return this; } /** * Remove the value for the given header name. */ public MessageBuilder removeHeader(String headerName) { - if (StringUtils.hasLength(headerName) && !headerName.equals(MessageHeaders.ID) - && !headerName.equals(MessageHeaders.TIMESTAMP)) { - Object removedValue = this.headers.remove(headerName); - if (removedValue != null) { - this.modified = true; - } - } + this.headerAccessor.removeHeader(headerName); return this; } @@ -166,17 +121,12 @@ public final class MessageBuilder { * Copy the name-value pairs from the provided Map. This operation will overwrite any existing values. Use { * {@link #copyHeadersIfAbsent(Map)} to avoid overwriting values. Note that the 'id' and 'timestamp' header values * will never be overwritten. - * + * * @see MessageHeaders#ID * @see MessageHeaders#TIMESTAMP */ public MessageBuilder copyHeaders(Map headersToCopy) { - Set keys = headersToCopy.keySet(); - for (String key : keys) { - if (!this.isReadOnly(key)) { - this.setHeader(key, headersToCopy.get(key)); - } - } + this.headerAccessor.copyHeaders(headersToCopy); return this; } @@ -184,36 +134,31 @@ public final class MessageBuilder { * Copy the name-value pairs from the provided Map. This operation will not overwrite any existing values. */ public MessageBuilder copyHeadersIfAbsent(Map headersToCopy) { - Set keys = headersToCopy.keySet(); - for (String key : keys) { - if (!this.isReadOnly(key)) { - this.setHeaderIfAbsent(key, headersToCopy.get(key)); - } - } + this.headerAccessor.copyHeadersIfAbsent(headersToCopy); return this; } public MessageBuilder setExpirationDate(Long expirationDate) { - return this.setHeader(MessageHeaders.EXPIRATION_DATE, expirationDate); + return this.setHeader(EiMessageHeaderAccessor.EXPIRATION_DATE, expirationDate); } public MessageBuilder setExpirationDate(Date expirationDate) { if (expirationDate != null) { - return this.setHeader(MessageHeaders.EXPIRATION_DATE, expirationDate.getTime()); + return this.setHeader(EiMessageHeaderAccessor.EXPIRATION_DATE, expirationDate.getTime()); } else { - return this.setHeader(MessageHeaders.EXPIRATION_DATE, null); + return this.setHeader(EiMessageHeaderAccessor.EXPIRATION_DATE, null); } } public MessageBuilder setCorrelationId(Object correlationId) { - return this.setHeader(MessageHeaders.CORRELATION_ID, correlationId); + return this.setHeader(EiMessageHeaderAccessor.CORRELATION_ID, correlationId); } public MessageBuilder pushSequenceDetails(Object correlationId, int sequenceNumber, int sequenceSize) { - Object incomingCorrelationId = headers.get(MessageHeaders.CORRELATION_ID); + Object incomingCorrelationId = this.headerAccessor.getCorrelationId(); @SuppressWarnings("unchecked") - List> incomingSequenceDetails = (List>) headers.get(MessageHeaders.SEQUENCE_DETAILS); + List> incomingSequenceDetails = (List>) this.headerAccessor.getHeader(EiMessageHeaderAccessor.SEQUENCE_DETAILS); if (incomingCorrelationId != null) { if (incomingSequenceDetails == null) { incomingSequenceDetails = new ArrayList>(); @@ -222,22 +167,24 @@ public final class MessageBuilder { incomingSequenceDetails = new ArrayList>(incomingSequenceDetails); } incomingSequenceDetails.add(Arrays.asList(incomingCorrelationId, - headers.get(MessageHeaders.SEQUENCE_NUMBER), headers.get(MessageHeaders.SEQUENCE_SIZE))); + this.headerAccessor.getSequenceNumber(), this.headerAccessor.getSequenceSize())); incomingSequenceDetails = Collections.unmodifiableList(incomingSequenceDetails); } if (incomingSequenceDetails != null) { - setHeader(MessageHeaders.SEQUENCE_DETAILS, incomingSequenceDetails); + setHeader(EiMessageHeaderAccessor.SEQUENCE_DETAILS, incomingSequenceDetails); } return setCorrelationId(correlationId).setSequenceNumber(sequenceNumber).setSequenceSize(sequenceSize); } public MessageBuilder popSequenceDetails() { - String key = MessageHeaders.SEQUENCE_DETAILS; - if (!headers.containsKey(key)) { - return this; - } + String key = EiMessageHeaderAccessor.SEQUENCE_DETAILS; @SuppressWarnings("unchecked") - List> incomingSequenceDetails = new ArrayList>((List>) headers.get(key)); + List> incomingSequenceDetails = (List>) this.headerAccessor.getHeader(key); + if (incomingSequenceDetails == null) { + return this; + } else { + incomingSequenceDetails = new ArrayList>(incomingSequenceDetails); + } List sequenceDetails = incomingSequenceDetails.remove(incomingSequenceDetails.size() - 1); Assert.state(sequenceDetails.size() == 3, "Wrong sequence details (not created by MessageBuilder?): " + sequenceDetails); @@ -251,10 +198,10 @@ public final class MessageBuilder { setSequenceSize(sequenceSize); } if (!incomingSequenceDetails.isEmpty()) { - headers.put(MessageHeaders.SEQUENCE_DETAILS, incomingSequenceDetails); + this.headerAccessor.setHeader(EiMessageHeaderAccessor.SEQUENCE_DETAILS, incomingSequenceDetails); } else { - headers.remove(MessageHeaders.SEQUENCE_DETAILS); + this.headerAccessor.removeHeader(EiMessageHeaderAccessor.SEQUENCE_DETAILS); } return this; } @@ -276,59 +223,25 @@ public final class MessageBuilder { } public MessageBuilder setSequenceNumber(Integer sequenceNumber) { - return this.setHeader(MessageHeaders.SEQUENCE_NUMBER, sequenceNumber); + return this.setHeader(EiMessageHeaderAccessor.SEQUENCE_NUMBER, sequenceNumber); } public MessageBuilder setSequenceSize(Integer sequenceSize) { - return this.setHeader(MessageHeaders.SEQUENCE_SIZE, sequenceSize); + return this.setHeader(EiMessageHeaderAccessor.SEQUENCE_SIZE, sequenceSize); } public MessageBuilder setPriority(Integer priority) { - return this.setHeader(MessageHeaders.PRIORITY, priority); + return this.setHeader(EiMessageHeaderAccessor.PRIORITY, priority); } @SuppressWarnings("unchecked") public Message build() { - if (!this.modified && this.originalMessage != null) { + if (!this.modified && !this.headerAccessor.isModified() && this.originalMessage != null) { return this.originalMessage; } if (this.payload instanceof Throwable) { - return (Message) new ErrorMessage((Throwable) this.payload, this.headers); + return (Message) new ErrorMessage((Throwable) this.payload, this.headerAccessor.toMap()); } - return new GenericMessage(this.payload, this.headers); + return new GenericMessage(this.payload, this.headerAccessor.toMap()); } - - private boolean isReadOnly(String headerName) { - return MessageHeaders.ID.equals(headerName) || MessageHeaders.TIMESTAMP.equals(headerName); - } - - private void verifyType(String headerName, Object headerValue) { - if (headerName != null && headerValue != null) { - if (MessageHeaders.ID.equals(headerName)) { - Assert.isTrue(headerValue instanceof UUID, "The '" + headerName + "' header value must be a UUID."); - } - else if (MessageHeaders.TIMESTAMP.equals(headerName)) { - Assert.isTrue(headerValue instanceof Long, "The '" + headerName + "' header value must be a Long."); - } - else if (MessageHeaders.EXPIRATION_DATE.equals(headerName)) { - Assert.isTrue(headerValue instanceof Date || headerValue instanceof Long, "The '" + headerName - + "' header value must be a Date or Long."); - } - else if (MessageHeaders.ERROR_CHANNEL.equals(headerName) - || MessageHeaders.REPLY_CHANNEL.endsWith(headerName)) { - Assert.isTrue(headerValue instanceof MessageChannel || headerValue instanceof String, "The '" - + headerName + "' header value must be a MessageChannel or String."); - } - else if (MessageHeaders.SEQUENCE_NUMBER.equals(headerName) - || MessageHeaders.SEQUENCE_SIZE.equals(headerName)) { - Assert.isTrue(Integer.class.isAssignableFrom(headerValue.getClass()), "The '" + headerName - + "' header value must be an Integer."); - } - else if (MessageHeaders.PRIORITY.equals(headerName)) { - Assert.isTrue(Integer.class.isAssignableFrom(headerValue.getClass()), "The '" + headerName - + "' header value must be an Integer."); - } - } - } - } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java deleted file mode 100644 index 8f9abe8e95..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/BeanFactoryChannelResolver.java +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.support.channel; - -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.MessageChannel; -import org.springframework.util.Assert; - -/** - * {@link ChannelResolver} implementation based on a Spring {@link BeanFactory}. - * - *

Will lookup Spring managed beans identified by bean name, - * expecting them to be of type {@link MessageChannel}. - * - * @author Mark Fisher - * @see org.springframework.beans.factory.BeanFactory - */ -public class BeanFactoryChannelResolver implements ChannelResolver, BeanFactoryAware { - - private volatile BeanFactory beanFactory; - - - /** - * Create a new instance of the {@link BeanFactoryChannelResolver} class. - *

The BeanFactory to access must be set via setBeanFactory. - * This will happen automatically if this resolver is defined within an - * ApplicationContext thereby receiving the callback upon initialization. - * @see #setBeanFactory - */ - public BeanFactoryChannelResolver() { - } - - /** - * Create a new instance of the {@link BeanFactoryChannelResolver} class. - *

Use of this constructor is redundant if this object is being created - * by a Spring IoC container as the supplied {@link BeanFactory} will be - * replaced by the {@link BeanFactory} that creates it (c.f. the - * {@link BeanFactoryAware} contract). So only use this constructor if you - * are instantiating this object explicitly rather than defining a bean. - * - * @param beanFactory the bean factory to be used to lookup {@link MessageChannel}s. - */ - public BeanFactoryChannelResolver(BeanFactory beanFactory) { - Assert.notNull(beanFactory, "BeanFactory must not be null"); - this.beanFactory = beanFactory; - } - - - public void setBeanFactory(BeanFactory beanFactory) { - this.beanFactory = beanFactory; - } - - public MessageChannel resolveChannelName(String name) { - Assert.state(this.beanFactory != null, "BeanFactory is required"); - try { - return this.beanFactory.getBean(name, MessageChannel.class); - } - catch (BeansException e) { - throw new ChannelResolutionException( - "failed to look up MessageChannel bean with name '" + name + "'", e); - } - } - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/ChannelResolutionException.java b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/ChannelResolutionException.java deleted file mode 100644 index 6f5df14576..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/ChannelResolutionException.java +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.support.channel; - -import org.springframework.integration.MessagingException; - -/** - * Thrown by a ChannelResolver when it cannot resolve a channel name. - * - * @author Mark Fisher - * @see org.springframework.integration.support.channel.ChannelResolver - */ -@SuppressWarnings("serial") -public class ChannelResolutionException extends MessagingException { - - /** - * Create a new ChannelResolutionException. - * @param description the description - */ - public ChannelResolutionException(String description) { - super(description); - } - - /** - * Create a new ChannelResolutionException. - * @param description the description - * @param cause the root cause (if any) - */ - public ChannelResolutionException(String description, Throwable cause) { - super(description, cause); - } - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/ChannelResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/ChannelResolver.java deleted file mode 100644 index 87dcd938a2..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/ChannelResolver.java +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.support.channel; - -import org.springframework.integration.MessageChannel; - -/** - * Strategy for resolving a name to a {@link MessageChannel}. - * - * @author Mark Fisher - */ -public interface ChannelResolver { - - /** - * Return the MessageChannel for the given name. - */ - MessageChannel resolveChannelName(String channelName); - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/support/channel/package-info.java deleted file mode 100644 index 0ca3bfcb07..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/channel/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Provides classes supporting channel resolution. - */ -package org.springframework.integration.support.channel; \ No newline at end of file diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MapMessageConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MapMessageConverter.java index 65677c9f57..f509903976 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MapMessageConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MapMessageConverter.java @@ -15,12 +15,14 @@ */ package org.springframework.integration.support.converter; +import java.lang.reflect.Type; import java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.springframework.integration.Message; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.converter.MessageConverter; import org.springframework.util.Assert; /** @@ -29,7 +31,7 @@ import org.springframework.util.Assert; * @since 3.0 * */ -public class MapMessageConverter implements MessageConverter { +public class MapMessageConverter implements MessageConverter { private volatile String[] headerNames; @@ -81,7 +83,7 @@ public class MapMessageConverter implements MessageConverter { return convertedMessage; } - public

Object fromMessage(Message

message) { + public Object fromMessage(Message message, Type type) { Map map = new HashMap(); map.put("payload", message.getPayload()); Map headers = new HashMap(); diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MessageConversionException.java b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MessageConversionException.java deleted file mode 100644 index a0fc5eb54a..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MessageConversionException.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.support.converter; - -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; - -/** - * @author Mark Fisher - * @since 2.0 - */ -@SuppressWarnings("serial") -public class MessageConversionException extends MessagingException { - - public MessageConversionException(String description, Throwable cause) { - super(description, cause); - } - - public MessageConversionException(Message failedMessage, String description, Throwable cause) { - super(failedMessage, description, cause); - } - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MessageConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MessageConverter.java deleted file mode 100644 index 26be1d55f3..0000000000 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/MessageConverter.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright 2002-2010 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.support.converter; - -import org.springframework.integration.Message; - -/** - * @author Mark Fisher - * @since 2.0 - */ -public interface MessageConverter { - -

Message

toMessage(Object object); - -

Object fromMessage(Message

message); - -} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/SimpleMessageConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/SimpleMessageConverter.java index f33bef35b3..45dea9c4f7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/SimpleMessageConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/SimpleMessageConverter.java @@ -16,17 +16,21 @@ package org.springframework.integration.support.converter; -import org.springframework.integration.Message; +import java.lang.reflect.Type; + import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.converter.MessageConversionException; +import org.springframework.messaging.support.converter.MessageConverter; /** * @author Mark Fisher * @since 2.0 */ @SuppressWarnings({"unchecked", "rawtypes"}) -public class SimpleMessageConverter implements MessageConverter { +public class SimpleMessageConverter implements MessageConverter { private volatile InboundMessageMapper inboundMessageMapper; @@ -70,7 +74,7 @@ public class SimpleMessageConverter implements MessageConverter { } } - public

Object fromMessage(Message

message) { + public Object fromMessage(Message message, Type targetClass) { try { return this.outboundMessageMapper.fromMessage(message); } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/package-info.java index 3a351798a4..8a19baafb2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/converter/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/converter/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting message conversion. */ -package org.springframework.integration.support.converter; \ No newline at end of file +package org.springframework.integration.support.converter; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJacksonJsonMessageParser.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJacksonJsonMessageParser.java index e291e95f4e..8d16b229fb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJacksonJsonMessageParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJacksonJsonMessageParser.java @@ -16,7 +16,7 @@ package org.springframework.integration.support.json; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJsonInboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJsonInboundMessageMapper.java index 7492b7149d..fef2a71de2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJsonInboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/AbstractJsonInboundMessageMapper.java @@ -20,13 +20,13 @@ import java.lang.reflect.Type; import java.util.HashMap; import java.util.Map; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.util.Assert; /** * Abstract {@link InboundMessageMapper} implementation that maps incoming JSON messages - * to a {@link org.springframework.integration.Message} with the specified payload type. + * to a {@link org.springframework.messaging.Message} with the specified payload type. * * @author Artem Bilan * @since 3.0 @@ -41,10 +41,10 @@ public abstract class AbstractJsonInboundMessageMapper

implements InboundMess protected static final Map> DEFAULT_HEADER_TYPES = new HashMap>(); static { - DEFAULT_HEADER_TYPES.put(MessageHeaders.PRIORITY, Integer.class); - DEFAULT_HEADER_TYPES.put(MessageHeaders.EXPIRATION_DATE, Long.class); - DEFAULT_HEADER_TYPES.put(MessageHeaders.SEQUENCE_SIZE, Integer.class); - DEFAULT_HEADER_TYPES.put(MessageHeaders.SEQUENCE_NUMBER, Integer.class); + DEFAULT_HEADER_TYPES.put(EiMessageHeaderAccessor.PRIORITY, Integer.class); + DEFAULT_HEADER_TYPES.put(EiMessageHeaderAccessor.EXPIRATION_DATE, Long.class); + DEFAULT_HEADER_TYPES.put(EiMessageHeaderAccessor.SEQUENCE_SIZE, Integer.class); + DEFAULT_HEADER_TYPES.put(EiMessageHeaderAccessor.SEQUENCE_NUMBER, Integer.class); } protected final Type payloadType; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java index 15af06bbec..182907d07e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/Jackson2JsonMessageParser.java @@ -20,8 +20,8 @@ package org.springframework.integration.support.json; import java.util.LinkedHashMap; import java.util.Map; -import org.springframework.integration.Message; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; import org.springframework.util.Assert; import com.fasterxml.jackson.core.JsonFactory; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonMessageParser.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonMessageParser.java index f86b173368..c96beee76b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonMessageParser.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JacksonJsonMessageParser.java @@ -23,8 +23,8 @@ import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonToken; -import org.springframework.integration.Message; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonInboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonInboundMessageMapper.java index 299e302915..8b27de79b4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonInboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonInboundMessageMapper.java @@ -19,8 +19,8 @@ package org.springframework.integration.support.json; import java.lang.reflect.Type; import java.util.Map; -import org.springframework.integration.Message; import org.springframework.integration.support.json.JsonInboundMessageMapper.JsonMessageParser; +import org.springframework.messaging.Message; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonOutboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonOutboundMessageMapper.java index 03c93efc17..4576dbd5f0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonOutboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/json/JsonOutboundMessageMapper.java @@ -15,8 +15,9 @@ */ package org.springframework.integration.support.json; -import org.springframework.integration.Message; + import org.springframework.integration.mapping.OutboundMessageMapper; +import org.springframework.messaging.Message; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/support/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/support/package-info.java index d5749773a1..2f05db874c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/support/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/support/package-info.java @@ -1,4 +1,4 @@ /** * Base core support package. */ -package org.springframework.integration.support; \ No newline at end of file +package org.springframework.integration.support; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java index 4a1101f747..81cb53b3e6 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/ExpressionEvaluatingTransactionSynchronizationProcessor.java @@ -16,8 +16,8 @@ import java.util.Map.Entry; import org.springframework.expression.Expression; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/IntegrationResourceHolder.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/IntegrationResourceHolder.java index 8cdc0b949b..159f346199 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/IntegrationResourceHolder.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/IntegrationResourceHolder.java @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.transaction.support.ResourceHolder; /** @@ -76,4 +76,4 @@ public class IntegrationResourceHolder implements ResourceHolder { return false; } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java index 297ad70bac..7f879b9722 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/PseudoTransactionManager.java @@ -53,4 +53,4 @@ public class PseudoTransactionManager extends AbstractPlatformTransactionManager protected void doRollback(DefaultTransactionStatus status) throws TransactionException { //noop } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionSynchronizationProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionSynchronizationProcessor.java index 868d6001e4..690fc29481 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionSynchronizationProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transaction/TransactionSynchronizationProcessor.java @@ -28,4 +28,4 @@ public interface TransactionSynchronizationProcessor { void processAfterRollback(IntegrationResourceHolder holder); -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractMessageProcessingTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractMessageProcessingTransformer.java index de7be1707f..b67e0c5f5b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractMessageProcessingTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractMessageProcessingTransformer.java @@ -19,7 +19,7 @@ package org.springframework.integration.transformer; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.handler.AbstractMessageProcessor; import org.springframework.integration.handler.MessageProcessor; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java index 0e4f19d4ad..9587397f4e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractPayloadTransformer.java @@ -16,7 +16,7 @@ package org.springframework.integration.transformer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * A base class for {@link Transformer} implementations that modify the payload diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractTransformer.java index 69b06995ae..0babd6d07b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/AbstractTransformer.java @@ -16,7 +16,7 @@ package org.springframework.integration.transformer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/ClaimCheckInTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/ClaimCheckInTransformer.java index b21d1700c9..08cc794391 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/ClaimCheckInTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/ClaimCheckInTransformer.java @@ -16,7 +16,7 @@ package org.springframework.integration.transformer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.MessageStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/ClaimCheckOutTransformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/ClaimCheckOutTransformer.java index 7c4114911b..bcb0ce421d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/ClaimCheckOutTransformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/ClaimCheckOutTransformer.java @@ -18,7 +18,7 @@ package org.springframework.integration.transformer; import java.util.UUID; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.MessageStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/ContentEnricher.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/ContentEnricher.java index 51800b2cca..73234a3244 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/ContentEnricher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/ContentEnricher.java @@ -26,8 +26,8 @@ import org.springframework.expression.Expression; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.expression.IntegrationEvaluationContextAware; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderEnricher.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderEnricher.java index 9d57dff59e..31d5f1b041 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderEnricher.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderEnricher.java @@ -24,11 +24,11 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.support.HeaderValueMessageProcessor; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** * A Transformer that adds statically configured header values to a Message. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderFilter.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderFilter.java index 079bd2406f..0fa28789e2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderFilter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/HeaderFilter.java @@ -16,7 +16,7 @@ package org.springframework.integration.transformer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformationException.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformationException.java index 5791009d49..f4fd5ca4b0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformationException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformationException.java @@ -16,8 +16,8 @@ package org.springframework.integration.transformer; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** * Base Exception type for Message transformation errors. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java index 44e1038023..c9db3a2b50 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptor.java @@ -16,8 +16,8 @@ package org.springframework.integration.transformer; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java index cb6289ea49..2458cad1d0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/MessageTransformingHandler.java @@ -17,17 +17,17 @@ package org.springframework.integration.transformer; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.support.context.NamedComponent; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; /** * A reply-producing {@link MessageHandler} that delegates to a * {@link Transformer} instance to modify the received {@link Message} * and sends the result to its output channel. - * + * * @author Mark Fisher * @author Oleg Zhurakousky */ diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/Transformer.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/Transformer.java index 68a9ab2741..130cc92267 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/Transformer.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/Transformer.java @@ -16,7 +16,7 @@ package org.springframework.integration.transformer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Strategy interface for transforming a {@link Message}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/package-info.java index 62c9ce0e22..2cfd0759ef 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/package-info.java @@ -5,4 +5,4 @@ * @since 1.0 * */ -package org.springframework.integration.transformer; \ No newline at end of file +package org.springframework.integration.transformer; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/ExpressionEvaluatingHeaderValueMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/ExpressionEvaluatingHeaderValueMessageProcessor.java index dbb0dd669c..0d2204a7f4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/ExpressionEvaluatingHeaderValueMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/ExpressionEvaluatingHeaderValueMessageProcessor.java @@ -22,8 +22,8 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/MessageProcessingHeaderValueMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/MessageProcessingHeaderValueMessageProcessor.java index eebd1368bb..c29b7e6e65 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/MessageProcessingHeaderValueMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/MessageProcessingHeaderValueMessageProcessor.java @@ -16,9 +16,9 @@ package org.springframework.integration.transformer.support; -import org.springframework.integration.Message; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.handler.MethodInvokingMessageProcessor; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/StaticHeaderValueMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/StaticHeaderValueMessageProcessor.java index c90fbc34cd..b64792fd9b 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/StaticHeaderValueMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/transformer/support/StaticHeaderValueMessageProcessor.java @@ -16,7 +16,7 @@ package org.springframework.integration.transformer.support; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java b/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java index a833328e25..6f6d0cd6dd 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/AbstractExpressionEvaluator.java @@ -26,7 +26,7 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.expression.ExpressionUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/AcceptOnceCollectionFilter.java b/spring-integration-core/src/main/java/org/springframework/integration/util/AcceptOnceCollectionFilter.java index 6e6f064896..521552c095 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/AcceptOnceCollectionFilter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/AcceptOnceCollectionFilter.java @@ -43,4 +43,4 @@ public class AcceptOnceCollectionFilter implements CollectionFilter { return filteredElements; } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java index 7bd17635c7..40193dac3f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/BeanFactoryTypeConverter.java @@ -27,7 +27,7 @@ import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.expression.TypeConverter; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.history.MessageHistory; import org.springframework.util.ClassUtils; @@ -157,4 +157,4 @@ public class BeanFactoryTypeConverter implements TypeConverter, BeanFactoryAware return defaultEditor; } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/DefaultLockRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/util/DefaultLockRegistry.java index 10edb40bb5..eff7151b37 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/DefaultLockRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/DefaultLockRegistry.java @@ -76,4 +76,4 @@ public final class DefaultLockRegistry implements LockRegistry { Integer lockIndex = lockKey.hashCode() & this.mask; return this.lockTable[lockIndex]; } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java index 0067fab170..a8eef22920 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/MessagingMethodInvokerHelper.java @@ -49,9 +49,9 @@ import org.springframework.expression.Expression; import org.springframework.expression.TypeConverter; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; @@ -340,7 +340,7 @@ public class MessagingMethodInvokerHelper extends AbstractExpressionEvaluator if ("org.springframework.integration.gateway.RequestReplyExchanger".equals(iface.getName())) { frameworkMethods.add(targetClass.getMethod("exchange", Message.class)); } - else if ("org.springframework.integration.core.MessageHandler".equals(iface.getName()) && !requiresReply) { + else if ("org.springframework.messaging.MessageHandler".equals(iface.getName()) && !requiresReply) { frameworkMethods.add(targetClass.getMethod("handleMessage", Message.class)); } } diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/PassThruLockRegistry.java b/spring-integration-core/src/main/java/org/springframework/integration/util/PassThruLockRegistry.java index 03380a5121..8551349d5a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/PassThruLockRegistry.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/PassThruLockRegistry.java @@ -56,4 +56,4 @@ public final class PassThruLockRegistry implements LockRegistry { } }; } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/SimplePool.java b/spring-integration-core/src/main/java/org/springframework/integration/util/SimplePool.java index 2645c21eda..709e06704e 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/SimplePool.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/SimplePool.java @@ -27,7 +27,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/UniqueMethodFilter.java b/spring-integration-core/src/main/java/org/springframework/integration/util/UniqueMethodFilter.java index 8fd37cec0e..f7cd3781fa 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/UniqueMethodFilter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/UniqueMethodFilter.java @@ -43,4 +43,4 @@ public class UniqueMethodFilter implements MethodFilter { return this.uniqueMethods.contains(method); } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java index 160a633d46..348c4df167 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/WhileLockedProcessor.java @@ -18,7 +18,7 @@ package org.springframework.integration.util; import java.io.IOException; import java.util.concurrent.locks.Lock; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; /** * A simple strategy callback class that allows you to provide diff --git a/spring-integration-core/src/main/java/org/springframework/integration/util/package-info.java b/spring-integration-core/src/main/java/org/springframework/integration/util/package-info.java index 1e48fb2440..e52823c34a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/util/package-info.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/util/package-info.java @@ -1,4 +1,4 @@ /** * Provides core utility classes. */ -package org.springframework.integration.util; \ No newline at end of file +package org.springframework.integration.util; diff --git a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd index ed596cf9e7..61627d0ba5 100644 --- a/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd +++ b/spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd @@ -27,7 +27,7 @@ - + @@ -85,7 +85,7 @@ - + - + @@ -373,7 +373,7 @@ - + @@ -630,7 +630,7 @@ - + @@ -645,7 +645,7 @@ - + @@ -746,7 +746,7 @@ - + @@ -1025,7 +1025,7 @@ - + @@ -1278,7 +1278,7 @@ - + @@ -1291,7 +1291,7 @@ - + @@ -2525,7 +2525,7 @@ - + @@ -2985,7 +2985,7 @@ - + @@ -3009,7 +3009,7 @@ - + @@ -3031,7 +3031,7 @@ - + @@ -3057,7 +3057,7 @@ - + @@ -3074,7 +3074,7 @@ - + @@ -3126,7 +3126,7 @@ - + @@ -3365,7 +3365,7 @@ is provided, the return value is expected to match a channel name exactly. - + @@ -3525,7 +3525,7 @@ is provided, the return value is expected to match a channel name exactly. - + @@ -3762,7 +3762,7 @@ is provided, the return value is expected to match a channel name exactly. - + @@ -3778,7 +3778,7 @@ is provided, the return value is expected to match a channel name exactly. ]]> - + @@ -3995,7 +3995,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4016,7 +4016,7 @@ The list of component name patterns you want to track (e.g., tracked-components - + @@ -4077,7 +4077,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. ]]> - + @@ -4101,7 +4101,7 @@ endpoint itself is a Polling Consumer for a channel with a queue. ]]> - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandlerTests.java index ecc647d3bd..2208bf58ce 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AbstractCorrelatingMessageHandlerTests.java @@ -31,8 +31,8 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.store.MessageGroup; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatingMessageGroupProcessorHeaderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatingMessageGroupProcessorHeaderTests.java index 43b0eecd2b..a1a093e703 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatingMessageGroupProcessorHeaderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatingMessageGroupProcessorHeaderTests.java @@ -28,7 +28,7 @@ import java.util.List; import java.util.Map; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java index 73d7f19cb1..aaddc75608 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -26,10 +26,10 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageStore; @@ -209,21 +209,6 @@ public class AggregatorTests { assertThat(((Integer) reply.getPayload()), is(105)); } - @Test - public void testNullReturningAggregator() throws InterruptedException { - this.aggregator = new AggregatingMessageHandler(new NullReturningMessageProcessor(), new SimpleMessageStore(50)); - QueueChannel replyChannel = new QueueChannel(); - Message message1 = createMessage(3, "ABC", 3, 1, replyChannel, null); - Message message2 = createMessage(5, "ABC", 3, 2, replyChannel, null); - Message message3 = createMessage(7, "ABC", 3, 3, replyChannel, null); - this.aggregator.handleMessage(message1); - this.aggregator.handleMessage(message2); - this.aggregator.handleMessage(message3); - Message reply = replyChannel.receive(500); - assertNull(reply); - } - - private static Message createMessage(Object payload, Object correlationId, int sequenceSize, int sequenceNumber, MessageChannel replyChannel, String predefinedId) { MessageBuilder builder = MessageBuilder.withPayload(payload).setCorrelationId(correlationId) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java index bc85fb573c..c1e92a381f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java @@ -24,12 +24,12 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageStore; @@ -272,33 +272,6 @@ public class ConcurrentAggregatorTests { assertThat(((Integer) reply.getPayload()), is(105)); } - @Test - public void testNullReturningAggregator() throws InterruptedException { - this.aggregator = new AggregatingMessageHandler(new NullReturningMessageProcessor(), new SimpleMessageStore( - 50)); - QueueChannel replyChannel = new QueueChannel(); - Message message1 = createMessage(3, "ABC", 3, 1, replyChannel, null); - Message message2 = createMessage(5, "ABC", 3, 2, replyChannel, null); - Message message3 = createMessage(7, "ABC", 3, 3, replyChannel, null); - CountDownLatch latch = new CountDownLatch(3); - AggregatorTestTask task1 = new AggregatorTestTask(aggregator, message1, - latch); - this.taskExecutor.execute(task1); - AggregatorTestTask task2 = new AggregatorTestTask(aggregator, message2, - latch); - this.taskExecutor.execute(task2); - AggregatorTestTask task3 = new AggregatorTestTask(aggregator, message3, - latch); - this.taskExecutor.execute(task3); - latch.await(1000, TimeUnit.MILLISECONDS); - assertNull(task1.getException()); - assertNull(task2.getException()); - assertNull(task3.getException()); - Message reply = replyChannel.receive(500); - assertNull(reply); - } - - private static Message createMessage(Object payload, Object correlationId, int sequenceSize, int sequenceNumber, MessageChannel replyChannel, String predefinedId) { @@ -364,4 +337,4 @@ public class ConcurrentAggregatorTests { } } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTests.java index 24a5325364..d79cf0b902 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTests.java @@ -17,8 +17,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerIntegrationTests.java index 284e22cb86..474f9f3b03 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerIntegrationTests.java @@ -18,8 +18,8 @@ package org.springframework.integration.aggregator; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java index 037c096ddf..e116fd3eb4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageHandlerTests.java @@ -16,6 +16,15 @@ package org.springframework.integration.aggregator; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.isA; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.any; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; @@ -27,22 +36,14 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.internal.stubbing.answers.ThrowsException; import org.mockito.runners.MockitoJUnitRunner; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageHandlingException; +import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import static org.mockito.Matchers.isA; -import static org.mockito.Mockito.doAnswer; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; /** * @author Iwein Fuld @@ -81,6 +82,8 @@ public class CorrelatingMessageHandlerTests { Message message2 = testMessage(correlationKey, 2, 2); when(correlationStrategy.getCorrelationKey(isA(Message.class))).thenReturn(correlationKey); + when(processor.processMessageGroup(any(MessageGroup.class))).thenReturn(MessageBuilder.withPayload("grouped").build()); + when(outputChannel.send(any(Message.class), anyLong())).thenReturn(true); handler.handleMessage(message1); @@ -104,7 +107,7 @@ public class CorrelatingMessageHandlerTests { when(correlationStrategy.getCorrelationKey(isA(Message.class))).thenReturn(correlationKey); handler.setExpireGroupsUponCompletion(true); - + handler.handleMessage(message1); try { @@ -135,6 +138,8 @@ public class CorrelatingMessageHandlerTests { final CountDownLatch bothMessagesHandled = new CountDownLatch(2); when(correlationStrategy.getCorrelationKey(isA(Message.class))).thenReturn(correlationKey); + when(processor.processMessageGroup(any(MessageGroup.class))).thenReturn(MessageBuilder.withPayload("grouped").build()); + when(outputChannel.send(any(Message.class), anyLong())).thenReturn(true); handler.handleMessage(message1); bothMessagesHandled.countDown(); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelationStrategyAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelationStrategyAdapterTests.java index 8b45d1ebbe..ef855d10fa 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelationStrategyAdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelationStrategyAdapterTests.java @@ -19,7 +19,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.ReflectionUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java index 20b34d471f..79e44d73dd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingCorrelationStrategyTests.java @@ -27,8 +27,8 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessorTests.java index e7b787f284..f4d80d2783 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ExpressionEvaluatingMessageGroupProcessorTests.java @@ -32,9 +32,9 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; /** * @author Alex Peters diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java index f62a598720..4c5d62bde5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategyTests.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import static org.junit.Assert.assertEquals; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.junit.Test; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java index f68fa9fb76..d3706da2e3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MessageSequenceComparatorTests.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java index 9d38922e11..e7c48334cc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingMessageGroupProcessorTests.java @@ -32,7 +32,7 @@ import org.springframework.aop.framework.ProxyFactory; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingReleaseStrategyTests.java index 3ee04302a9..15eeea3a98 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/MethodInvokingReleaseStrategyTests.java @@ -24,10 +24,11 @@ import java.util.List; import org.junit.Assert; import org.junit.Test; import org.springframework.core.convert.ConversionFailedException; -import org.springframework.integration.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageGroup; +import org.springframework.messaging.Message; /** * @author Marius Bogoevici @@ -55,7 +56,7 @@ public class MethodInvokingReleaseStrategyTests { @SuppressWarnings("unused") public boolean checkCompletenessOnNonParameterizedListOfMessages(List> messages) { Assert.assertTrue(messages.size() > 0); - return messages.size() > messages.iterator().next().getHeaders().getSequenceSize(); + return messages.size() > new EiMessageHeaderAccessor(messages.iterator().next()).getSequenceSize(); } } ReleaseStrategy adapter = new MethodInvokingReleaseStrategy(new TestReleaseStrategy(), @@ -70,7 +71,7 @@ public class MethodInvokingReleaseStrategyTests { @SuppressWarnings("unused") public boolean checkCompletenessOnListOfMessagesParametrizedWithWildcard(List> messages) { Assert.assertTrue(messages.size() > 0); - return messages.size() > messages.iterator().next().getHeaders().getSequenceSize(); + return messages.size() > new EiMessageHeaderAccessor(messages.iterator().next()).getSequenceSize(); } } ReleaseStrategy adapter = new MethodInvokingReleaseStrategy(new TestReleaseStrategy(), @@ -85,7 +86,7 @@ public class MethodInvokingReleaseStrategyTests { @SuppressWarnings("unused") public boolean checkCompletenessOnListOfMessagesParametrizedWithString(List> messages) { Assert.assertTrue(messages.size() > 0); - return messages.size() > messages.iterator().next().getHeaders().getSequenceSize(); + return messages.size() > new EiMessageHeaderAccessor(messages.iterator().next()).getSequenceSize(); } } ReleaseStrategy adapter = new MethodInvokingReleaseStrategy(new TestReleaseStrategy(), diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java index 3f8bac57ca..0b16a57a15 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencerTests.java @@ -28,13 +28,13 @@ import java.util.Collections; import org.junit.Before; import org.junit.Test; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; /** * @author Marius Bogoevici @@ -69,11 +69,11 @@ public class ResequencerTests { Message reply2 = replyChannel.receive(0); Message reply3 = replyChannel.receive(0); assertNotNull(reply1); - assertThat( reply1.getHeaders().getSequenceNumber(), is(1)); + assertThat( new EiMessageHeaderAccessor(reply1).getSequenceNumber(), is(1)); assertNotNull(reply2); - assertThat(reply2.getHeaders().getSequenceNumber(), is(2)); + assertThat(new EiMessageHeaderAccessor(reply2).getSequenceNumber(), is(2)); assertNotNull(reply3); - assertThat( reply3.getHeaders().getSequenceNumber(), is(3)); + assertThat( new EiMessageHeaderAccessor(reply3).getSequenceNumber(), is(3)); } @Test @@ -142,11 +142,11 @@ public class ResequencerTests { Message reply2 = replyChannel.receive(0); Message reply3 = replyChannel.receive(0); assertNotNull(reply1); - assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber()); + assertEquals(new Integer(1), new EiMessageHeaderAccessor(reply1).getSequenceNumber()); assertNotNull(reply2); - assertEquals(new Integer(2), reply2.getHeaders().getSequenceNumber()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply2).getSequenceNumber()); assertNotNull(reply3); - assertEquals(new Integer(3), reply3.getHeaders().getSequenceNumber()); + assertEquals(new Integer(3), new EiMessageHeaderAccessor(reply3).getSequenceNumber()); } @Test @@ -165,18 +165,18 @@ public class ResequencerTests { Message reply3 = replyChannel.receive(0); // only messages 1 and 2 should have been received by now assertNotNull(reply1); - assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber()); + assertEquals(new Integer(1), new EiMessageHeaderAccessor(reply1).getSequenceNumber()); assertNotNull(reply2); - assertEquals(new Integer(2), reply2.getHeaders().getSequenceNumber()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply2).getSequenceNumber()); assertNull(reply3); // when sending the last message, the whole sequence must have been sent this.resequencer.handleMessage(message4); reply3 = replyChannel.receive(0); Message reply4 = replyChannel.receive(0); assertNotNull(reply3); - assertEquals(new Integer(3), reply3.getHeaders().getSequenceNumber()); + assertEquals(new Integer(3), new EiMessageHeaderAccessor(reply3).getSequenceNumber()); assertNotNull(reply4); - assertEquals(new Integer(4), reply4.getHeaders().getSequenceNumber()); + assertEquals(new Integer(4), new EiMessageHeaderAccessor(reply4).getSequenceNumber()); } @Test @@ -195,18 +195,18 @@ public class ResequencerTests { Message reply3 = replyChannel.receive(0); // only messages 1 and 2 should have been received by now assertNotNull(reply1); - assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber()); + assertEquals(new Integer(1), new EiMessageHeaderAccessor(reply1).getSequenceNumber()); assertNotNull(reply2); - assertEquals(new Integer(2), reply2.getHeaders().getSequenceNumber()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply2).getSequenceNumber()); assertNull(reply3); // when sending the last message, the whole sequence must have been sent this.resequencer.handleMessage(message4); reply3 = replyChannel.receive(0); Message reply4 = replyChannel.receive(0); assertNotNull(reply3); - assertEquals(new Integer(3), reply3.getHeaders().getSequenceNumber()); + assertEquals(new Integer(3), new EiMessageHeaderAccessor(reply3).getSequenceNumber()); assertNotNull(reply4); - assertEquals(new Integer(4), reply4.getHeaders().getSequenceNumber()); + assertEquals(new Integer(4), new EiMessageHeaderAccessor(reply4).getSequenceNumber()); } @Test @@ -227,8 +227,8 @@ public class ResequencerTests { assertNotNull(reply1); assertNotNull(reply2); assertNull(reply3); - ArrayList sequence = new ArrayList(Arrays.asList(reply1.getHeaders().getSequenceNumber(), reply2.getHeaders() - .getSequenceNumber())); + ArrayList sequence = new ArrayList(Arrays.asList(new EiMessageHeaderAccessor(reply1).getSequenceNumber(), + new EiMessageHeaderAccessor(reply2).getSequenceNumber())); Collections.sort(sequence); assertEquals("[1, 2]", sequence.toString()); // when sending the last message, the whole sequence must have been sent @@ -251,7 +251,7 @@ public class ResequencerTests { Message discard2 = discardChannel.receive(0); // message2 has been discarded because it came in with the wrong sequence size assertNotNull(discard1); - assertEquals(new Integer(1), discard1.getHeaders().getSequenceNumber()); + assertEquals(new Integer(1), new EiMessageHeaderAccessor(discard1).getSequenceNumber()); assertNull(discard2); } @@ -292,13 +292,13 @@ public class ResequencerTests { reply3 = replyChannel.receive(0); Message reply4 = replyChannel.receive(0); assertNotNull(reply1); - assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber()); + assertEquals(new Integer(1), new EiMessageHeaderAccessor(reply1).getSequenceNumber()); assertNotNull(reply2); - assertEquals(new Integer(2), reply2.getHeaders().getSequenceNumber()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply2).getSequenceNumber()); assertNotNull(reply3); - assertEquals(new Integer(3), reply3.getHeaders().getSequenceNumber()); + assertEquals(new Integer(3), new EiMessageHeaderAccessor(reply3).getSequenceNumber()); assertNotNull(reply4); - assertEquals(new Integer(4), reply4.getHeaders().getSequenceNumber()); + assertEquals(new Integer(4), new EiMessageHeaderAccessor(reply4).getSequenceNumber()); } @Test diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java index 4376cca851..7d94f8a482 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ResequencingMessageGroupProcessorTests.java @@ -17,7 +17,7 @@ package org.springframework.integration.aggregator; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategyTests.java index 677e9af49c..373bf7e293 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/SequenceSizeReleaseStrategyTests.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategyTests.java index 712880ebe1..dad3cb6ea0 100755 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/TimeoutCountSequenceSizeReleaseStrategyTests.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.SimpleMessageGroup; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java index 7f4f6d6714..2fef5589e5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorExpressionIntegrationTests.java @@ -25,10 +25,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.PollableChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -60,9 +60,9 @@ public class AggregatorExpressionIntegrationTests { private Map stubHeaders(int sequenceNumber, int sequenceSize, int correllationId) { Map headers = new HashMap(); - headers.put(MessageHeaders.SEQUENCE_NUMBER, sequenceNumber); - headers.put(MessageHeaders.SEQUENCE_SIZE, sequenceSize); - headers.put(MessageHeaders.CORRELATION_ID, correllationId); + headers.put(EiMessageHeaderAccessor.SEQUENCE_NUMBER, sequenceNumber); + headers.put(EiMessageHeaderAccessor.SEQUENCE_SIZE, sequenceSize); + headers.put(EiMessageHeaderAccessor.CORRELATION_ID, correllationId); return headers; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java index 4c1eca9ccd..0aa0e82767 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AggregatorIntegrationTests.java @@ -28,9 +28,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -47,11 +47,11 @@ public class AggregatorIntegrationTests { @Autowired @Qualifier("input") private MessageChannel input; - + @Autowired @Qualifier("expiringAggregatorInput") private MessageChannel expiringAggregatorInput; - + @Autowired @Qualifier("nonExpiringAggregatorInput") private MessageChannel nonExpiringAggregatorInput; @@ -59,7 +59,7 @@ public class AggregatorIntegrationTests { @Autowired @Qualifier("output") private PollableChannel output; - + @Autowired @Qualifier("discard") private PollableChannel discard; @@ -72,7 +72,7 @@ public class AggregatorIntegrationTests { } assertEquals(0 + 1 + 2 + 3 + 4, output.receive().getPayload()); } - + @Test public void testNonExpiringAggregator() throws Exception { for (int i = 0; i < 5; i++) { @@ -80,22 +80,22 @@ public class AggregatorIntegrationTests { nonExpiringAggregatorInput.send(new GenericMessage(i, headers)); } assertNotNull(output.receive(0)); - + assertNull(discard.receive(0)); - + for (int i = 5; i < 10; i++) { Map headers = stubHeaders(i, 5, 1); nonExpiringAggregatorInput.send(new GenericMessage(i, headers)); } assertNull(output.receive(0)); - + assertNotNull(discard.receive(0)); assertNotNull(discard.receive(0)); assertNotNull(discard.receive(0)); assertNotNull(discard.receive(0)); assertNotNull(discard.receive(0)); } - + @Test public void testExpiringAggregator() throws Exception { for (int i = 0; i < 5; i++) { @@ -103,15 +103,15 @@ public class AggregatorIntegrationTests { expiringAggregatorInput.send(new GenericMessage(i, headers)); } assertNotNull(output.receive(0)); - + assertNull(discard.receive(0)); - + for (int i = 5; i < 10; i++) { Map headers = stubHeaders(i, 5, 1); expiringAggregatorInput.send(new GenericMessage(i, headers)); } assertNotNull(output.receive(0)); - + assertNull(discard.receive(0)); } @@ -129,9 +129,9 @@ public class AggregatorIntegrationTests { private Map stubHeaders(int sequenceNumber, int sequenceSize, int correllationId) { Map headers = new HashMap(); - headers.put(MessageHeaders.SEQUENCE_NUMBER, sequenceNumber); - headers.put(MessageHeaders.SEQUENCE_SIZE, sequenceSize); - headers.put(MessageHeaders.CORRELATION_ID, correllationId); + headers.put(EiMessageHeaderAccessor.SEQUENCE_NUMBER, sequenceNumber); + headers.put(EiMessageHeaderAccessor.SEQUENCE_SIZE, sequenceSize); + headers.put(EiMessageHeaderAccessor.CORRELATION_ID, correllationId); return headers; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java index 4d5a20ffbb..3dfca6c3ac 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/AnnotationAggregatorTests.java @@ -23,12 +23,12 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.CorrelationStrategy; import org.springframework.integration.annotation.ReleaseStrategy; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java index 85f7671eab..07aa6776fe 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java @@ -30,10 +30,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.PollableChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -70,9 +70,9 @@ public class DefaultMessageAggregatorIntegrationTests { private Map stubHeaders(int sequenceNumber, int sequenceSize, int correllationId) { Map headers = new HashMap(); - headers.put(MessageHeaders.SEQUENCE_NUMBER, sequenceNumber); - headers.put(MessageHeaders.SEQUENCE_SIZE, sequenceSize); - headers.put(MessageHeaders.CORRELATION_ID, correllationId); + headers.put(EiMessageHeaderAccessor.SEQUENCE_NUMBER, sequenceNumber); + headers.put(EiMessageHeaderAccessor.SEQUENCE_SIZE, sequenceSize); + headers.put(EiMessageHeaderAccessor.CORRELATION_ID, correllationId); return headers; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java index 93bf2b3a5f..7378ae14fd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java @@ -24,9 +24,9 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java index 015e21c4bf..1839ed07bb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/ResequencerIntegrationTests.java @@ -19,8 +19,9 @@ package org.springframework.integration.aggregator.integration; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.aggregator.ResequencingMessageHandler; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; @@ -37,7 +38,7 @@ import static org.junit.Assert.assertNull; */ public class ResequencerIntegrationTests { - @Test + @Test public void validateUnboundedResequencerLight(){ ApplicationContext context = new ClassPathXmlApplicationContext("ResequencerIntegrationTest-context.xml", ResequencerIntegrationTests.class); MessageChannel inputChannel = context .getBean("resequencerLightInput", MessageChannel.class); @@ -45,52 +46,52 @@ public class ResequencerIntegrationTests { EventDrivenConsumer edc = context.getBean("resequencerLight", EventDrivenConsumer.class); ResequencingMessageHandler handler = TestUtils.getPropertyValue(edc, "handler", ResequencingMessageHandler.class); MessageGroupStore store = TestUtils.getPropertyValue(handler, "messageStore", MessageGroupStore.class); - + Message message1 = MessageBuilder.withPayload("1").setCorrelationId("A").setSequenceNumber(1).build(); Message message2 = MessageBuilder.withPayload("2").setCorrelationId("A").setSequenceNumber(2).build(); Message message3 = MessageBuilder.withPayload("3").setCorrelationId("A").setSequenceNumber(3).build(); Message message4 = MessageBuilder.withPayload("4").setCorrelationId("A").setSequenceNumber(4).build(); Message message5 = MessageBuilder.withPayload("5").setCorrelationId("A").setSequenceNumber(5).build(); Message message6 = MessageBuilder.withPayload("6").setCorrelationId("A").setSequenceNumber(6).build(); - + inputChannel.send(message3); assertNull(outputChannel.receive(0)); - + inputChannel.send(message1); message1 = outputChannel.receive(0); assertNotNull(message1); - assertEquals((Integer)1, message1.getHeaders().getSequenceNumber()); - + assertEquals((Integer)1, new EiMessageHeaderAccessor(message1).getSequenceNumber()); + inputChannel.send(message2); message2 = outputChannel.receive(0); message3 = outputChannel.receive(0); - assertNotNull(message2); + assertNotNull(message2); assertNotNull(message3); - assertEquals((Integer)2, message2.getHeaders().getSequenceNumber()); - assertEquals((Integer)3, message3.getHeaders().getSequenceNumber()); - + assertEquals((Integer)2, new EiMessageHeaderAccessor(message2).getSequenceNumber()); + assertEquals((Integer)3, new EiMessageHeaderAccessor(message3).getSequenceNumber()); + inputChannel.send(message5); assertNull(outputChannel.receive(0)); - + inputChannel.send(message6); assertNull(outputChannel.receive(0)); - + inputChannel.send(message4); message4 = outputChannel.receive(0); message5 = outputChannel.receive(0); message6 = outputChannel.receive(0); - assertNotNull(message4); + assertNotNull(message4); assertNotNull(message5); assertNotNull(message6); - assertEquals((Integer)4, message4.getHeaders().getSequenceNumber()); - assertEquals((Integer)5, message5.getHeaders().getSequenceNumber()); - assertEquals((Integer)6, message6.getHeaders().getSequenceNumber()); - - + assertEquals((Integer)4, new EiMessageHeaderAccessor(message4).getSequenceNumber()); + assertEquals((Integer)5, new EiMessageHeaderAccessor(message5).getSequenceNumber()); + assertEquals((Integer)6, new EiMessageHeaderAccessor(message6).getSequenceNumber()); + + assertEquals(0, store.getMessageGroup("A").getMessages().size()); } - - @Test + + @Test public void validateUnboundedResequencerDeep(){ ApplicationContext context = new ClassPathXmlApplicationContext("ResequencerIntegrationTest-context.xml", ResequencerIntegrationTests.class); MessageChannel inputChannel = context .getBean("resequencerDeepInput", MessageChannel.class); @@ -98,11 +99,11 @@ public class ResequencerIntegrationTests { EventDrivenConsumer edc = context.getBean("resequencerDeep", EventDrivenConsumer.class); ResequencingMessageHandler handler = TestUtils.getPropertyValue(edc, "handler", ResequencingMessageHandler.class); MessageGroupStore store = TestUtils.getPropertyValue(handler, "messageStore", MessageGroupStore.class); - + Message message1 = MessageBuilder.withPayload("1").setCorrelationId("A").setSequenceNumber(1).build(); Message message2 = MessageBuilder.withPayload("2").setCorrelationId("A").setSequenceNumber(2).build(); Message message3 = MessageBuilder.withPayload("3").setCorrelationId("A").setSequenceNumber(3).build(); - + inputChannel.send(message3); assertNull(outputChannel.receive(0)); inputChannel.send(message1); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java index d2b95b4455..1c69c0405b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregationResendTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java index 045cd78bca..bb61efef3e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorReplyChannelTests.java @@ -29,9 +29,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java index 0f459f5d26..76ebc145a8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/AggregatorWithCustomReleaseStrategyTests.java @@ -19,8 +19,8 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java index c957e99ab5..7f34a611aa 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/NestedAggregationTests.java @@ -25,15 +25,15 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; /** - * + * * @author Dave Syer */ @ContextConfiguration @@ -66,7 +66,7 @@ public class NestedAggregationTests { private List sendAndReceiveMessage(DirectChannel channel, int timeout, Message input) { - MessagingTemplate messagingTemplate = new MessagingTemplate(); + GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); messagingTemplate.setReceiveTimeout(timeout); @SuppressWarnings("unchecked") diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java index 61492f8923..c78039a171 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/scenarios/PartialSequencesWithGapsTests.java @@ -19,11 +19,12 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -63,8 +64,8 @@ public class PartialSequencesWithGapsTests { in.send(message(6, 6)); in.send(message(2, 6)); in.send(message(1, 6)); - assertThat(received.poll().getHeaders().getSequenceNumber(), is(1)); - assertThat(received.poll().getHeaders().getSequenceNumber(), is(2)); + assertThat(new EiMessageHeaderAccessor(received.poll()).getSequenceNumber(), is(1)); + assertThat(new EiMessageHeaderAccessor(received.poll()).getSequenceNumber(), is(2)); received.poll(); received.poll(); in.send(message(5, 6)); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java index d232182e5f..8666f0f41d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Payload; import org.springframework.integration.annotation.Publisher; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java index 846aba14f2..adbcfb2313 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Payload; import org.springframework.integration.annotation.Publisher; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java index 06eaebf4ef..bb2588b5b2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java @@ -28,10 +28,11 @@ import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolver; /** * @author Mark Fisher @@ -40,7 +41,7 @@ import org.springframework.integration.support.channel.ChannelResolver; */ public class MessagePublishingInterceptorTests { - private ChannelResolver channelResolver; + private DestinationResolver channelResolver; private final QueueChannel testChannel = new QueueChannel(); @@ -49,7 +50,7 @@ public class MessagePublishingInterceptorTests { @Before public void setup() { beanFactory = new DefaultListableBeanFactory(); - channelResolver = new BeanFactoryChannelResolver(beanFactory); + channelResolver = new BeanFactoryMessageChannelDestinationResolver(beanFactory); beanFactory.registerSingleton("c", testChannel); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml index 04dea82f3b..f384d9847f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests-context.xml @@ -44,7 +44,7 @@ + class="org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver"> diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests.java index f93a410960..efc503373a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorUsageTests.java @@ -21,7 +21,7 @@ import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java index 49a4257255..ea75a1edb4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherAnnotationAdvisorTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.support.StaticApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Payload; import org.springframework.integration.annotation.Publisher; import org.springframework.integration.channel.QueueChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherExpressionTests.java index 052122b182..7398c517c3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aop/PublisherExpressionTests.java @@ -25,13 +25,13 @@ import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.support.StaticApplicationContext; import org.springframework.expression.EvaluationContext; -import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Payload; import org.springframework.integration.annotation.Publisher; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.IntegrationEvaluationContextFactoryBean; import org.springframework.integration.context.IntegrationContextUtils; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java index de35a1b92f..a96d21e999 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/ApplicationContextMessageBusTests.java @@ -26,19 +26,20 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; + import org.springframework.beans.factory.BeanFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.MessageSource; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.scheduling.PollerMetadata; import org.springframework.integration.support.MessageBuilder; @@ -96,7 +97,7 @@ public class ApplicationContextMessageBusTests { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("messageBusTests.xml", this.getClass()); context.start(); PollableChannel sourceChannel = (PollableChannel) context.getBean("sourceChannel"); - sourceChannel.send(new GenericMessage("test")); + sourceChannel.send(new GenericMessage("test")); PollableChannel targetChannel = (PollableChannel) context.getBean("targetChannel"); Message result = targetChannel.receive(3000); assertEquals("test", result.getPayload()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java index 3d97e82f9f..c559f0bfd3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/bus/DirectChannelSubscriptionTests.java @@ -21,15 +21,15 @@ import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.annotation.MessagingAnnotationPostProcessor; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.ServiceActivatingHandler; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/BeanFactoryChannelResolverTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/BeanFactoryChannelResolverTests.java deleted file mode 100644 index 54eda82fcb..0000000000 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/BeanFactoryChannelResolverTests.java +++ /dev/null @@ -1,55 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.channel; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertSame; - -import org.junit.Test; - -import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolutionException; - -/** - * @author Mark Fisher - */ -public class BeanFactoryChannelResolverTests { - - @Test - public void lookupRegisteredChannel() { - GenericApplicationContext context = new GenericApplicationContext(); - QueueChannel testChannel = new QueueChannel(); - testChannel.setBeanName("testChannel"); - context.getBeanFactory().registerSingleton("testChannel", testChannel); - context.refresh(); - BeanFactoryChannelResolver resolver = new BeanFactoryChannelResolver(context); - MessageChannel lookedUpChannel = resolver.resolveChannelName("testChannel"); - assertNotNull(testChannel); - assertSame(testChannel, lookedUpChannel); - } - - @Test(expected = ChannelResolutionException.class) - public void lookupNonRegisteredChannel() { - GenericApplicationContext context = new GenericApplicationContext(); - context.refresh(); - BeanFactoryChannelResolver resolver = new BeanFactoryChannelResolver(context); - resolver.resolveChannelName("noSuchChannel"); - } - -} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java index 62b424c435..3097f23402 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/ChannelPurgerTests.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java index 6352d53975..547c62e280 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DatatypeChannelTests.java @@ -32,12 +32,12 @@ import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.support.ErrorMessage; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelTests.java index 3455abee1d..40b5e75bb0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DirectChannelTests.java @@ -24,9 +24,9 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; import org.springframework.integration.dispatcher.UnicastingDispatcher; import org.springframework.integration.endpoint.EventDrivenConsumer; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests.java index d2fc098334..0cb9222619 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatcherHasNoSubscribersTests.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatchingChannelErrorHandlingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatchingChannelErrorHandlingTests.java index 9fceaa77ac..93ec381413 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatchingChannelErrorHandlingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/DispatchingChannelErrorHandlingTests.java @@ -24,17 +24,15 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; - import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/ExecutorChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/ExecutorChannelTests.java index 8b377c60bf..cdce79c8c4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/ExecutorChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/ExecutorChannelTests.java @@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; import org.springframework.core.task.SimpleAsyncTaskExecutor; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; import org.springframework.integration.message.GenericMessage; import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java index 2b53325638..cd4f993856 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/MessagePayloadTestComparator.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java index abaff43952..5beb2477fe 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/MixedDispatcherConfigurationScenarioTests.java @@ -43,9 +43,9 @@ import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageRejectedException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; import org.springframework.integration.dispatcher.UnicastingDispatcher; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java index 3de3057e76..5097f57375 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/P2pChannelTests.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.dispatcher.MessageDispatcher; import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils.FieldCallback; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java index 97d9b0ffd3..85cb91df08 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java @@ -25,7 +25,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java index c4acf0c5e7..e9f2bebb13 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/QueueChannelTests.java @@ -30,7 +30,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.selector.UnexpiredMessageSelector; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/TestChannelResolver.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/TestChannelResolver.java index 42f7e06f57..93d15a745d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/TestChannelResolver.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/TestChannelResolver.java @@ -20,19 +20,19 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.DestinationResolver; import org.springframework.util.Assert; /** * @author Mark Fisher */ -public class TestChannelResolver implements ChannelResolver { +public class TestChannelResolver implements DestinationResolver { private volatile Map channels = new ConcurrentHashMap(); - public MessageChannel resolveChannelName(String channelName) { + public MessageChannel resolveDestination(String channelName) { return this.channels.get(channelName); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests.java index f077fa1d8e..82a90e8689 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/TransactionSynchronizationQueueChannelTests.java @@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java index f3a3747aa3..1489656967 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java @@ -33,19 +33,19 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.FatalBeanException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.TestChannelInterceptor; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; import org.springframework.integration.dispatcher.UnicastingDispatcher; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.util.ErrorHandlingTaskExecutor; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.PollableChannel; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests.java index 19bf4b3ecd..6e524f18f2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/DispatchingChannelParserTests.java @@ -32,7 +32,7 @@ import org.springframework.beans.FatalBeanException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.ExecutorChannel; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java index 235e6ee31d..fccfd8aa76 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/RendezvousChannelParserTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.RendezvousChannel; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSource.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSource.java index bb9b2220da..36de8b35cc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestSource.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestTransformer.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestTransformer.java index e69b69e738..b791a11daf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/TestTransformer.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.Transformer; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java index c3fcafea86..cdd794de09 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/config/ThreadLocalChannelParserTests.java @@ -32,7 +32,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.config.TestChannelInterceptor; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java index 618416cae9..69698e72bb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/ChannelInterceptorTests.java @@ -31,8 +31,8 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests.java index ae9cd45cdc..28b8c0b223 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorSubElementTests.java @@ -24,9 +24,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests.java index e5c2d13bc9..a4fb094da4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorTests.java @@ -31,8 +31,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.core.Ordered; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java index 175ec3828a..bf282bcee7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/GlobalWireTapTests.java @@ -20,9 +20,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java index cd87384e38..c8af1399e4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java @@ -22,12 +22,11 @@ import static org.junit.Assert.assertTrue; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java index 093534d702..d1319a1439 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/WireTapTests.java @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNull; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/LocalChannelRegistryTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/LocalChannelRegistryTests.java index be02be4342..8ea862b6bb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/LocalChannelRegistryTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/registry/LocalChannelRegistryTests.java @@ -21,15 +21,13 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Before; import org.junit.Test; -import org.springframework.context.ApplicationContext; -import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.message.GenericMessage; /** @@ -41,12 +39,12 @@ public class LocalChannelRegistryTests { private LocalChannelRegistry registry = new LocalChannelRegistry(); - private AbstractApplicationContext context = new GenericApplicationContext(); + private GenericApplicationContext context = new GenericApplicationContext(); @Before public void setUp() { - context.refresh(); registry.setApplicationContext(context); + context.refresh(); } @Test diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java index 91123e4d11..8b1b469baa 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorParserTests.java @@ -16,6 +16,13 @@ package org.springframework.integration.config; +import static org.hamcrest.CoreMatchers.instanceOf; +import static org.hamcrest.CoreMatchers.is; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertThat; +import static org.junit.Assert.assertTrue; + import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -24,15 +31,11 @@ import java.util.concurrent.atomic.AtomicReference; import org.junit.Assert; import org.junit.Before; import org.junit.Test; - import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.aggregator.AggregatingMessageHandler; @@ -42,20 +45,15 @@ import org.springframework.integration.aggregator.ExpressionEvaluatingReleaseStr import org.springframework.integration.aggregator.MethodInvokingMessageGroupProcessor; import org.springframework.integration.aggregator.MethodInvokingReleaseStrategy; import org.springframework.integration.aggregator.ReleaseStrategy; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; - -import static org.hamcrest.CoreMatchers.is; -import static org.hamcrest.CoreMatchers.instanceOf; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; /** * @author Marius Bogoevici diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests.java index b020d6041c..033b3f3a97 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithCorrelationStrategyTests.java @@ -21,12 +21,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.aggregator.ReleaseStrategy; import org.springframework.integration.aggregator.CorrelationStrategy; import org.springframework.integration.annotation.Aggregator; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests.java index 2322dee5f4..6eb6fdb24a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/AggregatorWithMessageStoreParserTests.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.annotation.DirtiesContext; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java index d07774fd09..80aae61c47 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChainParserTests.java @@ -48,11 +48,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.MessageRejectedException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.gateway.GatewayProxyFactoryBean; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; @@ -65,6 +62,10 @@ import org.springframework.integration.message.MessageMatcher; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.transformer.MessageTransformingHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.StringUtils; @@ -191,7 +192,7 @@ public class ChainParserTests { Message reply = this.replyOutput.receive(0); assertNotNull(reply); assertEquals("foo", reply.getPayload()); - assertEquals("ABC", reply.getHeaders().getCorrelationId()); + assertEquals("ABC", new EiMessageHeaderAccessor(reply).getCorrelationId()); assertEquals("XYZ", reply.getHeaders().get("testValue")); assertEquals(123, reply.getHeaders().get("testRef")); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java index 0d4f1625bf..08ab72d949 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelAdapterParserTests.java @@ -32,18 +32,18 @@ import org.junit.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageDispatchingException; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolutionException; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolutionException; /** * @author Mark Fisher @@ -112,8 +112,8 @@ public class ChannelAdapterParserTests { String beanName = "outboundWithImplicitChannel"; Object channel = this.applicationContext.getBean(beanName); assertTrue(channel instanceof DirectChannel); - BeanFactoryChannelResolver channelResolver = new BeanFactoryChannelResolver(this.applicationContext); - assertNotNull(channelResolver.resolveChannelName(beanName)); + BeanFactoryMessageChannelDestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(this.applicationContext); + assertNotNull(channelResolver.resolveDestination(beanName)); Object adapter = this.applicationContext.getBean(beanName + ".adapter"); assertNotNull(adapter); assertTrue(adapter instanceof EventDrivenConsumer); @@ -142,8 +142,8 @@ public class ChannelAdapterParserTests { String beanName = "methodInvokingConsumer"; Object channel = this.applicationContext.getBean(beanName); assertTrue(channel instanceof DirectChannel); - BeanFactoryChannelResolver channelResolver = new BeanFactoryChannelResolver(this.applicationContext); - assertNotNull(channelResolver.resolveChannelName(beanName)); + BeanFactoryMessageChannelDestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(this.applicationContext); + assertNotNull(channelResolver.resolveDestination(beanName)); Object adapter = this.applicationContext.getBean(beanName + ".adapter"); assertNotNull(adapter); assertTrue(adapter instanceof EventDrivenConsumer); @@ -163,8 +163,8 @@ public class ChannelAdapterParserTests { String beanName = "expressionConsumer"; Object channel = this.applicationContext.getBean(beanName); assertTrue(channel instanceof DirectChannel); - BeanFactoryChannelResolver channelResolver = new BeanFactoryChannelResolver(this.applicationContext); - assertNotNull(channelResolver.resolveChannelName(beanName)); + BeanFactoryMessageChannelDestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(this.applicationContext); + assertNotNull(channelResolver.resolveDestination(beanName)); Object adapter = this.applicationContext.getBean(beanName + ".adapter"); assertNotNull(adapter); assertTrue(adapter instanceof EventDrivenConsumer); @@ -258,10 +258,10 @@ public class ChannelAdapterParserTests { this.applicationContext.stop(); } - @Test(expected = ChannelResolutionException.class) + @Test(expected = DestinationResolutionException.class) public void methodInvokingSourceAdapterIsNotChannel() { - BeanFactoryChannelResolver channelResolver = new BeanFactoryChannelResolver(this.applicationContext); - channelResolver.resolveChannelName("methodInvokingSource"); + BeanFactoryMessageChannelDestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(this.applicationContext); + channelResolver.resolveDestination("methodInvokingSource"); } @Test @@ -281,7 +281,7 @@ public class ChannelAdapterParserTests { } public static class SampleBean { - private String message = "hello"; + private final String message = "hello"; String getMessage() { return message; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java index eb32cd091c..85caeca9a5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ChannelWithMessageStoreParserTests.java @@ -24,9 +24,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.annotation.DirtiesContext; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java index 17cb8db458..ccdb0ba77e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/EndpointParserTests.java @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java index 2197c0ee97..f430cc0584 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ExceptionThrowingTestBean.java @@ -16,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java index 40035831dc..df157a6381 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/FilterParserTests.java @@ -26,11 +26,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.core.MessageSelector; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.filter.MessageFilter; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java index e198665add..99baffa892 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/MessageBusParserTests.java @@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.junit.Test; - import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.event.SimpleApplicationEventMulticaster; @@ -29,7 +28,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.SpringVersion; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @@ -43,16 +42,16 @@ public class MessageBusParserTests { public void testErrorChannelReference() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithErrorChannel.xml", this.getClass()); - BeanFactoryChannelResolver resolver = new BeanFactoryChannelResolver(context); - assertEquals(context.getBean("errorChannel"), resolver.resolveChannelName("errorChannel")); + BeanFactoryMessageChannelDestinationResolver resolver = new BeanFactoryMessageChannelDestinationResolver(context); + assertEquals(context.getBean("errorChannel"), resolver.resolveDestination("errorChannel")); } @Test public void testDefaultErrorChannel() { ApplicationContext context = new ClassPathXmlApplicationContext( "messageBusWithDefaults.xml", this.getClass()); - BeanFactoryChannelResolver resolver = new BeanFactoryChannelResolver(context); - assertEquals(context.getBean("errorChannel"), resolver.resolveChannelName("errorChannel")); + BeanFactoryMessageChannelDestinationResolver resolver = new BeanFactoryMessageChannelDestinationResolver(context); + assertEquals(context.getBean("errorChannel"), resolver.resolveDestination("errorChannel")); } @Test diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java index c486da9dc8..67ff81af8f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerParserTests.java @@ -24,8 +24,8 @@ import org.junit.Before; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.aggregator.CorrelationStrategy; import org.springframework.integration.aggregator.MethodInvokingCorrelationStrategy; import org.springframework.integration.aggregator.MethodInvokingReleaseStrategy; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests.java index 8865f23fda..a9d9bf6b3f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ResequencerWithMessageStoreParserTests.java @@ -23,9 +23,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; @@ -37,21 +38,21 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @ContextConfiguration @RunWith(SpringJUnit4ClassRunner.class) public class ResequencerWithMessageStoreParserTests { - + @Autowired @Qualifier("input") private MessageChannel input; - + @Autowired @Qualifier("output") private PollableChannel output; - + @Autowired private MessageGroupStore messageGroupStore; @Test public void testResequence() { - + input.send(createMessage("123", "id1", 3, 1, null)); assertEquals(1, messageGroupStore.getMessageGroup("id1").size()); input.send(createMessage("789", "id1", 3, 3, null)); @@ -63,11 +64,11 @@ public class ResequencerWithMessageStoreParserTests { Message message3 = output.receive(500); assertNotNull(message1); - assertEquals(new Integer(1), message1.getHeaders().getSequenceNumber()); + assertEquals(new Integer(1), new EiMessageHeaderAccessor(message1).getSequenceNumber()); assertNotNull(message2); - assertEquals(new Integer(2), message2.getHeaders().getSequenceNumber()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(message2).getSequenceNumber()); assertNotNull(message3); - assertEquals(new Integer(3), message3.getHeaders().getSequenceNumber()); + assertEquals(new Integer(3), new EiMessageHeaderAccessor(message3).getSequenceNumber()); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests.java index e690afaee5..ed190c4257 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/RouterFactoryBeanDelegationTests.java @@ -26,8 +26,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.router.AbstractMappingMessageRouter; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java index 5633fb1f14..a189f6b87e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/SelectorChainParserTests.java @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.selector.MessageSelectorChain; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java index 6cbedef177..b2cc19063b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/ServiceActivatorAnnotationPostProcessorTests.java @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.springframework.beans.factory.support.RootBeanDefinition; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.DirectChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java index b24c759df1..7e190e68e1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/SourcePollingChannelAdapterFactoryBeanTests.java @@ -33,7 +33,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/StubMessageSelector.java b/spring-integration-core/src/test/java/org/springframework/integration/config/StubMessageSelector.java index 886f699dec..3d470a1a7e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/StubMessageSelector.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregatorBean.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregatorBean.java index 356676168b..713c29bb82 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregatorBean.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestAggregatorBean.java @@ -22,7 +22,8 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.message.GenericMessage; @@ -44,7 +45,7 @@ public class TestAggregatorBean { for (Message message : sortableList) { buffer.append(message.getPayload().toString()); if (null == correlationId) { - correlationId = message.getHeaders().getCorrelationId(); + correlationId = new EiMessageHeaderAccessor(message).getCorrelationId(); } } Message returnedMessage = new GenericMessage(buffer.toString()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java index 7fc2084706..1e1fb411e1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestChannelInterceptor.java @@ -18,8 +18,8 @@ package org.springframework.integration.config; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestConsumer.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestConsumer.java index f7615c83fc..1b1b5d3197 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestConsumer.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestConsumer.java @@ -16,8 +16,8 @@ package org.springframework.integration.config; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestCorrelationStrategy.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestCorrelationStrategy.java index 71c16e8f69..097ca8996d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestCorrelationStrategy.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestCorrelationStrategy.java @@ -16,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.aggregator.CorrelationStrategy; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestHandler.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestHandler.java index 9d70bad5ee..91b161793b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestHandler.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestHandler.java @@ -18,7 +18,7 @@ package org.springframework.integration.config; import java.util.concurrent.CountDownLatch; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.ServiceActivator; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestSelector.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestSelector.java index 762006863a..d3389ce157 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestSelector.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestSelector.java @@ -16,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/TestSource.java b/spring-integration-core/src/test/java/org/springframework/integration/config/TestSource.java index 028d61fba1..8af9c7fc06 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/TestSource.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/TestSource.java @@ -16,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests.java index 649713409f..3bf5ed1c54 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/WireTapParserTests.java @@ -26,10 +26,10 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.interceptor.WireTap; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java index bc7b2f92b5..490ed89f63 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AggregatorAnnotationTests.java @@ -16,6 +16,12 @@ package org.springframework.integration.config.annotation; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; +import static org.springframework.integration.test.util.TestUtils.getPropertyValue; + import java.lang.reflect.Method; import java.util.Map; @@ -29,18 +35,12 @@ import org.springframework.integration.aggregator.MethodInvokingCorrelationStrat import org.springframework.integration.aggregator.MethodInvokingReleaseStrategy; import org.springframework.integration.aggregator.SequenceSizeReleaseStrategy; import org.springframework.integration.channel.NullChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; import org.springframework.integration.test.util.TestUtils; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertTrue; - -import static org.springframework.integration.test.util.TestUtils.getPropertyValue; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolver; /** * @author Marius Bogoevici @@ -69,9 +69,9 @@ public class AggregatorAnnotationTests { final String endpointName = "endpointWithCustomizedAnnotation"; MessageHandler aggregator = this.getAggregator(context, endpointName); assertTrue(getPropertyValue(aggregator, "releaseStrategy") instanceof SequenceSizeReleaseStrategy); - ChannelResolver channelResolver = new BeanFactoryChannelResolver(context); - assertEquals(channelResolver.resolveChannelName("outputChannel"), getPropertyValue(aggregator, "outputChannel")); - assertEquals(channelResolver.resolveChannelName("discardChannel"), getPropertyValue(aggregator, + DestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(context); + assertEquals(channelResolver.resolveDestination("outputChannel"), getPropertyValue(aggregator, "outputChannel")); + assertEquals(channelResolver.resolveDestination("discardChannel"), getPropertyValue(aggregator, "discardChannel")); assertEquals(98765432l, getPropertyValue(aggregator, "messagingTemplate.sendTimeout")); assertEquals(true, getPropertyValue(aggregator, "sendPartialResultOnExpiry")); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java index 569a55f06f..8a9c4fb84b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/AnnotatedEndpointActivationTests.java @@ -23,17 +23,16 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/FilterAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/FilterAnnotationPostProcessorTests.java index 2a236c09f6..10cd8d8a60 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/FilterAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/FilterAnnotationPostProcessorTests.java @@ -29,7 +29,7 @@ import java.util.List; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Filter; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.channel.DirectChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests.java index e81f1c43b1..2e3b31d2c9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorAopIntegrationTests.java @@ -29,11 +29,11 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -72,7 +72,7 @@ public class MessagingAnnotationPostProcessorAopIntegrationTests { @Aspect public static class HandlerAspect { - @Before("execution(* org.springframework.integration.core.MessageHandler+.*(..)) && args(message)") + @Before("execution(* org.springframework.messaging.MessageHandler+.*(..)) && args(message)") public void addOneHundred(Message message) { ((AtomicInteger) message.getPayload()).addAndGet(100); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java index b609ad822a..fa5b8aeb45 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/MessagingAnnotationPostProcessorTests.java @@ -24,26 +24,25 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import org.junit.Test; - import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.annotation.Transformer; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.test.util.TestUtils.TestApplicationContext; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolver; /** * @author Mark Fisher @@ -136,8 +135,8 @@ public class MessagingAnnotationPostProcessorTests { OutboundOnlyTestBean testBean = new OutboundOnlyTestBean(latch); postProcessor.postProcessAfterInitialization(testBean, "testBean"); context.refresh(); - ChannelResolver channelResolver = new BeanFactoryChannelResolver(context); - MessageChannel testChannel = channelResolver.resolveChannelName("testChannel"); + DestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(context); + MessageChannel testChannel = channelResolver.resolveDestination("testChannel"); testChannel.send(new GenericMessage("foo")); latch.await(1000, TimeUnit.MILLISECONDS); assertEquals(0, latch.getCount()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java index 5788469f63..fa5911e1bb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/RouterAnnotationPostProcessorTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.Router; import org.springframework.integration.channel.DirectChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java index 5693be050f..001850be26 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SplitterAnnotationPostProcessorTests.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.Splitter; import org.springframework.integration.channel.DirectChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java index f03f97daf9..7a8cdbf9cf 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/SubscriberOrderTests.java @@ -27,8 +27,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.annotation.Order; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java index 5e12684e6e..bda87e61ab 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithCustomizedAggregator.java @@ -22,7 +22,8 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.message.GenericMessage; @@ -39,8 +40,8 @@ public class TestAnnotatedEndpointWithCustomizedAggregator { @Aggregator( inputChannel = "inputChannel", outputChannel = "outputChannel", - discardChannel = "discardChannel", - sendPartialResultsOnExpiry = true, + discardChannel = "discardChannel", + sendPartialResultsOnExpiry = true, sendTimeout = 98765432) public Message aggregatingMethod(List> messages) { List> sortableList = new ArrayList>(messages); @@ -50,7 +51,7 @@ public class TestAnnotatedEndpointWithCustomizedAggregator { for (Message message : sortableList) { buffer.append(message.getPayload().toString()); if (null == correlationId) { - correlationId = message.getHeaders().getCorrelationId(); + correlationId = new EiMessageHeaderAccessor(message).getCorrelationId(); } } Message returnedMessage = new GenericMessage(buffer.toString()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java index 0eecaa0253..bb7811bf50 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithDefaultAggregator.java @@ -22,7 +22,8 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.MessageEndpoint; @@ -45,7 +46,7 @@ public class TestAnnotatedEndpointWithDefaultAggregator { for (Message message : sortableList) { buffer.append(message.getPayload().toString()); if (null == correlationId) { - correlationId = message.getHeaders().getCorrelationId(); + correlationId =new EiMessageHeaderAccessor(message).getCorrelationId(); } } Message returnedMessage = new GenericMessage(buffer.toString()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithReleaseStrategy.java b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithReleaseStrategy.java index aeec45d063..dc27df7c1a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithReleaseStrategy.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/annotation/TestAnnotatedEndpointWithReleaseStrategy.java @@ -22,7 +22,8 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.MessageEndpoint; @@ -46,7 +47,7 @@ public class TestAnnotatedEndpointWithReleaseStrategy { for (Message message : sortableList) { buffer.append(message.getPayload().toString()); if (null == correlationId) { - correlationId = message.getHeaders().getCorrelationId(); + correlationId = new EiMessageHeaderAccessor(message).getCorrelationId(); } } Message returnedMessage = new GenericMessage(buffer.toString()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests.java index 518058a094..ff3a9a947a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/BridgeParserTests.java @@ -22,21 +22,20 @@ import static org.junit.Assert.assertThat; import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.junit.Test; - import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.BridgeHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageMatcher; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @@ -110,7 +109,7 @@ public class BridgeParserTests extends AbstractJUnit4SpringContextTests { @Test public void bridgeWithSendTimeout() { BridgeHandler handler = (BridgeHandler) new DirectFieldAccessor(bridgeWithSendTimeout).getPropertyValue("handler"); - MessagingTemplate template = (MessagingTemplate) new DirectFieldAccessor(handler).getPropertyValue("messagingTemplate"); + GenericMessagingTemplate template = (GenericMessagingTemplate) new DirectFieldAccessor(handler).getPropertyValue("messagingTemplate"); assertEquals(new Long(1234), new DirectFieldAccessor(template).getPropertyValue("sendTimeout")); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java index 7f651199d2..bb302f3370 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ChannelAutoCreationTests.java @@ -45,4 +45,4 @@ public class ChannelAutoCreationTests { public void testDisablingAutoChannelCreationBefore(){ new ClassPathXmlApplicationContext("TestDisableChannelAutoCreation-before-context.xml", this.getClass()); } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests.java index 9ed512c1f9..824ed919c5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ClaimCheckParserTests.java @@ -28,10 +28,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.store.MessageStore; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests.java index c5cf59893a..00aeb4933f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusChainTests.java @@ -24,9 +24,9 @@ import java.util.Date; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.jmx.export.annotation.ManagedOperation; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests.java index d384ffe3ed..d03567a9d5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusExplicitPollerTests.java @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests.java index 9b02b6e24e..38acf71be6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusPollerTests.java @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java index a33a614b87..eb11ff7ca8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ControlBusTests.java @@ -28,9 +28,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.jmx.export.annotation.ManagedOperation; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java index 0b772e8dc0..a2416e2065 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserTests.java @@ -23,10 +23,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.convert.converter.Converter; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests.java index fc0edaf773..960eec36a1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ConverterParserWithExistingConversionServiceTests.java @@ -57,6 +57,7 @@ public class ConverterParserWithExistingConversionServiceTests { new ClassPathXmlApplicationContext("ConverterParserWithExistingConversionServiceTests-parent.xml", ConverterParserWithExistingConversionServiceTests.class); GenericApplicationContext childContext = new GenericApplicationContext(); childContext.setParent(parentContext); + childContext.refresh(); GenericConversionService conversionServiceParent = parentContext.getBean(IntegrationContextUtils.INTEGRATION_CONVERSION_SERVICE_BEAN_NAME,GenericConversionService.class); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests.java index 3247f9eb8d..5b50d34b78 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelayerUsageTests.java @@ -24,9 +24,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java index 6f20e5907f..269192532d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DelegatingConsumerParserTests.java @@ -27,16 +27,11 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.ServiceActivatorFactoryBean; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.filter.MessageFilter; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; @@ -46,6 +41,10 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.transformer.AbstractTransformer; import org.springframework.integration.transformer.MessageTransformingHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests.java index dd46d510d8..cbb4c68b76 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersOverrideDefaultTests.java @@ -21,10 +21,10 @@ import static org.junit.Assert.fail; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersTests.java index 79c7701824..4893d2b940 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/DispatcherMaxSubscribersTests.java @@ -18,7 +18,7 @@ package org.springframework.integration.config.xml; import static org.junit.Assert.assertEquals; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.test.util.TestUtils; /** @@ -81,4 +81,4 @@ public abstract class DispatcherMaxSubscribersTests { Integer explicitMin = TestUtils.getPropertyValue(pubSubExplicitChannel, "dispatcher.minSubscribers", Integer.class); assertEquals(1, explicitMin.intValue()); } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java index 18cb5ed44b..137e6f2577 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests.java @@ -33,12 +33,7 @@ import org.springframework.beans.TypeMismatchException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; @@ -46,6 +41,11 @@ import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.transformer.ContentEnricher; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java index 7a2964b37a..90b04dc6cc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTests3.java @@ -25,10 +25,10 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.spel.SpelEvaluationException; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java index 380fe4dce9..a7de83cff7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserTestsWithoutRequestChannel.java @@ -28,9 +28,9 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java index f8bcb98a77..b8321677a6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/EnricherParserWithRequestPayloadExpressionTests.java @@ -28,10 +28,10 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java index 596db2add7..6895706401 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorChannelAutoCreationTests.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java index 7d1b5af4b9..fbeaa6f56a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ErrorMessageExceptionTypeRouterParserTests.java @@ -21,9 +21,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.ErrorMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java index ed5b8f39ce..af22aba746 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/GatewayParserTests.java @@ -28,9 +28,9 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.task.SimpleAsyncTaskExecutor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.gateway.TestService; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java index b1ac84fafa..b86849b6b3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherMethodInvokingTests.java @@ -27,8 +27,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java index 864e9c6fc5..238b5a0fdd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherOverwriteTests.java @@ -22,16 +22,16 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -142,10 +142,11 @@ public class HeaderEnricherOverwriteTests { @Test public void priorityExplicitOverwriteTrue() { MessageChannel channel = context.getBean("priorityExplicitOverwriteTrueInput", MessageChannel.class); - MessagingTemplate template = new MessagingTemplate(channel); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination(channel); Message result = template.sendAndReceive(new GenericMessage("test")); assertNotNull(result); - assertEquals(new Integer(42), result.getHeaders().getPriority()); + assertEquals(new Integer(42), new EiMessageHeaderAccessor(result).getPriority()); } @Test @@ -159,7 +160,7 @@ public class HeaderEnricherOverwriteTests { input.send(message); Message result = replyChannel.receive(0); assertNotNull(result); - assertEquals(new Integer(77), result.getHeaders().getPriority()); + assertEquals(new Integer(77), new EiMessageHeaderAccessor(result).getPriority()); } @Test diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java index 1f3d90eb3f..cb2fd7666a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherParserTests.java @@ -21,9 +21,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests-context.xml index ee182870ca..010849d5d8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests-context.xml @@ -16,7 +16,7 @@ - + diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java index 42bafd2a15..b1bd7e8068 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderEnricherTests.java @@ -16,27 +16,30 @@ package org.springframework.integration.config.xml; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertSame; +import static org.junit.Assert.assertTrue; + import java.util.Date; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.MessageTransformationException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import static org.junit.Assert.*; - /** * @author Mark Fisher * @author Artem Bilan @@ -98,63 +101,63 @@ public class HeaderEnricherTests { @Test public void correlationIdValue() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("correlationIdValueInput", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); - assertEquals("ABC", result.getHeaders().getCorrelationId()); + assertEquals("ABC", new EiMessageHeaderAccessor(result).getCorrelationId()); } @Test public void correlationIdValueWithType() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("correlationIdValueWithTypeInput", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); - Object correlationId = result.getHeaders().getCorrelationId(); + Object correlationId = new EiMessageHeaderAccessor(result).getCorrelationId(); assertEquals(Long.class, correlationId.getClass()); assertEquals(new Long(123), correlationId); } @Test public void correlationIdRef() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("correlationIdRefInput", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); - assertEquals(new Integer(123), result.getHeaders().getCorrelationId()); + assertEquals(new Integer(123), new EiMessageHeaderAccessor(result).getCorrelationId()); } @Test public void expirationDateValue() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("expirationDateValueInput", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); - assertEquals(new Long(1111), result.getHeaders().getExpirationDate()); + assertEquals(new Long(1111), new EiMessageHeaderAccessor(result).getExpirationDate()); } @Test public void expirationDateRef() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("expirationDateRefInput", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); - assertEquals(new Long(9999), result.getHeaders().getExpirationDate()); + assertEquals(new Long(9999), new EiMessageHeaderAccessor(result).getExpirationDate()); } @Test public void priority() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("priorityInput", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); - assertEquals(new Integer(42), result.getHeaders().getPriority()); + assertEquals(new Integer(42), new EiMessageHeaderAccessor(result).getPriority()); } @Test public void expressionUsingPayload() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("payloadExpressionInput", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage(new TestBean("foo"))); assertNotNull(result); @@ -163,7 +166,7 @@ public class HeaderEnricherTests { @Test public void expressionUsingHeader() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("headerExpressionInput", MessageChannel.class); Message message = MessageBuilder.withPayload("test").setHeader("testHeader1", "foo").build(); Message result = template.sendAndReceive(channel, message); @@ -173,7 +176,7 @@ public class HeaderEnricherTests { @Test public void expressionWithDateType() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("expressionWithDateTypeInput", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); @@ -185,7 +188,7 @@ public class HeaderEnricherTests { @Test public void expressionWithLongType() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("expressionWithLongTypeInput", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); @@ -195,7 +198,7 @@ public class HeaderEnricherTests { @Test public void refWithMethod() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("refWithMethod", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); @@ -205,7 +208,7 @@ public class HeaderEnricherTests { @Test public void ref() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("ref", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); @@ -216,7 +219,7 @@ public class HeaderEnricherTests { @Test public void innerBean() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("innerBean", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); @@ -227,7 +230,7 @@ public class HeaderEnricherTests { @Test public void innerBeanWithMethod() { - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); MessageChannel channel = context.getBean("innerBeanWithMethod", MessageChannel.class); Message result = template.sendAndReceive(channel, new GenericMessage("test")); assertNotNull(result); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderFilterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderFilterParserTests.java index d06ddb6550..ffc8b03d5d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderFilterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/HeaderFilterParserTests.java @@ -24,8 +24,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IdGeneratorConfigurerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IdGeneratorConfigurerTests.java index 30b43b18c0..0bcb282c4a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IdGeneratorConfigurerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/IdGeneratorConfigurerTests.java @@ -25,15 +25,14 @@ import java.util.UUID; import java.util.concurrent.atomic.AtomicLong; import org.junit.Test; - import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessageHeaders.IdGenerator; -import org.springframework.integration.MessageHeaders.JdkIdGenerator; -import org.springframework.integration.MessageHeaders.SimpleIncrementingIdGenerator; +import org.springframework.integration.support.IdGenerators.JdkIdGenerator; +import org.springframework.integration.support.IdGenerators.SimpleIncrementingIdGenerator; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessageHeaders.IdGenerator; /** * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java index 12230d7218..94c51cad38 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/InnerDefinitionHandlerAwareEndpointParserTests.java @@ -27,24 +27,22 @@ import java.util.Map; import java.util.Properties; import org.junit.Assert; - import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.ApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.InputStreamResource; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.CollectionUtils; @@ -284,9 +282,9 @@ public class InnerDefinitionHandlerAwareEndpointParserTests { private Map stubHeaders(int sequenceNumber, int sequenceSize, int correllationId) { Map headers = new HashMap(); - headers.put(MessageHeaders.SEQUENCE_NUMBER, sequenceNumber); - headers.put(MessageHeaders.SEQUENCE_SIZE, sequenceSize); - headers.put(MessageHeaders.CORRELATION_ID, correllationId); + headers.put(EiMessageHeaderAccessor.SEQUENCE_NUMBER, sequenceNumber); + headers.put(EiMessageHeaderAccessor.SEQUENCE_SIZE, sequenceSize); + headers.put(EiMessageHeaderAccessor.CORRELATION_ID, correllationId); return headers; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java index 987ec06fc0..e97e12cbfb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MapToObjectTransformerParserTests.java @@ -30,9 +30,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.convert.converter.Converter; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java index 55fcd62d34..e85819470e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/MethodInvokingSelectorParserTests.java @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.filter.MethodInvokingSelector; import org.springframework.integration.selector.MessageSelectorChain; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/NestedChainParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/NestedChainParserTests.java index 0897d51b9d..6e437666da 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/NestedChainParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/NestedChainParserTests.java @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.MessageHandlerChain; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java index 057ecb086b..db49eb9067 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java @@ -30,9 +30,9 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.MessageTransformationException; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests.java index d3a24c4618..f2df48979c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToStringTransformerParserTests.java @@ -23,9 +23,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java index 28581abcb4..49d2fd763a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadDeserializingTransformerParserTests.java @@ -32,9 +32,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.serializer.Deserializer; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.transformer.MessageTransformationException; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java index 08b016e3e0..ab4354b5c3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PayloadSerializingTransformerParserTests.java @@ -30,9 +30,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.transformer.MessageTransformationException; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerWithErrorChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerWithErrorChannelTests.java index 90ab7ff4a8..90a83d4d2f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerWithErrorChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PollerWithErrorChannelTests.java @@ -25,12 +25,12 @@ import org.mockito.Mockito; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PublishingInterceptorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PublishingInterceptorParserTests.java index 8603b7eefe..02ca0a337d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PublishingInterceptorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/PublishingInterceptorParserTests.java @@ -29,9 +29,9 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java index 7b980e8832..30e3437d31 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ServiceActivatorParserTests.java @@ -26,11 +26,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -200,7 +200,9 @@ public class ServiceActivatorParserTests { } private Object sendAndReceive(MessageChannel channel, Object payload) { - MessagingTemplate template = new MessagingTemplate(channel); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination(channel); + return template.convertSendAndReceive(payload); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/SyslogTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/SyslogTransformerParserTests.java index fba6b28f11..35aaa1c407 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/SyslogTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/SyslogTransformerParserTests.java @@ -25,8 +25,8 @@ import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.transformer.SyslogToMapTransformer; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParserTests.java index b2f9d4558f..fb7bd75b93 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/TransactionSynchronizationFactoryParserTests.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpression; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.transaction.DefaultTransactionSynchronizationFactory; import org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/AsyncMessagingTemplateTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/AsyncMessagingTemplateTests.java index ec86037185..e85809edbe 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/AsyncMessagingTemplateTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/AsyncMessagingTemplateTests.java @@ -30,16 +30,16 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.junit.Test; - import org.springframework.context.support.StaticApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.MessagePostProcessor; import org.springframework.util.Assert; /** @@ -47,7 +47,7 @@ import org.springframework.util.Assert; * @since 2.0 */ public class AsyncMessagingTemplateTests { - + // TODO: changed from 0 because of recurrent failure: is this right? private long safety = 100; @@ -55,7 +55,7 @@ public class AsyncMessagingTemplateTests { public void asyncSendWithDefaultChannel() throws Exception { QueueChannel channel = new QueueChannel(); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); Message message = MessageBuilder.withPayload("test").build(); Future future = template.asyncSend(message); assertNull(future.get(1000, TimeUnit.MILLISECONDS)); @@ -102,7 +102,7 @@ public class AsyncMessagingTemplateTests { public void asyncConvertAndSendWithDefaultChannel() throws Exception { QueueChannel channel = new QueueChannel(); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); Future future = template.asyncConvertAndSend("test"); assertNull(future.get(1000, TimeUnit.MILLISECONDS)); Message result = channel.receive(0); @@ -146,7 +146,7 @@ public class AsyncMessagingTemplateTests { public void asyncReceiveWithDefaultChannel() throws Exception { QueueChannel channel = new QueueChannel(); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); Future> result = template.asyncReceive(); sendMessageAfterDelay(channel, new GenericMessage("test"), 200); long start = System.currentTimeMillis(); @@ -198,7 +198,7 @@ public class AsyncMessagingTemplateTests { public void asyncReceiveAndConvertWithDefaultChannel() throws Exception { QueueChannel channel = new QueueChannel(); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); Future result = template.asyncReceiveAndConvert(); sendMessageAfterDelay(channel, new GenericMessage("test"), 200); long start = System.currentTimeMillis(); @@ -253,7 +253,7 @@ public class AsyncMessagingTemplateTests { DirectChannel channel = new DirectChannel(); channel.subscribe(new EchoHandler(200)); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); long start = System.currentTimeMillis(); Future> result = template.asyncSendAndReceive(MessageBuilder.withPayload("test").build()); assertNotNull(result.get()); @@ -299,7 +299,7 @@ public class AsyncMessagingTemplateTests { DirectChannel channel = new DirectChannel(); channel.subscribe(new EchoHandler(200)); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); long start = System.currentTimeMillis(); Future result = template.asyncConvertSendAndReceive("test"); assertNotNull(result.get()); @@ -346,7 +346,7 @@ public class AsyncMessagingTemplateTests { DirectChannel channel = new DirectChannel(); channel.subscribe(new EchoHandler(200)); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); long start = System.currentTimeMillis(); Future result = template.asyncConvertSendAndReceive(new Integer(123), new TestMessagePostProcessor()); assertNotNull(result.get()); @@ -393,7 +393,7 @@ public class AsyncMessagingTemplateTests { DirectChannel channel = new DirectChannel(); channel.subscribe(new EchoHandler(200)); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); Future> result = template.asyncSendAndReceive(MessageBuilder.withPayload("test").build()); result.get(10, TimeUnit.MILLISECONDS); } @@ -403,7 +403,7 @@ public class AsyncMessagingTemplateTests { DirectChannel channel = new DirectChannel(); channel.subscribe(new EchoHandler(-1)); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); Future> result = template.asyncSendAndReceive(MessageBuilder.withPayload("test").build()); try { result.get(10, TimeUnit.MILLISECONDS); @@ -420,7 +420,7 @@ public class AsyncMessagingTemplateTests { EchoHandler handler = new EchoHandler(10000); channel.subscribe(handler); AsyncMessagingTemplate template = new AsyncMessagingTemplate(); - template.setDefaultChannel(channel); + template.setDefaultDestination(channel); Future> result = template.asyncSendAndReceive(MessageBuilder.withPayload("test").build()); try { Thread.sleep(200); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java index 83f91e4785..331775fac4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageHistoryTests.java @@ -24,11 +24,11 @@ import java.util.Properties; import org.junit.Test; -import org.springframework.integration.Message; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.context.NamedComponent; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java index 8ab80bad87..e3639c9f90 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/MessageIdGenerationTests.java @@ -29,9 +29,9 @@ import org.mockito.Mockito; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.GenericXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessageHeaders.IdGenerator; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessageHeaders.IdGenerator; import org.springframework.integration.message.GenericMessage; import org.springframework.util.ReflectionUtils; import org.springframework.util.StopWatch; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java b/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java deleted file mode 100644 index 0d084a45fb..0000000000 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/MessagingTemplateTests.java +++ /dev/null @@ -1,697 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.integration.core; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicReference; - -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.context.support.StaticApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.channel.AbstractMessageChannel; -import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.channel.PublishSubscribeChannel; -import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.endpoint.PollingConsumer; -import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; -import org.springframework.integration.mapping.InboundMessageMapper; -import org.springframework.integration.mapping.OutboundMessageMapper; -import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.ChannelResolutionException; -import org.springframework.integration.support.channel.ChannelResolver; -import org.springframework.integration.support.converter.SimpleMessageConverter; -import org.springframework.integration.test.util.TestUtils; -import org.springframework.integration.test.util.TestUtils.TestApplicationContext; - -/** - * @author Mark Fisher - * @author Gary Russell - */ -public class MessagingTemplateTests { - - private final TestApplicationContext context = TestUtils.createTestApplicationContext(); - - private QueueChannel requestChannel; - - - @Before - public void setUp() { - this.requestChannel = new QueueChannel(); - context.registerChannel("requestChannel", requestChannel); - PollingConsumer endpoint = new PollingConsumer(requestChannel, new TestHandler()); - context.registerEndpoint("testEndpoint", endpoint); - context.refresh(); - } - - @After - public void tearDown() { - try { - context.stop(); - } - catch (Exception e) { - // ignore - } - } - - @Test - public void send() { - MessagingTemplate template = new MessagingTemplate(); - QueueChannel channel = new QueueChannel(); - template.send(channel, new GenericMessage("test")); - Message reply = channel.receive(0); - assertNotNull(reply); - assertEquals("test", reply.getPayload()); - } - - @Test - public void sendWithDefaultChannelProvidedBySetter() { - QueueChannel channel = new QueueChannel(); - MessagingTemplate template = new MessagingTemplate(); - template.setDefaultChannel(channel); - template.send(new GenericMessage("test")); - Message reply = channel.receive(0); - assertNotNull(reply); - assertEquals("test", reply.getPayload()); - } - - @Test - public void sendWithDefaultChannelProvidedByConstructor() { - QueueChannel channel = new QueueChannel(); - MessagingTemplate template = new MessagingTemplate(channel); - template.send(new GenericMessage("test")); - Message reply = channel.receive(0); - assertNotNull(reply); - assertEquals("test", reply.getPayload()); - } - - @Test - public void sendWithExplicitChannelTakesPrecedenceOverDefault() { - QueueChannel explicitChannel = new QueueChannel(); - QueueChannel defaultChannel = new QueueChannel(); - MessagingTemplate template = new MessagingTemplate(defaultChannel); - template.send(explicitChannel, new GenericMessage("test")); - Message reply = explicitChannel.receive(0); - assertNotNull(reply); - assertEquals("test", reply.getPayload()); - assertNull(defaultChannel.receive(0)); - } - - @Test(expected = IllegalStateException.class) - public void sendWithoutChannelArgFailsIfNoDefaultAvailable() { - MessagingTemplate template = new MessagingTemplate(); - template.send(new GenericMessage("test")); - } - - @Test - public void receive() { - QueueChannel channel = new QueueChannel(); - channel.send(new GenericMessage("test")); - MessagingTemplate template = new MessagingTemplate(); - Message reply = template.receive(channel); - assertEquals("test", reply.getPayload()); - } - - @Test - public void receiveWithDefaultChannelProvidedBySetter() { - QueueChannel channel = new QueueChannel(); - channel.send(new GenericMessage("test")); - MessagingTemplate template = new MessagingTemplate(); - template.setDefaultChannel(channel); - Message reply = template.receive(); - assertEquals("test", reply.getPayload()); - } - - @Test - public void receiveWithDefaultChannelProvidedByConstructor() { - QueueChannel channel = new QueueChannel(); - channel.send(new GenericMessage("test")); - MessagingTemplate template = new MessagingTemplate(channel); - Message reply = template.receive(); - assertEquals("test", reply.getPayload()); - } - - @Test - public void receiveWithExplicitChannelTakesPrecedenceOverDefault() { - QueueChannel explicitChannel = new QueueChannel(); - QueueChannel defaultChannel = new QueueChannel(); - explicitChannel.send(new GenericMessage("test")); - MessagingTemplate template = new MessagingTemplate(defaultChannel); - template.setReceiveTimeout(0); - Message reply = template.receive(explicitChannel); - assertEquals("test", reply.getPayload()); - assertNull(template.receive()); - } - - @Test(expected = IllegalStateException.class) - public void receiveWithoutChannelArgFailsIfNoDefaultAvailable() { - MessagingTemplate template = new MessagingTemplate(); - template.receive(); - } - - @Test(expected = IllegalStateException.class) - public void receiveWithNonPollableDefaultFails() { - DirectChannel channel = new DirectChannel(); - MessagingTemplate template = new MessagingTemplate(channel); - template.receive(); - } - - @Test - public void sendAndReceive() { - MessagingTemplate template = new MessagingTemplate(); - template.setReceiveTimeout(3000); - Message reply = template.sendAndReceive(this.requestChannel, new GenericMessage("test")); - assertEquals("TEST", reply.getPayload()); - } - - @Test - public void sendAndReceiveWithDefaultChannel() { - MessagingTemplate template = new MessagingTemplate(); - template.setReceiveTimeout(3000); - template.setDefaultChannel(this.requestChannel); - Message reply = template.sendAndReceive(new GenericMessage("test")); - assertEquals("TEST", reply.getPayload()); - } - - @Test - public void sendAndReceiveWithExplicitChannelTakesPrecedenceOverDefault() { - QueueChannel defaultChannel = new QueueChannel(); - MessagingTemplate template = new MessagingTemplate(defaultChannel); - template.setReceiveTimeout(3000); - Message message = new GenericMessage("test"); - Message reply = template.sendAndReceive(this.requestChannel, message); - assertEquals("TEST", reply.getPayload()); - assertNull(defaultChannel.receive(0)); - } - - @Test(expected = IllegalStateException.class) - public void sendAndReceiveWithoutChannelArgFailsIfNoDefaultAvailable() { - MessagingTemplate template = new MessagingTemplate(); - template.sendAndReceive(new GenericMessage("test")); - } - - @Test - public void convertSendAndReceive() { - MessagingTemplate template = new MessagingTemplate(); - template.setReceiveTimeout(3000); - Object result = template.convertSendAndReceive(this.requestChannel, "test"); - assertNotNull(result); - assertEquals("TEST", result); - } - - @Test - public void convertSendAndReceiveWithDefaultChannel() { - MessagingTemplate template = new MessagingTemplate(); - template.setDefaultChannel(this.requestChannel); - template.setReceiveTimeout(3000); - Object result = template.convertSendAndReceive("test"); - assertNotNull(result); - assertEquals("TEST", result); - } - - @Test - public void convertSendAndReceiveWithResolvedChannel() { - StaticApplicationContext context = new StaticApplicationContext(); - context.registerSingleton("testChannel", DirectChannel.class); - context.refresh(); - SubscribableChannel testChannel = context.getBean("testChannel", SubscribableChannel.class); - testChannel.subscribe(new TestHandler()); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.setReceiveTimeout(3000); - Object result = template.convertSendAndReceive("testChannel", "test"); - assertNotNull(result); - assertEquals("TEST", result); - } - - @Test(expected = ChannelResolutionException.class) - public void convertSendAndReceiveWithUnresolvableChannel() { - StaticApplicationContext context = new StaticApplicationContext(); - context.refresh(); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.setReceiveTimeout(3000); - template.convertSendAndReceive("testChannel", "test"); - } - - @Test - public void sendWithReturnAddress() throws InterruptedException { - final List replies = new ArrayList(3); - final CountDownLatch latch = new CountDownLatch(3); - MessageChannel replyChannel = new AbstractMessageChannel() { - @Override - protected boolean doSend(Message message, long timeout) { - replies.add((String) message.getPayload()); - latch.countDown(); - return true; - } - }; - MessagingTemplate template = new MessagingTemplate(); - Message message1 = MessageBuilder.withPayload("test1").setReplyChannel(replyChannel).build(); - Message message2 = MessageBuilder.withPayload("test2").setReplyChannel(replyChannel).build(); - Message message3 = MessageBuilder.withPayload("test3").setReplyChannel(replyChannel).build(); - template.send(this.requestChannel, message1); - template.send(this.requestChannel, message2); - template.send(this.requestChannel, message3); - latch.await(2000, TimeUnit.MILLISECONDS); - assertEquals(0, latch.getCount()); - assertTrue(replies.contains("TEST1")); - assertTrue(replies.contains("TEST2")); - assertTrue(replies.contains("TEST3")); - } - - @Test - public void sendByChannelName() { - StaticApplicationContext context = new StaticApplicationContext(); - context.registerSingleton("testChannel", QueueChannel.class); - context.refresh(); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.afterPropertiesSet(); - Message message = MessageBuilder.withPayload("test").build(); - template.send("testChannel", message); - PollableChannel channel = context.getBean("testChannel", PollableChannel.class); - assertEquals(message, channel.receive(0)); - } - - @Test - public void sendByChannelNameWithCustomChannelResolver() { - QueueChannel testChannel = new QueueChannel(); - final QueueChannel anotherChannel = new QueueChannel(); - - DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - beanFactory.registerSingleton("testChannel", testChannel); - - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(beanFactory); - - template.afterPropertiesSet(); - Message message = MessageBuilder.withPayload("test").build(); - template.send("testChannel", message); - assertEquals(message, testChannel.receive(0)); - - template.setChannelResolver(new ChannelResolver() { - public MessageChannel resolveChannelName(String channelName) { - return anotherChannel; - } - }); - message = MessageBuilder.withPayload("test").build(); - template.send("testChannel", message); - assertEquals(message, anotherChannel.receive(0)); - } - - @Test(expected = IllegalStateException.class) - public void sendByChannelNameWithoutChannelResolver() { - MessagingTemplate template = new MessagingTemplate(); - template.send("testChannel", MessageBuilder.withPayload("test").build()); - } - - @Test(expected = ChannelResolutionException.class) - public void sendByChannelNameWithUnresolvableChannel() { - StaticApplicationContext context = new StaticApplicationContext(); - context.registerSingleton("testChannel", QueueChannel.class); - context.refresh(); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.afterPropertiesSet(); - Message message = MessageBuilder.withPayload("test").build(); - template.send("noSuchChannel", message); - } - - @Test - public void receiveByChannelName() { - StaticApplicationContext context = new StaticApplicationContext(); - context.registerSingleton("testChannel", QueueChannel.class); - context.refresh(); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.afterPropertiesSet(); - PollableChannel channel = context.getBean("testChannel", PollableChannel.class); - Message message = MessageBuilder.withPayload("test").build(); - channel.send(message); - assertEquals(message, template.receive("testChannel")); - } - - @Test - public void receiveByChannelNameWithCustomChannelResolver() { - QueueChannel testChannel = new QueueChannel(); - DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); - beanFactory.registerSingleton("testChannel", testChannel); - - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(beanFactory); - template.afterPropertiesSet(); - Message message = MessageBuilder.withPayload("test").build(); - testChannel.send(message); - assertEquals(message, template.receive("testChannel")); - } - - @Test(expected = IllegalArgumentException.class) - public void receiveByChannelNameWithNonPollableChannel() { - StaticApplicationContext context = new StaticApplicationContext(); - context.registerSingleton("testChannel", DirectChannel.class); - context.refresh(); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.afterPropertiesSet(); - template.receive("testChannel"); - } - - @Test(expected = IllegalStateException.class) - public void receiveByChannelNameWithoutChannelResolver() { - MessagingTemplate template = new MessagingTemplate(); - template.receive("testChannel"); - } - - @Test(expected = ChannelResolutionException.class) - public void receiveByChannelNameWithUnresolvableChannel() { - StaticApplicationContext context = new StaticApplicationContext(); - context.registerSingleton("testChannel", QueueChannel.class); - context.refresh(); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.afterPropertiesSet(); - template.receive("noSuchChannel"); - } - - @Test - public void convertAndSendToChannel() { - MessagingTemplate template = new MessagingTemplate(); - QueueChannel channel = new QueueChannel(); - template.convertAndSend(channel, "test"); - Message reply = channel.receive(0); - assertNotNull(reply); - assertEquals("test", reply.getPayload()); - } - - @Test - public void convertAndSendToDefaultChannel() { - QueueChannel channel = new QueueChannel(); - MessagingTemplate template = new MessagingTemplate(); - template.setDefaultChannel(channel); - template.convertAndSend("test"); - Message reply = channel.receive(0); - assertNotNull(reply); - assertEquals("test", reply.getPayload()); - } - - @Test - public void convertAndSendToResolvedChannel() { - StaticApplicationContext context = new StaticApplicationContext(); - context.registerSingleton("testChannel", QueueChannel.class); - context.refresh(); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.afterPropertiesSet(); - template.convertAndSend("testChannel", "test"); - PollableChannel channel = context.getBean("testChannel", PollableChannel.class); - Message reply = channel.receive(0); - assertEquals("test", reply.getPayload()); - } - - @Test(expected = ChannelResolutionException.class) - public void convertAndSendToUnresolvableChannel() { - StaticApplicationContext context = new StaticApplicationContext(); - context.refresh(); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.afterPropertiesSet(); - template.convertAndSend("testChannel", "test"); - } - - @Test - public void convertAndSendWithCustomConverter() { - MessagingTemplate template = new MessagingTemplate(); - TestMapper mapper = new TestMapper(); - template.setMessageConverter(new SimpleMessageConverter(mapper, mapper)); - QueueChannel channel = new QueueChannel(); - template.convertAndSend(channel, "test"); - Message reply = channel.receive(0); - assertNotNull(reply); - assertEquals("to:test", reply.getPayload()); - } - - @Test - public void receiveAndConvertFromChannel() { - MessagingTemplate template = new MessagingTemplate(); - QueueChannel channel = new QueueChannel(); - channel.send(new GenericMessage("test")); - Object result = template.receiveAndConvert(channel); - assertNotNull(result); - assertEquals("test", result); - } - - @Test - public void receiveAndConvertFromDefaultChannel() { - QueueChannel channel = new QueueChannel(); - channel.send(new GenericMessage("test")); - MessagingTemplate template = new MessagingTemplate(); - template.setDefaultChannel(channel); - Object result = template.receiveAndConvert(); - assertNotNull(result); - assertEquals("test", result); - } - - @Test - public void receiveAndConvertFromResolvedChannel() { - StaticApplicationContext context = new StaticApplicationContext(); - context.registerSingleton("testChannel", QueueChannel.class); - context.refresh(); - PollableChannel channel = context.getBean("testChannel", PollableChannel.class); - channel.send(new GenericMessage("test")); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.afterPropertiesSet(); - Object result = template.receiveAndConvert("testChannel"); - assertNotNull(result); - assertEquals("test", result); - } - - @Test(expected = ChannelResolutionException.class) - public void receiveAndConvertFromUnresolvableChannel() { - StaticApplicationContext context = new StaticApplicationContext(); - context.refresh(); - MessagingTemplate template = new MessagingTemplate(); - template.setBeanFactory(context); - template.afterPropertiesSet(); - template.receiveAndConvert("testChannel"); - } - - @Test - public void receiveAndConvertWithCustomConverter() { - MessagingTemplate template = new MessagingTemplate(); - TestMapper mapper = new TestMapper(); - template.setMessageConverter(new SimpleMessageConverter(mapper, mapper)); - QueueChannel channel = new QueueChannel(); - channel.send(new GenericMessage("test")); - Object result = template.receiveAndConvert(channel); - assertNotNull(result); - assertEquals("from:test", result); - } - - @Test - public void convertSendAndReceiveWithCustomConverter() { - TestMapper mapper = new TestMapper(); - MessagingTemplate template = new MessagingTemplate(); - template.setDefaultChannel(this.requestChannel); - template.setMessageConverter(new SimpleMessageConverter(mapper, mapper)); - Object result = template.convertSendAndReceive("test"); - assertNotNull(result); - assertEquals("from:TO:TEST", result); - } - - @Test - public void testLateReply() { - MessagingTemplate template = new MessagingTemplate(); - QueueChannel channel = new QueueChannel(); - template.setDefaultChannel(channel); - template.setReceiveTimeout(1); - template.setThrowExceptionOnLateReply(true); - Object result = template.sendAndReceive(new GenericMessage("foo")); - assertNull(result); - Message message = channel.receive(); - try { - ((MessageChannel) message.getHeaders().getReplyChannel()).send(new GenericMessage("bar")); - fail("Exception expected"); - } - catch (MessagingException e) { - assertEquals("Reply message being sent, but the receiving thread has already timed out", e.getMessage()); - } - } - - @Test - public void testNoSubs() { - MessagingTemplate template = new MessagingTemplate(); - PublishSubscribeChannel channel = new PublishSubscribeChannel(); - template.setDefaultChannel(channel); - template.convertAndSend("foo"); - } - - @Test - public void testSubsAllFail() { - MessagingTemplate template = new MessagingTemplate(); - PublishSubscribeChannel channel = new PublishSubscribeChannel(); - channel.subscribe(new MessageHandler() { - - @Override - public void handleMessage(Message message) throws MessagingException { - throw new RuntimeException(); - } - }); - channel.setIgnoreFailures(true); - template.setDefaultChannel(channel); - template.convertAndSend("foo"); - } - - @Test - public void testEnoughSubs() { - MessagingTemplate template = new MessagingTemplate(); - PublishSubscribeChannel channel = new PublishSubscribeChannel(); - channel.setMinSubscribers(1); - channel.subscribe(new MessageHandler() { - - @Override - public void handleMessage(Message message) throws MessagingException { - } - }); - template.setDefaultChannel(channel); - template.convertAndSend("foo"); - } - - @Test(expected=MessageDeliveryException.class) - public void testNoSubsFatal() { - MessagingTemplate template = new MessagingTemplate(); - PublishSubscribeChannel channel = new PublishSubscribeChannel(); - channel.setMinSubscribers(1); - template.setDefaultChannel(channel); - template.convertAndSend("foo"); - } - - @Test(expected=MessageDeliveryException.class) - public void testNotEnoughSubsFatal() { - MessagingTemplate template = new MessagingTemplate(); - PublishSubscribeChannel channel = new PublishSubscribeChannel(); - channel.setMinSubscribers(2); - channel.subscribe(new MessageHandler() { - - @Override - public void handleMessage(Message message) throws MessagingException { - } - }); - template.setDefaultChannel(channel); - template.convertAndSend("foo"); - } - - @Test - public void testNeverReceive() { - MessagingTemplate template = new MessagingTemplate(); - DirectChannel channel = new DirectChannel(); - final AtomicReference replyChannel = new AtomicReference(); - channel.subscribe(new MessageHandler() { - @Override - public void handleMessage(Message message) throws MessagingException { - replyChannel.set((MessageChannel) message.getHeaders().getReplyChannel()); - throw new MessagingException("foo"); - } - }); - template.setDefaultChannel(channel); - template.setReceiveTimeout(10000); - template.setThrowExceptionOnLateReply(true); - try { - template.sendAndReceive(new GenericMessage("foo")); - fail("Exception expected"); - } - catch (MessagingException e) { - assertTrue(e.getMessage().equals("foo")); - } - try { - replyChannel.get().send(new GenericMessage("bar")); - fail("Exception expected"); - } - catch (MessagingException e) { - assertEquals( - "Reply message being sent, but the receiving thread has already caught an exception and won't receive", - e.getMessage()); - } - } - - @Test - public void testTwoReplies() { - MessagingTemplate template = new MessagingTemplate(); - DirectChannel channel = new DirectChannel(); - final AtomicReference replyChannel = new AtomicReference(); - channel.subscribe(new MessageHandler() { - @Override - public void handleMessage(Message message) throws MessagingException { - MessageChannel replyChannelHeader = (MessageChannel) message.getHeaders().getReplyChannel(); - replyChannel.set(replyChannelHeader); - replyChannelHeader.send(new GenericMessage("bar")); - } - }); - template.setDefaultChannel(channel); - template.setReceiveTimeout(10000); - template.setThrowExceptionOnLateReply(true); - Message reply = template.sendAndReceive(new GenericMessage("foo")); - assertTrue(reply.getPayload().equals("bar")); - try { - replyChannel.get().send(new GenericMessage("baz")); - fail("Exception expected"); - } - catch (MessagingException e) { - assertEquals( - "Reply message being sent, but the receiving thread has already received a reply", - e.getMessage()); - } - } - - private static class TestMapper implements InboundMessageMapper, OutboundMessageMapper { - - public Object fromMessage(Message message) throws Exception { - return "from:" + message.getPayload(); - } - - public Message toMessage(Object object) throws Exception { - return new GenericMessage("to:" + object); - } - } - - - private static class TestHandler extends AbstractReplyProducingMessageHandler { - - @Override - public Object handleRequestMessage(Message message) { - return message.getPayload().toString().toUpperCase(); - } - } - -} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/core/TimeBasedUUIDGenerator.java b/spring-integration-core/src/test/java/org/springframework/integration/core/TimeBasedUUIDGenerator.java index 6a26c38531..d1cdf2841d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/core/TimeBasedUUIDGenerator.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/core/TimeBasedUUIDGenerator.java @@ -104,4 +104,4 @@ class TimeBasedUUIDGenerator { } return macAddressAsLong; } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java index e2fbb99777..351013fe2b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/AggregateMessageDeliveryExceptionTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.dispatcher; +import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -24,11 +25,9 @@ import java.util.List; import org.junit.Ignore; import org.junit.Test; -import static org.hamcrest.CoreMatchers.containsString; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; /** * @author Iwein Fuld diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java index 38b1f81520..0b0c152c1a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/BroadcastingDispatcherTests.java @@ -35,9 +35,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; @@ -249,10 +250,10 @@ public class BroadcastingDispatcherTests { dispatcher.addHandler(target2); dispatcher.dispatch(new GenericMessage("test")); assertEquals(2, messages.size()); - assertEquals(0, (int) messages.get(0).getHeaders().getSequenceNumber()); - assertEquals(0, (int) messages.get(0).getHeaders().getSequenceSize()); - assertEquals(0, (int) messages.get(1).getHeaders().getSequenceNumber()); - assertEquals(0, (int) messages.get(1).getHeaders().getSequenceSize()); + assertEquals(0, (int) new EiMessageHeaderAccessor(messages.get(0)).getSequenceNumber()); + assertEquals(0, (int) new EiMessageHeaderAccessor(messages.get(0)).getSequenceSize()); + assertEquals(0, (int) new EiMessageHeaderAccessor(messages.get(1)).getSequenceNumber()); + assertEquals(0, (int) new EiMessageHeaderAccessor(messages.get(1)).getSequenceSize()); } @Test @@ -270,15 +271,15 @@ public class BroadcastingDispatcherTests { Object originalId = inputMessage.getHeaders().getId(); dispatcher.dispatch(inputMessage); assertEquals(3, messages.size()); - assertEquals(1, (int) messages.get(0).getHeaders().getSequenceNumber()); - assertEquals(3, (int) messages.get(0).getHeaders().getSequenceSize()); - assertEquals(originalId, messages.get(0).getHeaders().getCorrelationId()); - assertEquals(2, (int) messages.get(1).getHeaders().getSequenceNumber()); - assertEquals(3, (int) messages.get(1).getHeaders().getSequenceSize()); - assertEquals(originalId, messages.get(1).getHeaders().getCorrelationId()); - assertEquals(3, (int) messages.get(2).getHeaders().getSequenceNumber()); - assertEquals(3, (int) messages.get(2).getHeaders().getSequenceSize()); - assertEquals(originalId, messages.get(2).getHeaders().getCorrelationId()); + assertEquals(1, (int) new EiMessageHeaderAccessor(messages.get(0)).getSequenceNumber()); + assertEquals(3, (int) new EiMessageHeaderAccessor(messages.get(0)).getSequenceSize()); + assertEquals(originalId, new EiMessageHeaderAccessor(messages.get(0)).getCorrelationId()); + assertEquals(2, (int) new EiMessageHeaderAccessor(messages.get(1)).getSequenceNumber()); + assertEquals(3, (int) new EiMessageHeaderAccessor(messages.get(1)).getSequenceSize()); + assertEquals(originalId, new EiMessageHeaderAccessor(messages.get(1)).getCorrelationId()); + assertEquals(3, (int) new EiMessageHeaderAccessor(messages.get(2)).getSequenceNumber()); + assertEquals(3, (int) new EiMessageHeaderAccessor(messages.get(2)).getSequenceSize()); + assertEquals(originalId, new EiMessageHeaderAccessor(messages.get(2)).getCorrelationId()); } /** @@ -311,7 +312,7 @@ public class BroadcastingDispatcherTests { dispatcher.addHandler(targetMock1); targetMock1.handleMessage(messageMock); Message dontReplaceThisMessage = MessageBuilder.withPayload("x").build(); - expectLastCall().andThrow(new MessagingException(dontReplaceThisMessage, + expectLastCall().andThrow(new MessagingException(dontReplaceThisMessage, "Mock Exception")); replay(globalMocks); try { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java index 54aaeb72e6..2e70ab4e49 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/FailOverDispatcherTests.java @@ -25,14 +25,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageRejectedException; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.TestHandlers; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java index 996af8339d..31b33e9a86 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/PollingTransactionTests.java @@ -33,9 +33,9 @@ import org.springframework.aop.Advisor; import org.springframework.aop.framework.Advised; import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java index a09f58a4e1..28f1c2239f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherConcurrentTests.java @@ -31,10 +31,10 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageRejectedException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherTests.java index 7a53ff635d..449c9f0938 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/RoundRobinDispatcherTests.java @@ -25,9 +25,9 @@ import static org.junit.Assert.fail; import static org.mockito.Mockito.doThrow; import org.mockito.runners.MockitoJUnitRunner; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.support.MessageBuilder; import java.util.concurrent.atomic.AtomicInteger; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/UnicastingDispatcherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/UnicastingDispatcherTests.java index a578e403b0..da68398339 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/UnicastingDispatcherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/dispatcher/UnicastingDispatcherTests.java @@ -19,17 +19,16 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; - import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.gateway.RequestReplyExchanger; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.SubscribableChannel; /** * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java index f629e21ec8..0f3d3d462f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/CorrelationIdTests.java @@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.ServiceActivatingHandler; @@ -48,7 +48,7 @@ public class CorrelationIdTests { endpoint.start(); assertTrue(inputChannel.send(message)); Message reply = outputChannel.receive(0); - assertEquals(correlationId, reply.getHeaders().getCorrelationId()); + assertEquals(correlationId, new EiMessageHeaderAccessor(reply).getCorrelationId()); } @Test @@ -63,8 +63,8 @@ public class CorrelationIdTests { endpoint.start(); assertTrue(inputChannel.send(message)); Message reply = outputChannel.receive(0); - assertEquals(message.getHeaders().getCorrelationId(), reply.getHeaders().getCorrelationId()); - assertTrue(message.getHeaders().getCorrelationId().equals(reply.getHeaders().getCorrelationId())); + assertEquals(new EiMessageHeaderAccessor(message).getCorrelationId(), new EiMessageHeaderAccessor(reply).getCorrelationId()); + assertTrue(new EiMessageHeaderAccessor(message).getCorrelationId().equals(new EiMessageHeaderAccessor(reply).getCorrelationId())); } @Test @@ -80,7 +80,7 @@ public class CorrelationIdTests { endpoint.start(); assertTrue(inputChannel.send(message)); Message reply = outputChannel.receive(0); - assertEquals("456-XYZ", reply.getHeaders().getCorrelationId()); + assertEquals("456-XYZ", new EiMessageHeaderAccessor(reply).getCorrelationId()); } @Test @@ -94,7 +94,7 @@ public class CorrelationIdTests { endpoint.start(); assertTrue(inputChannel.send(message)); Message reply = outputChannel.receive(0); - assertEquals("456-XYZ", reply.getHeaders().getCorrelationId()); + assertEquals("456-XYZ", new EiMessageHeaderAccessor(reply).getCorrelationId()); } @Test @@ -107,13 +107,13 @@ public class CorrelationIdTests { splitter.handleMessage(message); Message reply1 = testChannel.receive(100); Message reply2 = testChannel.receive(100); - assertEquals(message.getHeaders().getId(), reply1.getHeaders().getCorrelationId()); - assertEquals(message.getHeaders().getId(), reply2.getHeaders().getCorrelationId()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(reply1).getCorrelationId()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(reply2).getCorrelationId()); } @Test public void testCorrelationIdWithSplitterWhenValueSetOnIncomingMessage() throws Exception { - + final String correlationIdForTest = "#FOR_TEST#"; Message message = MessageBuilder.withPayload("test1,test2").setCorrelationId(correlationIdForTest).build(); QueueChannel testChannel = new QueueChannel(); @@ -123,10 +123,10 @@ public class CorrelationIdTests { splitter.handleMessage(message); Message reply1 = testChannel.receive(100); Message reply2 = testChannel.receive(100); - assertEquals(message.getHeaders().getId(), reply1.getHeaders().getCorrelationId()); - assertEquals(message.getHeaders().getId(), reply2.getHeaders().getCorrelationId()); - assertTrue("Sequence details missing", reply1.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); - assertTrue("Sequence details missing", reply2.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(reply1).getCorrelationId()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(reply2).getCorrelationId()); + assertTrue("Sequence details missing", reply1.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); + assertTrue("Sequence details missing", reply2.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); } @SuppressWarnings("unused") diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceIntegrationTests.java index 9102368b91..b2f0d0d28c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceIntegrationTests.java @@ -31,7 +31,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.ExpressionFactoryBean; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java index c7ab2e78cf..5521198eda 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ExpressionEvaluatingMessageSourceTests.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.core.convert.ConversionFailedException; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java index e52342e744..ea9202fcc7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/MessageProducerSupportTests.java @@ -20,16 +20,16 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.PublishSubscribeChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.ServiceActivatingHandler; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.support.ErrorMessage; /** * @author Oleg Zhurakousky @@ -41,7 +41,7 @@ public class MessageProducerSupportTests { @Test(expected=MessageDeliveryException.class) public void validateExceptionIfNoErrorChannel() { DirectChannel outChannel = new DirectChannel(); - + outChannel.subscribe(new MessageHandler() { public void handleMessage(Message message) throws MessagingException { throw new RuntimeException("problems"); @@ -64,7 +64,7 @@ public class MessageProducerSupportTests { } }); PublishSubscribeChannel errorChannel = new PublishSubscribeChannel(); - errorChannel.subscribe(new MessageHandler() { + errorChannel.subscribe(new MessageHandler() { public void handleMessage(Message message) throws MessagingException { throw new RuntimeException("ooops"); } @@ -81,7 +81,7 @@ public class MessageProducerSupportTests { @Test public void validateSuccessfulErrorFlowDoesNotThrowErrors() { DirectChannel outChannel = new DirectChannel(); - outChannel.subscribe(new MessageHandler() { + outChannel.subscribe(new MessageHandler() { public void handleMessage(Message message) throws MessagingException { throw new RuntimeException("problems"); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java index cf6175a5e1..c806a39a7b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingConsumerEndpointTests.java @@ -35,10 +35,10 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageRejectedException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.scheduling.Trigger; import org.springframework.scheduling.TriggerContext; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java index 6aa45237c1..9e9cc80b83 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointErrorHandlingTests.java @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.ErrorMessage; /** * @author Jonas Partner diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointStub.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointStub.java index ed800db767..72199f3e3d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointStub.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingEndpointStub.java @@ -16,7 +16,7 @@ package org.springframework.integration.endpoint; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.scheduling.support.PeriodicTrigger; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java index 7f7afdd9fc..ba2f9f71c7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PollingLifecycleTests.java @@ -31,12 +31,12 @@ import org.junit.Test; import org.mockito.Mockito; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.config.ConfigurableBeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.SourcePollingChannelAdapterFactoryBean; import org.springframework.integration.config.TestErrorHandler; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.scheduling.PollerMetadata; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PseudoTransactionalMessageSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PseudoTransactionalMessageSourceTests.java index d3aed36e8e..daa3264619 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PseudoTransactionalMessageSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/PseudoTransactionalMessageSourceTests.java @@ -28,10 +28,10 @@ import org.junit.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.MessageSource; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.transaction.DefaultTransactionSynchronizationFactory; import org.springframework.integration.transaction.ExpressionEvaluatingTransactionSynchronizationProcessor; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java index c865956418..5f222d21d8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ReturnAddressTests.java @@ -21,14 +21,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import org.junit.Test; - import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.ChannelResolutionException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.DestinationResolutionException; /** * @author Mark Fisher @@ -99,7 +98,7 @@ public class ReturnAddressTests { assertNull(channel2.receive(0)); } - @Test(expected = ChannelResolutionException.class) + @Test(expected = DestinationResolutionException.class) public void returnAddressFallbackButNotAvailable() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "returnAddressTests.xml", this.getClass()); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java index af939da109..fc9fe8fa04 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorEndpointTests.java @@ -22,15 +22,15 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import org.junit.Test; - -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.handler.ReplyRequiredException; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** * @author Mark Fisher @@ -121,8 +121,8 @@ public class ServiceActivatorEndpointTests { reply1 = replyChannel1.receive(0); assertNull(reply1); reply2 = replyChannel2.receive(0); - assertNotNull(reply2); - assertEquals("foobar", reply2.getPayload()); + assertNotNull(reply2); + assertEquals("foobar", reply2.getPayload()); } @Test @@ -178,7 +178,7 @@ public class ServiceActivatorEndpointTests { .setReplyChannel(replyChannel).build(); endpoint.handleMessage(message); Message reply = replyChannel.receive(500); - assertNull(reply.getHeaders().getCorrelationId()); + assertNull(new EiMessageHeaderAccessor(reply).getCorrelationId()); } @Test @@ -195,7 +195,7 @@ public class ServiceActivatorEndpointTests { .setReplyChannel(replyChannel).build(); endpoint.handleMessage(message); Message reply = replyChannel.receive(500); - Object correlationId = reply.getHeaders().getCorrelationId(); + Object correlationId = new EiMessageHeaderAccessor(reply).getCorrelationId(); assertFalse(message.getHeaders().getId().equals(correlationId)); assertEquals("ABC-123", correlationId); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java index f2969be31c..f60fa53187 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ServiceActivatorMethodResolutionTests.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.ServiceActivatingHandler; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java index 09e5a5e78d..e9be8e8ff7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/annotation/MessageParameterAnnotatedEndpoint.java @@ -16,7 +16,7 @@ package org.springframework.integration.endpoint.annotation; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/expression/ParentContextTests.java b/spring-integration-core/src/test/java/org/springframework/integration/expression/ParentContextTests.java index 1ee65ab487..14491a2dbc 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/expression/ParentContextTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/expression/ParentContextTests.java @@ -37,14 +37,14 @@ import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.EvaluationContext; import org.springframework.expression.PropertyAccessor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.IntegrationEvaluationContextFactoryBean; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.json.JsonPathUtils; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; /** * @author Gary Russell diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/DynamicExpressionFilterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/DynamicExpressionFilterIntegrationTests.java index 8934f4c62c..72ca4995b6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/DynamicExpressionFilterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/DynamicExpressionFilterIntegrationTests.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterAnnotationMethodResolutionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterAnnotationMethodResolutionTests.java index 25855a711d..8c31138239 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterAnnotationMethodResolutionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterAnnotationMethodResolutionTests.java @@ -23,11 +23,11 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Filter; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.FilterFactoryBean; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterContextTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterContextTests.java index 1f5998b3c7..7cd5f09dec 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterContextTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/FilterContextTests.java @@ -23,9 +23,9 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java index 7a7bc9fdb2..bb2323ff2f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java index 458ea2295b..71f71c449a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/MethodInvokingSelectorTests.java @@ -23,7 +23,7 @@ import java.lang.reflect.Method; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/SpelFilterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/SpelFilterIntegrationTests.java index 15fdb08e7f..54ae604d71 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/filter/SpelFilterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/filter/SpelFilterIntegrationTests.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java index c21fa01040..0e3f32f051 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/AsyncGatewayTests.java @@ -26,11 +26,11 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java index 2230838492..9e6058ed26 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInterfaceTests.java @@ -29,10 +29,10 @@ import org.mockito.Mockito; import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Gateway; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; /** * @author Oleg Zhurakousky diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java index dbd55f036a..365985a52b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java @@ -23,10 +23,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.annotation.DirtiesContext; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java index e076aa4b1a..5f1bdbc57f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayMethodInboundMessageMapperToMessageTests.java @@ -30,7 +30,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java index 1260680e02..1d79578f6d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyFactoryBeanTests.java @@ -37,13 +37,13 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.core.convert.support.GenericConversionService; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.message.GenericMessage; import org.springframework.util.ReflectionUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyMessageMappingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyMessageMappingTests.java index be5a3bdd11..896886c4a6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyMessageMappingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayProxyMessageMappingTests.java @@ -28,8 +28,8 @@ import org.junit.Test; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java index b50a69c769..f5ab5e4386 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithHeaderAnnotations.java @@ -20,10 +20,9 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.annotation.Header; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -50,7 +49,7 @@ public class GatewayWithHeaderAnnotations { public static interface TestService { // wrt INT-1205, priority no longer has a $ prefix, so here we are testing the $custom header as well - public String test(String str, @Header(MessageHeaders.PRIORITY) int priority, @Header("$custom") String custom); + public String test(String str, @Header(EiMessageHeaderAccessor.PRIORITY) int priority, @Header("$custom") String custom); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithPayloadExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithPayloadExpressionTests.java index c291a36b10..33c82a29da 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithPayloadExpressionTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithPayloadExpressionTests.java @@ -22,9 +22,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests.java index d94e025f65..693035258e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/HeaderEnrichedGatewayTests.java @@ -23,9 +23,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Header; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/InnerGatewayWithChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/InnerGatewayWithChainTests.java index 6924720403..0c9f4a0a13 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/InnerGatewayWithChainTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/InnerGatewayWithChainTests.java @@ -25,9 +25,9 @@ import org.junit.runner.RunWith; import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java index 551be03ab7..11e17d244b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MessagingGatewayTests.java @@ -34,18 +34,18 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.PublishSubscribeChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.test.util.TestUtils; +import org.springframework.integration.test.util.TestUtils.TestApplicationContext; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; /** * @author Iwein Fuld @@ -72,13 +72,12 @@ public class MessagingGatewayTests { this.messagingGateway = new MessagingGatewaySupport() {}; this.messagingGateway.setRequestChannel(requestChannel); this.messagingGateway.setReplyChannel(replyChannel); - AbstractApplicationContext context = TestUtils.createTestApplicationContext(); - context.refresh(); - - this.messagingGateway.setBeanFactory(context); + TestApplicationContext applicationContext = TestUtils.createTestApplicationContext(); + this.messagingGateway.setBeanFactory(applicationContext); this.messagingGateway.afterPropertiesSet(); this.messagingGateway.start(); reset(allmocks); + applicationContext.refresh(); } @@ -254,6 +253,8 @@ public class MessagingGatewayTests { handler.afterPropertiesSet(); errorChannel.subscribe(handler); + this.messagingGateway = new MessagingGatewaySupport() {}; + this.messagingGateway.setRequestChannel(reqChannel); this.messagingGateway.setErrorChannel(errorChannel); this.messagingGateway.setReplyChannel(null); @@ -277,6 +278,8 @@ public class MessagingGatewayTests { handler.afterPropertiesSet(); errorChannel.subscribe(handler); + this.messagingGateway = new MessagingGatewaySupport() {}; + this.messagingGateway.setRequestChannel(reqChannel); this.messagingGateway.setErrorChannel(errorChannel); this.messagingGateway.setReplyChannel(null); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MultipleEndpointGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MultipleEndpointGatewayTests.java index 19bca2fa49..51a65049a6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/MultipleEndpointGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MultipleEndpointGatewayTests.java @@ -19,7 +19,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java index bacb204a6f..2b6a49d0e1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/NestedGatewayTests.java @@ -20,7 +20,7 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java index 11e3f19cd4..f4e68b2909 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestChannelInterceptor.java @@ -18,8 +18,8 @@ package org.springframework.integration.gateway; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestHandler.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestHandler.java index 1c39c37d35..d500fcf241 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestHandler.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestHandler.java @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java index 7287c51a38..c0b84d4232 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/TestService.java @@ -18,7 +18,7 @@ package org.springframework.integration.gateway; import java.util.concurrent.Future; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Payload; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTests.java index b2055aae20..6408e40d5f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/AbstractReplyProducingMessageHandlerTests.java @@ -25,9 +25,9 @@ import static org.hamcrest.CoreMatchers.containsString; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java index f418233c36..31e7f2f828 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/BridgeHandlerTests.java @@ -22,14 +22,13 @@ import static org.junit.Assert.assertThat; import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.junit.Test; - -import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageMatcher; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.ChannelResolutionException; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.DestinationResolutionException; /** * @author Mark Fisher @@ -55,7 +54,7 @@ public class BridgeHandlerTests { assertThat(reply, sameExceptImmutableHeaders(request)); } - @Test(expected = ChannelResolutionException.class) + @Test(expected = DestinationResolutionException.class) public void missingOutputChannelVerifiedAtRuntime() { Message request = new GenericMessage("test"); handler.handleMessage(request); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/CollectionAndArrayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/CollectionAndArrayTests.java index 9d07083dbc..3ba0015f71 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/CollectionAndArrayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/CollectionAndArrayTests.java @@ -31,9 +31,9 @@ import java.util.Set; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.splitter.AbstractMessageSplitter; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java index 21aa844223..9e916d20ca 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/CustomConverterMessageProcessingTests.java @@ -25,10 +25,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.core.convert.converter.Converter; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java index 185550cde5..cb6aa330b4 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/DelayHandlerTests.java @@ -37,19 +37,19 @@ import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.support.StaticApplicationContext; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java index ff745da960..627cf9d7ad 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ExpressionEvaluatingMessageProcessorTests.java @@ -40,12 +40,12 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; import org.springframework.integration.config.IntegrationEvaluationContextFactoryBean; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; /** * @author Dave Syer diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/HeaderAnnotationTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/HeaderAnnotationTransformerTests.java index 58ac3ad367..d9ba5a5b49 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/HeaderAnnotationTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/HeaderAnnotationTransformerTests.java @@ -20,14 +20,13 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import org.junit.Test; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.annotation.Header; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.MessageTransformingHandler; import org.springframework.integration.transformer.MethodInvokingTransformer; +import org.springframework.messaging.Message; /** * @author Mark Fisher @@ -47,7 +46,7 @@ public class HeaderAnnotationTransformerTests { Message result = outputChannel.receive(0); assertNotNull(result); assertEquals("testabc", result.getPayload()); - assertEquals("abc", result.getHeaders().getCorrelationId()); + assertEquals("abc", new EiMessageHeaderAccessor(result).getCorrelationId()); } @Test // INT-1082 @@ -62,7 +61,7 @@ public class HeaderAnnotationTransformerTests { Message result = outputChannel.receive(0); assertNotNull(result); assertEquals("ABC", result.getPayload()); - assertEquals("abc", result.getHeaders().getCorrelationId()); + assertEquals("abc", new EiMessageHeaderAccessor(result).getCorrelationId()); } @Test @@ -99,7 +98,7 @@ public class HeaderAnnotationTransformerTests { public static class TestTransformer { public String appendCorrelationId(Object payload, - @Header(value = MessageHeaders.CORRELATION_ID, required = true) Object correlationId) { + @Header(value = EiMessageHeaderAccessor.CORRELATION_ID, required = true) Object correlationId) { return payload.toString() + correlationId.toString(); } @@ -107,7 +106,7 @@ public class HeaderAnnotationTransformerTests { return payload.toString() + header.toString(); } - public String evalCorrelationId(@Header(value = MessageHeaders.CORRELATION_ID + ".toUpperCase()") String result) { + public String evalCorrelationId(@Header(value = EiMessageHeaderAccessor.CORRELATION_ID + ".toUpperCase()") String result) { return result.toString(); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/LoggingHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/LoggingHandlerTests.java index 50dc6b97cd..bc09dc2be1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/LoggingHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/LoggingHandlerTests.java @@ -32,7 +32,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.handler.LoggingHandler.Level; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java index f247b65e31..540d7185b3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MessageHandlerChainTests.java @@ -17,7 +17,6 @@ package org.springframework.integration.handler; import static org.easymock.EasyMock.*; -import static org.junit.Assert.assertEquals; import java.util.ArrayList; import java.util.List; @@ -25,10 +24,10 @@ import java.util.List; import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.context.IntegrationObjectSupport; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java index 472206d75f..f5f3b3897e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingHeaderEnricherTests.java @@ -23,7 +23,7 @@ import java.util.Map; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Payload; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.HeaderEnricher; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java index a7f0670233..99e8859ff6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorAnnotationTests.java @@ -36,10 +36,10 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessagingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java index 6b078bf311..f31a0f71ae 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MethodInvokingMessageProcessorTests.java @@ -33,7 +33,7 @@ import org.junit.Rule; import org.junit.Test; import org.junit.rules.ExpectedException; import org.springframework.expression.spel.SpelEvaluationException; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.ServiceActivator; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/MockHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/MockHandlerTests.java index 0dd22bfecf..2a6c91d13d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/MockHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/MockHandlerTests.java @@ -25,8 +25,8 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java index 152b41f15e..fba9d6c58f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ServiceActivatorDefaultFrameworkMethodTests.java @@ -23,13 +23,13 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java index b74ef1b7e3..eb3c51f4af 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/AdvisedMessageHandlerTests.java @@ -54,22 +54,22 @@ import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.support.AopUtils; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageSelector; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.filter.MessageFilter; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.advice.ExpressionEvaluatingRequestHandlerAdvice.MessageHandlingExpressionEvaluatingAdviceException; import org.springframework.integration.message.AdviceMessage; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.util.ErrorHandlingTaskExecutor; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.retry.RecoveryCallback; import org.springframework.retry.RetryContext; import org.springframework.retry.RetryState; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGeneratorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGeneratorTests.java index bb1f33a374..229da74a9f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGeneratorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/advice/SpelExpressionRetryStateGeneratorTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.classify.ClassifierSupport; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.retry.RetryState; import org.springframework.retry.support.DefaultRetryState; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/AnnotatedAdapter.java b/spring-integration-core/src/test/java/org/springframework/integration/history/AnnotatedAdapter.java index e5423b7a45..b432008eea 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/AnnotatedAdapter.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/AnnotatedAdapter.java @@ -19,7 +19,7 @@ import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationEvent; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.MessageEndpoint; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/AnotatedTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/AnotatedTests.java index edd8f49a1f..bae4216219 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/AnotatedTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/AnotatedTests.java @@ -29,9 +29,9 @@ import org.mockito.Mockito; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java index 4aec32ba50..9d32cb9d69 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java @@ -16,6 +16,12 @@ package org.springframework.integration.history; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + import java.util.Iterator; import java.util.Map; import java.util.Properties; @@ -27,22 +33,16 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.config.ConsumerEndpointFactoryBean; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; import org.springframework.util.StopWatch; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - /** * @author Oleg Zhurakousky * @author Gunnar Hillert diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonInboundMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonInboundMessageMapperTests.java index 37e25b36f7..580309c9a9 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonInboundMessageMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonInboundMessageMapperTests.java @@ -30,13 +30,13 @@ import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.junit.Test; -import org.springframework.integration.Message; import org.springframework.integration.message.MessageMatcher; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.json.JacksonJsonObjectMapperProvider; import org.springframework.integration.support.json.JsonInboundMessageMapper; import org.springframework.integration.support.json.JsonInboundMessageMapper.JsonMessageParser; import org.springframework.integration.support.json.JsonObjectMapper; +import org.springframework.messaging.Message; /** * @author Jeremy Grelle diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonSymmetricalMessageMappingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonSymmetricalMessageMappingTests.java index 23af36e283..29e80e2799 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonSymmetricalMessageMappingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/AbstractJsonSymmetricalMessageMappingTests.java @@ -22,7 +22,6 @@ import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.junit.Test; -import org.springframework.integration.Message; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.MessageMatcher; import org.springframework.integration.support.MessageBuilder; @@ -30,6 +29,7 @@ import org.springframework.integration.support.context.NamedComponent; import org.springframework.integration.support.json.JsonInboundMessageMapper; import org.springframework.integration.support.json.JsonInboundMessageMapper.JsonMessageParser; import org.springframework.integration.support.json.JsonOutboundMessageMapper; +import org.springframework.messaging.Message; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java index b10f62b90d..f6c01055aa 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonOutboundMessageMapperTests.java @@ -28,11 +28,11 @@ import org.codehaus.jackson.JsonToken; import org.codehaus.jackson.map.ObjectMapper; import org.junit.Test; -import org.springframework.integration.Message; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.context.NamedComponent; import org.springframework.integration.support.json.JsonOutboundMessageMapper; +import org.springframework.messaging.Message; /** * @author Jeremy Grelle @@ -86,7 +86,7 @@ public class JsonOutboundMessageMapperTests { String result = mapper.fromMessage(testMessage); assertEquals(expected, result); } - + @Test public void testFromMessageWithHeadersAndBeanPayload() throws Exception { TestBean payload = new TestBean(); @@ -99,7 +99,7 @@ public class JsonOutboundMessageMapperTests { TestBean parsedPayload = extractJsonPayloadToTestBean(result); assertEquals(payload, parsedPayload); } - + @Test public void testFromMessageExtractBeanPayload() throws Exception { TestBean payload = new TestBean(); @@ -111,7 +111,7 @@ public class JsonOutboundMessageMapperTests { TestBean parsedPayload = objectMapper.readValue(result, TestBean.class); assertEquals(payload, parsedPayload); } - + private TestBean extractJsonPayloadToTestBean(String json) throws JsonParseException, IOException { JsonParser parser = jsonFactory.createJsonParser(json); do { diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java index 7fae338604..3385b6b72d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonPathTests.java @@ -28,29 +28,29 @@ import java.io.IOException; import java.util.Map; import java.util.Scanner; +import org.hamcrest.Matchers; import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; -import org.hamcrest.Matchers; - -import com.jayway.jsonpath.Criteria; -import com.jayway.jsonpath.Filter; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.core.io.ClassPathResource; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageRejectedException; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.test.context.support.AnnotationConfigContextLoader; +import com.jayway.jsonpath.Criteria; +import com.jayway.jsonpath.Filter; + /** * @author Artem Bilan * @since 3.0 diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerParserTests.java index e8bbc6c9b0..ff45f7fe84 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/JsonToObjectTransformerParserTests.java @@ -27,10 +27,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.json.Jackson2JsonObjectMapper; import org.springframework.integration.support.json.JsonObjectMapper; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerParserTests.java index 31aa1f9ddd..3cf107ff94 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerParserTests.java @@ -31,9 +31,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.json.Jackson2JsonObjectMapper; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerTests.java index 8d4a777f5f..e3aeceb3eb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/ObjectToJsonTransformerTests.java @@ -27,11 +27,11 @@ import org.codehaus.jackson.JsonGenerator.Feature; import org.codehaus.jackson.map.ObjectMapper; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.json.JacksonJsonObjectMapper; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/TestChildBean.java b/spring-integration-core/src/test/java/org/springframework/integration/json/TestChildBean.java index ff1438d6c7..8745641334 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/TestChildBean.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/TestChildBean.java @@ -68,4 +68,4 @@ public class TestChildBean { return false; return true; } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/ExpressionEvaluatingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/ExpressionEvaluatingMessageHandlerTests.java index c6cb3bcbf1..f1fc479c54 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/ExpressionEvaluatingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/ExpressionEvaluatingMessageHandlerTests.java @@ -28,9 +28,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; import org.springframework.integration.handler.ExpressionEvaluatingMessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** * @author Artem Bilan @@ -92,4 +92,4 @@ public class ExpressionEvaluatingMessageHandlerTests { } } -} +} \ No newline at end of file diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java index 042bfcecf3..b05c94daac 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/GenericMessageTests.java @@ -23,7 +23,7 @@ import java.util.Map; import org.junit.Test; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; /** * @author Mark Fisher @@ -35,13 +35,13 @@ public class GenericMessageTests { Map headerMap = new HashMap(); headerMap.put("testAttribute", new Integer(123)); headerMap.put("testProperty", "foo"); - headerMap.put(MessageHeaders.SEQUENCE_SIZE, 42); - headerMap.put(MessageHeaders.SEQUENCE_NUMBER, 24); + headerMap.put(EiMessageHeaderAccessor.SEQUENCE_SIZE, 42); + headerMap.put(EiMessageHeaderAccessor.SEQUENCE_NUMBER, 24); GenericMessage message = new GenericMessage("test", headerMap); assertEquals(new Integer(123), message.getHeaders().get("testAttribute")); assertEquals("foo", message.getHeaders().get("testProperty", String.class)); - assertEquals(new Integer(42), message.getHeaders().getSequenceSize()); - assertEquals(new Integer(24), message.getHeaders().getSequenceNumber()); + assertEquals(new Integer(42), new EiMessageHeaderAccessor(message).getSequenceSize()); + assertEquals(new Integer(24), new EiMessageHeaderAccessor(message).getSequenceNumber()); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderTests.java index 92c8f9c61f..9b12a68d18 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageBuilderTests.java @@ -27,15 +27,16 @@ import java.util.Map; import java.util.UUID; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.support.MessageBuilder; /** * @author Mark Fisher */ public class MessageBuilderTests { - + @Test(expected= IllegalArgumentException.class) // priority must be an Integer public void testPriorityHeader(){ MessageBuilder.withPayload("ha").setHeader("priority", "10").build(); @@ -122,7 +123,7 @@ public class MessageBuilderTests { public void testPriority() { Message importantMessage = MessageBuilder.withPayload(1) .setPriority(123).build(); - assertEquals(new Integer(123), importantMessage.getHeaders().getPriority()); + assertEquals(new Integer(123), new EiMessageHeaderAccessor(importantMessage).getPriority()); } @Test @@ -130,9 +131,9 @@ public class MessageBuilderTests { Message message1 = MessageBuilder.withPayload(1) .setPriority(42).build(); Message message2 = MessageBuilder.fromMessage(message1) - .setHeaderIfAbsent(MessageHeaders.PRIORITY, 13) + .setHeaderIfAbsent(EiMessageHeaderAccessor.PRIORITY, 13) .build(); - assertEquals(new Integer(42), message2.getHeaders().getPriority()); + assertEquals(new Integer(42), new EiMessageHeaderAccessor(message2).getPriority()); } @Test @@ -140,7 +141,7 @@ public class MessageBuilderTests { Long past = System.currentTimeMillis() - (60 * 1000); Message expiredMessage = MessageBuilder.withPayload(1) .setExpirationDate(past).build(); - assertEquals(past, expiredMessage.getHeaders().getExpirationDate()); + assertEquals(past, new EiMessageHeaderAccessor(expiredMessage).getExpirationDate()); } @Test @@ -148,7 +149,7 @@ public class MessageBuilderTests { Long past = System.currentTimeMillis() - (60 * 1000); Message expiredMessage = MessageBuilder.withPayload(1) .setExpirationDate(new Date(past)).build(); - assertEquals(past, expiredMessage.getHeaders().getExpirationDate()); + assertEquals(past, new EiMessageHeaderAccessor(expiredMessage).getExpirationDate()); } @Test @@ -170,43 +171,43 @@ public class MessageBuilderTests { .build(); assertFalse(message2.getHeaders().containsKey("foo")); } - + @Test public void testPushAndPopSequenceDetails() throws Exception { Message message1 = MessageBuilder.withPayload(1).pushSequenceDetails("foo", 1, 2).build(); - assertFalse(message1.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertFalse(message1.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); Message message2 = MessageBuilder.fromMessage(message1).pushSequenceDetails("bar", 1, 1).build(); - assertTrue(message2.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertTrue(message2.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); Message message3 = MessageBuilder.fromMessage(message2).popSequenceDetails().build(); - assertFalse(message3.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertFalse(message3.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); } @Test public void testPushAndPopSequenceDetailsWhenNoCorrelationId() throws Exception { Message message1 = MessageBuilder.withPayload(1).build(); - assertFalse(message1.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertFalse(message1.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); Message message2 = MessageBuilder.fromMessage(message1).pushSequenceDetails("bar", 1, 1).build(); - assertFalse(message2.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertFalse(message2.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); Message message3 = MessageBuilder.fromMessage(message2).popSequenceDetails().build(); - assertFalse(message3.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertFalse(message3.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); } @Test public void testPopSequenceDetailsWhenNotPopped() throws Exception { Message message1 = MessageBuilder.withPayload(1).build(); - assertFalse(message1.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertFalse(message1.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); Message message2 = MessageBuilder.fromMessage(message1).popSequenceDetails().build(); - assertFalse(message2.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertFalse(message2.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); } @Test public void testPushAndPopSequenceDetailsWhenNoSequence() throws Exception { Message message1 = MessageBuilder.withPayload(1).setCorrelationId("foo").build(); - assertFalse(message1.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertFalse(message1.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); Message message2 = MessageBuilder.fromMessage(message1).pushSequenceDetails("bar", 1, 1).build(); - assertTrue(message2.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertTrue(message2.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); Message message3 = MessageBuilder.fromMessage(message2).popSequenceDetails().build(); - assertFalse(message3.getHeaders().containsKey(MessageHeaders.SEQUENCE_DETAILS)); + assertFalse(message3.getHeaders().containsKey(EiMessageHeaderAccessor.SEQUENCE_DETAILS)); } @Test @@ -240,7 +241,7 @@ public class MessageBuilderTests { Map newHeaders = new HashMap(); newHeaders.put("a", 123); newHeaders.put("b", "xyz"); - newHeaders.put("c", current); + newHeaders.put("c", current); Message result = MessageBuilder.fromMessage(original).copyHeaders(newHeaders).build(); assertEquals(original, result); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageHeadersTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageHeadersTests.java index 62f81b2003..0463c724cd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageHeadersTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageHeadersTests.java @@ -32,7 +32,7 @@ import java.util.Set; import org.junit.Test; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageMatcher.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageMatcher.java index dc8fd68ee5..61c8985a1b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MessageMatcher.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MessageMatcher.java @@ -8,8 +8,8 @@ import java.util.Map; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; /** * Matcher to make assertions about message equality easier. Usage: @@ -58,4 +58,4 @@ public class MessageMatcher extends BaseMatcher> { description.appendText("Headers match except ID and timestamp for payload: ").appendValue(payload).appendText(" and headers: ").appendValue(headers); } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java index 0bf4bed39e..e05ec90266 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageHandlerTests.java @@ -26,8 +26,8 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.MethodInvokingMessageHandler; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageSourceTests.java index 500bafbffe..d2348cd204 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingMessageSourceTests.java @@ -30,8 +30,8 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.endpoint.MethodInvokingMessageSource; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java index cffa393060..f358481518 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/PayloadAndHeaderMappingTests.java @@ -30,11 +30,11 @@ import java.util.Properties; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/TestHandlers.java b/spring-integration-core/src/test/java/org/springframework/integration/message/TestHandlers.java index 628cd317c4..6e04ff7309 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/TestHandlers.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; /** * Factory for handler beans that are useful for testing. diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java index c27243bd3b..90c5368d43 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/selector/PayloadTypeSelectorTests.java @@ -21,8 +21,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; -import org.springframework.integration.MessagingException; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.selector.PayloadTypeSelector; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java index 7fe547b2e2..4a44e9d151 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/selector/UnexpiredMessageSelectorTests.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.selector.UnexpiredMessageSelector; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourceInboundChannelAdapterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourceInboundChannelAdapterParserTests.java index 6fa7a5f54f..f29fca2f6f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourceInboundChannelAdapterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/resource/ResourceInboundChannelAdapterParserTests.java @@ -28,7 +28,7 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.io.Resource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java index 716b958bbe..3511fdfc29 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/ErrorMessageExceptionTypeRouterTests.java @@ -24,20 +24,21 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; + import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.support.ErrorMessage; /** * @author Mark Fisher * @author Oleg Zhurakousky */ public class ErrorMessageExceptionTypeRouterTests { - + private DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory(); private QueueChannel illegalArgumentChannel = new QueueChannel(); @@ -49,7 +50,7 @@ public class ErrorMessageExceptionTypeRouterTests { private QueueChannel messageDeliveryExceptionChannel = new QueueChannel(); private QueueChannel defaultChannel = new QueueChannel(); - + @Before public void prepare(){ beanFactory.registerSingleton("illegalArgumentChannel", illegalArgumentChannel); @@ -73,7 +74,7 @@ public class ErrorMessageExceptionTypeRouterTests { exceptionTypeChannelMap.put(RuntimeException.class.getName(), "runtimeExceptionChannel"); exceptionTypeChannelMap.put(MessageHandlingException.class.getName(), "messageHandlingExceptionChannel"); router.setChannelMappings(exceptionTypeChannelMap); - + router.setBeanFactory(beanFactory); router.setDefaultOutputChannel(defaultChannel); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java index ddcd8eb984..f5dc431535 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/HeaderValueRouterTests.java @@ -23,12 +23,12 @@ import org.junit.Test; import org.springframework.beans.factory.support.ManagedMap; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.StaticApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.DestinationResolver; /** * @author Mark Fisher @@ -70,15 +70,15 @@ public class HeaderValueRouterTests { Message result = channel.receive(1000); assertNotNull(result); assertSame(message, result); - - // validate dynamics + + // validate dynamics HeaderValueRouter router = (HeaderValueRouter) context.getBean("router"); router.setChannelMapping("testChannel", "newChannel"); router.handleMessage(message); QueueChannel newChannel = (QueueChannel) context.getBean("newChannel"); result = newChannel.receive(10); assertNotNull(result); - + router.removeChannelMapping("testChannel"); router.handleMessage(message); result = channel.receive(1000); @@ -119,8 +119,8 @@ public class HeaderValueRouterTests { routerBeanDefinition.getPropertyValues().addPropertyValue("resolutionRequired", "true"); routerBeanDefinition.getPropertyValues().addPropertyValue("channelMappings", channelMappings); routerBeanDefinition.getPropertyValues().addPropertyValue("beanFactory", context); - routerBeanDefinition.getPropertyValues().addPropertyValue("channelResolver", new ChannelResolver() { - public MessageChannel resolveChannelName(String channelName) { + routerBeanDefinition.getPropertyValues().addPropertyValue("channelResolver", new DestinationResolver() { + public MessageChannel resolveDestination(String channelName) { return context.getBean("anotherChannel", MessageChannel.class); } }); @@ -185,5 +185,5 @@ public class HeaderValueRouterTests { assertSame(message, result2); } - + } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java index 9dc5f16efa..bb8f3fcbb8 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/MethodInvokingRouterTests.java @@ -26,17 +26,16 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.DestinationResolver; /** * @author Mark Fisher @@ -136,15 +135,15 @@ public class MethodInvokingRouterTests { Message result2 = barChannel.receive(0); assertNotNull(result2); assertEquals("bar", result2.getPayload()); - + try { router.handleMessage(badMessage); fail(); } catch (MessageDeliveryException e) { /* Success */ } - - + + } @Test @@ -181,14 +180,14 @@ public class MethodInvokingRouterTests { Message result2 = barChannel.receive(0); assertNotNull(result2); assertEquals("bar", result2.getPayload()); - + try { router.handleMessage(badMessage); fail(); } catch (MessageDeliveryException e) { /* Success */ } - + } @Test @@ -225,14 +224,14 @@ public class MethodInvokingRouterTests { Message result2 = barChannel.receive(0); assertNotNull(result2); assertEquals("bar", result2.getPayload()); - + try { router.handleMessage(badMessage); fail(); } catch (MessageDeliveryException e) { /* Success */ } - + } @Test @@ -275,7 +274,7 @@ public class MethodInvokingRouterTests { assertEquals("bar", result2a.getPayload()); assertNotNull(result2b); assertEquals("bar", result2b.getPayload()); - + try { router.handleMessage(badMessage); fail(); @@ -324,7 +323,7 @@ public class MethodInvokingRouterTests { Message result2b = barChannel.receive(0); assertNotNull(result2b); assertEquals("bar", result2b.getPayload()); - + try { router.handleMessage(badMessage); fail(); @@ -373,7 +372,7 @@ public class MethodInvokingRouterTests { Message result2b = barChannel.receive(0); assertNotNull(result2b); assertEquals("bar", result2b.getPayload()); - + try { router.handleMessage(badMessage); fail(); @@ -422,7 +421,7 @@ public class MethodInvokingRouterTests { assertEquals("bar", result2a.getPayload()); assertNotNull(result2b); assertEquals("bar", result2b.getPayload()); - + try { router.handleMessage(badMessage); fail(); @@ -479,7 +478,7 @@ public class MethodInvokingRouterTests { } catch (MessageDeliveryException e) { /* Success */ } - + } @Test @@ -529,7 +528,7 @@ public class MethodInvokingRouterTests { } catch (MessageDeliveryException e) { /* Success */ } - + } @@ -589,22 +588,22 @@ public class MethodInvokingRouterTests { public static class SingleChannelInstanceRoutingTestBean { - private ChannelResolver channelResolver; + private DestinationResolver channelResolver; - public SingleChannelInstanceRoutingTestBean(ChannelResolver channelResolver) { + public SingleChannelInstanceRoutingTestBean(DestinationResolver channelResolver) { this.channelResolver = channelResolver; } public MessageChannel routePayload(String name) { - return channelResolver.resolveChannelName(name + "-channel"); + return channelResolver.resolveDestination(name + "-channel"); } public MessageChannel routeMessage(Message message) { if (message.getPayload().equals("foo")) { - return channelResolver.resolveChannelName("foo-channel"); + return channelResolver.resolveDestination("foo-channel"); } else if (message.getPayload().equals("bar")) { - return channelResolver.resolveChannelName("bar-channel"); + return channelResolver.resolveDestination("bar-channel"); } return null; } @@ -613,17 +612,17 @@ public class MethodInvokingRouterTests { public static class MultiChannelInstanceRoutingTestBean { - private ChannelResolver channelResolver; + private DestinationResolver channelResolver; - public MultiChannelInstanceRoutingTestBean(ChannelResolver channelResolver) { + public MultiChannelInstanceRoutingTestBean(DestinationResolver channelResolver) { this.channelResolver = channelResolver; } public List routePayload(String name) { List results = new ArrayList(); if (name.equals("foo") || name.equals("bar")) { - results.add(channelResolver.resolveChannelName("foo-channel")); - results.add(channelResolver.resolveChannelName("bar-channel")); + results.add(channelResolver.resolveDestination("foo-channel")); + results.add(channelResolver.resolveDestination("bar-channel")); } return results; } @@ -631,8 +630,8 @@ public class MethodInvokingRouterTests { public List routeMessage(Message message) { List results = new ArrayList(); if (message.getPayload().equals("foo") || message.getPayload().equals("bar")) { - results.add(channelResolver.resolveChannelName("foo-channel")); - results.add(channelResolver.resolveChannelName("bar-channel")); + results.add(channelResolver.resolveDestination("foo-channel")); + results.add(channelResolver.resolveDestination("bar-channel")); } return results; } @@ -641,8 +640,8 @@ public class MethodInvokingRouterTests { MessageChannel[] results = null; if (message.getPayload().equals("foo") || message.getPayload().equals("bar")) { results = new MessageChannel[2]; - results[0] = channelResolver.resolveChannelName("foo-channel"); - results[1] = channelResolver.resolveChannelName("bar-channel"); + results[0] = channelResolver.resolveDestination("foo-channel"); + results[1] = channelResolver.resolveDestination("bar-channel"); } return results; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java index 1ccae67586..8edd0ce0c7 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/MultiChannelRouterTests.java @@ -25,8 +25,8 @@ import java.util.List; import org.junit.Test; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java index dceaf4c931..87c0e60ab3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/PayloadTypeRouterTests.java @@ -28,7 +28,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java index 46e75fcc5e..9a9371a4ff 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/RecipientListRouterTests.java @@ -26,13 +26,14 @@ import java.util.List; import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.router.RecipientListRouter.Recipient; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; /** * @author Mark Fisher @@ -148,7 +149,7 @@ public class RecipientListRouterTests { assertEquals("test", result1a.getPayload()); Message result1b = channelB.receive(0); assertNotNull(result1b); - assertEquals("blocker", result1b.getPayload()); + assertEquals("blocker", result1b.getPayload()); assertNull(channelC.receive(0)); throw e; } @@ -296,13 +297,13 @@ public class RecipientListRouterTests { assertNotNull(result1a); assertNotNull(result1b); assertEquals("test", result1a.getPayload()); - assertEquals(0, result1a.getHeaders().getSequenceNumber().intValue()); - assertEquals(0, result1a.getHeaders().getSequenceSize().intValue()); - assertNull(result1a.getHeaders().getCorrelationId()); + assertEquals(0, new EiMessageHeaderAccessor(result1a).getSequenceNumber().intValue()); + assertEquals(0, new EiMessageHeaderAccessor(result1a).getSequenceSize().intValue()); + assertNull(new EiMessageHeaderAccessor(result1a).getCorrelationId()); assertEquals("test", result1b.getPayload()); - assertEquals(0, result1b.getHeaders().getSequenceNumber().intValue()); - assertEquals(0, result1b.getHeaders().getSequenceSize().intValue()); - assertNull(result1b.getHeaders().getCorrelationId()); + assertEquals(0, new EiMessageHeaderAccessor(result1b).getSequenceNumber().intValue()); + assertEquals(0, new EiMessageHeaderAccessor(result1b).getSequenceSize().intValue()); + assertNull(new EiMessageHeaderAccessor(result1b).getCorrelationId()); } @Test @@ -324,13 +325,13 @@ public class RecipientListRouterTests { assertNotNull(result1a); assertNotNull(result1b); assertEquals("test", result1a.getPayload()); - assertEquals(1, result1a.getHeaders().getSequenceNumber().intValue()); - assertEquals(2, result1a.getHeaders().getSequenceSize().intValue()); - assertEquals(message.getHeaders().getId(), result1a.getHeaders().getCorrelationId()); + assertEquals(1,new EiMessageHeaderAccessor(result1a).getSequenceNumber().intValue()); + assertEquals(2, new EiMessageHeaderAccessor(result1a).getSequenceSize().intValue()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(result1a).getCorrelationId()); assertEquals("test", result1b.getPayload()); - assertEquals(2, result1b.getHeaders().getSequenceNumber().intValue()); - assertEquals(2, result1b.getHeaders().getSequenceSize().intValue()); - assertEquals(message.getHeaders().getId(), result1b.getHeaders().getCorrelationId()); + assertEquals(2, new EiMessageHeaderAccessor(result1b).getSequenceNumber().intValue()); + assertEquals(2, new EiMessageHeaderAccessor(result1b).getSequenceSize().intValue()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(result1b).getCorrelationId()); } @Test(expected = IllegalArgumentException.class) diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java index 17f1384003..211be0b34b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterConcurrencyTest.java @@ -36,8 +36,8 @@ import org.mockito.stubbing.Answer; import org.springframework.beans.factory.BeanFactory; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.context.IntegrationContextUtils; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java index 157429eda1..eaed7b873a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/RouterTests.java @@ -27,13 +27,13 @@ import org.junit.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessagingException; import org.springframework.util.CollectionUtils; /** @@ -120,9 +120,9 @@ public class RouterTests { QueueChannel testChannel = new QueueChannel(); GenericApplicationContext context = new GenericApplicationContext(); context.getBeanFactory().registerSingleton("testChannel", testChannel); - context.refresh(); router.setBeanFactory(context); + context.refresh(); router.handleMessage(new GenericMessage("test")); Message reply = testChannel.receive(0); assertEquals("test", reply.getPayload()); @@ -144,9 +144,10 @@ public class RouterTests { context.getBeanFactory().registerSingleton("testChannel1", testChannel1); context.getBeanFactory().registerSingleton("testChannel2", testChannel2); - context.refresh(); router.setBeanFactory(context); + context.refresh(); + router.handleMessage(new GenericMessage("test")); Message reply1 = testChannel1.receive(0); @@ -191,9 +192,9 @@ public class RouterTests { QueueChannel testChannel = new QueueChannel(); GenericApplicationContext context = new GenericApplicationContext(); context.getBeanFactory().registerSingleton("testChannel", testChannel); - context.refresh(); router.setBeanFactory(context); + context.refresh(); router.handleMessage(new GenericMessage("test")); Message reply = testChannel.receive(0); assertEquals("test", reply.getPayload()); @@ -214,9 +215,9 @@ public class RouterTests { QueueChannel testChannel = new QueueChannel(); GenericApplicationContext context = new GenericApplicationContext(); context.getBeanFactory().registerSingleton("testing_MyChannel", testChannel); - context.refresh(); router.setBeanFactory(context); + context.refresh(); router.handleMessage(new GenericMessage("test")); Message reply = testChannel.receive(0); assertEquals("test", reply.getPayload()); @@ -258,9 +259,9 @@ public class RouterTests { QueueChannel testChannel = new QueueChannel(); GenericApplicationContext context = new GenericApplicationContext(); context.getBeanFactory().registerSingleton("MyChannel_withSuffix", testChannel); - context.refresh(); router.setBeanFactory(context); + context.refresh(); router.handleMessage(new GenericMessage("test")); Message reply = testChannel.receive(0); assertEquals("test", reply.getPayload()); @@ -315,6 +316,7 @@ public class RouterTests { context.refresh(); router.setBeanFactory(context); + router.handleMessage(new GenericMessage("test")); Message reply1 = testChannel1.receive(0); @@ -379,9 +381,10 @@ public class RouterTests { context.getBeanFactory().registerSingleton("100", testChannel1); context.getBeanFactory().registerSingleton("200", testChannel2); - context.refresh(); router.setBeanFactory(context); + context.refresh(); + router.handleMessage(new GenericMessage("test")); Message reply1 = testChannel1.receive(0); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests.java index 8d4149ccf8..7e7b7028bd 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/DynamicExpressionRouterIntegrationTests.java @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java index 64308722a3..e2ce376985 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/ExceptionTypeRouterParserTests.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterConvertibleTypeTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterConvertibleTypeTests.java index 926bb9b529..73287379fb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterConvertibleTypeTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterConvertibleTypeTests.java @@ -23,9 +23,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests.java index fc0f1d5056..1d4d0b1bc2 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/HeaderValueRouterParserTests.java @@ -23,8 +23,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java index 5cb8ab5c0d..4c2a4d62f1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/PayloadTypeRouterParserTests.java @@ -16,29 +16,31 @@ package org.springframework.integration.router.config; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +import static org.mockito.Mockito.mock; + import java.io.ByteArrayInputStream; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.BeanDefinitionStoreException; +import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.InputStreamResource; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - /** * @author Oleg Zhurakousky */ @@ -51,7 +53,7 @@ public class PayloadTypeRouterParserTests { @Autowired private TestService testService; - + @Test public void testPayloadTypeRouter() { context.start(); @@ -68,10 +70,10 @@ public class PayloadTypeRouterParserTests { PollableChannel chanel3 = (PollableChannel) context.getBean("channel3"); PollableChannel chanel4 = (PollableChannel) context.getBean("channel4"); assertTrue(chanel1.receive(100).getPayload() instanceof String); - assertTrue(chanel2.receive(100).getPayload() instanceof Integer); - assertTrue(chanel3.receive(100).getPayload().getClass().isArray()); + assertTrue(chanel2.receive(100).getPayload() instanceof Integer); + assertTrue(chanel3.receive(100).getPayload().getClass().isArray()); assertTrue(chanel4.receive(100).getPayload().getClass().isArray()); - + EventDrivenConsumer edc = context.getBean("routerWithChannelResolver", EventDrivenConsumer.class); assertEquals(context.getBean("cr"), TestUtils.getPropertyValue(edc, "handler.channelResolver")); } @@ -84,9 +86,9 @@ public class PayloadTypeRouterParserTests { reader.setValidationMode(XmlBeanDefinitionReader.VALIDATION_XSD); reader.loadBeanDefinitions(new InputStreamResource(stream)); } - + @SuppressWarnings("unused") - private String routerConfigFakeType = + private String routerConfigFakeType = "" + "" + " " + ""; - - private String routerConfigNoMaping = + + private String routerConfigNoMaping = "" + " message); } - public static class MyChannelResolver extends BeanFactoryChannelResolver{} + public static class MyChannelResolver extends BeanFactoryMessageChannelDestinationResolver { + + MyChannelResolver() { + super(mock(BeanFactory.class)); + } + } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java index f3ce841987..7aeda4828a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RecipientListRouterParserTests.java @@ -28,9 +28,9 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.router.RecipientListRouter; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RfbFixRouter.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RfbFixRouter.java index 9cab411d8c..697293a5b1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RfbFixRouter.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RfbFixRouter.java @@ -18,8 +18,8 @@ package org.springframework.integration.router.config; import java.util.Collection; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.router.AbstractMessageRouter; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java index 03d54fdc8c..5ee429710b 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterParserTests.java @@ -30,24 +30,24 @@ import java.util.List; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mockito; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.annotation.Router; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.router.AbstractMappingMessageRouter; import org.springframework.integration.router.MethodInvokingRouter; -import org.springframework.integration.support.channel.ChannelResolutionException; -import org.springframework.integration.support.channel.ChannelResolver; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.messaging.core.DestinationResolutionException; +import org.springframework.messaging.core.DestinationResolver; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -164,7 +164,7 @@ public class RouterParserTests { this.inputForRouterRequiringResolution.send(new GenericMessage(3)); } catch (Exception e) { - assertTrue(e.getCause() instanceof ChannelResolutionException); + assertTrue(e.getCause() instanceof DestinationResolutionException); } } @@ -176,7 +176,7 @@ public class RouterParserTests { @Test public void timeoutValueConfigured() { assertTrue(this.routerWithTimeout instanceof MethodInvokingRouter); - MessagingTemplate template = TestUtils.getPropertyValue(this.routerWithTimeout, "messagingTemplate", MessagingTemplate.class); + GenericMessagingTemplate template = TestUtils.getPropertyValue(this.routerWithTimeout, "messagingTemplate", GenericMessagingTemplate.class); Long timeout = TestUtils.getPropertyValue(template, "sendTimeout", Long.class); assertEquals(new Long(1234), timeout); } @@ -188,15 +188,15 @@ public class RouterParserTests { Message message1 = this.sequenceOut1.receive(1000); Message message2 = this.sequenceOut2.receive(1000); Message message3 = this.sequenceOut3.receive(1000); - assertEquals(originalMessage.getHeaders().getId(), message1.getHeaders().getCorrelationId()); - assertEquals(originalMessage.getHeaders().getId(), message2.getHeaders().getCorrelationId()); - assertEquals(originalMessage.getHeaders().getId(), message3.getHeaders().getCorrelationId()); - assertEquals(new Integer(1), message1.getHeaders().getSequenceNumber()); - assertEquals(new Integer(3), message1.getHeaders().getSequenceSize()); - assertEquals(new Integer(2), message2.getHeaders().getSequenceNumber()); - assertEquals(new Integer(3), message2.getHeaders().getSequenceSize()); - assertEquals(new Integer(3), message3.getHeaders().getSequenceNumber()); - assertEquals(new Integer(3), message3.getHeaders().getSequenceSize()); + assertEquals(originalMessage.getHeaders().getId(), new EiMessageHeaderAccessor(message1).getCorrelationId()); + assertEquals(originalMessage.getHeaders().getId(), new EiMessageHeaderAccessor(message2).getCorrelationId()); + assertEquals(originalMessage.getHeaders().getId(), new EiMessageHeaderAccessor(message3).getCorrelationId()); + assertEquals(new Integer(1), new EiMessageHeaderAccessor(message1).getSequenceNumber()); + assertEquals(new Integer(3), new EiMessageHeaderAccessor(message1).getSequenceSize()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(message2).getSequenceNumber()); + assertEquals(new Integer(3), new EiMessageHeaderAccessor(message2).getSequenceSize()); + assertEquals(new Integer(3), new EiMessageHeaderAccessor(message3).getSequenceNumber()); + assertEquals(new Integer(3), new EiMessageHeaderAccessor(message3).getSequenceSize()); } @Test @@ -284,9 +284,9 @@ public class RouterParserTests { } - static class TestChannelResover implements ChannelResolver { + static class TestChannelResover implements DestinationResolver { - public MessageChannel resolveChannelName(String channelName) { + public MessageChannel resolveDestination(String channelName) { return null; } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java index 8a0bc215dd..f61de07d68 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/RouterWithMappingTests.java @@ -24,10 +24,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.config.ConsumerEndpointFactoryBean; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.router.AbstractMappingMessageRouter; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SpelRouterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SpelRouterIntegrationTests.java index e1ef43112d..c940fef76f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SpelRouterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SpelRouterIntegrationTests.java @@ -23,10 +23,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java index 79fea1bfdb..90ae9d07ce 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterAggregatorTests.java @@ -27,9 +27,9 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java index e139dfd65a..607224a616 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/config/SplitterParserTests.java @@ -19,10 +19,11 @@ package org.springframework.integration.router.config; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.handler.ReplyRequiredException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; @@ -94,7 +95,7 @@ public class SplitterParserTests { assertEquals("test", result4.getPayload()); assertNull(output.receive(0)); } - + @Test(expected = ReplyRequiredException.class) public void splitterParserTestWithRequiresReply() { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( @@ -113,8 +114,8 @@ public class SplitterParserTests { PollableChannel output = (PollableChannel) context.getBean("output"); inputChannel.send(MessageBuilder.withPayload(Collections.emptyList()).build()); Message message = output.receive(1000); - assertThat(message.getHeaders().getSequenceNumber(), is(0)); - assertThat(message.getHeaders().getSequenceSize(), is(0)); + assertThat(new EiMessageHeaderAccessor(message).getSequenceNumber(), is(0)); + assertThat(new EiMessageHeaderAccessor(message).getSequenceSize(), is(0)); } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/config/TestSplitterImpl.java b/spring-integration-core/src/test/java/org/springframework/integration/router/config/TestSplitterImpl.java index 83986a7c3d..575a0e2409 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/config/TestSplitterImpl.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.splitter.AbstractMessageSplitter; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java b/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java index 95432a4a33..4f903c9046 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/selector/MessageSelectorChainTests.java +++ b/spring-integration-core/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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java index 04fa22ccb0..fe5233dc8c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/DefaultSplitterTests.java @@ -28,7 +28,8 @@ import java.util.Collections; import java.util.List; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; @@ -94,7 +95,7 @@ public class DefaultSplitterTests { endpoint.start(); assertTrue(inputChannel.send(message)); Message reply = outputChannel.receive(0); - assertEquals(message.getHeaders().getId(), reply.getHeaders().getCorrelationId()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(reply).getCorrelationId()); } @Test diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests.java index b51b8fa181..98a08557a3 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/DynamicExpressionSplitterIntegrationTests.java @@ -26,9 +26,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java index 757c82520e..b569eb1bcb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/MethodInvokingSplitterTests.java @@ -26,7 +26,8 @@ import java.util.List; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Splitter; import org.springframework.integration.channel.QueueChannel; @@ -329,14 +330,14 @@ public class MethodInvokingSplitterTests { List> replies = replyChannel.clear(); Message reply1 = replies.get(0); assertNotNull(reply1); - assertEquals(new Integer(2), reply1.getHeaders().getSequenceSize()); - assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber()); - assertEquals(message.getHeaders().getId(), reply1.getHeaders().getCorrelationId()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply1).getSequenceSize()); + assertEquals(new Integer(1), new EiMessageHeaderAccessor(reply1).getSequenceNumber()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(reply1).getCorrelationId()); Message reply2 = replies.get(1); assertNotNull(reply2); - assertEquals(new Integer(2), reply2.getHeaders().getSequenceSize()); - assertEquals(new Integer(2), reply2.getHeaders().getSequenceNumber()); - assertEquals(message.getHeaders().getId(), reply2.getHeaders().getCorrelationId()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply2).getSequenceSize()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply2).getSequenceNumber()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(reply2).getCorrelationId()); } @Test @@ -349,14 +350,14 @@ public class MethodInvokingSplitterTests { List> replies = replyChannel.clear(); Message reply1 = replies.get(0); assertNotNull(reply1); - assertEquals(new Integer(2), reply1.getHeaders().getSequenceSize()); - assertEquals(new Integer(1), reply1.getHeaders().getSequenceNumber()); - assertEquals(message.getHeaders().getId(), reply1.getHeaders().getCorrelationId()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply1).getSequenceSize()); + assertEquals(new Integer(1), new EiMessageHeaderAccessor(reply1).getSequenceNumber()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(reply1).getCorrelationId()); Message reply2 = replies.get(1); assertNotNull(reply2); - assertEquals(new Integer(2), reply2.getHeaders().getSequenceSize()); - assertEquals(new Integer(2), reply2.getHeaders().getSequenceNumber()); - assertEquals(message.getHeaders().getId(), reply2.getHeaders().getCorrelationId()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply2).getSequenceSize()); + assertEquals(new Integer(2), new EiMessageHeaderAccessor(reply2).getSequenceNumber()); + assertEquals(message.getHeaders().getId(), new EiMessageHeaderAccessor(reply2).getCorrelationId()); } @Test diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests.java index b7a9796289..28a31bf24d 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SpelSplitterIntegrationTests.java @@ -26,9 +26,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java index 3a1675233a..a4c753f622 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/splitter/SplitterIntegrationTests.java @@ -30,8 +30,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.annotation.Splitter; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageGroupQueueTests.java b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageGroupQueueTests.java index dc22fc0c4e..7269adedb5 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageGroupQueueTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageGroupQueueTests.java @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Ignore; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import static org.junit.Assert.assertEquals; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java index e1b162eb43..6811a11008 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/store/MessageStoreTests.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.store.MessageGroupStore.MessageGroupCallback; import org.springframework.test.util.ReflectionTestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageGroupTests.java b/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageGroupTests.java index b072f6a419..69d7a5688c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageGroupTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageGroupTests.java @@ -12,7 +12,7 @@ import java.util.List; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java b/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java index 3190be47c9..72c088a428 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/store/SimpleMessageStoreTests.java @@ -27,8 +27,8 @@ import java.util.Collection; import java.util.List; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.store.MessageGroupStore.MessageGroupCallback; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.util.ReflectionTestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/support/converter/MapMessageConverterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/support/converter/MapMessageConverterTests.java index 3243057352..989cfa918a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/support/converter/MapMessageConverterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/support/converter/MapMessageConverterTests.java @@ -24,7 +24,7 @@ import static org.junit.Assert.fail; import java.util.Map; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; /** @@ -44,7 +44,7 @@ public class MapMessageConverterTests { MapMessageConverter converter = new MapMessageConverter(); converter.setHeaderNames("bar"); @SuppressWarnings("unchecked") - Map map = (Map) converter.fromMessage(message); + Map map = (Map) converter.fromMessage(message, Map.class); @SuppressWarnings("unchecked") Map headers = (Map) map.get("headers"); @@ -78,7 +78,7 @@ public class MapMessageConverterTests { MapMessageConverter converter = new MapMessageConverter(); converter.setHeaderNames("bar"); @SuppressWarnings("unchecked") - Map map = (Map) converter.fromMessage(message); + Map map = (Map) converter.fromMessage(message, Map.class); map.remove("payload"); @@ -98,7 +98,7 @@ public class MapMessageConverterTests { MapMessageConverter converter = new MapMessageConverter(); converter.setHeaderNames("bar"); @SuppressWarnings("unchecked") - Map map = (Map) converter.fromMessage(message); + Map map = (Map) converter.fromMessage(message, Map.class); @SuppressWarnings("unchecked") Map headers = (Map) map.get("headers"); @@ -117,7 +117,7 @@ public class MapMessageConverterTests { MapMessageConverter converter = new MapMessageConverter(); converter.setHeaderNames("bar"); @SuppressWarnings("unchecked") - Map map = (Map) converter.fromMessage(message); + Map map = (Map) converter.fromMessage(message, Map.class); @SuppressWarnings("unchecked") Map headers = (Map) map.get("headers"); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java index 202412d28f..03e2111271 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/test/util/TestUtils.java @@ -33,18 +33,18 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.history.MessageHistory; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.support.context.NamedComponent; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.Assert; import org.springframework.util.ErrorHandler; @@ -86,7 +86,7 @@ public abstract class TestUtils { public static TestApplicationContext createTestApplicationContext() { TestApplicationContext context = new TestApplicationContext(); - ErrorHandler errorHandler = new MessagePublishingErrorHandler(new BeanFactoryChannelResolver(context)); + ErrorHandler errorHandler = new MessagePublishingErrorHandler(new BeanFactoryMessageChannelDestinationResolver(context)); ThreadPoolTaskScheduler scheduler = createTaskScheduler(10); scheduler.setErrorHandler(errorHandler); registerBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME, scheduler, context); diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ClaimCheckTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ClaimCheckTransformerTests.java index 96b88dc166..bb1ff0fd3f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ClaimCheckTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ClaimCheckTransformerTests.java @@ -22,7 +22,7 @@ import java.util.UUID; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.MessageStore; import org.springframework.integration.store.SimpleMessageStore; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java index 8d5f4cbe7d..c07f344667 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ContentEnricherTests.java @@ -34,8 +34,6 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.NullChannel; @@ -47,6 +45,8 @@ import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.ReplyRequiredException; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.PeriodicTrigger; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionHeaderEnricherIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionHeaderEnricherIntegrationTests.java index cad648d41d..ac3ce765d6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionHeaderEnricherIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionHeaderEnricherIntegrationTests.java @@ -21,9 +21,9 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionTransformerIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionTransformerIntegrationTests.java index 241782fea9..1fa5bbd173 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionTransformerIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/DynamicExpressionTransformerIntegrationTests.java @@ -21,9 +21,9 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/HeaderFilterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/HeaderFilterTests.java index a1f837d26e..1a489ad464 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/HeaderFilterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/HeaderFilterTests.java @@ -24,7 +24,8 @@ import java.util.UUID; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.HeaderFilter; @@ -70,7 +71,7 @@ public class HeaderFilterTests { assertNull(result.getHeaders().get("z")); assertEquals("testErrorChannel", result.getHeaders().getErrorChannel()); assertEquals(replyChannel, result.getHeaders().getReplyChannel()); - assertEquals(correlationId, result.getHeaders().getCorrelationId()); + assertEquals(correlationId, new EiMessageHeaderAccessor(result).getCorrelationId()); } } diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java index 04dc8b794c..30a900be46 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MapToObjectTransformerTests.java @@ -30,7 +30,7 @@ import org.springframework.context.support.GenericApplicationContext; import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.converter.ConverterRegistry; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageHistoryParameterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageHistoryParameterTests.java index 71aa7afb36..38625dc1a0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageHistoryParameterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageHistoryParameterTests.java @@ -20,13 +20,13 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; import org.springframework.integration.annotation.Transformer; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptorTests.java index f05502583a..588e05440e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MessageTransformingChannelInterceptorTests.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java index f1676e91d2..a83b10181c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/MethodInvokingTransformerTests.java @@ -24,7 +24,7 @@ import java.util.Properties; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Transformer; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java index a3b6e7e9b5..6769517675 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToMapTransformerTests.java @@ -32,7 +32,7 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import static org.junit.Assert.assertEquals; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToStringTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToStringTransformerTests.java index f50a1de359..f435d83816 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToStringTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/ObjectToStringTransformerTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertEquals; import java.nio.charset.Charset; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadDeserializingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadDeserializingTransformerTests.java index 042bb41390..b07916eac1 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadDeserializingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadDeserializingTransformerTests.java @@ -26,7 +26,7 @@ import java.io.Serializable; import org.junit.Test; import org.springframework.core.convert.converter.Converter; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadSerializingTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadSerializingTransformerTests.java index 5638cc34cb..8567b29d1a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadSerializingTransformerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadSerializingTransformerTests.java @@ -27,7 +27,7 @@ import java.io.Serializable; import org.junit.Test; import org.springframework.core.convert.converter.Converter; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java index f37662fd54..294aa3cdba 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/PayloadTransformerTests.java +++ b/spring-integration-core/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.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelHeaderEnricherIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelHeaderEnricherIntegrationTests.java index 47fa83b455..aee485331e 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelHeaderEnricherIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelHeaderEnricherIntegrationTests.java @@ -24,9 +24,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests-context.xml b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests-context.xml index b81e1f88e5..b0c3c43562 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests-context.xml +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests-context.xml @@ -37,7 +37,7 @@ + value="#{T(org.springframework.integration.transformer.SpelTransformerIntegrationTests$BarFunction).getMethod('bar', T(org.springframework.messaging.Message))}"/> diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests.java index 056624fc97..2cff2baa42 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/SpelTransformerIntegrationTests.java @@ -35,16 +35,16 @@ import org.springframework.expression.AccessException; import org.springframework.expression.EvaluationContext; import org.springframework.expression.PropertyAccessor; import org.springframework.expression.TypedValue; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.IntegrationEvaluationContextFactoryBean; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.ReplyRequiredException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java b/spring-integration-core/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java index b2f3e6f99d..901ec000d0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/transformer/TransformerContextTests.java @@ -22,13 +22,13 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; /** * @author Mark Fisher @@ -85,4 +85,4 @@ public class TransformerContextTests { } } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java index bc194b8bdb..4a58dd2006 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/BeanFactoryTypeConverterTests.java @@ -54,8 +54,8 @@ import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.DefaultConversionService; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.MethodInvokingMessageProcessor; import org.springframework.integration.handler.ServiceActivatingHandler; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/DefaultLockRegistryTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/DefaultLockRegistryTests.java index 6ae4f82ccb..fe403862ed 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/DefaultLockRegistryTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/DefaultLockRegistryTests.java @@ -181,4 +181,4 @@ public class DefaultLockRegistryTests { assertSame(locks[3], moreLocks[3]); } -} \ No newline at end of file +} diff --git a/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java b/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java index fc7a5cfb13..63cdd11546 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/util/SimplePoolTests.java @@ -28,8 +28,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; -import org.springframework.integration.MessagingException; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.MessagingException; /** * @author Gary Russell diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/config/package-info.java b/spring-integration-event/src/main/java/org/springframework/integration/event/config/package-info.java index 95cacc698e..56643b37c4 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/config/package-info.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.event.config; \ No newline at end of file +package org.springframework.integration.event.config; diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/core/MessagingEvent.java b/spring-integration-event/src/main/java/org/springframework/integration/event/core/MessagingEvent.java index a146355d28..9f90464d90 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/core/MessagingEvent.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/core/MessagingEvent.java @@ -17,7 +17,7 @@ package org.springframework.integration.event.core; import org.springframework.context.ApplicationEvent; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * A subclass of {@link ApplicationEvent} that wraps a {@link Message}. diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/core/package-info.java b/spring-integration-event/src/main/java/org/springframework/integration/event/core/package-info.java index e4e6fa51f1..135709dfb8 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/core/package-info.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/core/package-info.java @@ -1,4 +1,4 @@ /** * Provides Event core classes. */ -package org.springframework.integration.event.core; \ No newline at end of file +package org.springframework.integration.event.core; diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java index 450cad45ab..48a2076676 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducer.java @@ -26,7 +26,7 @@ import org.springframework.context.event.ApplicationEventMulticaster; import org.springframework.context.event.SmartApplicationListener; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.core.Ordered; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.endpoint.ExpressionMessageProducerSupport; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/package-info.java b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/package-info.java index 37e9b01512..323d6a7c0d 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/package-info.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting inbound endpoints. */ -package org.springframework.integration.event.inbound; \ No newline at end of file +package org.springframework.integration.event.inbound; diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandler.java b/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandler.java index 2e4236dadb..7b07a7fc1c 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandler.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandler.java @@ -19,13 +19,13 @@ package org.springframework.integration.event.outbound; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.event.core.MessagingEvent; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.util.Assert; /** - * A {@link org.springframework.integration.core.MessageHandler} that publishes each {@link Message} it receives as + * A {@link org.springframework.messaging.MessageHandler} that publishes each {@link Message} it receives as * a {@link MessagingEvent}. The {@link MessagingEvent} is a subclass of * Spring's {@link ApplicationEvent} used by this adapter to simply wrap the * {@link Message}. diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/package-info.java b/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/package-info.java index d4bec61c97..c6ca28fd16 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/package-info.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/outbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting outbound endpoints. */ -package org.springframework.integration.event.outbound; \ No newline at end of file +package org.springframework.integration.event.outbound; diff --git a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd index f17b92c8d0..dceb5c3789 100644 --- a/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd +++ b/spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd @@ -30,7 +30,7 @@ + type="org.springframework.messaging.MessageChannel" /> diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests.java index e53ed1d8b6..a7520a727c 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventInboundChannelAdapterParserTests.java @@ -37,9 +37,9 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEvent; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.event.inbound.ApplicationEventListeningMessageProducer; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTests.java index 5121ad0040..a3a19a4fe9 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/config/EventOutboundChannelAdapterParserTests.java @@ -29,10 +29,10 @@ import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationListener; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.event.outbound.ApplicationEventPublishingMessageHandler; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java index 9f043cee10..5321180d16 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/inbound/ApplicationEventListeningMessageProducerTests.java @@ -43,11 +43,11 @@ import org.springframework.context.event.SimpleApplicationEventMulticaster; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.event.core.MessagingEvent; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandlerTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandlerTests.java index 41ce0c4d9b..b47b73eced 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandlerTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/outbound/ApplicationEventPublishingMessageHandlerTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.event.core.MessagingEvent; import org.springframework.integration.event.outbound.ApplicationEventPublishingMessageHandler; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/package-info.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/package-info.java index a25230d5bc..bc20bed643 100644 --- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/package-info.java +++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.feed.config; \ No newline at end of file +package org.springframework.integration.feed.config; diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java index 38ca53ef82..03fe2beff6 100644 --- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java +++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/FeedEntryMessageSource.java @@ -25,8 +25,8 @@ import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; diff --git a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/package-info.java b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/package-info.java index 051a68101d..cf5e05d90f 100644 --- a/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/package-info.java +++ b/spring-integration-feed/src/main/java/org/springframework/integration/feed/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting inbound endpoints. */ -package org.springframework.integration.feed.inbound; \ No newline at end of file +package org.springframework.integration.feed.inbound; diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java index 9d1d973610..992a6396e6 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/config/FeedInboundChannelAdapterParserTests.java @@ -35,11 +35,11 @@ import org.junit.Test; import org.mockito.Mockito; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.feed.inbound.FeedEntryMessageSource; import org.springframework.integration.history.MessageHistory; diff --git a/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java b/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java index 1244cd3e48..afd32231c6 100644 --- a/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java +++ b/spring-integration-feed/src/test/java/org/springframework/integration/feed/inbound/FeedEntryMessageSourceTests.java @@ -25,7 +25,7 @@ import java.net.URL; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.metadata.PropertiesPersistingMetadataStore; import com.sun.syndication.feed.synd.SyndEntry; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultDirectoryScanner.java b/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultDirectoryScanner.java index a966599a6f..5cac889aba 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultDirectoryScanner.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultDirectoryScanner.java @@ -20,7 +20,7 @@ import java.io.File; import java.util.Arrays; import java.util.List; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.file.filters.AcceptOnceFileListFilter; import org.springframework.integration.file.filters.FileListFilter; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java b/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java index 6658d3245a..487117ef2a 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/DefaultFileNameGenerator.java +++ b/spring-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; +import org.springframework.messaging.Message; import org.springframework.integration.util.AbstractExpressionEvaluator; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileMessageHolder.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileMessageHolder.java index edf872156d..e629a07715 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileMessageHolder.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileMessageHolder.java @@ -17,7 +17,7 @@ package org.springframework.integration.file; import java.io.File; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * A simple wrapper for a {@code Message;} used for diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileNameGenerator.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileNameGenerator.java index 0c7ca53aeb..c0f0c13b51 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileNameGenerator.java +++ b/spring-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; +import org.springframework.messaging.Message; /** * Strategy interface for generating a file name from a message. diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java index c5ea0494c4..671392d832 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileReadingMessageSource.java @@ -26,8 +26,8 @@ import java.util.concurrent.PriorityBlockingQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.aggregator.ResequencingMessageGroupProcessor; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; @@ -287,7 +287,7 @@ public class FileReadingMessageSource extends IntegrationObjectSupport implement * Adds the failed message back to the 'toBeReceived' queue if there is room. * * @param failedMessage - * the {@link org.springframework.integration.Message} that failed + * the {@link org.springframework.messaging.Message} that failed */ public void onFailure(Message failedMessage) { if (logger.isWarnEnabled()) { diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java index 35fe06a475..c19902314f 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileWritingMessageHandler.java @@ -30,9 +30,8 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.file.support.FileExistsMode; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; @@ -41,6 +40,7 @@ import org.springframework.integration.util.DefaultLockRegistry; import org.springframework.integration.util.LockRegistry; import org.springframework.integration.util.PassThruLockRegistry; import org.springframework.integration.util.WhileLockedProcessor; +import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; import org.springframework.util.StringUtils; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterFactoryBean.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterFactoryBean.java index 4e50804d63..9534953d4e 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterFactoryBean.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/FileTailInboundChannelAdapterFactoryBean.java @@ -23,7 +23,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.SmartLifecycle; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.file.tail.ApacheCommonsFileTailingMessageProducer; import org.springframework.integration.file.tail.FileTailingMessageProducerSupport; import org.springframework.integration.file.tail.OSDelegatingFileTailingMessageProducer; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/config/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/config/package-info.java index ad9f5c175c..0fc72990fd 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/config/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers, factory beans. */ -package org.springframework.integration.file.config; \ No newline at end of file +package org.springframework.integration.file.config; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/filters/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/package-info.java index 1ed977d958..b49617430f 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/filters/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/filters/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting file filtering. */ -package org.springframework.integration.file.filters; \ No newline at end of file +package org.springframework.integration.file.filters; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java index 129676fcec..7e85537232 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/NioFileLocker.java @@ -16,7 +16,7 @@ package org.springframework.integration.file.locking; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.file.FileReadingMessageSource; import java.io.File; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/package-info.java index ff21be6c69..8c675dff29 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/locking/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/locking/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting file locking. */ -package org.springframework.integration.file.locking; \ No newline at end of file +package org.springframework.integration.file.locking; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/package-info.java index e6f08faf68..8990153a13 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/package-info.java @@ -1,4 +1,4 @@ /** * Base package for File support. */ -package org.springframework.integration.file; \ No newline at end of file +package org.springframework.integration.file; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java index 194e18b104..99b61dff90 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/AbstractRemoteFileOutboundGateway.java @@ -32,8 +32,6 @@ import java.util.Set; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.filters.FileListFilter; @@ -44,6 +42,8 @@ import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/package-info.java index 7a819cd63b..62eeab4d16 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/gateway/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting remote file gateways. */ -package org.springframework.integration.file.remote.gateway; \ No newline at end of file +package org.springframework.integration.file.remote.gateway; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java index b314c5d812..f27d90a5fb 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandler.java @@ -24,9 +24,6 @@ import java.io.IOException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.MessagingException; import org.springframework.integration.file.DefaultFileNameGenerator; import org.springframework.integration.file.FileNameGenerator; import org.springframework.integration.file.remote.RemoteFileUtils; @@ -34,12 +31,15 @@ import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; import org.springframework.util.FileCopyUtils; import org.springframework.util.StringUtils; /** - * A {@link org.springframework.integration.core.MessageHandler} implementation that transfers files to a remote server. + * A {@link org.springframework.messaging.MessageHandler} implementation that transfers files to a remote server. * * @author Iwein Fuld * @author Mark Fisher diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/package-info.java index 30f8b3471b..feac70a5aa 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/handler/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting remote file message handlers. */ -package org.springframework.integration.file.remote.handler; \ No newline at end of file +package org.springframework.integration.file.remote.handler; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/package-info.java index 3ee2c198a7..af48a71b88 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/package-info.java @@ -1,4 +1,4 @@ /** * Base package for supporting remote files. */ -package org.springframework.integration.file.remote; \ No newline at end of file +package org.springframework.integration.file.remote; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/package-info.java index 2abd3f949a..d914a3ed1e 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/session/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting remote file sessions. */ -package org.springframework.integration.file.remote.session; \ No newline at end of file +package org.springframework.integration.file.remote.session; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizer.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizer.java index b2bcab056b..8bf51feacb 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizer.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizer.java @@ -31,11 +31,11 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.InitializingBean; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; -import org.springframework.integration.MessagingException; import org.springframework.integration.expression.IntegrationEvaluationContextAware; import org.springframework.integration.file.filters.FileListFilter; import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java index 74f023b208..a9d1b3b284 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/AbstractInboundFileSynchronizingMessageSource.java @@ -22,8 +22,8 @@ import java.util.Arrays; import java.util.Comparator; import java.util.regex.Pattern; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.file.FileReadingMessageSource; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/package-info.java index 87e7684f33..77762b3c3f 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/remote/synchronizer/package-info.java @@ -2,4 +2,4 @@ * Provides classes supporting the synchronization of remote and * local file directories. */ -package org.springframework.integration.file.remote.synchronizer; \ No newline at end of file +package org.springframework.integration.file.remote.synchronizer; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/FileTailingMessageProducerSupport.java b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/FileTailingMessageProducerSupport.java index ad6a4223a8..ca690951df 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/FileTailingMessageProducerSupport.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/FileTailingMessageProducerSupport.java @@ -21,7 +21,7 @@ import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.core.task.SimpleAsyncTaskExecutor; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.event.FileIntegrationEvent; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/OSDelegatingFileTailingMessageProducer.java b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/OSDelegatingFileTailingMessageProducer.java index 317857677b..aa0f73f1f9 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/OSDelegatingFileTailingMessageProducer.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/OSDelegatingFileTailingMessageProducer.java @@ -20,7 +20,7 @@ import java.io.IOException; import java.io.InputStreamReader; import java.util.Date; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.scheduling.TaskScheduler; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.Assert; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/package-info.java index 427fd622e0..754f7b6ad8 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/tail/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/tail/package-info.java @@ -1,4 +1,4 @@ /** * Classes used for tailing file system files. */ -package org.springframework.integration.file.tail; \ No newline at end of file +package org.springframework.integration.file.tail; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/test/BigMGetTests.java b/spring-integration-file/src/main/java/org/springframework/integration/file/test/BigMGetTests.java index 974e877ed4..3c012dba33 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/test/BigMGetTests.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/test/BigMGetTests.java @@ -20,9 +20,9 @@ import java.io.FileOutputStream; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java b/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java index c3e56bc751..611e994d0f 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformer.java +++ b/spring-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.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.Transformer; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/package-info.java b/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/package-info.java index f91d9b5a3c..61ac93df0d 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/package-info.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/transformer/package-info.java @@ -2,4 +2,4 @@ * Provides classes supporting the transformation of file contents * to messages. */ -package org.springframework.integration.file.transformer; \ No newline at end of file +package org.springframework.integration.file.transformer; diff --git a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd index 455db6f8f2..c6079baea1 100644 --- a/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd +++ b/spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd @@ -44,7 +44,7 @@ - + The channel through which outgoing messages will arrive. - + @@ -281,7 +281,7 @@ Only files matching this regular expression will be picked up by this adapter. The channel through which outgoing messages will arrive. - + @@ -294,7 +294,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -528,7 +528,7 @@ Only files matching this regular expression will be picked up by this adapter. - + @@ -542,7 +542,7 @@ Only files matching this regular expression will be picked up by this adapter. - + diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/DefaultFileNameGeneratorTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/DefaultFileNameGeneratorTests.java index c2f1f4d7af..1f9e0963a5 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/DefaultFileNameGeneratorTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/DefaultFileNameGeneratorTests.java @@ -24,8 +24,8 @@ import java.io.File; import org.junit.Test; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileInboundTransactionTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileInboundTransactionTests.java index a2115fecb0..e8b794df72 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileInboundTransactionTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileInboundTransactionTests.java @@ -29,11 +29,11 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterInsideChainTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterInsideChainTests.java index 2ab12e84c2..1df5dc3153 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterInsideChainTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterInsideChainTests.java @@ -30,8 +30,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java index fcad325a99..9c34d5f82c 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundChannelAdapterIntegrationTests.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundGatewayIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundGatewayIntegrationTests.java index 9a26e1f1a4..d820584188 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundGatewayIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileOutboundGatewayIntegrationTests.java @@ -19,7 +19,6 @@ package org.springframework.integration.file; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; @@ -37,8 +36,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.support.MessageBuilder; @@ -76,7 +75,7 @@ public class FileOutboundGatewayIntegrationTests { static final String DEFAULT_ENCODING = "UTF-8"; - static final String SAMPLE_CONTENT = "HelloWorld\näöüß"; + static final String SAMPLE_CONTENT = "HelloWorld\n��������"; Message message; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceIntegrationTests.java index 8427ea6832..7d9de0bed5 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceIntegrationTests.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; +import org.springframework.messaging.Message; import org.springframework.test.annotation.Repeat; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java index c63c9d9f50..3a4e45b92e 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileReadingMessageSourceTests.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * @author Iwein Fuld diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileToChannelIntegrationTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileToChannelIntegrationTests.java index 1679ad5cab..0854e6e8a3 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileToChannelIntegrationTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileToChannelIntegrationTests.java @@ -27,8 +27,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java index 276b6b725e..07ffad4e8f 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java @@ -37,13 +37,13 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.NullChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.file.support.FileExistsMode; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; import org.springframework.util.FileCopyUtils; /** diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java index f1ff9da6f0..0d7e93cd87 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/CustomFileNameGenerator.java @@ -16,7 +16,7 @@ package org.springframework.integration.file.config; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.file.FileNameGenerator; import java.util.Date; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java index e18828aad9..84839646e9 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileMessageHistoryTests.java @@ -20,8 +20,8 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests.java index 7dc76045c5..723f3d1fab 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundChannelAdapterParserTests.java @@ -33,9 +33,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.file.DefaultFileNameGenerator; import org.springframework.integration.file.FileWritingMessageHandler; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java index 296715ae40..59ac82783d 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/config/FileOutboundGatewayParserTests.java @@ -30,17 +30,17 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.file.DefaultFileNameGenerator; import org.springframework.integration.file.FileWritingMessageHandler; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.util.FileCopyUtils; @@ -122,7 +122,8 @@ public class FileOutboundGatewayParserTests { @Test public void gatewayWithIgnoreMode() throws Exception{ - final MessagingTemplate messagingTemplate = new MessagingTemplate(this.gatewayWithIgnoreModeChannel); + final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); + messagingTemplate.setDefaultDestination(this.gatewayWithIgnoreModeChannel); final String expectedFileContent = "Initial File Content:"; final File testFile = new File("test/fileToAppend.txt"); @@ -157,7 +158,8 @@ public class FileOutboundGatewayParserTests { @Test public void gatewayWithFailMode() throws Exception{ - final MessagingTemplate messagingTemplate = new MessagingTemplate(this.gatewayWithFailModeChannel); + final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); + messagingTemplate.setDefaultDestination(this.gatewayWithFailModeChannel); String expectedFileContent = "Initial File Content:"; @@ -196,7 +198,8 @@ public class FileOutboundGatewayParserTests { @Test public void gatewayWithFailModeLowercase() throws Exception{ - final MessagingTemplate messagingTemplate = new MessagingTemplate(this.gatewayWithFailModeLowercaseChannel); + final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); + messagingTemplate.setDefaultDestination(this.gatewayWithFailModeLowercaseChannel); String expectedFileContent = "Initial File Content:"; @@ -237,7 +240,8 @@ public class FileOutboundGatewayParserTests { @Test public void gatewayWithAppendMode() throws Exception{ - final MessagingTemplate messagingTemplate = new MessagingTemplate(this.gatewayWithAppendModeChannel); + final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); + messagingTemplate.setDefaultDestination(this.gatewayWithAppendModeChannel); String expectedFileContent = "Initial File Content:String content:"; @@ -275,7 +279,8 @@ public class FileOutboundGatewayParserTests { assertFalse(TestUtils.getPropertyValue(this.gatewayWithReplaceModeHandler, "requiresReply", Boolean.class)); - final MessagingTemplate messagingTemplate = new MessagingTemplate(this.gatewayWithReplaceModeChannel); + final GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); + messagingTemplate.setDefaultDestination(this.gatewayWithReplaceModeChannel); String expectedFileContent = "String content:"; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/recursive/FileInboundChannelAdapterWithRecursiveDirectoryTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/recursive/FileInboundChannelAdapterWithRecursiveDirectoryTests.java index ce612f36ab..2bbb5a45b9 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/recursive/FileInboundChannelAdapterWithRecursiveDirectoryTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/recursive/FileInboundChannelAdapterWithRecursiveDirectoryTests.java @@ -20,8 +20,8 @@ import org.junit.Test; import org.junit.rules.TemporaryFolder; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; @@ -34,7 +34,6 @@ import java.util.List; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import static org.hamcrest.CoreMatchers.hasItems; import static org.springframework.integration.test.matcher.PayloadMatcher.hasPayload; /** diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java index 80213429b7..f25c44b0b1 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/gateway/RemoteFileOutboundGatewayTests.java @@ -41,8 +41,6 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.file.filters.AbstractSimplePatternFileListFilter; import org.springframework.integration.file.remote.AbstractFileInfo; @@ -50,6 +48,8 @@ import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; /** @@ -848,4 +848,4 @@ class TestPatternFilter extends AbstractSimplePatternFileListFilter return file.getFilename(); } -} \ No newline at end of file +} diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java index 77a3eb541a..ebff5489dd 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/remote/handler/FileTransferringMessageHandlerTests.java @@ -42,7 +42,6 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.ExpressionParser; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; import org.springframework.integration.file.remote.session.CachingSessionFactory; import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; @@ -50,6 +49,7 @@ import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.util.SimplePool; +import org.springframework.messaging.Message; /** * @author Oleg Zhurakousky diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java index 694fb680ab..6bf605ce4f 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/tail/FileTailingMessageProducerTests.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.file.tail.FileTailingMessageProducerSupport.FileTailingEvent; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java index 9ed7db6ba0..bc90e8b8a9 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java @@ -28,7 +28,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.file.FileHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.FileCopyUtils; diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToByteArrayTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToByteArrayTransformerTests.java index fd941dff2e..ca6629ff59 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToByteArrayTransformerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToByteArrayTransformerTests.java @@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * @author Alex Peters diff --git a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java index e3bcffc09a..3193f16af0 100644 --- a/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java +++ b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/FileToStringTransformerTests.java @@ -25,7 +25,7 @@ import static org.junit.Assert.assertThat; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * @author Alex Peters diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/package-info.java index 46d5d37052..6dc81f4f18 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/package-info.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.ftp.config; \ No newline at end of file +package org.springframework.integration.ftp.config; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/package-info.java index 4386deb757..0e05211d77 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/package-info.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/filters/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting FTP file filtering. */ -package org.springframework.integration.ftp.filters; \ No newline at end of file +package org.springframework.integration.ftp.filters; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/package-info.java index 0df0b48511..1c2fcc1669 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/package-info.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/gateway/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting FTP gateways. */ -package org.springframework.integration.ftp.gateway; \ No newline at end of file +package org.springframework.integration.ftp.gateway; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/package-info.java index edc7bbf482..2788dfd40b 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/package-info.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting inbound endpoints. */ -package org.springframework.integration.ftp.inbound; \ No newline at end of file +package org.springframework.integration.ftp.inbound; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java index 1cd438b245..f687328fee 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/AbstractFtpSessionFactory.java @@ -26,7 +26,7 @@ import org.apache.commons.net.ftp.FTPClientConfig; import org.apache.commons.net.ftp.FTPFile; import org.apache.commons.net.ftp.FTPReply; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; import org.springframework.util.Assert; diff --git a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/package-info.java b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/package-info.java index 36349c15b9..9a69c0ef62 100644 --- a/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/package-info.java +++ b/spring-integration-ftp/src/main/java/org/springframework/integration/ftp/session/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting FTP sessions. */ -package org.springframework.integration.ftp.session; \ No newline at end of file +package org.springframework.integration.ftp.session; diff --git a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd index 48945cdabf..a841d4e0cd 100644 --- a/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd +++ b/spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd @@ -311,7 +311,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -326,7 +326,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -487,7 +487,7 @@ - + diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests.java index 20c8dceb1c..46e5211c4b 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/FtpParserInboundTests.java @@ -53,4 +53,4 @@ public class FtpParserInboundTests { public void cleanUp() throws Exception{ new File("target/foo").delete(); } -} \ No newline at end of file +} diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java index 1d1a62082a..22cd2205df 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundChannelAdapterParserTests.java @@ -36,7 +36,7 @@ import org.junit.Test; import org.springframework.beans.factory.FactoryBean; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.file.filters.FileListFilter; import org.springframework.integration.file.remote.session.CachingSessionFactory; diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundOutboundSanitySample.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundOutboundSanitySample.java index 4ebad92a99..0a7b0020c4 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundOutboundSanitySample.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpInboundOutboundSanitySample.java @@ -25,7 +25,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java index 8556c99042..5febf99e46 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundChannelAdapterParserTests.java @@ -29,9 +29,9 @@ import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.PublishSubscribeChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.file.DefaultFileNameGenerator; import org.springframework.integration.file.remote.handler.FileTransferringMessageHandler; diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java index 73c8f1c18e..bb8edea5ae 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/config/FtpOutboundGatewayParserTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.file.remote.gateway.AbstractRemoteFileOutboundGateway.Command; import org.springframework.integration.file.remote.gateway.AbstractRemoteFileOutboundGateway.Option; diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java index 96bc62aef5..335cd88560 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/inbound/FtpInboundRemoteFileSystemSynchronizerTests.java @@ -42,10 +42,10 @@ import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.SpelParserConfiguration; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.ftp.filters.FtpRegexPatternFileListFilter; import org.springframework.integration.ftp.session.AbstractFtpSessionFactory; +import org.springframework.messaging.Message; /** * @author Oleg Zhurakousky diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java index cb088f65da..ba69378a7f 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/outbound/FtpOutboundTests.java @@ -44,9 +44,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.common.LiteralExpression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.file.FileNameGenerator; import org.springframework.integration.file.remote.FileInfo; import org.springframework.integration.file.remote.handler.FileTransferringMessageHandler; diff --git a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java index 0a9a9f7140..7e68c79c0c 100644 --- a/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java +++ b/spring-integration-ftp/src/test/java/org/springframework/integration/ftp/session/SessionFactoryTests.java @@ -27,7 +27,7 @@ import org.apache.commons.net.ftp.FTPClient; import org.junit.Ignore; import org.junit.Test; import org.mockito.Mockito; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.file.remote.session.CachingSessionFactory; import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.file.remote.session.SessionFactory; diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/package-info.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/package-info.java index 6a97083bfa..83e13b5ba4 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/package-info.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/config/xml/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.gemfire.config.xml; \ No newline at end of file +package org.springframework.integration.gemfire.config.xml; diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducer.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducer.java index 5d1bf07238..b89cf828ea 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducer.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducer.java @@ -25,7 +25,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.data.gemfire.listener.ContinuousQueryDefinition; import org.springframework.data.gemfire.listener.ContinuousQueryListener; import org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.endpoint.ExpressionMessageProducerSupport; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/package-info.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/package-info.java index 5495b40c97..29f4b7f241 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/package-info.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting inbound endpoints. */ -package org.springframework.integration.gemfire.inbound; \ No newline at end of file +package org.springframework.integration.gemfire.inbound; diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandler.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandler.java index cd5d021797..0fe6e551b4 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandler.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandler.java @@ -25,8 +25,8 @@ import org.springframework.data.gemfire.GemfireCallback; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.util.Assert; diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/package-info.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/package-info.java index e17623be69..67906692f3 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/package-info.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/outbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting outbound endpoints. */ -package org.springframework.integration.gemfire.outbound; \ No newline at end of file +package org.springframework.integration.gemfire.outbound; diff --git a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/package-info.java b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/package-info.java index 49e330aab9..4b9f37ad31 100644 --- a/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/package-info.java +++ b/spring-integration-gemfire/src/main/java/org/springframework/integration/gemfire/store/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes releated to storing messages. */ -package org.springframework.integration.gemfire.store; \ No newline at end of file +package org.springframework.integration.gemfire.store; diff --git a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd index a359514060..5275e684f7 100644 --- a/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd +++ b/spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd @@ -151,7 +151,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -193,7 +193,7 @@ reference to the "nullChannel" here. ]]> + type="org.springframework.messaging.MessageChannel" /> diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java index d1304b339d..779087c964 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/config/xml/GemfireOutboundChannelAdapterParserTests.java @@ -21,8 +21,8 @@ import org.junit.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.message.GenericMessage; import org.w3c.dom.Element; diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CacheListeningMessageProducerTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CacheListeningMessageProducerTests.java index 949f16e8eb..45ba92a563 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CacheListeningMessageProducerTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CacheListeningMessageProducerTests.java @@ -27,7 +27,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.RegionAttributesFactoryBean; import org.springframework.data.gemfire.RegionFactoryBean; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import com.gemstone.gemfire.cache.Cache; diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducerTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducerTests.java index bb82529a08..072a35b241 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducerTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/ContinuousQueryMessageProducerTests.java @@ -19,11 +19,11 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.gemfire.listener.ContinuousQueryListenerContainer; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.expression.ExpressionUtils; +import org.springframework.messaging.MessageHandler; import com.gemstone.gemfire.cache.Operation; import com.gemstone.gemfire.cache.query.CqEvent; @@ -146,8 +146,8 @@ public class ContinuousQueryMessageProducerTests { * (non-Javadoc) * * @see - * org.springframework.integration.core.MessageHandler#handleMessage - * (org.springframework.integration.Message) + * org.springframework.messaging.MessageHandler#handleMessage + * (org.springframework.messaging.Message) */ public void handleMessage(Message message) throws MessagingException { count++; diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CqInboundChannelAdapterTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CqInboundChannelAdapterTests.java index dcd55bb419..55cd7bbcfc 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CqInboundChannelAdapterTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/CqInboundChannelAdapterTests.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.gemfire.fork.ForkUtil; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests.java index 003bac50be..5250f7e8c6 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/inbound/GemfireInboundChannelAdapterTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2011 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -17,12 +17,13 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -53,35 +54,35 @@ public class GemfireInboundChannelAdapterTests { @Autowired DistributedRegion region2; - + @Autowired DistributedRegion region3; - + @Test public void testGemfireInboundChannelAdapterWithExpression() { - + EventHandler eventHandler1 = new EventHandler(); channel1.subscribe(eventHandler1); - + region1.put("payload", "payload"); - + assertEquals("payload", eventHandler1.event); } - + @Test public void testGemfireInboundChannelAdapterDefault() { EventHandler eventHandler2 = new EventHandler(); channel2.subscribe(eventHandler2); - + region2.put("payload", "payload"); - + assertTrue(eventHandler2.event instanceof EntryEvent); EntryEvent event = (EntryEvent)eventHandler2.event; assertEquals("payload", event.getNewValue()); } - + @Test public void testErrorChannel() { channel3.subscribe(new MessageHandler() { @@ -110,7 +111,7 @@ public class GemfireInboundChannelAdapterTests { static class EventHandler implements MessageHandler { public Object event = null; public void handleMessage(Message message) throws MessagingException { - event = message.getPayload(); + event = message.getPayload(); } } diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandlerTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandlerTests.java index 1a54aac995..235542930b 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandlerTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/CacheWritingMessageHandlerTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.RegionFactoryBean; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import com.gemstone.gemfire.cache.Cache; diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests.java index 783b19eaee..33e1155381 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/outbound/GemfireOutboundChannelAdapterTests.java @@ -21,8 +21,8 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/DelayerHandlerRescheduleIntegrationTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/DelayerHandlerRescheduleIntegrationTests.java index dbddb47e84..06037c9feb 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/DelayerHandlerRescheduleIntegrationTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/DelayerHandlerRescheduleIntegrationTests.java @@ -29,15 +29,15 @@ import org.junit.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.gemfire.CacheFactoryBean; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.handler.DelayHandler; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.support.LongRunningIntegrationTest; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.Assert; diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/GemfireGroupStoreTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/GemfireGroupStoreTests.java index 3358429489..cf9d58a59a 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/GemfireGroupStoreTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/GemfireGroupStoreTests.java @@ -39,8 +39,8 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.gemfire.CacheFactoryBean; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; diff --git a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/GemfireMessageStoreTests.java b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/GemfireMessageStoreTests.java index 6f06c7842f..de8ac8a85e 100644 --- a/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/GemfireMessageStoreTests.java +++ b/spring-integration-gemfire/src/test/java/org/springframework/integration/gemfire/store/GemfireMessageStoreTests.java @@ -27,7 +27,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.data.gemfire.CacheFactoryBean; import org.springframework.data.gemfire.RegionFactoryBean; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java index ce6196da45..e75d331fc8 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyCommandMessageProcessor.java @@ -18,7 +18,7 @@ import groovy.lang.GString; import java.util.Map; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.scripting.AbstractScriptExecutingMessageProcessor; import org.springframework.integration.scripting.DefaultScriptVariableGenerator; import org.springframework.integration.scripting.ScriptVariableGenerator; diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java index eb79bc172e..0230a215cf 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessor.java @@ -20,12 +20,8 @@ import groovy.lang.GString; import java.util.Map; -import org.springframework.beans.BeansException; -import org.springframework.beans.factory.BeanClassLoaderAware; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.scripting.AbstractScriptExecutingMessageProcessor; import org.springframework.integration.scripting.ScriptVariableGenerator; import org.springframework.scripting.ScriptSource; diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java index 9af9aeed24..2bda2cfb74 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/GroovyControlBusFactoryBean.java @@ -22,9 +22,9 @@ import org.springframework.beans.factory.*; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.Lifecycle; import org.springframework.core.annotation.AnnotationUtils; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.config.AbstractSimpleMessageHandlerFactoryBean; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.groovy.GroovyCommandMessageProcessor; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.scripting.ScriptVariableGenerator; diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java index eb986af844..8961059b27 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers, factory beans. */ -package org.springframework.integration.groovy.config; \ No newline at end of file +package org.springframework.integration.groovy.config; diff --git a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java index 0c090757c6..0fb3e3b501 100644 --- a/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java +++ b/spring-integration-groovy/src/main/java/org/springframework/integration/groovy/package-info.java @@ -1,4 +1,4 @@ /** * Base package for Groovy support. */ -package org.springframework.integration.groovy; \ No newline at end of file +package org.springframework.integration.groovy; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyControlBusIntegrationTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyControlBusIntegrationTests.java index 4363f349a4..abb8bc3fd0 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyControlBusIntegrationTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyControlBusIntegrationTests.java @@ -23,9 +23,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scripting.ScriptSource; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java index 7e04be5c68..b92ca96deb 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptExecutingMessageProcessorTests.java @@ -29,7 +29,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Rule; import org.junit.Test; import org.springframework.core.io.AbstractResource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.scripting.RefreshableResourceScriptSource; import org.springframework.integration.scripting.ScriptVariableGenerator; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptPayloadMessageProcessorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptPayloadMessageProcessorTests.java index c21613555d..8d9a51290e 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptPayloadMessageProcessorTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/GroovyScriptPayloadMessageProcessorTests.java @@ -24,7 +24,7 @@ import groovy.lang.MissingPropertyException; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.scripting.DefaultScriptVariableGenerator; import org.springframework.integration.scripting.ScriptVariableGenerator; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/RepeatProcessor.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/RepeatProcessor.java index d2c65fb01d..90cb4221f5 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/RepeatProcessor.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/RepeatProcessor.java @@ -93,4 +93,4 @@ public class RepeatProcessor implements MethodRule { } }; } -} \ No newline at end of file +} diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java index e5d3dbe2d6..34bc3d310d 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyControlBusTests.java @@ -34,10 +34,10 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanCreationNotAllowedException; import org.springframework.beans.factory.BeanIsAbstractException; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.support.MessageBuilder; import org.springframework.jmx.export.annotation.ManagedOperation; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java index b472eeabb5..09162cb1e4 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyFilterTests.java @@ -26,10 +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.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.filter.MessageFilter; import org.springframework.integration.filter.MethodInvokingSelector; @@ -37,6 +34,9 @@ import org.springframework.integration.groovy.GroovyScriptExecutingMessageProces import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyHeaderEnricherTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyHeaderEnricherTests.java index e6efa554c6..85ad5a316f 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyHeaderEnricherTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyHeaderEnricherTests.java @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.groovy.GroovyScriptExecutingMessageProcessor; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRefreshTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRefreshTests.java index 48e162977c..4d035e5ffe 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRefreshTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRefreshTests.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.AbstractResource; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java index 07b1c2fa6a..5e97037e4f 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyRouterTests.java @@ -25,15 +25,15 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.groovy.GroovyScriptExecutingMessageProcessor; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.router.MethodInvokingRouter; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java index 06bfcfd1cf..41528bc540 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyServiceActivatorTests.java @@ -16,10 +16,7 @@ package org.springframework.integration.groovy.config; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.*; - import groovy.lang.GroovyObject; import groovy.lang.MissingPropertyException; @@ -34,12 +31,12 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.ReplyRequiredException; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.scripting.ScriptVariableGenerator; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovySplitterTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovySplitterTests.java index 543831ec9f..2a1982bdd0 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovySplitterTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovySplitterTests.java @@ -25,15 +25,15 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.groovy.GroovyScriptExecutingMessageProcessor; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.splitter.MethodInvokingSplitter; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyTransformerTests.java b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyTransformerTests.java index 5fafa41c7d..56c32321df 100644 --- a/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyTransformerTests.java +++ b/spring-integration-groovy/src/test/java/org/springframework/integration/groovy/config/GroovyTransformerTests.java @@ -25,10 +25,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.groovy.GroovyScriptExecutingMessageProcessor; import org.springframework.integration.handler.MessageProcessor; import org.springframework.integration.support.MessageBuilder; @@ -36,6 +33,9 @@ import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.transformer.AbstractMessageProcessingTransformer; import org.springframework.integration.transformer.MessageTransformingHandler; import org.springframework.integration.transformer.Transformer; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/config/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/config/package-info.java index 925d371332..5c9a0f1df4 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/config/package-info.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.http.config; \ No newline at end of file +package org.springframework.integration.http.config; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/converter/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/converter/package-info.java index 92bb9a4a6c..0017b76f02 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/converter/package-info.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/converter/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting message conversion. */ -package org.springframework.integration.http.converter; \ No newline at end of file +package org.springframework.integration.http.converter; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java index ecfdd144d9..92c46d82ee 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingController.java @@ -28,7 +28,7 @@ import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.http.server.ServletServerHttpResponse; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; import org.springframework.validation.Errors; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java index 7645811022..cd02d4a682 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingEndpointSupport.java @@ -47,9 +47,9 @@ import org.springframework.http.converter.xml.Jaxb2RootElementHttpMessageConvert import org.springframework.http.converter.xml.SourceHttpMessageConverter; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessagingException; import org.springframework.integration.context.OrderlyShutdownCapable; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.gateway.MessagingGatewaySupport; @@ -84,7 +84,7 @@ import org.springframework.web.servlet.HandlerMapping; *

* The behavior is "request/reply" by default. Pass {@code false} to the constructor to force send-only as opposed * to sendAndReceive. Send-only means that as soon as the Message is created and passed to the - * {@link #setRequestChannel(org.springframework.integration.MessageChannel) request channel}, a response will be + * {@link #setRequestChannel(org.springframework.messaging.MessageChannel) request channel}, a response will be * generated. Subclasses determine how that response is generated (e.g. simple status response or rendering a View). *

* In a request-reply scenario, the reply Message's payload will be extracted prior to generating a response by default. diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGateway.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGateway.java index 0bc7a24603..4ddbafdd52 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGateway.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGateway.java @@ -29,8 +29,8 @@ import org.springframework.http.MediaType; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.http.server.ServletServerHttpResponse; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.http.converter.MultipartAwareFormHttpMessageConverter; import org.springframework.util.CollectionUtils; import org.springframework.util.MultiValueMap; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/package-info.java index e8a381439b..c953feb432 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/package-info.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting inbound endpoints. */ -package org.springframework.integration.http.inbound; \ No newline at end of file +package org.springframework.integration.http.inbound; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/package-info.java index 96f76ec492..42992ed299 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/package-info.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/multipart/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting multipart HTTP requests. */ -package org.springframework.integration.http.multipart; \ No newline at end of file +package org.springframework.integration.http.multipart; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java index d3c5e9b956..e3e115040c 100755 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandler.java @@ -44,16 +44,16 @@ import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.expression.ExpressionEvalMap; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.http.support.DefaultHttpHeaderMapper; import org.springframework.integration.mapping.HeaderMapper; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; import org.springframework.util.CollectionUtils; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/package-info.java index 7ae26a9981..c829cdd5c7 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/package-info.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/outbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting outbound endpoints. */ -package org.springframework.integration.http.outbound; \ No newline at end of file +package org.springframework.integration.http.outbound; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/package-info.java index 3cef3afb79..b7df10b843 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/package-info.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/package-info.java @@ -1,4 +1,4 @@ /** * Base package for Http support. */ -package org.springframework.integration.http; \ No newline at end of file +package org.springframework.integration.http; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java index 57b9f926bf..04085e563f 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/DefaultHttpHeaderMapper.java @@ -47,7 +47,7 @@ import org.springframework.core.convert.TypeDescriptor; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.mapping.HeaderMapper; import org.springframework.util.Assert; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/support/package-info.java b/spring-integration-http/src/main/java/org/springframework/integration/http/support/package-info.java index 88f88c6ed0..7b3918ea7a 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/support/package-info.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/support/package-info.java @@ -2,4 +2,4 @@ * Provides classes to support Http endpoints, including header * mapping. */ -package org.springframework.integration.http.support; \ No newline at end of file +package org.springframework.integration.http.support; diff --git a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd index 9768ebac03..5913a2d55b 100644 --- a/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd +++ b/spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd @@ -104,7 +104,7 @@ - + @@ -517,7 +517,7 @@ - + @@ -805,7 +805,7 @@ - + diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java index 903f958864..2ec9f33b82 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpProxyScenarioTests.java @@ -42,10 +42,10 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.PollableChannel; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java index d86d234170..629c11359e 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundChannelAdapterParserTests.java @@ -44,9 +44,9 @@ import org.springframework.expression.spel.SpelEvaluationException; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.http.converter.SerializingHttpMessageConverter; import org.springframework.integration.http.inbound.HttpRequestHandlingController; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java index 4454aedee2..55ca8d4c09 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpInboundGatewayParserTests.java @@ -45,16 +45,16 @@ import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpression; import org.springframework.http.HttpHeaders; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.http.converter.SerializingHttpMessageConverter; import org.springframework.integration.http.inbound.HttpRequestHandlingController; import org.springframework.integration.http.inbound.HttpRequestHandlingMessagingGateway; import org.springframework.integration.http.support.DefaultHttpHeaderMapper; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.test.annotation.DirtiesContext; @@ -118,10 +118,10 @@ public class HttpInboundGatewayParserTests { assertThat((Boolean) getPropertyValue(gateway, "convertExceptions"), is(true)); assertThat((PollableChannel) getPropertyValue(gateway, "replyChannel"), is(responses)); assertNotNull(TestUtils.getPropertyValue(gateway, "errorChannel")); - MessagingTemplate messagingTemplate = TestUtils.getPropertyValue( - gateway, "messagingTemplate", MessagingTemplate.class); - assertEquals(1234L, TestUtils.getPropertyValue(messagingTemplate, "sendTimeout")); - assertEquals(4567L, TestUtils.getPropertyValue(messagingTemplate, "receiveTimeout")); + GenericMessagingTemplate messagingTemplate = TestUtils.getPropertyValue( + gateway, "messagingTemplate", GenericMessagingTemplate.class); + assertEquals(Long.valueOf(1234), TestUtils.getPropertyValue(messagingTemplate, "sendTimeout")); + assertEquals(Long.valueOf(4567), TestUtils.getPropertyValue(messagingTemplate, "receiveTimeout")); boolean registerDefaultConverters = TestUtils.getPropertyValue(gateway,"mergeWithDefaultConverters", Boolean.class); assertFalse("By default the register-default-converters flag should be false", registerDefaultConverters); diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java index 19ea89efd6..e1bb38ccaf 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParserTests.java @@ -40,8 +40,8 @@ import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java index ffbe90640a..a312fb7fea 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayParserTests.java @@ -40,8 +40,8 @@ import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.http.outbound.HttpRequestExecutingMessageHandler; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpression.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpression.java index 2717942a48..6c6322abac 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpression.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/HttpOutboundGatewayWithMethodExpression.java @@ -27,8 +27,8 @@ import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.SocketUtils; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java index 9fd899c4d5..0ff5d7a67f 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/config/OutboundResponseTypeTests.java @@ -33,8 +33,8 @@ import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.SocketUtils; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingControllerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingControllerTests.java index 8dfb3db725..538822d274 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingControllerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingControllerTests.java @@ -35,7 +35,7 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.http.HttpStatus; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java index 7a22860198..1a87905b56 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayTests.java @@ -39,7 +39,7 @@ import org.springframework.http.converter.ByteArrayHttpMessageConverter; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotWritableException; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java index 37784a121c..2c4f1e19f8 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/inbound/HttpRequestHandlingMessagingGatewayWithPathMappingTests.java @@ -27,11 +27,11 @@ import org.junit.Test; import org.springframework.beans.factory.BeanFactory; import org.springframework.expression.ExpressionParser; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.util.AntPathMatcher; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java index 755189ef5c..a9b7ab0c5c 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/CookieTests.java @@ -42,7 +42,7 @@ import org.springframework.http.HttpStatus; import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpResponse; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; @@ -147,6 +147,7 @@ public class CookieTests { } }; } + }; } diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java index 5a85cc1c88..ea97b9fcb9 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/HttpRequestExecutingMessageHandlerTests.java @@ -65,10 +65,10 @@ import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.http.converter.SerializingHttpMessageConverter; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java index d4c978174c..93e97ee643 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/outbound/UriVariableExpressionTests.java @@ -34,7 +34,7 @@ import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.SimpleClientHttpRequestFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java index 6f48fdce0d..997762a841 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageInboundTests.java @@ -42,7 +42,7 @@ import org.springframework.core.convert.support.GenericConversionService; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.mapping.HeaderMapper; import org.springframework.util.CollectionUtils; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java index 82911df7f6..21a5ffd0cf 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/support/DefaultHttpHeaderMapperFromMessageOutboundTests.java @@ -37,8 +37,8 @@ import org.junit.Test; import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.mapping.HeaderMapper; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.CollectionUtils; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/package-info.java index 6f77c85629..0a1dcf80e2 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/package-info.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers, factory beans. */ -package org.springframework.integration.ip.config; \ No newline at end of file +package org.springframework.integration.ip.config; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/package-info.java index 9fd1487b9b..ffdae6527f 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/package-info.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/package-info.java @@ -1,4 +1,4 @@ /** * Base package for IP (TCP/UDP) Support. */ -package org.springframework.integration.ip; \ No newline at end of file +package org.springframework.integration.ip; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpInboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpInboundGateway.java index 1309caed33..09a7454c9d 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpInboundGateway.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpInboundGateway.java @@ -20,7 +20,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.context.OrderlyShutdownCapable; import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.ip.IpHeaders; @@ -32,7 +33,6 @@ import org.springframework.integration.ip.tcp.connection.ClientModeConnectionMan import org.springframework.integration.ip.tcp.connection.TcpConnection; import org.springframework.integration.ip.tcp.connection.TcpListener; import org.springframework.integration.ip.tcp.connection.TcpSender; -import org.springframework.integration.message.ErrorMessage; import org.springframework.util.Assert; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java index be81330c89..309a3b90a7 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpOutboundGateway.java @@ -23,10 +23,11 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import org.springframework.context.SmartLifecycle; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageTimeoutException; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; @@ -34,7 +35,6 @@ import org.springframework.integration.ip.tcp.connection.AbstractConnectionFacto import org.springframework.integration.ip.tcp.connection.TcpConnection; import org.springframework.integration.ip.tcp.connection.TcpListener; import org.springframework.integration.ip.tcp.connection.TcpSender; -import org.springframework.integration.message.ErrorMessage; import org.springframework.util.Assert; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapter.java index 61e607dcbb..c55bb0a765 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapter.java @@ -18,7 +18,8 @@ package org.springframework.integration.ip.tcp; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.context.OrderlyShutdownCapable; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; @@ -28,7 +29,6 @@ import org.springframework.integration.ip.tcp.connection.ClientModeCapable; import org.springframework.integration.ip.tcp.connection.ClientModeConnectionManager; import org.springframework.integration.ip.tcp.connection.ConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpListener; -import org.springframework.integration.message.ErrorMessage; import org.springframework.util.Assert; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java index faeb42dad5..ebd28a5741 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandler.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledFuture; import org.springframework.context.Lifecycle; -import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.ip.IpHeaders; @@ -32,6 +31,7 @@ import org.springframework.integration.ip.tcp.connection.ClientModeConnectionMan import org.springframework.integration.ip.tcp.connection.ConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpConnection; import org.springframework.integration.ip.tcp.connection.TcpSender; +import org.springframework.messaging.Message; import org.springframework.scheduling.TaskScheduler; import org.springframework.util.Assert; @@ -51,7 +51,7 @@ public class TcpSendingMessageHandler extends AbstractMessageHandler implements private volatile AbstractConnectionFactory serverConnectionFactory; - private Map connections = new ConcurrentHashMap(); + private final Map connections = new ConcurrentHashMap(); private volatile boolean isClientMode; @@ -81,7 +81,7 @@ public class TcpSendingMessageHandler extends AbstractMessageHandler implements /** * Writes the message payload to the underlying socket, using the specified * message format. - * @see org.springframework.integration.core.MessageHandler#handleMessage(org.springframework.integration.Message) + * @see org.springframework.messaging.MessageHandler#handleMessage(org.springframework.messaging.Message) */ @Override public void handleMessageInternal(final Message message) throws diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java index 251d952c41..23af54fe9d 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/AbstractConnectionFactory.java @@ -44,7 +44,7 @@ import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.SmartLifecycle; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer; import org.springframework.util.Assert; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java index c552b0fe90..83f1d562e4 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactory.java @@ -19,10 +19,10 @@ import java.util.concurrent.Executor; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.ip.IpHeaders; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.util.SimplePool; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java index 2b75454027..f549ad6505 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactory.java @@ -23,9 +23,9 @@ import java.util.concurrent.atomic.AtomicLong; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.ip.IpHeaders; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/MessageConvertingTcpMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/MessageConvertingTcpMessageMapper.java index 50fd00380a..0a0b193b84 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/MessageConvertingTcpMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/MessageConvertingTcpMessageMapper.java @@ -15,9 +15,9 @@ */ package org.springframework.integration.ip.tcp.connection; -import org.springframework.integration.Message; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.converter.MessageConverter; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.converter.MessageConverter; import org.springframework.util.Assert; /** @@ -27,9 +27,9 @@ import org.springframework.util.Assert; */ public class MessageConvertingTcpMessageMapper extends TcpMessageMapper { - private final MessageConverter messageConverter; + private final MessageConverter messageConverter; - public MessageConvertingTcpMessageMapper(MessageConverter messageConverter) { + public MessageConvertingTcpMessageMapper(MessageConverter messageConverter) { Assert.notNull(messageConverter, "'messasgeConverter' must not be null"); this.messageConverter = messageConverter; } @@ -54,7 +54,7 @@ public class MessageConvertingTcpMessageMapper extends TcpMessageMapper { @Override public Object fromMessage(Message message) throws Exception { - return this.messageConverter.fromMessage(message); + return this.messageConverter.fromMessage(message, Object.class); } } diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java index 9311ca7237..0ea93dda37 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnection.java @@ -21,7 +21,7 @@ import java.nio.channels.SocketChannel; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * An abstraction over {@link Socket} and {@link SocketChannel} that diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListeningMessageProducer.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListeningMessageProducer.java index b63c754fdf..8ab90b2846 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListeningMessageProducer.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListeningMessageProducer.java @@ -19,7 +19,7 @@ import java.util.HashSet; import java.util.Set; import org.springframework.context.ApplicationListener; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptor.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptor.java index 1833397ef0..2fccab06e1 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptor.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptor.java @@ -22,4 +22,4 @@ package org.springframework.integration.ip.tcp.connection; */ public interface TcpConnectionInterceptor extends TcpConnection, TcpListener, TcpSender { -} \ No newline at end of file +} diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptorSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptorSupport.java index e46ef42ec5..cd4863c7d5 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptorSupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionInterceptorSupport.java @@ -18,8 +18,8 @@ package org.springframework.integration.ip.tcp.connection; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.ErrorMessage; /** * Base class for TcpConnectionIntercepters; passes all method calls through diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java index 01d2ed28b0..391bc6477e 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpConnectionSupport.java @@ -31,10 +31,10 @@ import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.tcp.serializer.AbstractByteArraySerializer; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.util.Assert; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpListener.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpListener.java index aa617331ab..a3e070b05f 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpListener.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpListener.java @@ -16,7 +16,7 @@ package org.springframework.integration.ip.tcp.connection; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Classes that implement this interface may register with a @@ -35,4 +35,4 @@ public interface TcpListener { */ abstract boolean onMessage(Message message); -} \ No newline at end of file +} diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java index 083f158c2f..623b3fe1f4 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapper.java @@ -20,12 +20,13 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; + import org.springframework.integration.MessageHandlingException; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.mapping.InboundMessageMapper; import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; /** * Maps incoming data from a {@link TcpConnection} to a {@link Message}. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java index f30d66a882..31d14172eb 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNetConnection.java @@ -23,7 +23,7 @@ import java.net.SocketTimeoutException; import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java index 459b8a15ff..a7f63f324a 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioConnection.java @@ -35,8 +35,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.springframework.context.ApplicationEventPublisher; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.ip.tcp.serializer.SoftEndOfStreamException; import org.springframework.util.Assert; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java index 7b38b2af5d..50a65d44ee 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpNioSSLConnection.java @@ -28,7 +28,7 @@ import javax.net.ssl.SSLEngineResult.Status; import javax.net.ssl.SSLException; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; /** diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSender.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSender.java index 9476e4430e..5bd77d7d0d 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSender.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpSender.java @@ -39,4 +39,4 @@ public interface TcpSender { */ void removeDeadConnection(TcpConnection connection); -} \ No newline at end of file +} diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/package-info.java index c770c0e80c..59dc5d6127 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/package-info.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/package-info.java @@ -1,4 +1,4 @@ /** * Base package for TCP Support. */ -package org.springframework.integration.ip.tcp; \ No newline at end of file +package org.springframework.integration.ip.tcp; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java index 00ac3ae9cb..406c3e893f 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapper.java @@ -23,9 +23,9 @@ import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.util.RegexUtils; import org.springframework.integration.mapping.InboundMessageMapper; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastReceivingChannelAdapter.java index 75f5660692..e93dd3b798 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastReceivingChannelAdapter.java @@ -21,7 +21,7 @@ import java.net.DatagramSocket; import java.net.InetAddress; import java.net.MulticastSocket; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; /** * Channel adapter that joins a multicast group and receives incoming packets and diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java index 701e8c60f1..67205e1c72 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/MulticastSendingMessageHandler.java @@ -23,7 +23,7 @@ import java.net.InetSocketAddress; import java.net.MulticastSocket; import java.net.NetworkInterface; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; /** * A {@link MessageHandler} implementation that maps a Message into diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java index dab9fa892e..afa26a11d5 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastReceivingChannelAdapter.java @@ -26,9 +26,9 @@ import java.net.SocketTimeoutException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessagingException; import org.springframework.integration.ip.AbstractInternetProtocolReceivingChannelAdapter; import org.springframework.integration.ip.IpHeaders; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java index 6310913cb1..fe657e4f44 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/UnicastSendingMessageHandler.java @@ -31,16 +31,16 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageRejectedException; -import org.springframework.integration.MessagingException; import org.springframework.integration.ip.AbstractInternetProtocolSendingMessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; /** - * A {@link org.springframework.integration.core.MessageHandler} implementation that maps a Message into + * A {@link org.springframework.messaging.MessageHandler} implementation that maps a Message into * a UDP datagram packet and sends that to the specified host and port. * * Messages can be basic, with no support for reliability, can be prefixed diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/package-info.java index 9d16c5b3cd..6bd7e58fc6 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/package-info.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/udp/package-info.java @@ -1,4 +1,4 @@ /** * Base package for UDP support. */ -package org.springframework.integration.ip.udp; \ No newline at end of file +package org.springframework.integration.ip.udp; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/package-info.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/package-info.java index 26e13aa585..4bda596645 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/package-info.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/util/package-info.java @@ -1,4 +1,4 @@ /** * Provides utilities for IP support. */ -package org.springframework.integration.ip.util; \ No newline at end of file +package org.springframework.integration.ip.util; diff --git a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd index 54cb88bd67..7e1af5f45f 100644 --- a/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd +++ b/spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd @@ -30,8 +30,7 @@ - + @@ -40,8 +39,7 @@ - + @@ -77,8 +75,7 @@ - + @@ -142,7 +139,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -152,7 +149,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -213,7 +210,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -266,7 +263,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -276,7 +273,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -348,7 +345,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -358,7 +355,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -715,7 +712,7 @@ + type="org.springframework.messaging.MessageChannel" /> diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java index c6b0831fed..4c6ce3462d 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/ParserUnitTests.java @@ -40,12 +40,8 @@ import org.springframework.core.io.UrlResource; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; @@ -76,6 +72,10 @@ import org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter; import org.springframework.integration.ip.udp.UnicastSendingMessageHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.scheduling.TaskScheduler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -477,8 +477,8 @@ public class ParserUnitTests { DirectFieldAccessor dfa = new DirectFieldAccessor(tcpOutboundGateway); assertSame(cfC2, dfa.getPropertyValue("connectionFactory")); assertEquals(234L, dfa.getPropertyValue("requestTimeout")); - MessagingTemplate messagingTemplate = TestUtils.getPropertyValue(tcpOutboundGateway, "messagingTemplate", - MessagingTemplate.class); + GenericMessagingTemplate messagingTemplate = TestUtils.getPropertyValue(tcpOutboundGateway, "messagingTemplate", + GenericMessagingTemplate.class); assertEquals(Long.valueOf(567), TestUtils.getPropertyValue(messagingTemplate, "sendTimeout", Long.class)); assertEquals(789L, dfa.getPropertyValue("remoteTimeout")); assertEquals("outGateway",tcpOutboundGateway.getComponentName()); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java index 31032d8649..fdc5ab48fe 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/ConnectionToConnectionTests.java @@ -32,7 +32,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests.java index 80c86fec4b..8ec93e816e 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/InterceptedSharedConnectionTests.java @@ -26,8 +26,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests.java index 01eb84e257..e8bf90971a 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SharedConnectionTests.java @@ -28,8 +28,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigOutboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigOutboundGatewayTests.java index 0667365d2b..9f3a0c9f6e 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigOutboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpConfigOutboundGatewayTests.java @@ -24,10 +24,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java index f4940df4bc..8fc3caaaad 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpInboundGatewayTests.java @@ -35,13 +35,8 @@ import javax.net.ServerSocketFactory; import javax.net.SocketFactory; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; @@ -50,8 +45,13 @@ import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionF import org.springframework.integration.ip.tcp.connection.TcpNioServerConnectionFactory; import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.support.channel.ChannelResolver; import org.springframework.integration.test.util.SocketUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.messaging.core.DestinationResolver; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; public class TcpInboundGatewayTests { @@ -68,8 +68,8 @@ public class TcpInboundGatewayTests { final QueueChannel channel = new QueueChannel(); gateway.setRequestChannel(channel); ServiceActivatingHandler handler = new ServiceActivatingHandler(new Service()); - handler.setChannelResolver(new ChannelResolver() { - public MessageChannel resolveChannelName(String channelName) { + handler.setChannelResolver(new DestinationResolver() { + public MessageChannel resolveDestination(String channelName) { return channel; } }); @@ -182,8 +182,8 @@ public class TcpInboundGatewayTests { final QueueChannel channel = new QueueChannel(); gateway.setRequestChannel(channel); ServiceActivatingHandler handler = new ServiceActivatingHandler(new Service()); - handler.setChannelResolver(new ChannelResolver() { - public MessageChannel resolveChannelName(String channelName) { + handler.setChannelResolver(new DestinationResolver() { + public MessageChannel resolveDestination(String channelName) { return channel; } }); diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java index 518d611e74..cbe3f8f846 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpOutboundGatewayTests.java @@ -53,13 +53,12 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; import org.mockito.Mockito; - import org.springframework.core.serializer.DefaultDeserializer; import org.springframework.core.serializer.DefaultSerializer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.MessageTimeoutException; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory; import org.springframework.integration.ip.tcp.connection.CachingClientConnectionFactory; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java index 578cdd72e2..46c0bc6971 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpReceivingChannelAdapterTests.java @@ -42,10 +42,10 @@ import javax.net.SocketFactory; import org.junit.Test; import org.springframework.core.serializer.DefaultDeserializer; import org.springframework.core.serializer.DefaultSerializer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java index ae853eec5f..630c713361 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingMessageHandlerTests.java @@ -52,11 +52,11 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.serializer.DefaultDeserializer; import org.springframework.core.serializer.DefaultSerializer; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingNoSocketTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingNoSocketTests.java index 7e92b2e299..8b20efcd98 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingNoSocketTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/TcpSendingNoSocketTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.fail; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java index 23c885407b..1d984cee34 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/CachingClientConnectionFactoryTests.java @@ -49,16 +49,16 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer; import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java index 4d90358adf..b3b9ea5ef8 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryShutDownTests.java @@ -22,7 +22,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; import org.junit.Test; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.util.StopWatch; /** diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java index d16615513a..ffe4422241 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionFactoryTests.java @@ -35,7 +35,7 @@ import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.ip.tcp.TcpReceivingChannelAdapter; import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.test.util.SocketUtils; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java index ce3b025e55..c6e19dbe70 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/ConnectionTimeoutTests.java @@ -32,13 +32,13 @@ import org.junit.Test; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.Message; import org.springframework.integration.ip.util.TestingUtilities; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.support.LongRunningIntegrationTest; import org.springframework.integration.test.util.SocketUtils; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.ErrorMessage; /** * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactoryTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactoryTests.java index 4912dc53fb..b55b8bfc86 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactoryTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/FailoverClientConnectionFactoryTests.java @@ -42,13 +42,8 @@ import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.tcp.TcpInboundGateway; import org.springframework.integration.ip.tcp.TcpOutboundGateway; @@ -56,6 +51,11 @@ import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.SocketUtils; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.SubscribableChannel; /** * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptor.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptor.java index dbc251bf97..40f0bf1acf 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptor.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/HelloWorldInterceptor.java @@ -20,8 +20,8 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java index 4e479aff0a..a67eff6584 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/SocketSupportTests.java @@ -39,7 +39,7 @@ import org.junit.Test; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer; import org.springframework.integration.ip.util.TestingUtilities; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java index 747188d689..434903c240 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpConnectionEventListenerTests.java @@ -22,8 +22,8 @@ import static org.junit.Assert.assertSame; import org.junit.Test; import org.mockito.Mockito; -import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; +import org.springframework.messaging.Message; /** * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java index 8bd39f705c..58fd23edbd 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpMessageMapperTests.java @@ -31,11 +31,12 @@ import javax.net.SocketFactory; import org.junit.Test; import org.springframework.core.serializer.DefaultDeserializer; import org.springframework.core.serializer.DefaultSerializer; -import org.springframework.integration.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.tcp.serializer.MapJsonSerializer; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.converter.MapMessageConverter; +import org.springframework.messaging.Message; /** * @author Gary Russell @@ -108,7 +109,7 @@ public class TcpMessageMapperTests { .getHeaders().get(IpHeaders.IP_ADDRESS)); assertEquals(1234, message .getHeaders().get(IpHeaders.REMOTE_PORT)); - assertEquals(Integer.valueOf(0), message.getHeaders().getSequenceNumber()); + assertEquals(Integer.valueOf(0), new EiMessageHeaderAccessor(message).getSequenceNumber()); message = mapper.toMessage(connection); assertEquals(TEST_PAYLOAD, new String((byte[]) message.getPayload())); assertEquals("MyHost", message @@ -117,7 +118,7 @@ public class TcpMessageMapperTests { .getHeaders().get(IpHeaders.IP_ADDRESS)); assertEquals(1234, message .getHeaders().get(IpHeaders.REMOTE_PORT)); - assertEquals(Integer.valueOf(0), message.getHeaders().getSequenceNumber()); + assertEquals(Integer.valueOf(0), new EiMessageHeaderAccessor(message).getSequenceNumber()); } @Test @@ -170,11 +171,11 @@ public class TcpMessageMapperTests { .getHeaders().get(IpHeaders.IP_ADDRESS)); assertEquals(1234, message .getHeaders().get(IpHeaders.REMOTE_PORT)); - assertEquals(Integer.valueOf(1), message - .getHeaders().getSequenceNumber()); - assertEquals(message.getHeaders().get(IpHeaders.CONNECTION_ID), message - .getHeaders().getCorrelationId()); + EiMessageHeaderAccessor headerAccessor = new EiMessageHeaderAccessor(message); + assertEquals(Integer.valueOf(1), headerAccessor.getSequenceNumber()); + assertEquals(message.getHeaders().get(IpHeaders.CONNECTION_ID), headerAccessor.getCorrelationId()); message = mapper.toMessage(connection); + headerAccessor = new EiMessageHeaderAccessor(message); assertEquals(TEST_PAYLOAD, new String((byte[]) message.getPayload())); assertEquals("MyHost", message .getHeaders().get(IpHeaders.HOSTNAME)); @@ -182,10 +183,8 @@ public class TcpMessageMapperTests { .getHeaders().get(IpHeaders.IP_ADDRESS)); assertEquals(1234, message .getHeaders().get(IpHeaders.REMOTE_PORT)); - assertEquals(Integer.valueOf(2), message - .getHeaders().getSequenceNumber()); - assertEquals(message.getHeaders().get(IpHeaders.CONNECTION_ID), message - .getHeaders().getCorrelationId()); + assertEquals(Integer.valueOf(2), headerAccessor.getSequenceNumber()); + assertEquals(message.getHeaders().get(IpHeaders.CONNECTION_ID), headerAccessor.getCorrelationId()); assertNotNull(message.getHeaders().get("foo")); assertEquals("bar", message.getHeaders().get("foo")); @@ -280,5 +279,4 @@ public class TcpMessageMapperTests { assertEquals(1234, message.getHeaders().get(IpHeaders.REMOTE_PORT)); assertEquals("someId", message.getHeaders().get(IpHeaders.CONNECTION_ID)); } - } diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionTests.java index c0269c24e1..b236e9466c 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNetConnectionTests.java @@ -38,14 +38,14 @@ import org.mockito.stubbing.Answer; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.Message; import org.springframework.integration.ip.tcp.connection.TcpNioConnection.ChannelInputStream; import org.springframework.integration.ip.tcp.serializer.ByteArrayStxEtxSerializer; import org.springframework.integration.ip.tcp.serializer.MapJsonSerializer; -import org.springframework.integration.message.ErrorMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.converter.MapMessageConverter; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.ErrorMessage; /** * @author Gary Russell diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java index 063a2bcd5c..682e55c0ea 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionReadTests.java @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import javax.net.SocketFactory; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.ip.tcp.serializer.AbstractByteArraySerializer; import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer; import org.springframework.integration.ip.tcp.serializer.ByteArrayLengthHeaderSerializer; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java index 0d8457eeef..564fd7ddcc 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/connection/TcpNioConnectionTests.java @@ -60,7 +60,6 @@ import org.mockito.stubbing.Answer; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.Message; import org.springframework.integration.ip.tcp.connection.TcpNioConnection.ChannelInputStream; import org.springframework.integration.ip.tcp.serializer.ByteArrayCrLfSerializer; import org.springframework.integration.ip.tcp.serializer.MapJsonSerializer; @@ -68,6 +67,7 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.support.converter.MapMessageConverter; import org.springframework.integration.test.util.SocketUtils; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; import org.springframework.util.ReflectionUtils; import org.springframework.util.ReflectionUtils.FieldCallback; import org.springframework.util.ReflectionUtils.FieldFilter; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java index fb6f07ec0d..a9e683140b 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketMessageMapperTests.java @@ -26,7 +26,7 @@ import java.net.InetSocketAddress; import java.nio.ByteBuffer; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.mapping.MessageMappingException; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketSendingHandlerTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketSendingHandlerTests.java index 47aa20c135..8a1b157e31 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketSendingHandlerTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/DatagramPacketSendingHandlerTests.java @@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.LogFactory; import org.junit.Ignore; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.SocketUtils; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/MultiClientTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/MultiClientTests.java index 6210aa1b32..067dd4d359 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/MultiClientTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/MultiClientTests.java @@ -20,7 +20,7 @@ import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.ip.util.SocketTestUtils; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpChannelAdapterTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpChannelAdapterTests.java index 129a9969de..2fc2523c5c 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpChannelAdapterTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpChannelAdapterTests.java @@ -32,10 +32,10 @@ import java.util.concurrent.atomic.AtomicReference; import org.apache.commons.logging.LogFactory; import org.junit.Ignore; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.util.SocketTestUtils; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java index de52414904..54c3b74ec6 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpMulticastEndToEndTests.java @@ -26,27 +26,26 @@ import java.util.concurrent.TimeUnit; import org.junit.Ignore; import org.junit.Test; - import org.springframework.context.ApplicationContext; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolver; /** * Sends and receives a simple message through to the Udp channel adapters. * If run as a JUnit just sends one message and terminates (see console). - * - * If run from main(), + * + * If run from main(), * hangs around for a couple of minutes to allow console interaction (enter a message on the - * console and you should see it go through the outbound context, over UDP, and + * console and you should see it go through the outbound context, over UDP, and * received in the other context (and written back to the console). - * + * * @author Gary Russell * @since 2.0 */ @@ -77,15 +76,15 @@ public class UdpMulticastEndToEndTests implements Runnable { t.start(); // launch the receiver AbstractApplicationContext applicationContext = new ClassPathXmlApplicationContext( "testIp-out-multicast-context.xml", - UdpMulticastEndToEndTests.class); + UdpMulticastEndToEndTests.class); launcher.launchSender(applicationContext); applicationContext.stop(); } public void launchSender(ApplicationContext applicationContext) throws Exception { - ChannelResolver channelResolver = new BeanFactoryChannelResolver(applicationContext); - MessageChannel inputChannel = channelResolver.resolveChannelName("mcInputChannel"); + DestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(applicationContext); + MessageChannel inputChannel = channelResolver.resolveDestination("mcInputChannel"); if (!readyToReceive.await(30, TimeUnit.SECONDS)) { fail("Receiver failed to start in 30s"); } @@ -129,7 +128,7 @@ public class UdpMulticastEndToEndTests implements Runnable { UdpMulticastEndToEndTests.class); while (okToRun) { try { - readyToReceive.countDown(); + readyToReceive.countDown(); sentFirst.await(); } catch (InterruptedException e) { diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java index a090202d13..7d63918b3c 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/udp/UdpUnicastEndToEndTests.java @@ -16,8 +16,8 @@ package org.springframework.integration.ip.udp; -import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -31,14 +31,14 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.channel.ChannelResolver; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.core.DestinationResolver; /** * Sends and receives a simple message through to the Udp channel adapters. @@ -107,8 +107,8 @@ public class UdpUnicastEndToEndTests implements Runnable { public void launchSender(ApplicationContext applicationContext) throws Exception { - ChannelResolver channelResolver = new BeanFactoryChannelResolver(applicationContext); - MessageChannel inputChannel = channelResolver.resolveChannelName("inputChannel"); + DestinationResolver channelResolver = new BeanFactoryMessageChannelDestinationResolver(applicationContext); + MessageChannel inputChannel = channelResolver.resolveDestination("inputChannel"); if (!readyToReceive.await(30, TimeUnit.SECONDS)) { fail("Receiver failed to start in 30s"); } diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java index 5e7988df45..b92bdbb672 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageHandler.java @@ -19,8 +19,6 @@ import java.util.Map; import javax.sql.DataSource; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.handler.AbstractMessageHandler; @@ -31,6 +29,8 @@ import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.support.GeneratedKeyHolder; import org.springframework.jdbc.support.KeyHolder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; import org.springframework.util.LinkedCaseInsensitiveMap; /** diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java index c335aa70eb..0b17b3cdbf 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcMessageStore.java @@ -37,9 +37,9 @@ import org.springframework.core.serializer.Serializer; import org.springframework.core.serializer.support.DeserializingConverter; import org.springframework.core.serializer.support.SerializingConverter; import org.springframework.dao.DuplicateKeyException; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.jdbc.store.JdbcChannelMessageStore; import org.springframework.integration.store.AbstractMessageGroupStore; import org.springframework.integration.store.MessageGroup; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcOutboundGateway.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcOutboundGateway.java index cd884207d3..8592ca3005 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcOutboundGateway.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcOutboundGateway.java @@ -21,7 +21,7 @@ import java.util.List; import javax.sql.DataSource; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.support.MessageBuilder; import org.springframework.jdbc.core.JdbcOperations; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java index 3cef0fe9d3..e60eb710ee 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapter.java @@ -24,7 +24,7 @@ import java.util.List; import javax.sql.DataSource; import org.springframework.dao.DataAccessException; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcExecutor.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcExecutor.java index bac5241659..ea3926ec67 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcExecutor.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcExecutor.java @@ -31,8 +31,6 @@ import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.jdbc.storedproc.ProcedureParameter; import org.springframework.jdbc.core.JdbcTemplate; @@ -46,6 +44,8 @@ import org.springframework.jdbc.core.simple.SimpleJdbcCallOperations; import org.springframework.jmx.export.annotation.ManagedAttribute; import org.springframework.jmx.export.annotation.ManagedMetric; import org.springframework.jmx.export.annotation.ManagedResource; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.util.Assert; import com.google.common.cache.CacheBuilder; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcMessageHandler.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcMessageHandler.java index df007e5c6d..563b9e2f96 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcMessageHandler.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcMessageHandler.java @@ -20,7 +20,7 @@ import javax.sql.DataSource; import org.springframework.beans.factory.InitializingBean; import org.springframework.expression.Expression; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.jdbc.storedproc.ProcedureParameter; import org.springframework.jdbc.core.SqlParameter; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java index e396e67fc3..bc1e8ee37a 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcOutboundGateway.java @@ -23,9 +23,9 @@ import java.util.Map; import javax.sql.DataSource; import org.springframework.expression.Expression; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.jdbc.storedproc.ProcedureParameter; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapter.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapter.java index 41d17800f3..f274abbc4c 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapter.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapter.java @@ -22,8 +22,8 @@ import java.util.Map; import javax.sql.DataSource; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; import org.springframework.integration.jdbc.storedproc.ProcedureParameter; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/config/package-info.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/config/package-info.java index 8c045bbfd2..f830e1ff76 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/config/package-info.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/config/package-info.java @@ -1,4 +1,4 @@ /** * Contains parser classes for the JDBC namespace support. */ -package org.springframework.integration.jdbc.config; \ No newline at end of file +package org.springframework.integration.jdbc.config; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/package-info.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/package-info.java index 50d354a29e..e56055c268 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/package-info.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/package-info.java @@ -2,4 +2,4 @@ * Root package of the Spring Integration JDBC module, which contains various * JDBC and Stored Procedure/Function supporting components. */ -package org.springframework.integration.jdbc; \ No newline at end of file +package org.springframework.integration.jdbc; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java index 7e0e655f6d..607b55b07d 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/JdbcChannelMessageStore.java @@ -16,7 +16,6 @@ package org.springframework.integration.jdbc.store; import java.sql.PreparedStatement; import java.sql.SQLException; import java.sql.Types; -import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; @@ -24,7 +23,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.UUID; -import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; @@ -39,8 +37,8 @@ import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; import org.springframework.core.serializer.support.DeserializingConverter; import org.springframework.core.serializer.support.SerializingConverter; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.jdbc.JdbcMessageStore; import org.springframework.integration.jdbc.store.channel.DerbyChannelMessageStoreQueryProvider; import org.springframework.integration.jdbc.store.channel.MessageRowMapper; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MessageRowMapper.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MessageRowMapper.java index af683fcefe..b43fada234 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MessageRowMapper.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/MessageRowMapper.java @@ -16,7 +16,7 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.springframework.core.serializer.support.DeserializingConverter; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.support.lob.LobHandler; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/package-info.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/package-info.java index b5fbffd699..88f51fe855 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/package-info.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/channel/package-info.java @@ -1,4 +1,4 @@ /** * Provides support classes for the JdbcChannelMessageStore. */ -package org.springframework.integration.jdbc.store.channel; \ No newline at end of file +package org.springframework.integration.jdbc.store.channel; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/package-info.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/package-info.java index e3498ea73b..5c0375ddbc 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/package-info.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/store/package-info.java @@ -1,4 +1,4 @@ /** * Provides JDBC-backed Message Store implementations. */ -package org.springframework.integration.jdbc.store; \ No newline at end of file +package org.springframework.integration.jdbc.store; diff --git a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/storedproc/package-info.java b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/storedproc/package-info.java index f36cb6b618..d6ec228cdb 100644 --- a/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/storedproc/package-info.java +++ b/spring-integration-jdbc/src/main/java/org/springframework/integration/jdbc/storedproc/package-info.java @@ -1,4 +1,4 @@ /** * Provides Stored Procedure/Function supporting classes. */ -package org.springframework.integration.jdbc.storedproc; \ No newline at end of file +package org.springframework.integration.jdbc.storedproc; diff --git a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd index 773d56306f..772943a5b4 100644 --- a/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd +++ b/spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd @@ -387,7 +387,7 @@ - + @@ -400,7 +400,7 @@ - + @@ -661,7 +661,7 @@ to be executed. - + @@ -863,7 +863,7 @@ - + @@ -876,7 +876,7 @@ - + @@ -1086,7 +1086,7 @@ - + diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/DelayerHandlerRescheduleIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/DelayerHandlerRescheduleIntegrationTests.java index af7ffb28cc..7d14b162aa 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/DelayerHandlerRescheduleIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/DelayerHandlerRescheduleIntegrationTests.java @@ -29,12 +29,7 @@ import org.junit.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.handler.DelayHandler; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; @@ -44,6 +39,11 @@ import org.springframework.integration.util.UUIDConverter; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.PollableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.transaction.support.TransactionSynchronization; import org.springframework.transaction.support.TransactionSynchronizationAdapter; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java index 8a07c8dc87..a6a98d64bd 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageHandlerIntegrationTests.java @@ -23,7 +23,7 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.jdbc.core.JdbcTemplate; @@ -96,4 +96,4 @@ public class JdbcMessageHandlerIntegrationTests { assertEquals("Wrong name", "foo", map.get("NAME")); } -} \ No newline at end of file +} diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java index 2426b8c170..b56e2b4615 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreChannelTests.java @@ -27,7 +27,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.store.MessageGroup; import org.springframework.test.annotation.DirtiesContext; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java index a52566a227..9875dcf002 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcMessageStoreTests.java @@ -43,8 +43,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.GenericMessage; @@ -54,6 +53,7 @@ import org.springframework.integration.store.MessageGroupStore.MessageGroupCallb import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.util.UUIDConverter; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.messaging.Message; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -176,7 +176,7 @@ public class JdbcMessageStoreTests { message = messageStore.addMessage(message); message = MessageBuilder.fromMessage(message).setCorrelationId("Y").build(); message = messageStore.addMessage(message); - assertEquals("Y", messageStore.getMessage(message.getHeaders().getId()).getHeaders().getCorrelationId()); + assertEquals("Y", new EiMessageHeaderAccessor(messageStore.getMessage(message.getHeaders().getId())).getCorrelationId()); } @Test @@ -426,11 +426,11 @@ public class JdbcMessageStoreTests { assertNotNull(messageFromGroup1); assertNotNull(messageFromGroup2); - LOG.info("messageFromGroup1: " + messageFromGroup1.getHeaders().getId() + "; Sequence #: " + messageFromGroup1.getHeaders().getSequenceNumber()); - LOG.info("messageFromGroup2: " + messageFromGroup2.getHeaders().getId() + "; Sequence #: " + messageFromGroup2.getHeaders().getSequenceNumber()); + LOG.info("messageFromGroup1: " + messageFromGroup1.getHeaders().getId() + "; Sequence #: " + new EiMessageHeaderAccessor(messageFromGroup1).getSequenceNumber()); + LOG.info("messageFromGroup2: " + messageFromGroup2.getHeaders().getId() + "; Sequence #: " + new EiMessageHeaderAccessor(messageFromGroup1).getSequenceNumber()); - assertEquals(Integer.valueOf(1), messageFromGroup1.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); - assertEquals(Integer.valueOf(2), messageFromGroup2.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); + assertEquals(Integer.valueOf(1), messageFromGroup1.getHeaders().get(EiMessageHeaderAccessor.SEQUENCE_NUMBER)); + assertEquals(Integer.valueOf(2), messageFromGroup2.getHeaders().get(EiMessageHeaderAccessor.SEQUENCE_NUMBER)); } @@ -468,11 +468,11 @@ public class JdbcMessageStoreTests { assertNotNull(messageFromRegion1); assertNotNull(messageFromRegion2); - LOG.info("messageFromRegion1: " + messageFromRegion1.getHeaders().getId() + "; Sequence #: " + messageFromRegion1.getHeaders().getSequenceNumber()); - LOG.info("messageFromRegion2: " + messageFromRegion2.getHeaders().getId() + "; Sequence #: " + messageFromRegion2.getHeaders().getSequenceNumber()); + LOG.info("messageFromRegion1: " + messageFromRegion1.getHeaders().getId() + "; Sequence #: " + new EiMessageHeaderAccessor(messageFromRegion1).getSequenceNumber()); + LOG.info("messageFromRegion2: " + messageFromRegion2.getHeaders().getId() + "; Sequence #: " + new EiMessageHeaderAccessor(messageFromRegion1).getSequenceNumber()); - assertEquals(Integer.valueOf(1), messageFromRegion1.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); - assertEquals(Integer.valueOf(2), messageFromRegion2.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); + assertEquals(Integer.valueOf(1), messageFromRegion1.getHeaders().get(EiMessageHeaderAccessor.SEQUENCE_NUMBER)); + assertEquals(Integer.valueOf(2), messageFromRegion2.getHeaders().get(EiMessageHeaderAccessor.SEQUENCE_NUMBER)); } @@ -518,4 +518,4 @@ public class JdbcMessageStoreTests { -} \ No newline at end of file +} diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java index fa2b9de2f2..26cfdce5fc 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/JdbcPollingChannelAdapterIntegrationTests.java @@ -34,13 +34,13 @@ import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabase; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseBuilder; import org.springframework.jdbc.datasource.embedded.EmbeddedDatabaseType; +import org.springframework.messaging.Message; /** * @author Jonas Partner @@ -337,4 +337,4 @@ public class JdbcPollingChannelAdapterIntegrationTests { } -} \ No newline at end of file +} diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/MessageGroupQueueTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/MessageGroupQueueTests.java index 9559b86966..c8d701ed47 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/MessageGroupQueueTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/MessageGroupQueueTests.java @@ -23,7 +23,7 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupQueue; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJmxManagedBeanTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJmxManagedBeanTests.java index 23f8e77c53..6aa871dc36 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJmxManagedBeanTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcJmxManagedBeanTests.java @@ -37,7 +37,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.jdbc.storedproc.CreateUser; import org.springframework.integration.jdbc.storedproc.User; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java index b677945480..097225fcda 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundChannelAdapterWithinChainTests.java @@ -20,8 +20,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.jdbc.storedproc.User; import org.springframework.integration.support.MessageBuilder; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java index 17c7186004..1ba3ae85c8 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithNamespaceIntegrationTests.java @@ -32,11 +32,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.jdbc.storedproc.CreateUser; import org.springframework.integration.jdbc.storedproc.User; import org.springframework.integration.support.MessageBuilder; @@ -44,8 +43,6 @@ import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import javax.sql.DataSource; - /** * @author Gunnar Hillert * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java index 183d9e5c65..4eb3b23edf 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpelIntegrationTests.java @@ -37,11 +37,9 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.jdbc.config.JdbcTypesEnum; import org.springframework.integration.jdbc.storedproc.User; import org.springframework.integration.message.GenericMessage; @@ -51,6 +49,8 @@ import org.springframework.integration.support.json.JsonInboundMessageMapper; import org.springframework.integration.support.json.JsonOutboundMessageMapper; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.SqlReturnType; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java index 4d529b3b34..2e2987d2e6 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcOutboundGatewayWithSpringContextIntegrationTests.java @@ -29,7 +29,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.jdbc.storedproc.CreateUser; import org.springframework.integration.jdbc.storedproc.User; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java index 1f08377605..ca3b30326d 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespace2IntegrationTests.java @@ -28,7 +28,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java index 793c5d7674..ffe2d2b22a 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithNamespaceIntegrationTests.java @@ -29,7 +29,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java index 1c18c7184e..2d24eafbd9 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/StoredProcPollingChannelAdapterWithSpringContextIntegrationTests.java @@ -29,7 +29,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java index 5f6f2e89fa..1cc4d743d9 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageHandlerParserTests.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jdbc.JdbcMessageHandler; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java index 975862b08c..39996391ac 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcMessageStoreParserTests.java @@ -14,7 +14,7 @@ import org.springframework.core.serializer.DefaultDeserializer; import org.springframework.core.serializer.DefaultSerializer; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.jdbc.JdbcMessageStore; import org.springframework.integration.store.MessageStore; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java index 00cdd7b42a..64f011bf3a 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcOutboundGatewayParserTests.java @@ -12,13 +12,12 @@ */ package org.springframework.integration.jdbc.config; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.Collections; -import java.util.List; import java.util.Map; import javax.sql.DataSource; @@ -30,17 +29,16 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jdbc.JdbcOutboundGateway; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; /** * @author Dave Syer @@ -59,7 +57,7 @@ public class JdbcOutboundGatewayParserTests { private ConfigurableApplicationContext context; - private MessagingTemplate messagingTemplate; + private GenericMessagingTemplate messagingTemplate; private static volatile int adviceCalled; @@ -163,7 +161,7 @@ public class JdbcOutboundGatewayParserTests { accessor = new DirectFieldAccessor(source); source = accessor.getPropertyValue("messagingTemplate"); - MessagingTemplate messagingTemplate = (MessagingTemplate) source; + GenericMessagingTemplate messagingTemplate = (GenericMessagingTemplate) source; accessor = new DirectFieldAccessor(messagingTemplate); @@ -238,7 +236,8 @@ public class JdbcOutboundGatewayParserTests { protected void setupMessagingTemplate() { PollableChannel pollableChannel = this.context.getBean("output", PollableChannel.class); - this.messagingTemplate = new MessagingTemplate(pollableChannel); + this.messagingTemplate = new GenericMessagingTemplate(); + this.messagingTemplate.setDefaultDestination(pollableChannel); this.messagingTemplate.setReceiveTimeout(500); } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java index f7d53c217a..7cb438620b 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/JdbcPollingChannelAdapterParserTests.java @@ -32,15 +32,15 @@ import org.junit.After; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.test.util.TestUtils; import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.namedparam.AbstractSqlParameterSource; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; @@ -60,7 +60,7 @@ public class JdbcPollingChannelAdapterParserTests { private JdbcTemplate jdbcTemplate; - private MessagingTemplate messagingTemplate; + private GenericMessagingTemplate messagingTemplate; private ConfigurableApplicationContext appCtx; @@ -183,7 +183,8 @@ public class JdbcPollingChannelAdapterParserTests { protected void setupMessagingTemplate() { PollableChannel pollableChannel = this.appCtx.getBean("target", PollableChannel.class); - this.messagingTemplate = new MessagingTemplate(pollableChannel); + this.messagingTemplate = new GenericMessagingTemplate(); + this.messagingTemplate.setDefaultDestination(pollableChannel); this.messagingTemplate.setReceiveTimeout(500); } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcInvalidConfigsTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcInvalidConfigsTests.java index eaa958f93d..8b5286fbd0 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcInvalidConfigsTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcInvalidConfigsTests.java @@ -13,40 +13,20 @@ package org.springframework.integration.jdbc.config; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.io.ByteArrayInputStream; -import java.sql.Types; -import java.util.List; import java.util.Properties; -import org.junit.After; import org.junit.Test; -import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.beans.factory.xml.XmlBeanDefinitionReader; import org.springframework.context.ApplicationContext; -import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.GenericApplicationContext; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.InputStreamResource; -import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.endpoint.EventDrivenConsumer; -import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; -import org.springframework.integration.jdbc.storedproc.ProcedureParameter; -import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.test.util.TestUtils; -import org.springframework.jdbc.core.SqlInOutParameter; -import org.springframework.jdbc.core.SqlOutParameter; -import org.springframework.jdbc.core.SqlParameter; /** * @author Artem Bilan diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java index 80f22a70db..d2237a32c8 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcMessageHandlerParserTests.java @@ -27,8 +27,8 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jdbc.storedproc.ProcedureParameter; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java index 02951a1da8..18f0be3357 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcOutboundGatewayParserTests.java @@ -30,9 +30,6 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jdbc.storedproc.PrimeMapper; @@ -43,6 +40,9 @@ import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.SqlInOutParameter; import org.springframework.jdbc.core.SqlOutParameter; import org.springframework.jdbc.core.SqlParameter; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.GenericMessagingTemplate; /** * @author Gunnar Hillert @@ -82,7 +82,7 @@ public class StoredProcOutboundGatewayParserTests { accessor = new DirectFieldAccessor(source); source = accessor.getPropertyValue("messagingTemplate"); - MessagingTemplate messagingTemplate = (MessagingTemplate) source; + GenericMessagingTemplate messagingTemplate = (GenericMessagingTemplate) source; accessor = new DirectFieldAccessor(messagingTemplate); diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java index 852d5ecd1b..9fe36b00ae 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/config/StoredProcPollingChannelAdapterParserTests.java @@ -33,7 +33,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.Expression; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.jdbc.storedproc.PrimeMapper; import org.springframework.integration.jdbc.storedproc.ProcedureParameter; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests.java index 315db03992..20a3baa02e 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreMultipleChannelTests.java @@ -36,8 +36,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.jdbc.core.JdbcTemplate; @@ -149,7 +150,7 @@ public class MySqlJdbcMessageStoreMultipleChannelTests { public void first(Message message ) { - int sequenceNumber = message.getHeaders().getSequenceNumber(); + int sequenceNumber = new EiMessageHeaderAccessor(message).getSequenceNumber(); LOG.info("First handling sequence number: " + sequenceNumber + "; Message ID: " + message.getHeaders().getId()); @@ -162,7 +163,7 @@ public class MySqlJdbcMessageStoreMultipleChannelTests { public void second(Message message ) { - int sequenceNumber = message.getHeaders().getSequenceNumber(); + int sequenceNumber = new EiMessageHeaderAccessor(message).getSequenceNumber(); LOG.info("Second handling sequence number: " + sequenceNumber + "; Message ID: " + message.getHeaders().getId()); if (sequenceNumber != 2) { diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java index 091bffba17..186f90f477 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/mysql/MySqlJdbcMessageStoreTests.java @@ -45,8 +45,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.serializer.Deserializer; import org.springframework.core.serializer.Serializer; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.jdbc.JdbcMessageStore; @@ -57,6 +56,7 @@ import org.springframework.integration.store.MessageGroupStore.MessageGroupCallb import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.util.UUIDConverter; import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.messaging.Message; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.annotation.DirtiesContext.ClassMode; import org.springframework.test.annotation.Repeat; @@ -215,7 +215,7 @@ public class MySqlJdbcMessageStoreTests { message = messageStore.addMessage(message); message = MessageBuilder.fromMessage(message).setCorrelationId("Y").build(); message = messageStore.addMessage(message); - assertEquals("Y", messageStore.getMessage(message.getHeaders().getId()).getHeaders().getCorrelationId()); + assertEquals("Y", new EiMessageHeaderAccessor(messageStore.getMessage(message.getHeaders().getId())).getCorrelationId()); } @Test @@ -466,11 +466,11 @@ public class MySqlJdbcMessageStoreTests { assertNotNull(messageFromGroup1); assertNotNull(messageFromGroup2); - LOG.info("messageFromGroup1: " + messageFromGroup1.getHeaders().getId() + "; Sequence #: " + messageFromGroup1.getHeaders().getSequenceNumber()); - LOG.info("messageFromGroup2: " + messageFromGroup2.getHeaders().getId() + "; Sequence #: " + messageFromGroup2.getHeaders().getSequenceNumber()); + LOG.info("messageFromGroup1: " + messageFromGroup1.getHeaders().getId() + "; Sequence #: " + new EiMessageHeaderAccessor(messageFromGroup1).getSequenceNumber()); + LOG.info("messageFromGroup2: " + messageFromGroup2.getHeaders().getId() + "; Sequence #: " + new EiMessageHeaderAccessor(messageFromGroup2).getSequenceNumber()); - assertEquals(Integer.valueOf(1), (Integer) messageFromGroup1.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); - assertEquals(Integer.valueOf(2), (Integer) messageFromGroup2.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); + assertEquals(Integer.valueOf(1), (Integer) messageFromGroup1.getHeaders().get(EiMessageHeaderAccessor.SEQUENCE_NUMBER)); + assertEquals(Integer.valueOf(2), (Integer) messageFromGroup2.getHeaders().get(EiMessageHeaderAccessor.SEQUENCE_NUMBER)); } @@ -510,11 +510,11 @@ public class MySqlJdbcMessageStoreTests { assertNotNull(messageFromRegion1); assertNotNull(messageFromRegion2); - LOG.info("messageFromRegion1: " + messageFromRegion1.getHeaders().getId() + "; Sequence #: " + messageFromRegion1.getHeaders().getSequenceNumber()); - LOG.info("messageFromRegion2: " + messageFromRegion2.getHeaders().getId() + "; Sequence #: " + messageFromRegion2.getHeaders().getSequenceNumber()); + LOG.info("messageFromRegion1: " + messageFromRegion1.getHeaders().getId() + "; Sequence #: " + new EiMessageHeaderAccessor(messageFromRegion1).getSequenceNumber()); + LOG.info("messageFromRegion2: " + messageFromRegion2.getHeaders().getId() + "; Sequence #: " +new EiMessageHeaderAccessor(messageFromRegion2).getSequenceNumber()); - assertEquals(Integer.valueOf(1), (Integer) messageFromRegion1.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); - assertEquals(Integer.valueOf(2), (Integer) messageFromRegion2.getHeaders().get(MessageHeaders.SEQUENCE_NUMBER)); + assertEquals(Integer.valueOf(1), (Integer) messageFromRegion1.getHeaders().get(EiMessageHeaderAccessor.SEQUENCE_NUMBER)); + assertEquals(Integer.valueOf(2), (Integer) messageFromRegion2.getHeaders().get(EiMessageHeaderAccessor.SEQUENCE_NUMBER)); } } diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractJdbcChannelMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractJdbcChannelMessageStoreTests.java index b36d8461d7..ead567e806 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractJdbcChannelMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractJdbcChannelMessageStoreTests.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull; import javax.sql.DataSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.jdbc.store.JdbcChannelMessageStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.transaction.PlatformTransactionManager; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java index 712b5bff52..ee4c8332d1 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/AbstractTxTimeoutMessageStoreTests.java @@ -28,8 +28,8 @@ import org.junit.Assert; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.jdbc.store.JdbcChannelMessageStore; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/TestService.java b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/TestService.java index 96c2b16a7c..6bd5f8382a 100644 --- a/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/TestService.java +++ b/spring-integration-jdbc/src/test/java/org/springframework/integration/jdbc/store/channel/TestService.java @@ -86,4 +86,4 @@ public class TestService { return duplicateMessagesCount.get(); } -} \ No newline at end of file +} diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/AbstractJmsChannel.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/AbstractJmsChannel.java index fb9c644733..8a5865bc53 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/AbstractJmsChannel.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/AbstractJmsChannel.java @@ -16,7 +16,8 @@ package org.springframework.integration.jms; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.jms.core.JmsTemplate; import org.springframework.util.Assert; @@ -44,7 +45,7 @@ public abstract class AbstractJmsChannel extends AbstractMessageChannel { @Override protected boolean doSend(Message message, long timeout) { try { - DynamicJmsTemplateProperties.setPriority(message.getHeaders().getPriority()); + DynamicJmsTemplateProperties.setPriority(new EiMessageHeaderAccessor(message).getPriority()); this.jmsTemplate.convertAndSend(message); } finally { diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java index d88b55f555..4a56155ed3 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListener.java @@ -29,8 +29,8 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.history.TrackableComponent; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java index d8802dea00..6d64ce99e1 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java @@ -28,7 +28,7 @@ import javax.jms.JMSException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.util.StringUtils; /** diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java index 747c40b253..2b4a3ecdaf 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationPollingSource.java @@ -20,8 +20,8 @@ import java.util.Map; import javax.jms.Destination; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java index 9dd7cdb4ba..32684c0aa1 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsOutboundGateway.java @@ -44,9 +44,7 @@ import javax.jms.Topic; import org.springframework.context.SmartLifecycle; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageTimeoutException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; @@ -59,6 +57,9 @@ import org.springframework.jms.support.converter.MessageConverter; import org.springframework.jms.support.converter.SimpleMessageConverter; import org.springframework.jms.support.destination.DestinationResolver; import org.springframework.jms.support.destination.DynamicDestinationResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; @@ -668,7 +669,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp jmsRequest.setJMSReplyTo(replyTo); connection.start(); - Integer priority = requestMessage.getHeaders().getPriority(); + Integer priority = new EiMessageHeaderAccessor(requestMessage).getPriority(); if (priority == null) { priority = this.priority; } @@ -722,7 +723,7 @@ public class JmsOutboundGateway extends AbstractReplyProducingMessageHandler imp jmsRequest.setJMSReplyTo(replyTo); connection.start(); - Integer priority = requestMessage.getHeaders().getPriority(); + Integer priority = new EiMessageHeaderAccessor(requestMessage).getPriority(); if (priority == null) { priority = this.priority; } diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java index 2eb202eeb4..4964155183 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsSendingMessageHandler.java @@ -20,17 +20,18 @@ import javax.jms.Destination; import javax.jms.JMSException; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; +import org.springframework.integration.EiMessageHeaderAccessor; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessagePostProcessor; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; import org.springframework.util.Assert; /** * A MessageConsumer that sends the converted Message payload within a JMS Message. - * + * * @author Mark Fisher * @author Oleg Zhurakousky */ @@ -78,7 +79,7 @@ public class JmsSendingMessageHandler extends AbstractMessageHandler { /** * Specify whether the payload should be extracted from each integration * Message to be used as the JMS Message body. - * + * *

The default value is true. To force passing of the full * Spring Integration Message instead, set this to false. */ @@ -108,7 +109,7 @@ public class JmsSendingMessageHandler extends AbstractMessageHandler { Object objectToSend = (this.extractPayload) ? message.getPayload() : message; MessagePostProcessor messagePostProcessor = new HeaderMappingMessagePostProcessor(message, this.headerMapper); try { - DynamicJmsTemplateProperties.setPriority(message.getHeaders().getPriority()); + DynamicJmsTemplateProperties.setPriority(new EiMessageHeaderAccessor(message).getPriority()); this.send(destination, objectToSend, messagePostProcessor); } finally { diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/PollableJmsChannel.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/PollableJmsChannel.java index e59ac489e8..8312651734 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/PollableJmsChannel.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/PollableJmsChannel.java @@ -16,8 +16,8 @@ package org.springframework.integration.jms; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.jms.core.JmsTemplate; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java index 41886087f7..d621e103ee 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/SubscribableJmsChannel.java @@ -22,12 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.context.SmartLifecycle; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageDispatchingException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.dispatcher.AbstractDispatcher; import org.springframework.integration.dispatcher.BroadcastingDispatcher; import org.springframework.integration.dispatcher.MessageDispatcher; @@ -36,6 +31,11 @@ import org.springframework.integration.dispatcher.UnicastingDispatcher; import org.springframework.integration.support.MessageBuilder; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.listener.AbstractMessageListenerContainer; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.SubscribableChannel; import org.springframework.util.Assert; /** diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/package-info.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/package-info.java index 4ff8c1a184..ffff76892a 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/package-info.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers, factory beans. */ -package org.springframework.integration.jms.config; \ No newline at end of file +package org.springframework.integration.jms.config; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/package-info.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/package-info.java index 7a74b1f504..811c9504e0 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/package-info.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/package-info.java @@ -1,4 +1,4 @@ /** * Base package for JMS Support. */ -package org.springframework.integration.jms; \ No newline at end of file +package org.springframework.integration.jms; diff --git a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd index a3aedd4afa..2661295b59 100644 --- a/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd +++ b/spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd @@ -442,7 +442,7 @@ - + @@ -462,7 +462,7 @@ - + @@ -525,7 +525,7 @@ - + @@ -636,7 +636,7 @@ - + @@ -646,7 +646,7 @@ - + @@ -656,7 +656,7 @@ - + @@ -779,7 +779,7 @@ - + @@ -788,7 +788,7 @@ - + @@ -1120,7 +1120,7 @@ - + @@ -1359,7 +1359,7 @@ - + @@ -1368,7 +1368,7 @@ - + diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListenerTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListenerTests.java index e9f4100060..418662ccd8 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListenerTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/ChannelPublishingJmsMessageListenerTests.java @@ -22,10 +22,10 @@ import javax.jms.Session; import org.junit.Test; import org.springframework.core.task.SimpleAsyncTaskExecutor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.jms.support.converter.MessageConversionException; import org.springframework.jms.support.converter.MessageConverter; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java index 1ca8bf5715..44e8241908 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/DefaultJmsHeaderMapperTests.java @@ -28,8 +28,8 @@ import javax.jms.Destination; import javax.jms.JMSException; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests.java index 3cbe61cb31..65c13724a1 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsOutboundInsideChainTests.java @@ -18,9 +18,9 @@ package org.springframework.integration.jms; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import static org.junit.Assert.*; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java index 9c8b5b1be2..b23dba0a18 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/PollableJmsChannelTests.java @@ -40,8 +40,8 @@ import org.apache.activemq.ActiveMQConnectionFactory; import org.apache.activemq.command.ActiveMQQueue; import org.junit.Test; import org.mockito.Mockito; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.jms.config.ActiveMqTestUtils; import org.springframework.integration.jms.config.JmsChannelFactoryBean; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java index 7e58137e85..6385285d0f 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/SubscribableJmsChannelTests.java @@ -48,15 +48,15 @@ import org.mockito.stubbing.Answer; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.context.support.StaticApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.jms.config.JmsChannelFactoryBean; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.jms.connection.CachingConnectionFactory; import org.springframework.jms.listener.AbstractMessageListenerContainer; import org.springframework.jms.listener.DefaultMessageListenerContainer; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; /** * @author Mark Fisher diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java index 7f6d5f6ebb..3a5c7ba7c7 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExceptionHandlingSiConsumerTests.java @@ -119,7 +119,7 @@ public class ExceptionHandlingSiConsumerTests { public static class SampleErrorTransformer { - public org.springframework.integration.Message transform(Throwable t) throws Exception { + public org.springframework.messaging.Message transform(Throwable t) throws Exception { return MessageBuilder.withPayload(t.getCause().getMessage()).build(); } } diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java index bed9878560..b6ef42d43b 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/ExtractRequestReplyPayloadTests.java @@ -23,17 +23,17 @@ import org.junit.Test; import org.mockito.Mockito; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageTimeoutException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.jms.ChannelPublishingJmsMessageListener; import org.springframework.integration.jms.JmsOutboundGateway; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; /** * @author ozhurakousky @@ -63,7 +63,8 @@ public class ExtractRequestReplyPayloadTests { jmsInputChannel.subscribe(new MessageHandler() { public void handleMessage(Message message) throws MessagingException { assertTrue(message.getPayload() instanceof String); - MessagingTemplate template = new MessagingTemplate((MessageChannel) message.getHeaders().getReplyChannel()); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel()); template.send(message); } }); @@ -84,7 +85,8 @@ public class ExtractRequestReplyPayloadTests { jmsInputChannel.subscribe(new MessageHandler() { public void handleMessage(Message message) throws MessagingException { assertTrue(message.getPayload() instanceof String); - MessagingTemplate template = new MessagingTemplate((MessageChannel) message.getHeaders().getReplyChannel()); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel()); template.send(message); } }); @@ -105,7 +107,8 @@ public class ExtractRequestReplyPayloadTests { MessageHandler handler = new MessageHandler() { public void handleMessage(Message message) throws MessagingException { assertTrue(message.getPayload() instanceof javax.jms.Message); - MessagingTemplate template = new MessagingTemplate((MessageChannel) message.getHeaders().getReplyChannel()); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel()); template.send(message); } }; @@ -127,7 +130,8 @@ public class ExtractRequestReplyPayloadTests { MessageHandler handler = new MessageHandler() { public void handleMessage(Message message) throws MessagingException { assertTrue(message.getPayload() instanceof javax.jms.Message); - MessagingTemplate template = new MessagingTemplate((MessageChannel) message.getHeaders().getReplyChannel()); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel()); template.send(message); } }; @@ -148,7 +152,8 @@ public class ExtractRequestReplyPayloadTests { MessageHandler handler = new MessageHandler() { public void handleMessage(Message message) throws MessagingException { assertTrue(message.getPayload() instanceof String); - MessagingTemplate template = new MessagingTemplate((MessageChannel) message.getHeaders().getReplyChannel()); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel()); template.send(message); } }; @@ -167,7 +172,8 @@ public class ExtractRequestReplyPayloadTests { MessageHandler handler = new MessageHandler() { public void handleMessage(Message message) throws MessagingException { assertTrue(message.getPayload() instanceof String); - MessagingTemplate template = new MessagingTemplate((MessageChannel) message.getHeaders().getReplyChannel()); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel()); template.send(message); } }; @@ -186,7 +192,8 @@ public class ExtractRequestReplyPayloadTests { MessageHandler handler = new MessageHandler() { public void handleMessage(Message message) throws MessagingException { assertTrue(message.getPayload() instanceof String); - MessagingTemplate template = new MessagingTemplate((MessageChannel) message.getHeaders().getReplyChannel()); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel()); template.send(message); } }; @@ -211,7 +218,8 @@ public class ExtractRequestReplyPayloadTests { MessageHandler handler = new MessageHandler() { public void handleMessage(Message message) throws MessagingException { assertTrue(message.getPayload() instanceof javax.jms.Message); - MessagingTemplate template = new MessagingTemplate((MessageChannel) message.getHeaders().getReplyChannel()); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination((MessageChannel) message.getHeaders().getReplyChannel()); template.send(message); } }; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java index 7f2d3c3787..89eab5f460 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/InboundOneWayErrorTests.java @@ -31,9 +31,9 @@ import javax.jms.Session; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessageCreator; import org.springframework.util.ErrorHandler; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java index ced27e7c57..24ae00c212 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelHistoryTests.java @@ -28,9 +28,9 @@ import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.jms.SubscribableJmsChannel; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java index b155278190..adb9f62298 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsChannelParserTests.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.context.support.AbstractApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; import org.springframework.integration.jms.PollableJmsChannel; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java index 1896ee3802..936d6ea4e5 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsDynamicDestinationTests.java @@ -24,13 +24,12 @@ import javax.jms.TextMessage; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -75,14 +74,14 @@ public class JmsDynamicDestinationTests { assertEquals("test-1", jmsResult1.getText()); assertEquals("queue://queue.test.dynamic.adapter.1", jmsResult1.getJMSDestination().toString()); assertEquals("test-2", jmsResult2.getText()); - assertEquals("queue://queue.test.dynamic.adapter.2", jmsResult2.getJMSDestination().toString()); + assertEquals("queue://queue.test.dynamic.adapter.2", jmsResult2.getJMSDestination().toString()); } @Test public void gateway() throws Exception { Message message1 = MessageBuilder.withPayload("test-1").setHeader("destinationNumber", 1).build(); Message message2 = MessageBuilder.withPayload("test-2").setHeader("destinationNumber", 2).build(); - MessagingTemplate template = new MessagingTemplate(); + GenericMessagingTemplate template = new GenericMessagingTemplate(); Message result1 = template.sendAndReceive(gatewayChannel, message1); Message result2 = template.sendAndReceive(gatewayChannel, message2); assertNotNull(result1); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java index cef1964379..a979c3248e 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java @@ -24,9 +24,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.jms.DefaultJmsHeaderMapper; import org.springframework.integration.jms.JmsHeaders; import org.springframework.integration.jms.StubTextMessage; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java index 3a400e8c1e..fe4859d670 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundChannelAdapterParserTests.java @@ -27,8 +27,8 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.test.util.TestUtils; import org.springframework.jms.core.JmsTemplate; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java index c63f7716c4..b0cfc34f23 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsInboundGatewayParserTests.java @@ -30,8 +30,8 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.jms.JmsMessageDrivenEndpoint; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java index 6c4d094a33..a27980560d 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageDrivenChannelAdapterParserTests.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.jms.JmsMessageDrivenEndpoint; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java index 889d1b3e68..6f6374aa20 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsMessageHistoryTests.java @@ -29,14 +29,14 @@ import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.jms.DefaultJmsHeaderMapper; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.context.NamedComponent; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.PollableChannel; /** * @author Oleg Zhurakousky diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java index ac97178ecf..dd30d2b99d 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundChannelAdapterParserTests.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jms.JmsHeaderMapper; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java index deabab1b24..342d17397c 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsOutboundGatewayParserTests.java @@ -38,17 +38,10 @@ import javax.jms.Session; import org.junit.Test; import org.mockito.Mockito; - import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.Expression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; @@ -61,6 +54,12 @@ import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; import org.springframework.jms.listener.DefaultMessageListenerContainer; import org.springframework.jms.support.converter.MessageConverter; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; /** * @author Jonas Partner @@ -220,7 +219,9 @@ public class JmsOutboundGatewayParserTests { Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "inboundGateway", 0); assertNotNull(componentHistoryRecord); assertEquals("jms:inbound-gateway", componentHistoryRecord.get("type")); - new MessagingTemplate((MessageChannel) message.getHeaders().getReplyChannel()).send(message); + GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); + messagingTemplate.setDefaultDestination((MessageChannel)message.getHeaders().getReplyChannel()); + messagingTemplate.send(message); } }; handler = spy(handler); diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests.java index 43063c67a4..4da43b38e7 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsPriorityTests.java @@ -29,10 +29,10 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.jms.listener.SessionAwareMessageListener; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests.java index 1968cc7eb9..25a96b9ddf 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsWithMarshallingMessageConverterTests.java @@ -31,10 +31,10 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.oxm.Marshaller; import org.springframework.oxm.Unmarshaller; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/TestJmsHeaderMapper.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/TestJmsHeaderMapper.java index 5129adaeee..47d0b01ec6 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/TestJmsHeaderMapper.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/TestJmsHeaderMapper.java @@ -21,7 +21,7 @@ import java.util.Map; import javax.jms.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.jms.JmsHeaderMapper; /** diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java index 88ccd133c8..56372d68bc 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithCachedConsumersTests.java @@ -121,7 +121,7 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti }); } }).start(); - org.springframework.integration.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); + org.springframework.messaging.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); assertEquals("bar", siReplyMessage.getPayload()); } finally { @@ -156,7 +156,7 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti }); } }).start(); - org.springframework.integration.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); + org.springframework.messaging.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); assertEquals("bar", siReplyMessage.getPayload()); } finally { @@ -191,7 +191,7 @@ public class RequestReplyScenariosWithCachedConsumersTests extends ActiveMQMulti }); } }).start(); - org.springframework.integration.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); + org.springframework.messaging.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); assertEquals("bar", siReplyMessage.getPayload()); } finally { diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java index 2b45147d00..99f4141f9a 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithNonCachedConsumersTests.java @@ -72,7 +72,7 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu }); } }).start(); - org.springframework.integration.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); + org.springframework.messaging.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); assertEquals("bar", siReplyMessage.getPayload()); } finally { @@ -105,7 +105,7 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu }); } }).start(); - org.springframework.integration.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); + org.springframework.messaging.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); assertEquals("bar", siReplyMessage.getPayload()); } finally { @@ -139,7 +139,7 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu }); } }).start(); - org.springframework.integration.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); + org.springframework.messaging.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); assertEquals("bar", siReplyMessage.getPayload()); } finally { @@ -173,7 +173,7 @@ public class RequestReplyScenariosWithNonCachedConsumersTests extends ActiveMQMu }); } }).start(); - org.springframework.integration.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); + org.springframework.messaging.Message siReplyMessage = gateway.exchange(new GenericMessage("foo")); assertEquals("bar", siReplyMessage.getPayload()); } finally { diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java index 3ba69e9aa6..c8ccc7ed37 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/request_reply/RequestReplyScenariosWithTempReplyQueuesTests.java @@ -40,7 +40,6 @@ import org.junit.Rule; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.gateway.RequestReplyExchanger; import org.springframework.integration.jms.ActiveMQMultiContextTests; import org.springframework.integration.jms.config.ActiveMqTestUtils; @@ -53,6 +52,7 @@ import org.springframework.jms.core.MessageCreator; import org.springframework.jms.listener.DefaultMessageListenerContainer; import org.springframework.jms.listener.SessionAwareMessageListener; import org.springframework.jms.support.converter.SimpleMessageConverter; +import org.springframework.messaging.MessageDeliveryException; /** * @author Oleg Zhurakousky * @author Gary Russell diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java index bd85df8e6a..e42041ef97 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/AttributePollingMessageSource.java @@ -20,7 +20,7 @@ import javax.management.MBeanServerConnection; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.AbstractMessageSource; import org.springframework.jmx.support.ObjectNameManager; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java index f110ab7b1e..e22b52fad0 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/DefaultNotificationMapper.java @@ -21,7 +21,7 @@ import java.util.concurrent.atomic.AtomicLong; import javax.management.Notification; import javax.management.ObjectName; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.util.Assert; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/MBeanTreePollingMessageSource.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/MBeanTreePollingMessageSource.java index 837e0df590..9e304731d4 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/MBeanTreePollingMessageSource.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/MBeanTreePollingMessageSource.java @@ -25,9 +25,9 @@ import javax.management.ObjectInstance; import javax.management.ObjectName; import javax.management.QueryExp; -import org.springframework.integration.MessagingException; import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.AbstractMessageSource; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; /** diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationListeningMessageProducer.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationListeningMessageProducer.java index 5abefc01f1..a8f5df28c7 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationListeningMessageProducer.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationListeningMessageProducer.java @@ -34,7 +34,7 @@ import javax.management.ObjectName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java index 550dbd34d9..3a52cbbb06 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/NotificationPublishingMessageHandler.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.ListableBeanFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.mapping.OutboundMessageMapper; import org.springframework.integration.monitor.IntegrationMBeanExporter; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java index 7b2232c304..d24e352adc 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/OperationInvokingMessageHandler.java @@ -32,12 +32,11 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.jmx.support.ObjectNameManager; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; @@ -63,172 +62,172 @@ import org.springframework.util.ObjectUtils; */ public class OperationInvokingMessageHandler extends AbstractReplyProducingMessageHandler implements InitializingBean { - private volatile MBeanServerConnection server; + private volatile MBeanServerConnection server; - private volatile ObjectName objectName; + private volatile ObjectName objectName; - private volatile String operationName; + private volatile String operationName; - /** - * Provide a reference to the MBeanServer within which the MBean - * target for operation invocation has been registered. - */ - public void setServer(MBeanServerConnection server) { - this.server = server; - } + /** + * Provide a reference to the MBeanServer within which the MBean + * target for operation invocation has been registered. + */ + public void setServer(MBeanServerConnection server) { + this.server = server; + } - /** - * Specify a default ObjectName to use when no such header is - * available on the Message being handled. - */ - public void setObjectName(String objectName) { - try { - if (objectName != null) { - this.objectName = ObjectNameManager.getInstance(objectName); - } - } - catch (MalformedObjectNameException e) { - throw new IllegalArgumentException(e); - } - } + /** + * Specify a default ObjectName to use when no such header is + * available on the Message being handled. + */ + public void setObjectName(String objectName) { + try { + if (objectName != null) { + this.objectName = ObjectNameManager.getInstance(objectName); + } + } + catch (MalformedObjectNameException e) { + throw new IllegalArgumentException(e); + } + } - /** - * Specify an operation name to be invoked when no such - * header is available on the Message being handled. - */ - public void setOperationName(String operationName) { - this.operationName = operationName; - } + /** + * Specify an operation name to be invoked when no such + * header is available on the Message being handled. + */ + public void setOperationName(String operationName) { + this.operationName = operationName; + } - @Override - public final void onInit() { - Assert.notNull(this.server, "MBeanServer is required."); - super.onInit(); - } + @Override + public final void onInit() { + Assert.notNull(this.server, "MBeanServer is required."); + super.onInit(); + } - @Override - protected Object handleRequestMessage(Message requestMessage) { - ObjectName objectName = this.resolveObjectName(requestMessage); - String operationName = this.resolveOperationName(requestMessage); - Map paramsFromMessage = this.resolveParameters(requestMessage); - try { - MBeanInfo mbeanInfo = this.server.getMBeanInfo(objectName); - MBeanOperationInfo[] opInfoArray = mbeanInfo.getOperations(); - boolean hasNoArgOption = false; - for (MBeanOperationInfo opInfo : opInfoArray) { - if (operationName.equals(opInfo.getName())) { - MBeanParameterInfo[] paramInfoArray = opInfo.getSignature(); - if (paramInfoArray.length == 0) { - hasNoArgOption = true; - } - if (paramInfoArray.length == paramsFromMessage.size()) { - int index = 0; - Object values[] = new Object[paramInfoArray.length]; - String signature[] = new String[paramInfoArray.length]; - for (MBeanParameterInfo paramInfo : paramInfoArray) { - Object value = paramsFromMessage.get(paramInfo.getName()); - if (value == null) { - /* - * With Spring 3.2.3 and greater, the parameter names are - * registered instead of the JVM's default p1, p2 etc. - * Fall back to that naming style if not found. - */ - value = paramsFromMessage.get("p" + (index + 1)); - } - if (value != null && value.getClass().getName().equals(paramInfo.getType())) { - values[index] = value; - signature[index] = paramInfo.getType(); - index++; - } - } - if (index == paramInfoArray.length) { - return this.server.invoke(objectName, operationName, values, signature); - } - } - } - } - if (hasNoArgOption) { - return this.server.invoke(objectName, operationName, null, null); - } - throw new MessagingException(requestMessage, "failed to find JMX operation '" - + operationName + "' on MBean [" + objectName + "] of type [" + mbeanInfo.getClassName() - + "] with " + paramsFromMessage.size() + " parameters: " + paramsFromMessage.keySet()); - } - catch (JMException e) { - throw new MessageHandlingException(requestMessage, "failed to invoke JMX operation '" + - operationName + "' on MBean [" + objectName + "]" + " with " + - paramsFromMessage.size() + " parameters: " + paramsFromMessage.keySet(), e); - } - catch (IOException e) { - throw new MessageHandlingException(requestMessage, "IOException on MBeanServerConnection", e); - } - } + @Override + protected Object handleRequestMessage(Message requestMessage) { + ObjectName objectName = this.resolveObjectName(requestMessage); + String operationName = this.resolveOperationName(requestMessage); + Map paramsFromMessage = this.resolveParameters(requestMessage); + try { + MBeanInfo mbeanInfo = this.server.getMBeanInfo(objectName); + MBeanOperationInfo[] opInfoArray = mbeanInfo.getOperations(); + boolean hasNoArgOption = false; + for (MBeanOperationInfo opInfo : opInfoArray) { + if (operationName.equals(opInfo.getName())) { + MBeanParameterInfo[] paramInfoArray = opInfo.getSignature(); + if (paramInfoArray.length == 0) { + hasNoArgOption = true; + } + if (paramInfoArray.length == paramsFromMessage.size()) { + int index = 0; + Object values[] = new Object[paramInfoArray.length]; + String signature[] = new String[paramInfoArray.length]; + for (MBeanParameterInfo paramInfo : paramInfoArray) { + Object value = paramsFromMessage.get(paramInfo.getName()); + if (value == null) { + /* + * With Spring 3.2.3 and greater, the parameter names are + * registered instead of the JVM's default p1, p2 etc. + * Fall back to that naming style if not found. + */ + value = paramsFromMessage.get("p" + (index + 1)); + } + if (value != null && value.getClass().getName().equals(paramInfo.getType())) { + values[index] = value; + signature[index] = paramInfo.getType(); + index++; + } + } + if (index == paramInfoArray.length) { + return this.server.invoke(objectName, operationName, values, signature); + } + } + } + } + if (hasNoArgOption) { + return this.server.invoke(objectName, operationName, null, null); + } + throw new MessagingException(requestMessage, "failed to find JMX operation '" + + operationName + "' on MBean [" + objectName + "] of type [" + mbeanInfo.getClassName() + + "] with " + paramsFromMessage.size() + " parameters: " + paramsFromMessage.keySet()); + } + catch (JMException e) { + throw new MessageHandlingException(requestMessage, "failed to invoke JMX operation '" + + operationName + "' on MBean [" + objectName + "]" + " with " + + paramsFromMessage.size() + " parameters: " + paramsFromMessage.keySet(), e); + } + catch (IOException e) { + throw new MessageHandlingException(requestMessage, "IOException on MBeanServerConnection", e); + } + } - /** - * First checks if defaultObjectName is set, otherwise falls back on {@link JmxHeaders#OBJECT_NAME} header. - */ - private ObjectName resolveObjectName(Message message) { - ObjectName objectName = this.objectName; - if (objectName == null){ - Object objectNameHeader = message.getHeaders().get(JmxHeaders.OBJECT_NAME); - if (objectNameHeader instanceof ObjectName) { - objectName = (ObjectName) objectNameHeader; - } - else if (objectNameHeader instanceof String) { - try { - objectName = ObjectNameManager.getInstance(objectNameHeader); - } - catch (MalformedObjectNameException e) { - throw new IllegalArgumentException(e); - } - } - } - Assert.notNull(objectName, "Failed to resolve ObjectName."); - return objectName; - } + /** + * First checks if defaultObjectName is set, otherwise falls back on {@link JmxHeaders#OBJECT_NAME} header. + */ + private ObjectName resolveObjectName(Message message) { + ObjectName objectName = this.objectName; + if (objectName == null){ + Object objectNameHeader = message.getHeaders().get(JmxHeaders.OBJECT_NAME); + if (objectNameHeader instanceof ObjectName) { + objectName = (ObjectName) objectNameHeader; + } + else if (objectNameHeader instanceof String) { + try { + objectName = ObjectNameManager.getInstance(objectNameHeader); + } + catch (MalformedObjectNameException e) { + throw new IllegalArgumentException(e); + } + } + } + Assert.notNull(objectName, "Failed to resolve ObjectName."); + return objectName; + } - /** - * First checks if defaultOperationName is set, otherwise falls back on {@link JmxHeaders#OPERATION_NAME} header. - */ - private String resolveOperationName(Message message) { - String operationName = this.operationName; - if (operationName == null){ - operationName = message.getHeaders().get(JmxHeaders.OPERATION_NAME, String.class); - } - Assert.notNull(operationName, "Failed to resolve operation name."); - return operationName; - } + /** + * First checks if defaultOperationName is set, otherwise falls back on {@link JmxHeaders#OPERATION_NAME} header. + */ + private String resolveOperationName(Message message) { + String operationName = this.operationName; + if (operationName == null){ + operationName = message.getHeaders().get(JmxHeaders.OPERATION_NAME, String.class); + } + Assert.notNull(operationName, "Failed to resolve operation name."); + return operationName; + } - @SuppressWarnings({ "unchecked", "rawtypes" }) - private Map resolveParameters(Message message) { - Map map = null; - if (message.getPayload() instanceof Map) { - map = (Map) message.getPayload(); - } - else if (message.getPayload() instanceof List) { - map = this.createParameterMapFromList((List) message.getPayload()); - } - else if (message.getPayload() != null && message.getPayload().getClass().isArray()) { - map = this.createParameterMapFromList( - Arrays.asList(ObjectUtils.toObjectArray(message.getPayload()))); - } - else if (message.getPayload() != null) { - map = this.createParameterMapFromList(Collections.singletonList(message.getPayload())); - } - else { - map = Collections.EMPTY_MAP; - } - return map; - } + @SuppressWarnings({ "unchecked", "rawtypes" }) + private Map resolveParameters(Message message) { + Map map = null; + if (message.getPayload() instanceof Map) { + map = (Map) message.getPayload(); + } + else if (message.getPayload() instanceof List) { + map = this.createParameterMapFromList((List) message.getPayload()); + } + else if (message.getPayload() != null && message.getPayload().getClass().isArray()) { + map = this.createParameterMapFromList( + Arrays.asList(ObjectUtils.toObjectArray(message.getPayload()))); + } + else if (message.getPayload() != null) { + map = this.createParameterMapFromList(Collections.singletonList(message.getPayload())); + } + else { + map = Collections.EMPTY_MAP; + } + return map; + } - @SuppressWarnings("rawtypes") - private Map createParameterMapFromList(List parameters) { - Map map = new HashMap(); - for (int i = 0; i < parameters.size(); i++) { - map.put("p" + (i + 1), parameters.get(i)); - } - return map; - } + @SuppressWarnings("rawtypes") + private Map createParameterMapFromList(List parameters) { + Map map = new HashMap(); + for (int i = 0; i < parameters.size(); i++) { + map.put("p" + (i + 1), parameters.get(i)); + } + return map; + } -} +} \ No newline at end of file diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/package-info.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/package-info.java index 4ccdbb0467..754d3c1227 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/package-info.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.jmx.config; \ No newline at end of file +package org.springframework.integration.jmx.config; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/package-info.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/package-info.java index deda0fbdef..0436f7d0d8 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/package-info.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/package-info.java @@ -1,4 +1,4 @@ /** * Base package for JMX support. */ -package org.springframework.integration.jmx; \ No newline at end of file +package org.springframework.integration.jmx; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/DirectChannelMetrics.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/DirectChannelMetrics.java index a9401fb370..319396e12d 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/DirectChannelMetrics.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/DirectChannelMetrics.java @@ -19,8 +19,8 @@ import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.util.StopWatch; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java index dcf5433cab..2365ccf5d8 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/IntegrationMBeanExporter.java @@ -56,13 +56,13 @@ import org.springframework.context.ApplicationContextAware; import org.springframework.context.Lifecycle; import org.springframework.context.SmartLifecycle; import org.springframework.core.task.support.ExecutorServiceAdapter; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.context.OrderlyShutdownCapable; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.core.MessageSource; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.support.context.NamedComponent; import org.springframework.jmx.export.MBeanExporter; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/PollableChannelMetrics.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/PollableChannelMetrics.java index c3538e240f..5d216be0e2 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/PollableChannelMetrics.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/PollableChannelMetrics.java @@ -19,7 +19,7 @@ package org.springframework.integration.monitor; import java.util.concurrent.atomic.AtomicInteger; import org.aopalliance.intercept.MethodInvocation; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.jmx.export.annotation.ManagedMetric; import org.springframework.jmx.export.annotation.ManagedOperation; import org.springframework.jmx.support.MetricType; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/SimpleMessageHandlerMetrics.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/SimpleMessageHandlerMetrics.java index 8f9875f1d9..67c3410693 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/SimpleMessageHandlerMetrics.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/SimpleMessageHandlerMetrics.java @@ -22,8 +22,8 @@ import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.jmx.export.annotation.ManagedResource; import org.springframework.util.StopWatch; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/package-info.java b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/package-info.java index 5f8b51f427..6f0a93778f 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/package-info.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/monitor/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to Spring Integration managed resources. */ -package org.springframework.integration.monitor; \ No newline at end of file +package org.springframework.integration.monitor; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/AttributePollingMessageSourceTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/AttributePollingMessageSourceTests.java index 450bd049e3..0415483f2f 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/AttributePollingMessageSourceTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/AttributePollingMessageSourceTests.java @@ -26,7 +26,7 @@ import javax.management.MBeanServer; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.jmx.support.MBeanServerFactoryBean; import org.springframework.jmx.support.ObjectNameManager; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java index 2692ab4ddc..f328b2131d 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/MBeanAttributeFilterTests.java @@ -25,12 +25,11 @@ import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.java index 4f46e8fc11..131223b33e 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.java @@ -32,7 +32,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.jmx.export.MBeanExporter; import org.springframework.jmx.export.notification.NotificationPublisher; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java index ee1a4dd503..a9c21ac444 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationPublishingMessageHandlerTests.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.StaticApplicationContext; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.jmx.export.MBeanExporter; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.java index 0b37d8b0ff..7048038452 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/OperationInvokingMessageHandlerTests.java @@ -30,8 +30,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.jmx.config.DynamicRouterTests; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests.java index 91b60ae712..e6e77b156e 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/UpdateMappingsTests.java @@ -20,9 +20,9 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests.java index 11229ce02c..2822822323 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/AttributePollingChannelAdapterParserTests.java @@ -24,9 +24,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java index 6c416c9d00..faef2b7b20 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/ControlBusParserTests.java @@ -1,11 +1,11 @@ /* * Copyright 2002-2010 the original author or authors. - * + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the * specific language governing permissions and limitations under the License. @@ -19,9 +19,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.jmx.export.MBeanExporter; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -39,7 +39,7 @@ public class ControlBusParserTests { @Test public void testControlMessageToChannelMetrics() throws InterruptedException { MessageChannel control = this.context.getBean("controlChannel", MessageChannel.class); - MessagingTemplate messagingTemplate = new MessagingTemplate(); + GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); Object value = messagingTemplate.convertSendAndReceive(control, "@integrationMbeanExporter.getChannelSendRate('testChannel').count"); assertEquals(new Integer(0), value); diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java index ac565a96c0..d422c18ddc 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/DynamicRouterTests.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.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParserTests.java index 2cd2531585..71c0c05469 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MBeanTreePollingChannelAdapterParserTests.java @@ -30,14 +30,13 @@ import javax.management.QueryExp; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.jmx.MBeanObjectConverter; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests.java index 67df132ba0..d650c87bf8 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/MethodInvokerTests.java @@ -23,11 +23,11 @@ import javax.management.ObjectName; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java index 596e025125..68e42f91b6 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationListeningChannelAdapterParserTests.java @@ -28,9 +28,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.jmx.NotificationListeningMessageProducer; import org.springframework.integration.test.util.TestUtils; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java index af0a1522aa..cbfe80a0d3 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java @@ -32,9 +32,9 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jmx.JmxHeaders; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java index defee9cbb7..605eac0665 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingChannelAdapterParserTests.java @@ -24,9 +24,9 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jmx.JmxHeaders; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java index 618b54175c..840d12015d 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/OperationInvokingOutboundGatewayTests.java @@ -24,12 +24,13 @@ import java.util.List; import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jmx.OperationInvokingMessageHandler; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PriorityChannelTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PriorityChannelTests.java index d4524d4a63..429573dba8 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PriorityChannelTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/PriorityChannelTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.integration.channel.QueueChannelOperations; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests.java index 72133ba6c9..6f2cbcff12 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/ChannelIntegrationTests.java @@ -18,8 +18,8 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/HandlerMonitoringIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/HandlerMonitoringIntegrationTests.java index 8c4e52517f..5f9e8a8cca 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/HandlerMonitoringIntegrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/HandlerMonitoringIntegrationTests.java @@ -24,7 +24,7 @@ import org.aspectj.lang.annotation.Before; import org.junit.Test; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.message.GenericMessage; public class HandlerMonitoringIntegrationTests { diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java index 2532dd7fa5..ade50b1655 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MBeanExporterIntegrationTests.java @@ -32,8 +32,8 @@ import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.Lifecycle; import org.springframework.context.support.GenericXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.context.OrderlyShutdownCapable; import org.springframework.integration.endpoint.AbstractEndpoint; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageChannelsMonitorIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageChannelsMonitorIntegrationTests.java index 85c26bc9ae..0fb6a4e44d 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageChannelsMonitorIntegrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageChannelsMonitorIntegrationTests.java @@ -26,8 +26,8 @@ import org.junit.Test; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageMetricsAdviceTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageMetricsAdviceTests.java index 7d5d01c994..f9a169456d 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageMetricsAdviceTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageMetricsAdviceTests.java @@ -12,11 +12,11 @@ import org.springframework.aop.framework.Advised; import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.support.NameMatchMethodPointcutAdvisor; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.NullChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.monitor.IntegrationMBeanExporter; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.ClassUtils; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceMonitoringIntegrationTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceMonitoringIntegrationTests.java index d0d780bb16..38c2082a1d 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceMonitoringIntegrationTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/MessageSourceMonitoringIntegrationTests.java @@ -17,7 +17,7 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; public class MessageSourceMonitoringIntegrationTests { diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/RemoteMBeanServerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/RemoteMBeanServerTests.java index 0abe1d65bc..ea02b6eebb 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/RemoteMBeanServerTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/monitor/RemoteMBeanServerTests.java @@ -24,9 +24,9 @@ import javax.management.Notification; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/package-info.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/package-info.java index 6b8aded2ce..272125bbe2 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/package-info.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/config/xml/package-info.java @@ -1,4 +1,4 @@ /** * Provides parser classes to provide Xml namespace support for the Jpa components. */ -package org.springframework.integration.jpa.config.xml; \ No newline at end of file +package org.springframework.integration.jpa.config.xml; diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java index 204e348046..df11035a3b 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/JpaExecutor.java @@ -28,8 +28,6 @@ import org.springframework.beans.factory.InitializingBean; import org.springframework.expression.EvaluationContext; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; import org.springframework.integration.expression.IntegrationEvaluationContextAware; import org.springframework.integration.jpa.support.JpaParameter; import org.springframework.integration.jpa.support.PersistMode; @@ -37,6 +35,8 @@ import org.springframework.integration.jpa.support.parametersource.BeanPropertyP import org.springframework.integration.jpa.support.parametersource.ExpressionEvaluatingParameterSourceFactory; import org.springframework.integration.jpa.support.parametersource.ParameterSource; import org.springframework.integration.jpa.support.parametersource.ParameterSourceFactory; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; /** diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/package-info.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/package-info.java index bd2ad18331..f5d170d3b6 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/package-info.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/core/package-info.java @@ -1,4 +1,4 @@ /** * Provides core classes of the JPA module. */ -package org.springframework.integration.jpa.core; \ No newline at end of file +package org.springframework.integration.jpa.core; diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapter.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapter.java index 2fd8697061..587728d1e2 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapter.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapter.java @@ -15,7 +15,7 @@ */ package org.springframework.integration.jpa.inbound; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; import org.springframework.integration.jpa.core.JpaExecutor; diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/package-info.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/package-info.java index f7b85c32a5..878e0a1833 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/package-info.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides inbound Spring Integration Jpa components. */ -package org.springframework.integration.jpa.inbound; \ No newline at end of file +package org.springframework.integration.jpa.inbound; diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGateway.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGateway.java index d6b01970ad..fa75e85832 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGateway.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGateway.java @@ -16,7 +16,7 @@ package org.springframework.integration.jpa.outbound; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.jpa.core.JpaExecutor; import org.springframework.integration.jpa.support.OutboundGatewayType; diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayFactoryBean.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayFactoryBean.java index 193008a355..e3aec65b34 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayFactoryBean.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayFactoryBean.java @@ -23,8 +23,8 @@ import org.aopalliance.aop.Advice; import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.config.AbstractFactoryBean; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.jpa.core.JpaExecutor; import org.springframework.integration.jpa.support.OutboundGatewayType; import org.springframework.transaction.interceptor.TransactionInterceptor; diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/package-info.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/package-info.java index a4e8ef5489..ddef4cbaa6 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/package-info.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/outbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides Spring Integration components for doing outbound operations. */ -package org.springframework.integration.jpa.outbound; \ No newline at end of file +package org.springframework.integration.jpa.outbound; diff --git a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/package-info.java b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/package-info.java index 1102b80178..2f6ad82524 100644 --- a/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/package-info.java +++ b/spring-integration-jpa/src/main/java/org/springframework/integration/jpa/package-info.java @@ -1,4 +1,4 @@ /** * Root package of the JPA Module. */ -package org.springframework.integration.jpa; \ No newline at end of file +package org.springframework.integration.jpa; diff --git a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd index f6c8b30c03..117e15ae66 100644 --- a/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd +++ b/spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd @@ -148,7 +148,7 @@ to be executed. - + diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaMessageHandlerParserTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaMessageHandlerParserTests.java index 78e7df421f..256420bc48 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaMessageHandlerParserTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaMessageHandlerParserTests.java @@ -24,9 +24,9 @@ import org.junit.After; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.AbstractMessageChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.jpa.core.JpaExecutor; diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java index 776ec14df2..31165a6f9a 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/config/xml/JpaOutboundGatewayParserTests.java @@ -29,10 +29,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpression; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; import org.springframework.integration.channel.AbstractMessageChannel; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.ReplyRequiredException; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; @@ -43,6 +40,10 @@ import org.springframework.integration.jpa.support.OutboundGatewayType; import org.springframework.integration.jpa.support.PersistMode; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; + /** * @author Gunnar Hillert diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java index 0012eaddf6..1c18d64411 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/core/JpaExecutorTests.java @@ -28,12 +28,12 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; import org.springframework.integration.jpa.support.JpaParameter; import org.springframework.integration.jpa.support.parametersource.ExpressionEvaluatingParameterSourceFactory; import org.springframework.integration.jpa.test.entity.StudentDomain; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.transaction.annotation.Transactional; @@ -273,4 +273,5 @@ public class JpaExecutorTests { } Assert.fail("Expected the test case to throw an exception"); } -} \ No newline at end of file + +} diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterTests.java index b427336156..3551abcc6d 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterTests.java @@ -34,8 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.support.GenericApplicationContext; import org.springframework.expression.common.LiteralExpression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.jpa.core.JpaExecutor; import org.springframework.integration.jpa.core.JpaOperations; @@ -44,6 +42,8 @@ import org.springframework.integration.jpa.test.JpaTestUtils; import org.springframework.integration.jpa.test.TestTrigger; import org.springframework.integration.jpa.test.entity.StudentDomain; import org.springframework.integration.scheduling.PollerMetadata; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.test.annotation.DirtiesContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTests.java index e76e4f92d0..709313194c 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTests.java @@ -22,8 +22,8 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.jpa.core.JpaExecutor; import org.springframework.integration.jpa.support.PersistMode; import org.springframework.integration.jpa.test.JpaTestUtils; diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTransactionalTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTransactionalTests.java index ff1fe35442..25d5a0b68e 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTransactionalTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundChannelAdapterTransactionalTests.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.jpa.test.JpaTestUtils; import org.springframework.integration.jpa.test.entity.StudentDomain; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java index d1e9f6e891..3d6a2f5902 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayIntegrationTests.java @@ -24,11 +24,11 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayTests.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayTests.java index fb5f2c88fc..0c7fbc0da9 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayTests.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/outbound/JpaOutboundGatewayTests.java @@ -20,7 +20,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.jpa.test.JpaTestUtils; import org.springframework.integration.jpa.test.entity.StudentDomain; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/Consumer.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/Consumer.java index 2b5eabf59e..c4c85be6ce 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/Consumer.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/Consumer.java @@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * diff --git a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/JpaTestUtils.java b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/JpaTestUtils.java index 80d2f8087a..ef79082b4b 100644 --- a/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/JpaTestUtils.java +++ b/spring-integration-jpa/src/test/java/org/springframework/integration/jpa/test/JpaTestUtils.java @@ -16,7 +16,7 @@ import java.util.Calendar; import java.util.Date; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.config.SourcePollingChannelAdapterFactoryBean; import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java index 99dfbff6be..d91e3a8f05 100755 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/AbstractMailReceiver.java @@ -416,7 +416,7 @@ public abstract class AbstractMailReceiver extends IntegrationObjectSupport impl return AbstractMailReceiver.this.obtainFolderInstance(); } catch (MessagingException e) { - throw new org.springframework.integration.MessagingException("Unable to obtain the mail folder", e); + throw new org.springframework.messaging.MessagingException("Unable to obtain the mail folder", e); } } diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java index edaea1c456..f678f75810 100755 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/ImapIdleChannelAdapter.java @@ -230,7 +230,7 @@ public class ImapIdleChannelAdapter extends MessageProducerSupport implements Be "Failure in 'idle' task. Will resubmit.", e); } else { - throw new org.springframework.integration.MessagingException( + throw new org.springframework.messaging.MessagingException( "Failure in 'idle' task. Will NOT resubmit.", e); } } @@ -240,7 +240,7 @@ public class ImapIdleChannelAdapter extends MessageProducerSupport implements Be private Runnable createMessageSendingTask(final Message mailMessage){ Runnable sendingTask = new Runnable() { public void run() { - org.springframework.integration.Message message = + org.springframework.messaging.Message message = MessageBuilder.withPayload(mailMessage).build(); if (TransactionSynchronizationManager.isActualTransactionActive()) { diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java index f1210f9062..d35686b301 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailReceivingMessageSource.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.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.core.MessageSource; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java index 81641098b9..552b6a245e 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailSendingMessageHandler.java @@ -20,10 +20,10 @@ import javax.mail.MessagingException; import javax.mail.internet.MimeMessage; import org.springframework.core.io.ByteArrayResource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.mapping.MessageMappingException; import org.springframework.mail.MailMessage; @@ -119,7 +119,7 @@ public class MailSendingMessageHandler extends AbstractMessageHandler { return new MimeMailMessage(mimeMessage); } catch (Exception e) { - throw new org.springframework.integration.MessagingException("Failed to creaet MimeMessage with contentType: " + + throw new org.springframework.messaging.MessagingException("Failed to creaet MimeMessage with contentType: " + contentType, e); } } diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/package-info.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/package-info.java index e91db0da03..e425b6f6f3 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/package-info.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.mail.config; \ No newline at end of file +package org.springframework.integration.mail.config; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/package-info.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/package-info.java index 520d77f613..7e4b1b0e8e 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/package-info.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/package-info.java @@ -1,4 +1,4 @@ /** * Base package for Mail support. */ -package org.springframework.integration.mail; \ No newline at end of file +package org.springframework.integration.mail; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java index 4feff16ab8..8b85bfd25e 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/transformer/AbstractMailMessageTransformer.java @@ -25,8 +25,8 @@ import javax.mail.Message.RecipientType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.mail.MailHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.MessageTransformationException; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/transformer/package-info.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/transformer/package-info.java index b36b099532..ec8b5ff597 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/transformer/package-info.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/transformer/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to transforming mail messages. */ -package org.springframework.integration.mail.transformer; \ No newline at end of file +package org.springframework.integration.mail.transformer; diff --git a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd index e12ed0c318..b2c1baf690 100644 --- a/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd +++ b/spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd @@ -123,7 +123,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -329,7 +329,7 @@ - + @@ -338,7 +338,7 @@ - + diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java index b69634a8cd..66428f4aaa 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/ImapMailReceiverTests.java @@ -66,7 +66,7 @@ import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.mail.ImapIdleChannelAdapter.ImapIdleExceptionEvent; @@ -389,7 +389,7 @@ public class ImapMailReceiverTests { PollableChannel channel = context.getBean("channel", PollableChannel.class); adapter.start(); - org.springframework.integration.Message replMessage = channel.receive(10000); + org.springframework.messaging.Message replMessage = channel.receive(10000); MessageHistory history = MessageHistory.read(replMessage); assertNotNull(history); Properties componentHistoryRecord = TestUtils.locateComponentInHistory(history, "simpleAdapter", 0); @@ -411,7 +411,7 @@ public class ImapMailReceiverTests { DirectChannel channel = new DirectChannel(); channel.subscribe(new AbstractReplyProducingMessageHandler() { @Override - protected Object handleRequestMessage(org.springframework.integration.Message requestMessage) { + protected Object handleRequestMessage(org.springframework.messaging.Message requestMessage) { throw new RuntimeException("Failed"); } }); @@ -463,7 +463,7 @@ public class ImapMailReceiverTests { }).when(receiver).fetchMessages(messages); adapter.start(); - org.springframework.integration.Message replMessage = errorChannel.receive(10000); + org.springframework.messaging.Message replMessage = errorChannel.receive(10000); assertNotNull(replMessage); assertEquals("Failed", ((Exception) replMessage.getPayload()).getCause().getMessage()); adapter.stop(); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java index befd1255be..6d26c05d0e 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerContextTests.java @@ -34,7 +34,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.mapping.MessageMappingException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; @@ -84,7 +84,7 @@ public class MailSendingMessageHandlerContextTests { @Test public void byteArrayMessage() throws Exception { byte[] payload = {1, 2, 3}; - org.springframework.integration.Message message = + org.springframework.messaging.Message message = MessageBuilder.withPayload(payload) .setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt") .setHeader(MailHeaders.TO, MailTestsHelper.TO) diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java index 144abccac5..43d9011bf7 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailSendingMessageHandlerTests.java @@ -72,7 +72,7 @@ public class MailSendingMessageHandlerTests { @Test public void byteArrayMessage() throws Exception { byte[] payload = {1, 2, 3}; - org.springframework.integration.Message message = + org.springframework.messaging.Message message = MessageBuilder.withPayload(payload) .setHeader(MailHeaders.ATTACHMENT_FILENAME, "attachment.txt") .setHeader(MailHeaders.TO, MailTestsHelper.TO) diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java index 0817d45ac4..89e1d9f6f4 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/MailTestsHelper.java @@ -20,7 +20,7 @@ import static org.mockito.Mockito.mock; import javax.mail.Folder; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.mail.MailReceiver.MailReceiverContext; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java index 2ab4873b6e..a5efaf7bd0 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/ImapIdleChannelAdapterParserTests.java @@ -34,7 +34,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.mail.ImapIdleChannelAdapter; import org.springframework.integration.mail.ImapMailReceiver; import org.springframework.integration.mail.SearchTermStrategy; diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests.java index c6a5931ac8..af35d96184 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/InboundChannelAdapterParserTests.java @@ -37,7 +37,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.mail.AbstractMailReceiver; import org.springframework.integration.mail.ImapIdleChannelAdapter; diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java index 8b0cb229eb..21236ce3b9 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailHeaderEnricherTests.java @@ -22,14 +22,13 @@ import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.mail.MailHeaders; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -48,7 +47,8 @@ public class MailHeaderEnricherTests { @Test public void literalValues() { - MessagingTemplate template = new MessagingTemplate(literalValuesInput); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination(literalValuesInput); Message result = template.sendAndReceive(new GenericMessage("test")); Map headers = result.getHeaders(); assertEquals("test.to", headers.get(MailHeaders.TO)); @@ -63,7 +63,8 @@ public class MailHeaderEnricherTests { @Test public void expressions() { - MessagingTemplate template = new MessagingTemplate(expressionsInput); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination(expressionsInput); Message result = template.sendAndReceive(new GenericMessage("foo")); Map headers = result.getHeaders(); assertEquals("foo.to", headers.get(MailHeaders.TO)); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java index 1b469dc542..a9dc83555e 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailOutboundChannelAdapterParserTests.java @@ -25,9 +25,9 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.mail.MailSendingMessageHandler; diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java index 43f689404a..fb557dc6e1 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MailToStringTransformerParserTests.java @@ -24,14 +24,13 @@ import javax.mail.internet.MimeMessage; import org.easymock.classextension.EasyMock; import org.junit.Test; - import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; /** * @author Mark Fisher @@ -42,8 +41,8 @@ public class MailToStringTransformerParserTests { public void topLevelTransformer() throws Exception { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "mailToStringTransformerParserTests.xml", this.getClass()); - MessageChannel input = new BeanFactoryChannelResolver(context).resolveChannelName("input"); - PollableChannel output = (PollableChannel) new BeanFactoryChannelResolver(context).resolveChannelName("output"); + MessageChannel input = new BeanFactoryMessageChannelDestinationResolver(context).resolveDestination("input"); + PollableChannel output = (PollableChannel) new BeanFactoryMessageChannelDestinationResolver(context).resolveDestination("output"); MimeMessage mimeMessage = EasyMock.createNiceMock(MimeMessage.class); EasyMock.expect(mimeMessage.getContent()).andReturn("hello"); EasyMock.replay(mimeMessage); @@ -58,8 +57,8 @@ public class MailToStringTransformerParserTests { public void transformerWithinChain() throws Exception { ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( "mailToStringTransformerWithinChain.xml", this.getClass()); - MessageChannel input = new BeanFactoryChannelResolver(context).resolveChannelName("input"); - PollableChannel output = (PollableChannel) new BeanFactoryChannelResolver(context).resolveChannelName("output"); + MessageChannel input = new BeanFactoryMessageChannelDestinationResolver(context).resolveDestination("input"); + PollableChannel output = (PollableChannel) new BeanFactoryMessageChannelDestinationResolver(context).resolveDestination("output"); MimeMessage mimeMessage = EasyMock.createNiceMock(MimeMessage.class); EasyMock.expect(mimeMessage.getContent()).andReturn("foo"); EasyMock.replay(mimeMessage); diff --git a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java index 8b0b9d5953..24e341c79b 100644 --- a/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java +++ b/spring-integration-mail/src/test/java/org/springframework/integration/mail/config/MessageWithContentTypeTests.java @@ -37,8 +37,8 @@ import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.mail.MailHeaders; import org.springframework.integration.mail.MailSendingMessageHandler; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbNamespaceHandler.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbNamespaceHandler.java index e5ff963b5d..b43acd1e14 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbNamespaceHandler.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbNamespaceHandler.java @@ -31,4 +31,4 @@ public class MongoDbNamespaceHandler extends AbstractIntegrationNamespaceHandler registerBeanDefinitionParser("inbound-channel-adapter", new MongoDbInboundChannelAdapterParser()); registerBeanDefinitionParser("outbound-channel-adapter", new MongoDbOutboundChannelAdapterParser()); } -} \ No newline at end of file +} diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParser.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParser.java index cfa509c9ca..eb0d774c20 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParser.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParser.java @@ -40,4 +40,4 @@ public class MongoDbOutboundChannelAdapterParser extends AbstractOutboundChannel return builder.getBeanDefinition(); } -} \ No newline at end of file +} diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/package-info.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/package-info.java index 682a467d53..2369ec7323 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/package-info.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/config/package-info.java @@ -1,4 +1,4 @@ /** * Contains parser classes for the MongoDb namespace support. */ -package org.springframework.integration.mongodb.config; \ No newline at end of file +package org.springframework.integration.mongodb.config; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java index c8d8c5bfca..ae55228062 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/MongoDbMessageSource.java @@ -26,7 +26,7 @@ import org.springframework.data.mongodb.core.query.Query; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; import org.springframework.integration.expression.ExpressionUtils; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/package-info.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/package-info.java index d76784f51e..cb8912f4db 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/package-info.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to the Mongo inbound channel adapters */ -package org.springframework.integration.mongodb.inbound; \ No newline at end of file +package org.springframework.integration.mongodb.inbound; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java index f111c35c97..11b015be09 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandler.java @@ -22,8 +22,8 @@ import org.springframework.data.mongodb.core.convert.MongoConverter; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.util.Assert; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/package-info.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/package-info.java index 76f94d97ab..64a9f6806d 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/package-info.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/outbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to the Mongo outbound channel adapters */ -package org.springframework.integration.mongodb.outbound; \ No newline at end of file +package org.springframework.integration.mongodb.outbound; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java index 083dbb3283..6465efbf1c 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/MongoDbMessageStore.java @@ -45,8 +45,8 @@ import org.springframework.data.mongodb.core.mapping.MongoPersistentEntity; import org.springframework.data.mongodb.core.mapping.MongoPersistentProperty; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.store.AbstractMessageGroupStore; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/package-info.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/package-info.java index 60cd57b799..dfab2b9b86 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/package-info.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/store/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to the MongoDB message store. */ -package org.springframework.integration.mongodb.store; \ No newline at end of file +package org.springframework.integration.mongodb.store; diff --git a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/support/package-info.java b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/support/package-info.java index fa8441666b..8004b4c31a 100644 --- a/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/support/package-info.java +++ b/spring-integration-mongodb/src/main/java/org/springframework/integration/mongodb/support/package-info.java @@ -1,4 +1,4 @@ /** * Provides supporting classes for this module. */ -package org.springframework.integration.mongodb.support; \ No newline at end of file +package org.springframework.integration.mongodb.support; diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterIntegrationTests.java index 7fb3d045a8..32d143b9d0 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbInboundChannelAdapterIntegrationTests.java @@ -29,7 +29,7 @@ import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.data.mongodb.core.MongoOperations; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.BasicQuery; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.mongodb.rules.MongoDbAvailable; diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterIntegrationTests.java index ccfb3491bf..f49cd8c335 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterIntegrationTests.java @@ -23,8 +23,8 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.data.mongodb.core.query.BasicQuery; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.mongodb.rules.MongoDbAvailable; import org.springframework.integration.mongodb.rules.MongoDbAvailableTests; diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParserTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParserTests.java index dd256ca09b..428933117a 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParserTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/config/MongoDbOutboundChannelAdapterParserTests.java @@ -31,12 +31,12 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpression; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.advice.RequestHandlerRetryAdvice; import org.springframework.integration.mongodb.outbound.MongoDbStoringMessageHandler; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.MessageHandler; /** * @author Oleg Zhurakousky * @author Artem Bilan diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java index 99982c0607..5a8d06de22 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/outbound/MongoDbStoringMessageHandlerTests.java @@ -30,7 +30,7 @@ import org.springframework.data.mongodb.core.mapping.MongoMappingContext; import org.springframework.data.mongodb.core.query.BasicQuery; import org.springframework.data.mongodb.core.query.Query; import org.springframework.expression.common.LiteralExpression; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.mongodb.rules.MongoDbAvailable; import org.springframework.integration.mongodb.rules.MongoDbAvailableTests; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests.java index 87a7637d26..1ae1c87a48 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/DelayerHandlerRescheduleIntegrationTests.java @@ -23,17 +23,13 @@ import static org.junit.Assert.fail; import java.util.Iterator; import java.util.concurrent.TimeUnit; +import org.hamcrest.Matchers; import org.junit.Rule; import org.junit.Test; -import org.hamcrest.Matchers; - import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.handler.DelayHandler; import org.springframework.integration.mongodb.rules.MongoDbAvailable; import org.springframework.integration.mongodb.rules.MongoDbAvailableTests; @@ -41,6 +37,9 @@ import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.support.LongRunningIntegrationTest; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; /** diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageGroupStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageGroupStoreTests.java index 2cf1e06c37..0a3a9de3b9 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageGroupStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageGroupStoreTests.java @@ -29,8 +29,8 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.mongodb.MongoDbFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java index c67d3bb70c..95271f4c92 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreClaimCheckIntegrationTests.java @@ -19,7 +19,7 @@ package org.springframework.integration.mongodb.store; import org.junit.Test; import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.data.mongodb.core.SimpleMongoDbFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.mongodb.rules.MongoDbAvailable; import org.springframework.integration.mongodb.rules.MongoDbAvailableTests; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java index d42ddb2b8f..94aee37012 100644 --- a/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java +++ b/spring-integration-mongodb/src/test/java/org/springframework/integration/mongodb/store/MongoDbMessageStoreTests.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.springframework.data.mongodb.MongoDbFactory; import org.springframework.data.mongodb.core.SimpleMongoDbFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.mongodb.rules.MongoDbAvailable; diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java index c28ea42f53..714e06e8ea 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/SubscribableRedisChannel.java @@ -29,19 +29,19 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -import org.springframework.integration.Message; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageDispatchingException; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.channel.MessagePublishingErrorHandler; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.dispatcher.AbstractDispatcher; import org.springframework.integration.dispatcher.BroadcastingDispatcher; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; -import org.springframework.integration.support.converter.MessageConverter; import org.springframework.integration.support.converter.SimpleMessageConverter; import org.springframework.integration.util.ErrorHandlingTaskExecutor; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; +import org.springframework.messaging.support.converter.MessageConverter; import org.springframework.util.Assert; import org.springframework.util.ErrorHandler; import org.springframework.util.StringUtils; @@ -108,9 +108,10 @@ public class SubscribableRedisChannel extends AbstractMessageChannel implements return this.dispatcher.removeHandler(handler); } + @SuppressWarnings("unchecked") @Override protected boolean doSend(Message message, long arg1) { - this.redisTemplate.convertAndSend(this.topicName, this.messageConverter.fromMessage(message)); + this.redisTemplate.convertAndSend(this.topicName, this.messageConverter.fromMessage(message, Object.class)); return true; } @@ -126,7 +127,7 @@ public class SubscribableRedisChannel extends AbstractMessageChannel implements this.container.setConnectionFactory(connectionFactory); if (!(this.taskExecutor instanceof ErrorHandlingTaskExecutor)) { ErrorHandler errorHandler = new MessagePublishingErrorHandler( - new BeanFactoryChannelResolver(this.getBeanFactory())); + new BeanFactoryMessageChannelDestinationResolver(this.getBeanFactory())); this.taskExecutor = new ErrorHandlingTaskExecutor(this.taskExecutor, errorHandler); } this.container.setTaskExecutor(this.taskExecutor); @@ -180,7 +181,7 @@ public class SubscribableRedisChannel extends AbstractMessageChannel implements private class MessageListenerDelegate { - @SuppressWarnings("unused") + @SuppressWarnings({ "unused", "unchecked" }) public void handleMessage(String s) { Message siMessage = messageConverter.toMessage(s); try { diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/package-info.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/package-info.java index 76b75e3b77..b305fd18c4 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/package-info.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/channel/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to Redis-backed channels. */ -package org.springframework.integration.redis.channel; \ No newline at end of file +package org.springframework.integration.redis.channel; diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisNamespaceHandler.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisNamespaceHandler.java index 6877708810..834863fee4 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisNamespaceHandler.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/RedisNamespaceHandler.java @@ -32,4 +32,4 @@ public class RedisNamespaceHandler extends AbstractIntegrationNamespaceHandler { registerBeanDefinitionParser("store-outbound-channel-adapter", new RedisStoreOutboundChannelAdapterParser()); registerBeanDefinitionParser("outbound-channel-adapter", new RedisOutboundChannelAdapterParser()); } -} \ No newline at end of file +} diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/package-info.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/package-info.java index c6d9d3d593..1e3fb19176 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/package-info.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.redis.config; \ No newline at end of file +package org.springframework.integration.redis.config; diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapter.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapter.java index 0fc7eb78be..5ded53e7c8 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapter.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapter.java @@ -25,10 +25,10 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -import org.springframework.integration.Message; import org.springframework.integration.endpoint.MessageProducerSupport; -import org.springframework.integration.support.converter.MessageConverter; import org.springframework.integration.support.converter.SimpleMessageConverter; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.converter.MessageConverter; import org.springframework.util.Assert; /** @@ -36,6 +36,7 @@ import org.springframework.util.Assert; * @author Oleg Zhurakousky * @since 2.1 */ +@SuppressWarnings("rawtypes") public class RedisInboundChannelAdapter extends MessageProducerSupport { private final RedisMessageListenerContainer container = new RedisMessageListenerContainer(); @@ -99,6 +100,7 @@ public class RedisInboundChannelAdapter extends MessageProducerSupport { this.container.stop(); } + @SuppressWarnings("unchecked") private Message convertMessage(String s) { return this.messageConverter.toMessage(s); } diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisStoreMessageSource.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisStoreMessageSource.java index 89b3a67f39..b7e01482c3 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisStoreMessageSource.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/RedisStoreMessageSource.java @@ -27,7 +27,7 @@ import org.springframework.data.redis.support.collections.RedisCollectionFactory import org.springframework.data.redis.support.collections.RedisStore; import org.springframework.expression.Expression; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; import org.springframework.integration.expression.ExpressionUtils; diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/package-info.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/package-info.java index 6b2e2c3dc7..65e2c5e227 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/package-info.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting inbound endpoints. */ -package org.springframework.integration.redis.inbound; \ No newline at end of file +package org.springframework.integration.redis.inbound; diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java index 731e54265b..2c5baa8bf1 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisPublishingMessageHandler.java @@ -20,16 +20,17 @@ import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.serializer.RedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -import org.springframework.integration.Message; import org.springframework.integration.handler.AbstractMessageHandler; -import org.springframework.integration.support.converter.MessageConverter; import org.springframework.integration.support.converter.SimpleMessageConverter; +import org.springframework.messaging.Message; +import org.springframework.messaging.support.converter.MessageConverter; import org.springframework.util.Assert; /** * @author Mark Fisher * @since 2.1 */ +@SuppressWarnings("rawtypes") public class RedisPublishingMessageHandler extends AbstractMessageHandler { private final StringRedisTemplate template; @@ -66,10 +67,11 @@ public class RedisPublishingMessageHandler extends AbstractMessageHandler { return this.defaultTopic; } + @SuppressWarnings("unchecked") @Override protected void handleMessageInternal(Message message) throws Exception { String topic = this.determineTopic(message); - Object value = this.messageConverter.fromMessage(message); + Object value = this.messageConverter.fromMessage(message, Object.class); this.template.convertAndSend(topic, value.toString()); } diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandler.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandler.java index b277c6ac26..2a1cbca3b3 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandler.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandler.java @@ -45,9 +45,9 @@ import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpressionParser; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.redis.support.RedisHeaders; diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/package-info.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/package-info.java index 4ed81be315..342cf35980 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/package-info.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/outbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting outbound endpoints. */ -package org.springframework.integration.redis.outbound; \ No newline at end of file +package org.springframework.integration.redis.outbound; diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/package-info.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/package-info.java index f716e9442a..3c9b90dc95 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/package-info.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/store/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to the Redis message store. */ -package org.springframework.integration.redis.store; \ No newline at end of file +package org.springframework.integration.redis.store; diff --git a/spring-integration-redis/src/main/java/org/springframework/integration/redis/support/package-info.java b/spring-integration-redis/src/main/java/org/springframework/integration/redis/support/package-info.java index 4ea4530ff2..84d96d99a1 100644 --- a/spring-integration-redis/src/main/java/org/springframework/integration/redis/support/package-info.java +++ b/spring-integration-redis/src/main/java/org/springframework/integration/redis/support/package-info.java @@ -1,4 +1,4 @@ /** * Provides supporting classes for this module. */ -package org.springframework.integration.redis.support; \ No newline at end of file +package org.springframework.integration.redis.support; diff --git a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd index 0a13868fab..f4df071b07 100644 --- a/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd +++ b/spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd @@ -446,7 +446,7 @@ Channel to which Error Messages will be sent. - + diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java index 51dfb65487..4706c61e6f 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/channel/SubscribableRedisChannelTests.java @@ -32,8 +32,8 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.data.redis.listener.adapter.MessageListenerAdapter; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.redis.rules.RedisAvailable; import org.springframework.integration.redis.rules.RedisAvailableTests; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java index 8b7464ba5a..5f4c28179e 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisChannelParserTests.java @@ -23,10 +23,10 @@ import org.mockito.Mockito; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.serializer.RedisSerializer; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.redis.rules.RedisAvailable; import org.springframework.integration.redis.rules.RedisAvailableTests; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java index 7f645041fa..1a28d4265f 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisInboundChannelAdapterParserTests.java @@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.redis.inbound.RedisInboundChannelAdapter; import org.springframework.integration.redis.rules.RedisAvailable; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java index 52010d1a65..6c7b7cd044 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/config/RedisOutboundChannelAdapterParserTests.java @@ -25,8 +25,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java index fb8cf9bb7f..7e20dc8996 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisInboundChannelAdapterTests.java @@ -23,7 +23,7 @@ import org.springframework.data.redis.connection.RedisConnection; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.listener.RedisMessageListenerContainer; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.redis.rules.RedisAvailable; import org.springframework.integration.redis.rules.RedisAvailableTests; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java index 3fffaaad4e..9142ef2efb 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/inbound/RedisStoreInboundChannelAdapterIntegrationTests.java @@ -26,7 +26,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; import org.springframework.data.redis.support.collections.RedisList; import org.springframework.data.redis.support.collections.RedisZSet; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.redis.rules.RedisAvailable; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java index 457c1c9e5a..9a62e661ae 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreOutboundChannelAdapterIntegrationTests.java @@ -44,8 +44,8 @@ import org.springframework.data.redis.support.collections.RedisSet; import org.springframework.data.redis.support.collections.RedisZSet; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.redis.rules.RedisAvailable; import org.springframework.integration.redis.rules.RedisAvailableTests; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java index bf8ce58bbe..ffe4280ee1 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/outbound/RedisStoreWritingMessageHandlerTests.java @@ -40,7 +40,7 @@ import org.springframework.data.redis.support.collections.RedisCollectionFactory import org.springframework.data.redis.support.collections.RedisList; import org.springframework.data.redis.support.collections.RedisZSet; import org.springframework.expression.common.LiteralExpression; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.redis.rules.RedisAvailable; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java index ad4d9123a1..5f05e5c5f8 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/DelayerHandlerRescheduleIntegrationTests.java @@ -26,10 +26,7 @@ import org.junit.Test; import org.springframework.context.support.AbstractApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.handler.DelayHandler; import org.springframework.integration.redis.rules.RedisAvailable; import org.springframework.integration.redis.rules.RedisAvailableTests; @@ -37,6 +34,9 @@ import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.support.LongRunningIntegrationTest; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; /** diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java index 99e2ee90c4..4195223cf3 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageGroupStoreTests.java @@ -36,8 +36,8 @@ import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; diff --git a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java index a8b76609af..39394d986e 100644 --- a/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java +++ b/spring-integration-redis/src/test/java/org/springframework/integration/redis/store/RedisMessageStoreTests.java @@ -22,7 +22,7 @@ import java.util.UUID; import org.junit.Test; import org.springframework.data.redis.connection.jedis.JedisConnectionFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java index 3b177adb08..004350b6fe 100644 --- a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java +++ b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiInboundGateway.java @@ -19,11 +19,11 @@ package org.springframework.integration.rmi; import java.rmi.registry.Registry; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.gateway.RequestReplyExchanger; import org.springframework.integration.support.context.NamedComponent; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.remoting.rmi.RmiServiceExporter; import org.springframework.remoting.support.RemoteInvocationExecutor; import org.springframework.util.Assert; @@ -31,7 +31,7 @@ import org.springframework.util.StringUtils; /** * An inbound Messaging Gateway for RMI-based remoting. - * + * * @author Mark Fisher */ public class RmiInboundGateway extends MessagingGatewaySupport implements RequestReplyExchanger, InitializingBean { @@ -87,7 +87,7 @@ public class RmiInboundGateway extends MessagingGatewaySupport implements Reques public void setRemoteInvocationExecutor(RemoteInvocationExecutor remoteInvocationExecutor) { this.remoteInvocationExecutor = remoteInvocationExecutor; } - + public String getComponentType() { return "rmi:inbound-gateway"; } diff --git a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java index 49b0422c59..db143c7160 100644 --- a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java +++ b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/RmiOutboundGateway.java @@ -18,10 +18,10 @@ package org.springframework.integration.rmi; import java.io.Serializable; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.gateway.RequestReplyExchanger; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/config/package-info.java b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/config/package-info.java index 551bfb8210..fd3bc101db 100644 --- a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/config/package-info.java +++ b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.rmi.config; \ No newline at end of file +package org.springframework.integration.rmi.config; diff --git a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/package-info.java b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/package-info.java index 8bbabfbb6f..4dca05d881 100644 --- a/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/package-info.java +++ b/spring-integration-rmi/src/main/java/org/springframework/integration/rmi/package-info.java @@ -1,4 +1,4 @@ /** * Base package for RMI support. */ -package org.springframework.integration.rmi; \ No newline at end of file +package org.springframework.integration.rmi; diff --git a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd index 78c7982a70..d33610c0a9 100644 --- a/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd +++ b/spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd @@ -32,7 +32,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -127,7 +127,7 @@ - + diff --git a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/BackToBackTests.java b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/BackToBackTests.java index c2c92e5ebc..5157c99055 100644 --- a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/BackToBackTests.java +++ b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/BackToBackTests.java @@ -21,13 +21,12 @@ import static org.junit.Assert.fail; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.support.AbstractApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.message.GenericMessage; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java index e62acc6de5..14c385e665 100644 --- a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java +++ b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/RmiOutboundGatewayTests.java @@ -27,9 +27,9 @@ import java.rmi.RemoteException; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.gateway.RequestReplyExchanger; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; diff --git a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java index 565833433c..1d068375bc 100644 --- a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java +++ b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiInboundGatewayParserTests.java @@ -21,14 +21,13 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import org.junit.Test; - import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.rmi.RmiInboundGateway; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; /** * @author Mark Fisher @@ -47,7 +46,7 @@ public class RmiInboundGatewayParserTests { DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); assertEquals(true, accessor.getPropertyValue("expectReply")); assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessagingTemplate template = (MessagingTemplate) + GenericMessagingTemplate template = (GenericMessagingTemplate) accessor.getPropertyValue("messagingTemplate"); DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); assertEquals(1000L, templateAccessor.getPropertyValue("sendTimeout")); @@ -63,7 +62,7 @@ public class RmiInboundGatewayParserTests { DirectFieldAccessor accessor = new DirectFieldAccessor(gateway); assertEquals(false, accessor.getPropertyValue("expectReply")); assertEquals(channel, accessor.getPropertyValue("requestChannel")); - MessagingTemplate template = (MessagingTemplate) + GenericMessagingTemplate template = (GenericMessagingTemplate) accessor.getPropertyValue("messagingTemplate"); DirectFieldAccessor templateAccessor = new DirectFieldAccessor(template); assertEquals(123L, templateAccessor.getPropertyValue("sendTimeout")); diff --git a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java index a7727dbc67..8f940eb907 100644 --- a/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java +++ b/spring-integration-rmi/src/test/java/org/springframework/integration/rmi/config/RmiOutboundGatewayParserTests.java @@ -25,10 +25,10 @@ import org.junit.Before; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.rmi.RmiInboundGateway; diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/AbstractScriptExecutingMessageProcessor.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/AbstractScriptExecutingMessageProcessor.java index 06300b0554..ce7beed5e8 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/AbstractScriptExecutingMessageProcessor.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/AbstractScriptExecutingMessageProcessor.java @@ -19,7 +19,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.handler.MessageProcessor; import org.springframework.scripting.ScriptSource; diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/DefaultScriptVariableGenerator.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/DefaultScriptVariableGenerator.java index 744cefdec4..31f0b634c9 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/DefaultScriptVariableGenerator.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/DefaultScriptVariableGenerator.java @@ -20,7 +20,7 @@ import java.util.Collections; import java.util.HashMap; import java.util.Map; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.util.CollectionUtils; /** diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/ScriptVariableGenerator.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/ScriptVariableGenerator.java index 7cb5b4e113..461d8eb065 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/ScriptVariableGenerator.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/ScriptVariableGenerator.java @@ -18,7 +18,7 @@ package org.springframework.integration.scripting; import java.util.Map; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * @author Oleg Zhurakousky diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/ScriptingException.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/ScriptingException.java index 59cd9aa800..9ad0fb5f4b 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/ScriptingException.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/ScriptingException.java @@ -12,7 +12,7 @@ */ package org.springframework.integration.scripting; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; /** * @author David Turanski diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/package-info.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/package-info.java index 2f51abfa9a..4d6517e208 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/package-info.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/jsr223/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.scripting.config.jsr223; \ No newline at end of file +package org.springframework.integration.scripting.config.jsr223; diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/package-info.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/package-info.java index 915f657c49..cb6861e165 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/package-info.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/config/package-info.java @@ -1,4 +1,4 @@ /** * Base package supporting configuration. */ -package org.springframework.integration.scripting.config; \ No newline at end of file +package org.springframework.integration.scripting.config; diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutingMessageProcessor.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutingMessageProcessor.java index b20be7cf6c..9763ce73e6 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutingMessageProcessor.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/ScriptExecutingMessageProcessor.java @@ -14,7 +14,7 @@ package org.springframework.integration.scripting.jsr223; import java.util.Map; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.scripting.AbstractScriptExecutingMessageProcessor; import org.springframework.integration.scripting.DefaultScriptVariableGenerator; import org.springframework.integration.scripting.ScriptExecutor; diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/package-info.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/package-info.java index 77d9622f0c..85da7b3113 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/package-info.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/jsr223/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting JSR223 Scripting. */ -package org.springframework.integration.scripting.jsr223; \ No newline at end of file +package org.springframework.integration.scripting.jsr223; diff --git a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/package-info.java b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/package-info.java index 8dad942fb7..d97a1229b2 100644 --- a/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/package-info.java +++ b/spring-integration-scripting/src/main/java/org/springframework/integration/scripting/package-info.java @@ -1,4 +1,4 @@ /** * Base package for scripting support. */ -package org.springframework.integration.scripting; \ No newline at end of file +package org.springframework.integration.scripting; diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223FilterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223FilterTests.java index 6ee0c020d9..4d22d428b3 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223FilterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223FilterTests.java @@ -24,8 +24,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java index 97d2ba1f9c..1a9196800c 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223HeaderEnricherTests.java @@ -22,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java index 756512422b..ddf42d7945 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223InboundChannelAdapterTests.java @@ -17,22 +17,21 @@ package org.springframework.integration.scripting.config.jsr223; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import java.util.Date; +import org.hamcrest.Matchers; import org.junit.Test; import org.junit.runner.RunWith; -import org.hamcrest.Matchers; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RefreshTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RefreshTests.java index e5451d10b1..6a095e2657 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RefreshTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RefreshTests.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.AbstractResource; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RouterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RouterTests.java index 92d9eec296..3901382699 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RouterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223RouterTests.java @@ -23,9 +23,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java index 964aadefb8..8aa35e16a3 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223ServiceActivatorTests.java @@ -31,8 +31,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.scripting.ScriptVariableGenerator; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223SplitterTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223SplitterTests.java index 4836a7a0e7..ca7bca6367 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223SplitterTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223SplitterTests.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java index d1d6f5e4cd..4d2b43b477 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/config/jsr223/Jsr223TransformerTests.java @@ -23,8 +23,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java index 691fb30d60..a84dadfeff 100644 --- a/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java +++ b/spring-integration-scripting/src/test/java/org/springframework/integration/scripting/jsr223/Jsr223ScriptExecutingMessageProcessorTests.java @@ -20,7 +20,7 @@ import java.util.Map; import org.junit.Before; import org.junit.Test; import org.springframework.core.io.ClassPathResource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.scripting.ScriptExecutor; import org.springframework.scripting.ScriptSource; diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java index 8fd99b578d..44eddf2e34 100644 --- a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java +++ b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelInvocation.java @@ -18,8 +18,8 @@ package org.springframework.integration.security.channel; import org.aopalliance.intercept.MethodInvocation; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.util.Assert; /** diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelSecurityMetadataSource.java b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelSecurityMetadataSource.java index a9fcbe738b..3e18b91a7b 100644 --- a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelSecurityMetadataSource.java +++ b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/ChannelSecurityMetadataSource.java @@ -25,15 +25,15 @@ import java.util.Map; import java.util.Set; import java.util.regex.Pattern; -import org.springframework.integration.MessageChannel; import org.springframework.integration.support.context.NamedComponent; +import org.springframework.messaging.MessageChannel; import org.springframework.security.access.ConfigAttribute; import org.springframework.security.access.SecurityMetadataSource; import org.springframework.util.Assert; /** * The {@link SecurityMetadataSource} implementation for secured {@link MessageChannel}s. - * + * * @author Mark Fisher * @author Oleg Zhurakousky */ diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/package-info.java b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/package-info.java index d93d2b0af1..4bbdce61eb 100644 --- a/spring-integration-security/src/main/java/org/springframework/integration/security/channel/package-info.java +++ b/spring-integration-security/src/main/java/org/springframework/integration/security/channel/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes related to secured channels. */ -package org.springframework.integration.security.channel; \ No newline at end of file +package org.springframework.integration.security.channel; diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java b/spring-integration-security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java index 530cd73df1..553f1d8acd 100644 --- a/spring-integration-security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java +++ b/spring-integration-security/src/main/java/org/springframework/integration/security/config/ChannelSecurityInterceptorBeanPostProcessor.java @@ -23,7 +23,7 @@ import org.springframework.aop.framework.ProxyFactory; import org.springframework.aop.support.DefaultPointcutAdvisor; import org.springframework.beans.BeansException; import org.springframework.beans.factory.config.BeanPostProcessor; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.security.channel.ChannelSecurityMetadataSource; import org.springframework.integration.security.channel.ChannelSecurityInterceptor; import org.springframework.util.Assert; diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java b/spring-integration-security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java index c70fae7bca..8ffe029021 100644 --- a/spring-integration-security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java +++ b/spring-integration-security/src/main/java/org/springframework/integration/security/config/SecuredChannelsParser.java @@ -34,7 +34,7 @@ import org.springframework.util.xml.DomUtils; /** * Creates a {@link org.springframework.integration.security.channel.ChannelSecurityInterceptor} * to control send and receive access, and creates a bean post-processor to apply the - * interceptor to {@link org.springframework.integration.MessageChannel}s + * interceptor to {@link org.springframework.messaging.MessageChannel}s * whose names match the specified patterns. * * @author Jonas Partner diff --git a/spring-integration-security/src/main/java/org/springframework/integration/security/config/package-info.java b/spring-integration-security/src/main/java/org/springframework/integration/security/config/package-info.java index 51d69fe430..2ffbe751b2 100644 --- a/spring-integration-security/src/main/java/org/springframework/integration/security/config/package-info.java +++ b/spring-integration-security/src/main/java/org/springframework/integration/security/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers, bean post processors. */ -package org.springframework.integration.security.config; \ No newline at end of file +package org.springframework.integration.security.config; diff --git a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-3.0.xsd b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-3.0.xsd index 1fde07d437..f0ce6af405 100644 --- a/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-3.0.xsd +++ b/spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-3.0.xsd @@ -51,4 +51,4 @@ - \ No newline at end of file + diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java index bff1af3e41..d6e9aad92c 100644 --- a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java +++ b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelAdapterSecurityIntegrationTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.security.SecurityTestUtils; import org.springframework.security.access.AccessDeniedException; diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorBeanPostProcessorTests.java b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorBeanPostProcessorTests.java index 5d12d46d15..0a02f84a83 100644 --- a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorBeanPostProcessorTests.java +++ b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorBeanPostProcessorTests.java @@ -24,7 +24,7 @@ import java.util.regex.Pattern; import org.junit.Test; import org.springframework.aop.support.AopUtils; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.security.config.ChannelSecurityInterceptorBeanPostProcessor; diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java index 4c5a9e2600..16cb474b9a 100644 --- a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java +++ b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/ChannelSecurityInterceptorTests.java @@ -23,7 +23,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.security.MockAuthenticationManager; diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/TestHandler.java b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/TestHandler.java index b304e66c48..582af2651f 100644 --- a/spring-integration-security/src/test/java/org/springframework/integration/security/channel/TestHandler.java +++ b/spring-integration-security/src/test/java/org/springframework/integration/security/channel/TestHandler.java @@ -19,8 +19,8 @@ package org.springframework.integration.security.channel; import java.util.ArrayList; import java.util.List; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; /** * @author Mark Fisher diff --git a/spring-integration-security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java b/spring-integration-security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java index fbcd19d48c..e35debe10c 100644 --- a/spring-integration-security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java +++ b/spring-integration-security/src/test/java/org/springframework/integration/security/config/SecuredChannelsParserTests.java @@ -30,8 +30,8 @@ import org.springframework.aop.Advisor; import org.springframework.aop.framework.Advised; import org.springframework.aop.support.AopUtils; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.AbstractPollableChannel; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.core.MessageSelector; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/package-info.java index d558e1527a..2ea284b823 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/package-info.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.sftp.config; \ No newline at end of file +package org.springframework.integration.sftp.config; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/package-info.java index b024f71d52..f78b5598c4 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/package-info.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/filters/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting SFTP file filtering. */ -package org.springframework.integration.sftp.filters; \ No newline at end of file +package org.springframework.integration.sftp.filters; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/package-info.java index b78c287c6a..6539c47db1 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/package-info.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/gateway/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting SFTP gateways. */ -package org.springframework.integration.sftp.gateway; \ No newline at end of file +package org.springframework.integration.sftp.gateway; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/package-info.java index 51c26a36e9..d1f9565319 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/package-info.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting inbound endpoints. */ -package org.springframework.integration.sftp.inbound; \ No newline at end of file +package org.springframework.integration.sftp.inbound; diff --git a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/package-info.java b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/package-info.java index a45dd814e2..70667be1c9 100644 --- a/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/package-info.java +++ b/spring-integration-sftp/src/main/java/org/springframework/integration/sftp/session/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes supporting SFTP sessions. */ -package org.springframework.integration.sftp.session; \ No newline at end of file +package org.springframework.integration.sftp.session; diff --git a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd index 543833b594..851642bee5 100644 --- a/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd +++ b/spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd @@ -312,7 +312,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -326,7 +326,7 @@ + type="org.springframework.messaging.MessageChannel" /> @@ -486,7 +486,7 @@ + type="org.springframework.messaging.MessageChannel" /> diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java index fb60fafd47..bcec30f821 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/InboundChannelAdapterParserTests.java @@ -35,8 +35,8 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.file.filters.FileListFilter; import org.springframework.integration.sftp.inbound.SftpInboundFileSynchronizer; diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java index 0e937b0da6..577156845b 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/OutboundChannelAdapterParserTests.java @@ -33,9 +33,9 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.Expression; import org.springframework.expression.common.LiteralExpression; import org.springframework.expression.spel.standard.SpelExpression; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.channel.PublishSubscribeChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.file.FileNameGenerator; import org.springframework.integration.file.remote.handler.FileTransferringMessageHandler; diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpInboundOutboundSanitySample.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpInboundOutboundSanitySample.java index 2c92487985..7fc13f9cfa 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpInboundOutboundSanitySample.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpInboundOutboundSanitySample.java @@ -21,7 +21,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.message.GenericMessage; import static org.junit.Assert.assertTrue; diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java index 9c50707a99..7159c6e314 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundGatewayParserTests.java @@ -29,7 +29,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.file.remote.gateway.AbstractRemoteFileOutboundGateway.Command; import org.springframework.integration.file.remote.gateway.AbstractRemoteFileOutboundGateway.Option; diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundTransferSample.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundTransferSample.java index ac5cb1aa09..b22d46f4ff 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundTransferSample.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/config/SftpOutboundTransferSample.java @@ -21,8 +21,8 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java index dd8842efb7..8f86df4cc0 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/inbound/SftpInboundRemoteFileSystemSynchronizerTests.java @@ -34,12 +34,12 @@ import java.util.Vector; import org.junit.After; import org.junit.Test; -import org.springframework.integration.Message; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.file.remote.session.Session; import org.springframework.integration.sftp.filters.SftpRegexPatternFileListFilter; import org.springframework.integration.sftp.session.DefaultSftpSessionFactory; import org.springframework.integration.sftp.session.SftpTestSessionFactory; +import org.springframework.messaging.Message; import com.jcraft.jsch.ChannelSftp; import com.jcraft.jsch.ChannelSftp.LsEntry; diff --git a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java index 8e1b8ec108..e5ec009805 100644 --- a/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java +++ b/spring-integration-sftp/src/test/java/org/springframework/integration/sftp/outbound/SftpOutboundTests.java @@ -40,9 +40,9 @@ import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.expression.common.LiteralExpression; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.file.DefaultFileNameGenerator; import org.springframework.integration.file.remote.FileInfo; import org.springframework.integration.file.remote.handler.FileTransferringMessageHandler; diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java index ffccdc47dd..3e31376a10 100644 --- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java +++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamReadingMessageSource.java @@ -20,8 +20,8 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageHandler.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageHandler.java index 723591d35f..be7ab23e50 100644 --- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageHandler.java +++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/ByteStreamWritingMessageHandler.java @@ -23,9 +23,9 @@ import java.io.OutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.AbstractMessageHandler; /** diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java index 490339678b..ce629d79d3 100644 --- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java +++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamReadingMessageSource.java @@ -22,8 +22,8 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.UnsupportedEncodingException; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java index 3385606d78..47f0c9e6c7 100644 --- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java +++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/CharacterStreamWritingMessageHandler.java @@ -26,9 +26,9 @@ import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.util.Assert; diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/config/package-info.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/config/package-info.java index 8cbca8584e..06fbaaed3e 100644 --- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/config/package-info.java +++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers. */ -package org.springframework.integration.stream.config; \ No newline at end of file +package org.springframework.integration.stream.config; diff --git a/spring-integration-stream/src/main/java/org/springframework/integration/stream/package-info.java b/spring-integration-stream/src/main/java/org/springframework/integration/stream/package-info.java index 289dc74f02..7567d58bc4 100644 --- a/spring-integration-stream/src/main/java/org/springframework/integration/stream/package-info.java +++ b/spring-integration-stream/src/main/java/org/springframework/integration/stream/package-info.java @@ -1,4 +1,4 @@ /** * Base package for stream support. */ -package org.springframework.integration.stream; \ No newline at end of file +package org.springframework.integration.stream; diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java index 3e61b4b2cd..dcf5a81772 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/ByteStreamSourceTests.java +++ b/spring-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; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java index c4520db2fb..08fb3d6305 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/CharacterStreamSourceTests.java +++ b/spring-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; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java index 0f113a833a..3fc35c3fd1 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleInboundChannelAdapterParserTests.java @@ -33,10 +33,10 @@ 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.Message; import org.springframework.integration.core.MessageSource; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.support.context.NamedComponent; +import org.springframework.messaging.Message; /** * @author Mark Fisher diff --git a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java index e3d57bea77..12d828ef57 100644 --- a/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java +++ b/spring-integration-stream/src/test/java/org/springframework/integration/stream/config/ConsoleOutboundChannelAdapterParserTests.java @@ -38,8 +38,8 @@ import org.springframework.beans.factory.BeanCreationException; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.handler.MessageHandlerChain; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.stream.CharacterStreamWritingMessageHandler; diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/DefaultMessageConverter.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/DefaultMessageConverter.java index aceb7e2e31..8490acc7cd 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/DefaultMessageConverter.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/DefaultMessageConverter.java @@ -22,7 +22,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.transformer.SyslogToMapTransformer; diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/MessageConverter.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/MessageConverter.java index 851fd5343b..6aa580667e 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/MessageConverter.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/MessageConverter.java @@ -15,7 +15,7 @@ */ package org.springframework.integration.syslog; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterFactoryBean.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterFactoryBean.java index 7f9bf13be0..5dd1bd9723 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterFactoryBean.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterFactoryBean.java @@ -20,7 +20,7 @@ import org.springframework.beans.factory.config.AbstractFactoryBean; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; import org.springframework.context.SmartLifecycle; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter; import org.springframework.integration.syslog.MessageConverter; diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/package-info.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/package-info.java index 584cdc2355..b273511912 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/package-info.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/config/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for configuration - parsers, namespace handlers, factory beans. */ -package org.springframework.integration.syslog.config; \ No newline at end of file +package org.springframework.integration.syslog.config; diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterSupport.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterSupport.java index 3090b944ed..e66c4b0e33 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterSupport.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterSupport.java @@ -17,8 +17,8 @@ package org.springframework.integration.syslog.inbound; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.syslog.DefaultMessageConverter; import org.springframework.integration.syslog.MessageConverter; diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/TcpSyslogReceivingChannelAdapter.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/TcpSyslogReceivingChannelAdapter.java index 5c283d34cf..635fb6cc9e 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/TcpSyslogReceivingChannelAdapter.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/TcpSyslogReceivingChannelAdapter.java @@ -18,11 +18,11 @@ package org.springframework.integration.syslog.inbound; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; -import org.springframework.integration.Message; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpListener; import org.springframework.integration.ip.tcp.connection.TcpNioServerConnectionFactory; import org.springframework.integration.ip.tcp.serializer.ByteArrayLfSerializer; +import org.springframework.messaging.Message; /** * TCP implementation of a syslog inbound channel adapter. diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/UdpSyslogReceivingChannelAdapter.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/UdpSyslogReceivingChannelAdapter.java index 528bfdcf15..fd9366ec8f 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/UdpSyslogReceivingChannelAdapter.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/UdpSyslogReceivingChannelAdapter.java @@ -15,10 +15,10 @@ */ package org.springframework.integration.syslog.inbound; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.ip.udp.UnicastReceivingChannelAdapter; /** diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/package-info.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/package-info.java index c9ec2538c3..43717a49f1 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/package-info.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes for inbound endpoints. */ -package org.springframework.integration.syslog.inbound; \ No newline at end of file +package org.springframework.integration.syslog.inbound; diff --git a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/package-info.java b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/package-info.java index 3a342a4f42..44e5bb8348 100644 --- a/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/package-info.java +++ b/spring-integration-syslog/src/main/java/org/springframework/integration/syslog/package-info.java @@ -1,4 +1,4 @@ /** * Base package for Syslog Support. */ -package org.springframework.integration.syslog; \ No newline at end of file +package org.springframework.integration.syslog; diff --git a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd index 5469b800c5..30ce3263d9 100644 --- a/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd +++ b/spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd @@ -48,7 +48,7 @@ + type="org.springframework.messaging.MessageChannel" /> diff --git a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterParserTests.java b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterParserTests.java index 3442ec8421..36744d41b8 100644 --- a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterParserTests.java +++ b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/config/SyslogReceivingChannelAdapterParserTests.java @@ -37,13 +37,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.PollableChannel; +import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.syslog.MessageConverter; import org.springframework.integration.syslog.inbound.TcpSyslogReceivingChannelAdapter; import org.springframework.integration.syslog.inbound.UdpSyslogReceivingChannelAdapter; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java index a4551aff85..1abd288d9c 100644 --- a/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java +++ b/spring-integration-syslog/src/test/java/org/springframework/integration/syslog/inbound/SyslogReceivingChannelAdapterTests.java @@ -37,11 +37,11 @@ import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.syslog.config.SyslogReceivingChannelAdapterFactoryBean; import org.springframework.integration.test.util.SocketUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.PollableChannel; /** * @author Gary Russell diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java index bd40145834..5705fc9f92 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/HeaderMatcher.java @@ -15,17 +15,18 @@ */ package org.springframework.integration.test.matcher; -import org.hamcrest.Description; -import org.hamcrest.Factory; -import org.hamcrest.Matcher; -import org.junit.Assert; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import static org.hamcrest.CoreMatchers.is; import java.util.Date; import java.util.Map; -import static org.hamcrest.CoreMatchers.is; +import org.hamcrest.Description; +import org.hamcrest.Factory; +import org.hamcrest.Matcher; +import org.junit.Assert; +import org.springframework.integration.EiMessageHeaderAccessor; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; /** * Are the {@link MessageHeaders} of a {@link Message} containing any entry @@ -121,7 +122,7 @@ public class HeaderMatcher extends TypeSafeMatcher> { @Factory public static Matcher> hasCorrelationId(T value) { - return new HeaderMatcher(MapContentMatchers.hasEntry(MessageHeaders.CORRELATION_ID, value)); + return new HeaderMatcher(MapContentMatchers.hasEntry(EiMessageHeaderAccessor.CORRELATION_ID, value)); } @Factory @@ -131,7 +132,7 @@ public class HeaderMatcher extends TypeSafeMatcher> { @Factory public static Matcher> hasSequenceNumber(Matcher matcher) { - return new HeaderMatcher(MapContentMatchers.hasEntry(MessageHeaders.SEQUENCE_NUMBER, matcher)); + return new HeaderMatcher(MapContentMatchers.hasEntry(EiMessageHeaderAccessor.SEQUENCE_NUMBER, matcher)); } @Factory @@ -141,7 +142,7 @@ public class HeaderMatcher extends TypeSafeMatcher> { @Factory public static Matcher> hasSequenceSize(Matcher value) { - return new HeaderMatcher(MapContentMatchers.hasEntry(MessageHeaders.SEQUENCE_SIZE, value)); + return new HeaderMatcher(MapContentMatchers.hasEntry(EiMessageHeaderAccessor.SEQUENCE_SIZE, value)); } @Factory @@ -151,7 +152,7 @@ public class HeaderMatcher extends TypeSafeMatcher> { @Factory public static Matcher> hasExpirationDate(Matcher matcher) { - return new HeaderMatcher(MapContentMatchers.hasEntry(MessageHeaders.EXPIRATION_DATE, matcher)); + return new HeaderMatcher(MapContentMatchers.hasEntry(EiMessageHeaderAccessor.EXPIRATION_DATE, matcher)); } @Factory @@ -164,4 +165,4 @@ public class HeaderMatcher extends TypeSafeMatcher> { return new HeaderMatcher(MapContentMatchers.hasEntry(MessageHeaders.TIMESTAMP, matcher)); } -} \ No newline at end of file +} diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java index cf188b34a5..8cf0fca235 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/MockitoMessageMatchers.java @@ -23,7 +23,7 @@ import java.util.Map; import org.hamcrest.Matcher; import org.mockito.Mockito; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Mockito matcher factory for {@link Message} matcher creation. diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadAndHeaderMatcher.java b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadAndHeaderMatcher.java index 5760f408ed..0626a2ffc8 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadAndHeaderMatcher.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadAndHeaderMatcher.java @@ -22,8 +22,8 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Factory; import org.hamcrest.Matcher; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; /** * Matcher to make assertions about message equality easier. Usage: @@ -87,4 +87,4 @@ public class PayloadAndHeaderMatcher extends BaseMatcher> { payload).appendText(" and headers: ").appendValue(headers); } -} \ No newline at end of file +} diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java index 0f85d89637..7947028881 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/PayloadMatcher.java @@ -20,7 +20,7 @@ import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.hamcrest.core.IsEqual; import org.junit.Assert; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Is the payload of a {@link Message} equal to a given value or is matching @@ -90,4 +90,4 @@ public class PayloadMatcher extends TypeSafeMatcher { public static Matcher hasPayload(Matcher payloadMatcher) { return new PayloadMatcher(payloadMatcher); } -} \ No newline at end of file +} diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/package-info.java b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/package-info.java index 405c6d5ef2..e8147cf290 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/package-info.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/matcher/package-info.java @@ -1,4 +1,4 @@ /** * Provides several {@link org.hamcrest.BaseMatcher} implementations. */ -package org.springframework.integration.test.matcher; \ No newline at end of file +package org.springframework.integration.test.matcher; diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java b/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java index 12d26ed297..a33ee7165d 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractRequestResponseScenarioTests.java @@ -26,10 +26,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.SubscribableChannel; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractResponseValidator.java b/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractResponseValidator.java index 4cc1e21133..7c9117c92b 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractResponseValidator.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/support/AbstractResponseValidator.java @@ -1,8 +1,8 @@ package org.springframework.integration.test.support; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.MessageHandler; /** * The base class for response validators used for {@link RequestResponseScenario}s * @author David Turanski diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/support/MessageValidator.java b/spring-integration-test/src/main/java/org/springframework/integration/test/support/MessageValidator.java index 0a55b92ce8..c1647994d8 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/support/MessageValidator.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/support/MessageValidator.java @@ -1,6 +1,6 @@ package org.springframework.integration.test.support; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; /** * Validate a message. Create an anonymous instance or subclass to * implement the validateMessage() method diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/support/RequestResponseScenario.java b/spring-integration-test/src/main/java/org/springframework/integration/test/support/RequestResponseScenario.java index 128eb55e45..d92e08cf6e 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/support/RequestResponseScenario.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/support/RequestResponseScenario.java @@ -1,6 +1,6 @@ package org.springframework.integration.test.support; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.util.Assert; /** diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/support/package-info.java b/spring-integration-test/src/main/java/org/springframework/integration/test/support/package-info.java index b5ed55d5a4..9438a0b637 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/support/package-info.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/support/package-info.java @@ -2,4 +2,4 @@ * Provides several test support classes including for testing Spring Integration * request-response message scenarios. */ -package org.springframework.integration.test.support; \ No newline at end of file +package org.springframework.integration.test.support; diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java index 2aca8b709e..c1c5466a83 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/util/TestUtils.java @@ -33,18 +33,18 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.config.ConfigurableListableBeanFactory; import org.springframework.context.support.GenericApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.channel.MessagePublishingErrorHandler; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.history.MessageHistory; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.support.context.NamedComponent; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.util.Assert; import org.springframework.util.ErrorHandler; @@ -85,7 +85,7 @@ public abstract class TestUtils { public static TestApplicationContext createTestApplicationContext() { TestApplicationContext context = new TestApplicationContext(); - ErrorHandler errorHandler = new MessagePublishingErrorHandler(new BeanFactoryChannelResolver(context)); + ErrorHandler errorHandler = new MessagePublishingErrorHandler(new BeanFactoryMessageChannelDestinationResolver(context)); ThreadPoolTaskScheduler scheduler = createTaskScheduler(10); scheduler.setErrorHandler(errorHandler); registerBean(IntegrationContextUtils.TASK_SCHEDULER_BEAN_NAME, scheduler, context); diff --git a/spring-integration-test/src/main/java/org/springframework/integration/test/util/package-info.java b/spring-integration-test/src/main/java/org/springframework/integration/test/util/package-info.java index 928a0ff037..0676d08174 100644 --- a/spring-integration-test/src/main/java/org/springframework/integration/test/util/package-info.java +++ b/spring-integration-test/src/main/java/org/springframework/integration/test/util/package-info.java @@ -3,4 +3,4 @@ * {@link org.springframework.integration.test.util.TestUtils} provides convenience * helpers to easily retrieve private bean properties. */ -package org.springframework.integration.test.util; \ No newline at end of file +package org.springframework.integration.test.util; diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/HeaderMatcherTests.java b/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/HeaderMatcherTests.java index ca22b28afb..e15d3d158b 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/HeaderMatcherTests.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/HeaderMatcherTests.java @@ -43,7 +43,7 @@ import java.util.UUID; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java b/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java index a184f96250..450af43431 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/MockitoMessageMatchersTests.java @@ -21,9 +21,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.exceptions.verification.junit.ArgumentsAreDifferent; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.support.MessageBuilder; import java.util.Date; diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/PayloadMatcherTests.java b/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/PayloadMatcherTests.java index 1a382f8ed5..00b1547ea1 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/PayloadMatcherTests.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/matcher/PayloadMatcherTests.java @@ -26,7 +26,7 @@ import static org.springframework.integration.test.matcher.PayloadMatcher.hasPay import java.math.BigDecimal; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; /** diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/mockito/ServiceActivatorOnMockitoMockTests.java b/spring-integration-test/src/test/java/org/springframework/integration/test/mockito/ServiceActivatorOnMockitoMockTests.java index 53fab25174..ebcc076469 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/mockito/ServiceActivatorOnMockitoMockTests.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/mockito/ServiceActivatorOnMockitoMockTests.java @@ -22,10 +22,10 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests.java b/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests.java index 33157aae82..d06d0d2817 100644 --- a/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests.java +++ b/spring-integration-test/src/test/java/org/springframework/integration/test/support/MessageScenariosTests.java @@ -24,7 +24,7 @@ import static org.springframework.integration.test.matcher.PayloadMatcher.hasPay import java.util.ArrayList; import java.util.List; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/package-info.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/package-info.java index 0bbe4fa77d..0c55281fe6 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/package-info.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/config/package-info.java @@ -1,4 +1,4 @@ /** * Contains parser classes for the Twitter namespace support. */ -package org.springframework.integration.twitter.config; \ No newline at end of file +package org.springframework.integration.twitter.config; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/package-info.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/package-info.java index efcc1dedbd..e2394d6f03 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/package-info.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/core/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes used across all Twitter components. */ -package org.springframework.integration.twitter.core; \ No newline at end of file +package org.springframework.integration.twitter.core; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java index 536c5ab910..e851a0fd58 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/AbstractTwitterMessageSource.java @@ -23,8 +23,8 @@ import java.util.Queue; import java.util.concurrent.LinkedBlockingQueue; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.MessageSource; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/package-info.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/package-info.java index 8838eb2c6f..edf5190547 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/package-info.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/inbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides inbound Twitter components. */ -package org.springframework.integration.twitter.inbound; \ No newline at end of file +package org.springframework.integration.twitter.inbound; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandler.java index 9aead3d773..6cbcadefd3 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandler.java @@ -16,7 +16,7 @@ package org.springframework.integration.twitter.outbound; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.twitter.core.TwitterHeaders; import org.springframework.social.twitter.api.Twitter; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandler.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandler.java index 7f2052d3dc..db877558a6 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandler.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandler.java @@ -16,7 +16,7 @@ package org.springframework.integration.twitter.outbound; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.social.twitter.api.Tweet; diff --git a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/package-info.java b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/package-info.java index 2384e876cb..d74fdc979f 100644 --- a/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/package-info.java +++ b/spring-integration-twitter/src/main/java/org/springframework/integration/twitter/outbound/package-info.java @@ -1,4 +1,4 @@ /** * Provides outbound Twitter components. */ -package org.springframework.integration.twitter.outbound; \ No newline at end of file +package org.springframework.integration.twitter.outbound; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParserTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParserTests.java index b94e7457b8..d88ca832e6 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParserTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/config/TestSendingMessageHandlerParserTests.java @@ -26,8 +26,8 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingDMsUsingNamespace.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingDMsUsingNamespace.java index 13dec1e9dd..0f7efbd9a1 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingDMsUsingNamespace.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingDMsUsingNamespace.java @@ -21,7 +21,7 @@ import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.twitter.core.TwitterHeaders; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace.java index 80d5aa832b..d20fc667ac 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TestSendingUpdatesUsingNamespace.java @@ -20,14 +20,13 @@ import java.util.Date; import org.junit.Ignore; import org.junit.Test; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @@ -38,7 +37,7 @@ import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; @ContextConfiguration public class TestSendingUpdatesUsingNamespace extends AbstractJUnit4SpringContextTests { - private MessagingTemplate messagingTemplate = new MessagingTemplate(); + private GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); @Value("#{out}") private MessageChannel channel; @@ -49,7 +48,7 @@ public class TestSendingUpdatesUsingNamespace extends AbstractJUnit4SpringContex @Test @Ignore public void testSendingATweet() throws Throwable { - MessageBuilder mb = MessageBuilder.withPayload("Early start today" + MessageBuilder mb = MessageBuilder.withPayload("Early start today" + new Date(System.currentTimeMillis())); Message m = mb.build(); this.messagingTemplate.send(this.channel, m); diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TwitterAnnouncer.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TwitterAnnouncer.java index 6752be00e5..e005d72d8a 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TwitterAnnouncer.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/ignored/TwitterAnnouncer.java @@ -16,7 +16,7 @@ package org.springframework.integration.twitter.ignored; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.history.MessageHistory; import org.springframework.social.twitter.api.DirectMessage; import org.springframework.social.twitter.api.Tweet; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java index 743039925c..b45abac0fa 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/DirectMessageReceivingMessageSourceTests.java @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.core.io.ClassPathResource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.social.twitter.api.DirectMessage; import org.springframework.social.twitter.api.impl.TwitterTemplate; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java index 7fb524243c..e01d370d5a 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceTests.java @@ -34,7 +34,7 @@ import org.junit.Test; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.core.io.ClassPathResource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.store.metadata.SimpleMetadataStore; import org.springframework.integration.test.util.TestUtils; import org.springframework.social.twitter.api.SearchMetadata; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java index 4985dfea89..34fb1f76b5 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/SearchReceivingMessageSourceWithRedisTests.java @@ -30,19 +30,20 @@ import java.util.List; import org.junit.Before; import org.junit.Test; + import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; import org.springframework.data.redis.connection.RedisConnectionFactory; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.integration.Message; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.redis.rules.RedisAvailable; import org.springframework.integration.redis.rules.RedisAvailableTests; import org.springframework.integration.redis.store.metadata.RedisMetadataStore; import org.springframework.integration.store.metadata.MetadataStore; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; import org.springframework.social.twitter.api.SearchMetadata; import org.springframework.social.twitter.api.SearchOperations; import org.springframework.social.twitter.api.SearchResults; @@ -60,7 +61,7 @@ public class SearchReceivingMessageSourceWithRedisTests extends RedisAvailableTe private RedisConnectionFactory redisConnectionFactory; private StringRedisTemplate redisTemplate; - private AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); + private final AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); @Before public void setup() { diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSourceTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSourceTests.java index 6782c65222..8d604960db 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSourceTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/inbound/TimelineReceivingMessageSourceTests.java @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.core.io.ClassPathResource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.social.twitter.api.Tweet; import org.springframework.social.twitter.api.impl.TwitterTemplate; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandlerTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandlerTests.java index 31e96323fb..5b1f394e85 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandlerTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/DirectMessageSendingMessageHandlerTests.java @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.core.io.ClassPathResource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.twitter.core.TwitterHeaders; import org.springframework.social.twitter.api.impl.TwitterTemplate; diff --git a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandlerTests.java b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandlerTests.java index 592a57a788..4b6cf488bc 100644 --- a/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandlerTests.java +++ b/spring-integration-twitter/src/test/java/org/springframework/integration/twitter/outbound/StatusUpdatingMessageHandlerTests.java @@ -22,7 +22,7 @@ import org.junit.Ignore; import org.junit.Test; import org.springframework.beans.factory.config.PropertiesFactoryBean; import org.springframework.core.io.ClassPathResource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.social.twitter.api.impl.TwitterTemplate; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceInboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceInboundGateway.java index 514ff3d6ac..3e99483d7c 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceInboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceInboundGateway.java @@ -18,8 +18,8 @@ package org.springframework.integration.ws; import java.util.Map; import org.springframework.expression.ExpressionException; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.gateway.MessagingGatewaySupport; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java index d56cafd855..bc7b01947e 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/AbstractWebServiceOutboundGateway.java @@ -25,12 +25,12 @@ import javax.xml.transform.TransformerException; import org.springframework.expression.Expression; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.integration.support.MessageBuilder; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; import org.springframework.util.StringUtils; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceInboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceInboundGateway.java index 947d223c0d..123f6537e9 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceInboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceInboundGateway.java @@ -16,7 +16,7 @@ package org.springframework.integration.ws; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.oxm.Marshaller; import org.springframework.oxm.Unmarshaller; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceOutboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceOutboundGateway.java index c2f2aa9156..21bd621780 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceOutboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/MarshallingWebServiceOutboundGateway.java @@ -18,7 +18,7 @@ package org.springframework.integration.ws; import java.io.IOException; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.oxm.Marshaller; import org.springframework.oxm.Unmarshaller; import org.springframework.util.Assert; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceInboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceInboundGateway.java index 7363c9170a..8b935a57c9 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceInboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceInboundGateway.java @@ -21,7 +21,7 @@ import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.dom.DOMSource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java index bd218b09d8..ec85d4bdc7 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/SimpleWebServiceOutboundGateway.java @@ -26,8 +26,8 @@ import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Document; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.WebServiceMessageFactory; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/package-info.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/package-info.java index bb2ddfa805..d89a5edf0a 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/package-info.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/config/package-info.java @@ -1,4 +1,4 @@ /** * Contains parser classes for the Web Services namespace support. */ -package org.springframework.integration.ws.config; \ No newline at end of file +package org.springframework.integration.ws.config; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/package-info.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/package-info.java index c982868eec..8898f95849 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/package-info.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/package-info.java @@ -2,4 +2,4 @@ * Provides several inbound and outbound Web Service components. Also contains * support classes (e.g. Header Mapper) */ -package org.springframework.integration.ws; \ No newline at end of file +package org.springframework.integration.ws; diff --git a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd index 2acea65f47..48ae454faa 100644 --- a/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd +++ b/spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd @@ -45,7 +45,7 @@ - + @@ -59,7 +59,7 @@ - + @@ -312,7 +312,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -321,7 +321,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -338,7 +338,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -452,7 +452,7 @@ this list can also be simple patterns to be matched against the header names (e. - + @@ -461,7 +461,7 @@ this list can also be simple patterns to be matched against the header names (e. - + diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceInboundGatewayTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceInboundGatewayTests.java index 9f439915dc..1946de3780 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceInboundGatewayTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceInboundGatewayTests.java @@ -41,11 +41,10 @@ import org.mockito.Mock; import org.mockito.invocation.InvocationOnMock; import org.mockito.runners.MockitoJUnitRunner; import org.mockito.stubbing.Answer; - -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageDeliveryException; import org.springframework.integration.channel.DirectChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageDeliveryException; import org.springframework.ws.WebServiceMessage; import org.springframework.ws.context.MessageContext; diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java index e9cecda011..4eb76e1e2c 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/SimpleWebServiceOutboundGatewayTests.java @@ -37,9 +37,9 @@ import org.mockito.stubbing.Answer; import org.springframework.beans.factory.BeanFactory; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.handler.ReplyRequiredException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java index 99c132053b..f8743c30d7 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/UriVariableTests.java @@ -24,6 +24,7 @@ import java.io.IOException; import java.net.URI; import java.net.URISyntaxException; import java.util.concurrent.atomic.AtomicReference; + import javax.jms.BytesMessage; import javax.jms.Connection; import javax.jms.ConnectionFactory; @@ -42,16 +43,15 @@ import org.mockito.ArgumentCaptor; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; - import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.MessageHandlingException; -import org.springframework.integration.core.MessageHandler; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import org.springframework.ws.client.WebServiceClientException; diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java index 5d9952fa55..18d741f312 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceHeaderEnricherTests.java @@ -22,14 +22,13 @@ import java.util.Map; import org.junit.Test; import org.junit.runner.RunWith; - import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.ws.WebServiceHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -49,7 +48,8 @@ public class WebServiceHeaderEnricherTests { @Test public void literalValue() { - MessagingTemplate template = new MessagingTemplate(literalValueInput); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination(literalValueInput); Message result = template.sendAndReceive(new GenericMessage("foo")); Map headers = result.getHeaders(); assertEquals("http://test", headers.get(WebServiceHeaders.SOAP_ACTION)); @@ -57,7 +57,8 @@ public class WebServiceHeaderEnricherTests { @Test public void expression() { - MessagingTemplate template = new MessagingTemplate(expressionInput); + GenericMessagingTemplate template = new GenericMessagingTemplate(); + template.setDefaultDestination(expressionInput); Message result = template.sendAndReceive(new GenericMessage("foo")); Map headers = result.getHeaders(); assertEquals("http://foo", headers.get(WebServiceHeaders.SOAP_ACTION)); diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java index 7d0e8855ef..53562fe826 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceInboundGatewayParserTests.java @@ -30,10 +30,10 @@ import org.mockito.Mockito; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.ws.MarshallingWebServiceInboundGateway; diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java index aaed1d3cba..9c459e1e82 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayParserTests.java @@ -30,9 +30,9 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.parsing.BeanDefinitionParsingException; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.MessageHandler; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessageHandler; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; diff --git a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java index e30a58717b..4f34594f71 100644 --- a/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java +++ b/spring-integration-ws/src/test/java/org/springframework/integration/ws/config/WebServiceOutboundGatewayWithHeaderMapperTests.java @@ -39,8 +39,8 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/DefaultXmlPayloadConverter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/DefaultXmlPayloadConverter.java index 890b9795da..3a206b7929 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/DefaultXmlPayloadConverter.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/DefaultXmlPayloadConverter.java @@ -29,7 +29,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.InputSource; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.xml.transform.StringSource; /** diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/package-info.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/package-info.java index 1a912c730b..40747ef719 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/package-info.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/config/package-info.java @@ -1,4 +1,4 @@ /** * Contains parser classes for the XML namespace support. */ -package org.springframework.integration.xml.config; \ No newline at end of file +package org.springframework.integration.xml.config; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/package-info.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/package-info.java index e1cc1f520c..17a424ed6c 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/package-info.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/package-info.java @@ -1,4 +1,4 @@ /** * Root package of the XML Module. */ -package org.springframework.integration.xml; \ No newline at end of file +package org.springframework.integration.xml; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/result/DomResultFactory.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/result/DomResultFactory.java index 36efa6b620..4270bce7d2 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/result/DomResultFactory.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/result/DomResultFactory.java @@ -22,7 +22,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Result; import javax.xml.transform.dom.DOMResult; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; /** * @author Jonas Partner diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/result/package-info.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/result/package-info.java index 62e580f3a7..1286514135 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/result/package-info.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/result/package-info.java @@ -3,4 +3,4 @@ * will return {@link javax.xml.transform.Result}, possibly taking into account * payload instance. */ -package org.springframework.integration.xml.result; \ No newline at end of file +package org.springframework.integration.xml.result; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathRouter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathRouter.java index dbd604d8bc..1a31136c7f 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathRouter.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathRouter.java @@ -21,7 +21,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.router.AbstractMappingMessageRouter; import org.springframework.integration.xml.DefaultXmlPayloadConverter; import org.springframework.integration.xml.XmlPayloadConverter; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/package-info.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/package-info.java index 3e8dbe9210..ad0b683afc 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/package-info.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/package-info.java @@ -1,4 +1,4 @@ /** * Provides XML message routers. */ -package org.springframework.integration.xml.router; \ No newline at end of file +package org.springframework.integration.xml.router; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java index adfc32132f..0a892f385c 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java +++ b/spring-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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.xml.xpath.XPathExpression; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/RegexTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/RegexTestXPathMessageSelector.java index 1dd23b7834..0b47a2f410 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/RegexTestXPathMessageSelector.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/RegexTestXPathMessageSelector.java @@ -20,7 +20,7 @@ import java.util.Map; import org.w3c.dom.Node; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java index 5972032d3f..51cf76a1bb 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java +++ b/spring-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; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.xml.xpath.XPathExpression; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java index 5639dc9641..1a37e8ec87 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/XmlValidatingMessageSelector.java @@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory; import org.xml.sax.SAXParseException; import org.springframework.core.io.Resource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.MessageRejectedException; import org.springframework.integration.core.MessageSelector; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/package-info.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/package-info.java index d50f04f5b8..bbd79e1507 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/package-info.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/package-info.java @@ -2,4 +2,4 @@ * Provides XML-centric {@link org.springframework.integration.core.MessageSelector} * implementations. */ -package org.springframework.integration.xml.selector; \ No newline at end of file +package org.springframework.integration.xml.selector; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/DomSourceFactory.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/DomSourceFactory.java index 5e9675a1ca..9ad7c8b72d 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/DomSourceFactory.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/DomSourceFactory.java @@ -28,7 +28,7 @@ import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Document; import org.xml.sax.InputSource; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; /** * {@link SourceFactory} implementation which supports creation of a {@link DOMSource} diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/StringSourceFactory.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/StringSourceFactory.java index 54a65210dc..88378fdecb 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/StringSourceFactory.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/StringSourceFactory.java @@ -26,7 +26,7 @@ import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Document; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.util.FileCopyUtils; import org.springframework.xml.transform.StringResult; import org.springframework.xml.transform.StringSource; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/package-info.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/package-info.java index e241050086..a0af5247e0 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/package-info.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/source/package-info.java @@ -2,4 +2,4 @@ * Provides various {@link org.springframework.integration.xml.source.SourceFactory} * implementations. */ -package org.springframework.integration.xml.source; \ No newline at end of file +package org.springframework.integration.xml.source; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java index 7cbed3ba2c..a809c9b73a 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java @@ -33,8 +33,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.splitter.AbstractMessageSplitter; import org.springframework.integration.xml.DefaultXmlPayloadConverter; import org.springframework.integration.xml.XmlPayloadConverter; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/package-info.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/package-info.java index 724f326331..4362c58541 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/package-info.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/package-info.java @@ -2,4 +2,4 @@ * Provides implementations of * {@link org.springframework.integration.splitter.AbstractMessageSplitter}. */ -package org.springframework.integration.xml.splitter; \ No newline at end of file +package org.springframework.integration.xml.splitter; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/MarshallingTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/MarshallingTransformer.java index c5a24f461c..f2ba1b28d5 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/MarshallingTransformer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/MarshallingTransformer.java @@ -21,8 +21,8 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Result; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.transformer.AbstractTransformer; import org.springframework.integration.xml.result.DomResultFactory; import org.springframework.integration.xml.result.ResultFactory; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java index 5e13461a5a..de44d6c579 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformer.java @@ -27,7 +27,7 @@ import javax.xml.transform.dom.DOMResult; import org.w3c.dom.Document; import org.xml.sax.InputSource; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.xml.transform.StringResult; /** diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/ResultToStringTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/ResultToStringTransformer.java index 67d0c7f86a..871ad29a27 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/ResultToStringTransformer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/ResultToStringTransformer.java @@ -26,7 +26,7 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.xml.transform.StringResult; /** diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java index 11b04eb894..67434c3cdb 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/UnmarshallingTransformer.java @@ -25,7 +25,7 @@ import javax.xml.transform.stream.StreamSource; import org.w3c.dom.Document; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.transformer.AbstractPayloadTransformer; import org.springframework.integration.transformer.Transformer; import org.springframework.integration.xml.source.DomSourceFactory; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java index 5d6587a534..a83f316ca0 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathHeaderEnricher.java @@ -20,7 +20,7 @@ import java.util.Map; import org.w3c.dom.Node; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.transformer.HeaderEnricher; import org.springframework.integration.transformer.support.HeaderValueMessageProcessor; import org.springframework.integration.xml.DefaultXmlPayloadConverter; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java index 79732654cd..5025d5563c 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java @@ -18,7 +18,7 @@ package org.springframework.integration.xml.transformer; import org.w3c.dom.Node; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.transformer.AbstractTransformer; import org.springframework.integration.xml.DefaultXmlPayloadConverter; import org.springframework.integration.xml.XmlPayloadConverter; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java index e79a01c2e2..0cdfd14b3c 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XsltPayloadTransformer.java @@ -35,15 +35,15 @@ import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.core.io.Resource; import org.springframework.expression.Expression; import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; -import org.springframework.integration.MessagingException; import org.springframework.integration.expression.ExpressionUtils; import org.springframework.integration.transformer.AbstractTransformer; import org.springframework.integration.xml.result.DomResultFactory; import org.springframework.integration.xml.result.ResultFactory; import org.springframework.integration.xml.source.DomSourceFactory; import org.springframework.integration.xml.source.SourceFactory; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; +import org.springframework.messaging.MessagingException; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.PatternMatchUtils; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/package-info.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/package-info.java index 85c13ee5eb..c164821769 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/package-info.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/package-info.java @@ -1,4 +1,4 @@ /** * Provides Transformer and Enricher implementations. */ -package org.springframework.integration.xml.transformer; \ No newline at end of file +package org.springframework.integration.xml.transformer; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/package-info.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/package-info.java index 782c9633ae..ec6943f6e0 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/package-info.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/xpath/package-info.java @@ -1,4 +1,4 @@ /** * Provides XPath supporting classes. */ -package org.springframework.integration.xml.xpath; \ No newline at end of file +package org.springframework.integration.xml.xpath; diff --git a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-3.0.xsd b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-3.0.xsd index 3ccf9a8344..942e816398 100644 --- a/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-3.0.xsd +++ b/spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-3.0.xsd @@ -790,7 +790,7 @@ - + @@ -802,7 +802,7 @@ - + @@ -814,7 +814,7 @@ - + @@ -831,7 +831,7 @@ - + @@ -840,7 +840,7 @@ - + diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java index b951bcbb02..14cd11ec8c 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/DefaultXmlPayloadConverterTests.java @@ -30,7 +30,7 @@ import org.junit.Assert; import org.custommonkey.xmlunit.XMLAssert; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.xml.transform.StringSource; import org.w3c.dom.Document; import org.w3c.dom.Node; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java index a70007d2e1..e74b057395 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java @@ -27,9 +27,9 @@ import org.w3c.dom.Document; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.config.StubResultFactory.StubStringResult; import org.springframework.xml.transform.StringResult; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubChannelResolver.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubDestinationResolver.java similarity index 72% rename from spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubChannelResolver.java rename to spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubDestinationResolver.java index 50684b6562..b0a0e5d5f9 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubChannelResolver.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubDestinationResolver.java @@ -16,13 +16,13 @@ package org.springframework.integration.xml.config; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.support.channel.ChannelResolver; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.core.DestinationResolver; -class StubChannelResolver implements ChannelResolver{ +class StubDestinationResolver implements DestinationResolver { - public MessageChannel resolveChannelName(String channelName) { + public MessageChannel resolveDestination(String channelName) { return null; } - -} \ No newline at end of file + +} diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java index fb3d892aed..7c7ea8fa31 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/UnmarshallingTransformerParserTests.java @@ -26,10 +26,10 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.MessagingException; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.MessagingException; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringSource; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathFilterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathFilterParserTests.java index 5425a56a8d..e8ca6637bd 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathFilterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathFilterParserTests.java @@ -24,10 +24,10 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathHeaderEnricherParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathHeaderEnricherParserTests.java index 7b55d6621b..329e874dd5 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathHeaderEnricherParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathHeaderEnricherParserTests.java @@ -28,10 +28,10 @@ import org.w3c.dom.Node; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java index b696aab411..3b88959ba6 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathMessageSplitterParserTests.java @@ -26,8 +26,8 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.message.GenericMessage; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java index c0b54fe553..e5049d11f3 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathRouterParserTests.java @@ -16,34 +16,32 @@ package org.springframework.integration.xml.config; +import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertEquals; - -import org.w3c.dom.Document; import org.junit.After; import org.junit.Test; - import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.config.AutowireCapableBeanFactory; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.router.AbstractMappingMessageRouter; import org.springframework.integration.support.MessageBuilder; -import org.springframework.integration.support.channel.BeanFactoryChannelResolver; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.xml.DefaultXmlPayloadConverter; import org.springframework.integration.xml.util.XmlTestUtil; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.core.BeanFactoryMessageChannelDestinationResolver; import org.springframework.test.context.ContextConfiguration; +import org.w3c.dom.Document; /** * @author Jonas Partner @@ -268,6 +266,6 @@ public class XPathRouterParserTests { } } - public static class MyChannelResolver extends BeanFactoryChannelResolver{} + public static class MyChannelResolver extends BeanFactoryMessageChannelDestinationResolver{} } diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java index 945eb75ba7..f4409f1f45 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XPathTransformerParserTests.java @@ -33,9 +33,9 @@ import org.w3c.dom.Node; import org.xml.sax.InputSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.xml.XmlPayloadConverter; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java index def25b87d2..5025f97dd4 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XmlPayloadValidatingFilterParserTests.java @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.MessageRejectedException; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java index 7856c390ea..bc16f2ee83 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/XsltPayloadTransformerParserTests.java @@ -29,9 +29,9 @@ import org.w3c.dom.Document; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/validationTestsSchema.xsd b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/validationTestsSchema.xsd index 8e2acedf9e..8d1f43ac1d 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/validationTestsSchema.xsd +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/validationTestsSchema.xsd @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathRouterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathRouterTests.java index bef0c73a43..fb2eb3bcb2 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathRouterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XPathRouterTests.java @@ -24,7 +24,7 @@ import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.xpath.XPathExpression; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/validationTestsSchema.xsd b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/validationTestsSchema.xsd index 8e2acedf9e..8d1f43ac1d 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/validationTestsSchema.xsd +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/validationTestsSchema.xsd @@ -3,4 +3,4 @@ - \ No newline at end of file + diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java index e5b7d8c774..8960180e8f 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java @@ -31,7 +31,7 @@ import org.junit.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.xml.transform.StringResult; /** diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java index 58781491b6..2e5b872cf6 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java @@ -22,7 +22,7 @@ import java.io.BufferedReader; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringSource; import org.w3c.dom.Document; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java index 01b93639b9..0136c95800 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/splitter/XPathMessageSplitterTests.java @@ -27,8 +27,8 @@ import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.util.XmlTestUtil; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java index d7f3295b94..69bfd28308 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/MarshallingTransformerTests.java @@ -28,7 +28,7 @@ import javax.xml.transform.dom.DOMResult; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.xml.result.StringResultFactory; import org.springframework.oxm.Marshaller; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java index 607e0a0c8d..703f92258d 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToDocumentTransformerTests.java @@ -26,7 +26,7 @@ import org.junit.Before; import org.junit.Test; import org.w3c.dom.Document; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringResult; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransformerTests.java index 5d404d7015..8e3be324d9 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/ResultToStringTransformerTests.java @@ -29,7 +29,7 @@ import javax.xml.transform.sax.SAXResult; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; import org.springframework.xml.transform.StringResult; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java index 1c8bd96edb..3f37bc6a69 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java @@ -25,7 +25,7 @@ import javax.xml.transform.Source; import org.junit.Test; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; import org.springframework.oxm.Unmarshaller; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java index 41a3418548..43fd1229f1 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathHeaderEnricherTests.java @@ -25,8 +25,8 @@ import java.util.Map; import org.junit.Test; -import org.springframework.integration.Message; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.xml.transformer.XPathHeaderEnricher; import org.springframework.integration.xml.transformer.XPathHeaderEnricher.XPathExpressionEvaluatingHeaderValueMessageProcessor; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java index 3f3bb31d98..24b8708385 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XPathTransformerTests.java @@ -32,7 +32,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.InputSource; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.xml.XmlPayloadConverter; import org.springframework.integration.xml.xpath.XPathEvaluationType; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java index 7bee4335b5..71f9e4a791 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltPayloadTransformerTests.java @@ -32,8 +32,8 @@ import org.w3c.dom.Document; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.ClassPathResource; import org.springframework.core.io.Resource; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.xml.result.StringResultFactory; import org.springframework.integration.xml.util.XmlTestUtil; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java index 9bf3986623..2277de64ca 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/XsltTransformerTests.java @@ -30,12 +30,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; import org.springframework.core.io.ClassPathResource; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.history.MessageHistory; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.test.util.TestUtils; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java index bef943e168..37218bc837 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/jaxbmarshaling/JaxbMarshallingIntegrationTests.java @@ -29,8 +29,8 @@ import org.w3c.dom.Document; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.MessageChannel; -import org.springframework.integration.core.PollableChannel; +import org.springframework.messaging.MessageChannel; +import org.springframework.messaging.PollableChannel; import org.springframework.integration.message.GenericMessage; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java index 833d2a835f..d9517de9a8 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/XmppHeaders.java @@ -17,7 +17,7 @@ package org.springframework.integration.xmpp; /** - * Used as keys for {@link org.springframework.integration.Message} objects + * Used as keys for {@link org.springframework.messaging.Message} objects * that handle XMPP events. * * @author Mario Gray diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/package-info.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/package-info.java index 8c9c31b522..b78823da1b 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/package-info.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/config/package-info.java @@ -1,4 +1,4 @@ /** * Contains parser classes for the XMPP namespace support. */ -package org.springframework.integration.xmpp.config; \ No newline at end of file +package org.springframework.integration.xmpp.config; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareEndpoint.java index 662c10fe83..b210e6fff3 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/AbstractXmppConnectionAwareEndpoint.java @@ -19,7 +19,7 @@ package org.springframework.integration.xmpp.core; import org.jivesoftware.smack.XMPPConnection; import org.springframework.beans.factory.BeanFactory; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.util.Assert; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/package-info.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/package-info.java index ba7086c508..c31504e730 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/package-info.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/core/package-info.java @@ -1,4 +1,4 @@ /** * Provides classes shared across all XMPP components. */ -package org.springframework.integration.xmpp.core; \ No newline at end of file +package org.springframework.integration.xmpp.core; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java index 2868d2b880..2c3334e22e 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpoint.java @@ -25,7 +25,7 @@ import org.jivesoftware.smack.RosterListener; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.Presence; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.xmpp.core.AbstractXmppConnectionAwareEndpoint; import org.springframework.util.Assert; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java index 24a2209282..1377340ebf 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandler.java @@ -18,7 +18,7 @@ package org.springframework.integration.xmpp.outbound; import org.jivesoftware.smack.XMPPConnection; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.xmpp.XmppHeaders; import org.springframework.integration.xmpp.core.AbstractXmppConnectionAwareMessageHandler; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandler.java index 5d5f5395e3..a5a5ce5a5e 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/outbound/PresenceSendingMessageHandler.java @@ -19,7 +19,7 @@ package org.springframework.integration.xmpp.outbound; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.Presence; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.xmpp.core.AbstractXmppConnectionAwareMessageHandler; import org.springframework.util.Assert; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/package-info.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/package-info.java index 9b9a6139e7..7970d04ba9 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/package-info.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/package-info.java @@ -1,4 +1,4 @@ /** * Root package of the Spring Integration XMPP Module. */ -package org.springframework.integration.xmpp; \ No newline at end of file +package org.springframework.integration.xmpp; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/XmppHeaderMapper.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/XmppHeaderMapper.java index 91c30e4874..aa10535ae5 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/XmppHeaderMapper.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/XmppHeaderMapper.java @@ -29,4 +29,4 @@ import org.springframework.integration.mapping.RequestReplyHeaderMapper; * @since 2.1 */ public interface XmppHeaderMapper extends RequestReplyHeaderMapper { -} \ No newline at end of file +} diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/package-info.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/package-info.java index f62bb8f6a0..2b3d60edc0 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/package-info.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/support/package-info.java @@ -3,4 +3,4 @@ * {@link org.springframework.integration.xmpp.support.XmppHeaderMapper} implementation * in this package. */ -package org.springframework.integration.xmpp.support; \ No newline at end of file +package org.springframework.integration.xmpp.support; diff --git a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd index b0b84522cb..12fe6b3b5a 100644 --- a/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd +++ b/spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd @@ -318,7 +318,7 @@ - + @@ -330,7 +330,7 @@ - + diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java index 78b494d849..8e1f852d52 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageInboundChannelAdapterParserTests.java @@ -33,7 +33,7 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.context.ApplicationContext; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.xmpp.inbound.ChatMessageListeningEndpoint; @@ -99,7 +99,7 @@ public class ChatMessageInboundChannelAdapterParserTests { message.setProperty("foo", "foo"); message.setProperty("bar", "bar"); packetListener.processPacket(message); - org.springframework.integration.Message siMessage = xmppInbound.receive(0); + org.springframework.messaging.Message siMessage = xmppInbound.receive(0); assertEquals("foo", siMessage.getHeaders().get("foo")); assertEquals("oleg", siMessage.getHeaders().get("xmpp_to")); } diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests.java index 29828693bf..496e26e534 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/ChatMessageOutboundChannelAdapterParserTests.java @@ -31,11 +31,11 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; import org.springframework.integration.handler.advice.AbstractRequestHandlerAdvice; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceOutboundChannelAdapterParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceOutboundChannelAdapterParserTests.java index a5fe499386..9e310f916f 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceOutboundChannelAdapterParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/PresenceOutboundChannelAdapterParserTests.java @@ -25,9 +25,9 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.SubscribableChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.SubscribableChannel; import org.springframework.integration.dispatcher.UnicastingDispatcher; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.endpoint.PollingConsumer; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java index b80f9e6cf5..a7b866ba15 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/config/XmppHeaderEnricherParserTests.java @@ -29,12 +29,12 @@ import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.annotation.Value; -import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.xmpp.XmppHeaders; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.core.GenericMessagingTemplate; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @@ -57,7 +57,7 @@ public class XmppHeaderEnricherParserTests { @SuppressWarnings("rawtypes") @Test public void to() { - MessagingTemplate messagingTemplate = new MessagingTemplate(); + GenericMessagingTemplate messagingTemplate = new GenericMessagingTemplate(); MessageHandler handler = mock(MessageHandler.class); doAnswer(new Answer() { public Object answer(InvocationOnMock invocation) throws Throwable { diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java index 37005844cb..765179d94a 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/SmackMessageSampleTests.java @@ -21,8 +21,8 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.Message; -import org.springframework.integration.MessageChannel; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessageChannel; import org.springframework.integration.message.GenericMessage; /** diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java index 0852c05e72..42b2f761b7 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/ignore/XmppMessageProducer.java @@ -18,7 +18,7 @@ package org.springframework.integration.xmpp.ignore; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.core.MessageSource; import org.springframework.integration.support.MessageBuilder; import org.springframework.integration.xmpp.XmppHeaders; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java index 128008308a..1c67767204 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/ChatMessageListeningEndpointTests.java @@ -36,12 +36,12 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.xmpp.core.XmppContextUtils; @@ -123,7 +123,7 @@ public class ChatMessageListeningEndpointTests { DirectChannel outChannel = new DirectChannel(); outChannel.subscribe(new MessageHandler() { - public void handleMessage(org.springframework.integration.Message message) + public void handleMessage(org.springframework.messaging.Message message) throws MessagingException { throw new RuntimeException("ooops"); } diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java index ff4eb7e7d8..41f9a1ee9a 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/inbound/PresenceListeningEndpointTests.java @@ -39,13 +39,13 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.Message; -import org.springframework.integration.MessagingException; +import org.springframework.messaging.Message; +import org.springframework.messaging.MessagingException; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.PollableChannel; -import org.springframework.integration.message.ErrorMessage; +import org.springframework.messaging.MessageHandler; +import org.springframework.messaging.PollableChannel; +import org.springframework.messaging.support.ErrorMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.xmpp.core.XmppContextUtils; @@ -140,7 +140,7 @@ public class PresenceListeningEndpointTests { DirectChannel outChannel = new DirectChannel(); outChannel.subscribe(new MessageHandler() { - public void handleMessage(org.springframework.integration.Message message) + public void handleMessage(org.springframework.messaging.Message message) throws MessagingException { throw new RuntimeException("ooops"); } diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java index 6de0b4452b..6c5bfac6a2 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/outbound/ChatMessageSendingMessageHandlerTests.java @@ -28,7 +28,7 @@ import org.mockito.ArgumentMatcher; import org.mockito.Mockito; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.Message; +import org.springframework.messaging.Message; import org.springframework.integration.MessageHandlingException; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.support.MessageBuilder; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/support/DefaultXmppHeaderMapperTests.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/support/DefaultXmppHeaderMapperTests.java index 321e2f0b93..4cd1a6201d 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/support/DefaultXmppHeaderMapperTests.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/support/DefaultXmppHeaderMapperTests.java @@ -26,7 +26,7 @@ import org.jivesoftware.smack.packet.Message; import org.junit.Test; -import org.springframework.integration.MessageHeaders; +import org.springframework.messaging.MessageHeaders; import org.springframework.integration.xmpp.XmppHeaders; /** diff --git a/src/reference/docbook/service-activator.xml b/src/reference/docbook/service-activator.xml index ecb3c3d5e7..1a423a85fc 100644 --- a/src/reference/docbook/service-activator.xml +++ b/src/reference/docbook/service-activator.xml @@ -37,7 +37,7 @@ value. If that value is available, it will then check its type. If it is a MessageChannel, the reply message will be sent to that channel. If it is a String, then the endpoint will attempt to resolve the channel name to a channel instance. - If the channel cannot be resolved, then a ChannelResolutionException will be thrown. + If the channel cannot be resolved, then a DestinationResolutionException will be thrown. It it can be resolved, the Message will be sent there. This is the technique used for Request Reply messaging in Spring Integration, and it is also an example of the Return Address pattern.