diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/Message.java b/spring-integration-core/src/main/java/org/springframework/integration/Message.java similarity index 94% rename from spring-integration-core/src/main/java/org/springframework/integration/core/Message.java rename to spring-integration-core/src/main/java/org/springframework/integration/Message.java index 1af36b0d2f..549dee2d28 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/Message.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/Message.java @@ -14,7 +14,8 @@ * limitations under the License. */ -package org.springframework.integration.core; +package org.springframework.integration; + /** * The central interface that any Message type must implement. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHeaders.java b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java similarity index 99% rename from spring-integration-core/src/main/java/org/springframework/integration/core/MessageHeaders.java rename to spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java index 001c037304..84c9498c5d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHeaders.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/MessageHeaders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.core; +package org.springframework.integration; import java.io.IOException; import java.io.ObjectInputStream; 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 af3254d251..22ed000964 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 @@ -20,10 +20,10 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.store.MessageGroup; import org.springframework.util.Assert; 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 b0907d98ff..66c5ce7ab3 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 @@ -18,7 +18,7 @@ import java.util.concurrent.ConcurrentMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.message.MessageSource; import org.springframework.integration.store.MessageGroup; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java index be6761db21..f010cacba5 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelatingMessageHandler.java @@ -19,11 +19,11 @@ 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.integration.MessageHeaders; import org.springframework.integration.channel.NullChannel; import org.springframework.integration.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.handler.AbstractMessageHandler; 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 1cac01f8df..c6e86b1d5a 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.core.Message; +import org.springframework.integration.Message; /** * Strategy for determining how messages shall be correlated. Implementations diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelationStrategyAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelationStrategyAdapter.java index bed28d78f8..7cbaaf5e28 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelationStrategyAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/CorrelationStrategyAdapter.java @@ -18,7 +18,7 @@ package org.springframework.integration.aggregator; import java.lang.reflect.Method; -import org.springframework.integration.core.Message; +import org.springframework.integration.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/DefaultAggregatingMessageGroupProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/DefaultAggregatingMessageGroupProcessor.java index fd5dbf49b8..2304f9a059 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 @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.springframework.integration.core.Message; +import org.springframework.integration.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/HeaderAttributeCorrelationStrategy.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/HeaderAttributeCorrelationStrategy.java index f2217b0a18..0f8f1dce07 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.core.Message; +import org.springframework.integration.Message; /** * Default implementation of {@link CorrelationStrategy}. Uses a header diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java index 656526b59b..77c4b95cb4 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/MessageListMethodAdapter.java @@ -16,7 +16,7 @@ package org.springframework.integration.aggregator; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.util.DefaultMethodInvoker; import org.springframework.util.Assert; 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 b05cf27cfa..82d9f830df 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,7 +18,7 @@ package org.springframework.integration.aggregator; import java.util.Comparator; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * A {@link Comparator} implementation based on the 'sequence number' 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 aa09896ad0..c376251a7b 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 @@ -26,9 +26,9 @@ import java.util.concurrent.atomic.AtomicReference; import org.springframework.aop.support.AopUtils; import org.springframework.core.annotation.AnnotationUtils; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.Header; -import org.springframework.integration.core.Message; import org.springframework.integration.store.MessageGroup; import org.springframework.util.Assert; import org.springframework.util.ReflectionUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/PassThroughMessageGroupProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/PassThroughMessageGroupProcessor.java index 1a41bf02bb..a5234ebd65 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/aggregator/PassThroughMessageGroupProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/aggregator/PassThroughMessageGroupProcessor.java @@ -13,7 +13,7 @@ package org.springframework.integration.aggregator; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.store.MessageGroup; 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 a522de55ca..527231acf4 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,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.store.MessageGroup; 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 6854d73bdf..426bc6b85c 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,48 +1,48 @@ -/* - * 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.aggregator; - -import java.util.Comparator; - -import org.springframework.integration.core.Message; - -/** - * @author Dave Syer - * - * @since 2.0 - * - */ -public class SequenceNumberComparator implements Comparator> { - - /** - * If both messages have a sequence number then compare that, otherwise if one has a sequence number and the other - * doesn't then the numbered message comes first, or finally of neither has a sequence number then they are equal in - * rank. - */ - public int compare(Message o1, Message o2) { - Integer sequenceNumber1 = o1.getHeaders().getSequenceNumber(); - Integer sequenceNumber2 = o2.getHeaders().getSequenceNumber(); - if (sequenceNumber1 == sequenceNumber2) { - return 0; - } - if (sequenceNumber1 == null) { - return -sequenceNumber2; - } - if (sequenceNumber2 == null) { - return sequenceNumber1; - } - return sequenceNumber1.compareTo(sequenceNumber2); - } - +/* + * 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.aggregator; + +import java.util.Comparator; + +import org.springframework.integration.Message; + +/** + * @author Dave Syer + * + * @since 2.0 + * + */ +public class SequenceNumberComparator implements Comparator> { + + /** + * If both messages have a sequence number then compare that, otherwise if one has a sequence number and the other + * doesn't then the numbered message comes first, or finally of neither has a sequence number then they are equal in + * rank. + */ + public int compare(Message o1, Message o2) { + Integer sequenceNumber1 = o1.getHeaders().getSequenceNumber(); + Integer sequenceNumber2 = o2.getHeaders().getSequenceNumber(); + if (sequenceNumber1 == sequenceNumber2) { + return 0; + } + if (sequenceNumber1 == null) { + return -sequenceNumber2; + } + if (sequenceNumber2 == null) { + return sequenceNumber1; + } + 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 dfcdbd74ff..1e4e29c350 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 @@ -21,7 +21,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.store.MessageGroup; /** 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 828601f414..adfd01c422 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.store.MessageGroup; /** 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 9d61d15799..a70f675ef4 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.core.Message} or of the expected + * {@link org.springframework.integration.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 611e0ac30b..2a60518ee5 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.core.Message} + * parameter of type {@link org.springframework.integration.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 bdf677c96c..db35ba3393 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.core.Message} or of the expected + * {@link org.springframework.integration.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/ServiceActivator.java b/spring-integration-core/src/main/java/org/springframework/integration/annotation/ServiceActivator.java index 353f8a2b69..c735927781 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.core.Message} or of the expected + * {@link org.springframework.integration.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 c2607076d5..c31e5fc54a 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.core.Message} or of the expected + * {@link org.springframework.integration.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/aop/MessagePublishingInterceptor.java b/spring-integration-core/src/main/java/org/springframework/integration/aop/MessagePublishingInterceptor.java index 556e3008d5..58b087fcbb 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 @@ -32,8 +32,8 @@ 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.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; 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 2439627644..6942dcb9ad 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 @@ -25,8 +25,8 @@ 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.context.IntegrationObjectSupport; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; 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 5d2d02ca5a..211e6eb171 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,7 +16,7 @@ package org.springframework.integration.channel; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; /** 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 213d6db3c7..09f23a7b3f 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 @@ -16,7 +16,7 @@ package org.springframework.integration.channel; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.SubscribableChannel; 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 1e5f9b2822..75610f4a0d 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,7 +16,7 @@ package org.springframework.integration.channel; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; /** 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 8ffa5e65ef..eb3c272ddc 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.core.Message; +import org.springframework.integration.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/MessagePublishingErrorHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/MessagePublishingErrorHandler.java index 0ca24b8177..0c11d4e334 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 @@ -20,11 +20,11 @@ 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.integration.Message; import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.ErrorMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; import org.springframework.util.Assert; 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 43792d22c8..7c8d3e4aac 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,7 +19,7 @@ package org.springframework.integration.channel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; /** 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 e93958ed84..490475de6c 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 @@ -19,8 +19,8 @@ package org.springframework.integration.channel; import java.util.Comparator; import java.util.concurrent.PriorityBlockingQueue; -import org.springframework.integration.core.Message; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.util.UpperBound; /** 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 37a8ed9e97..60e39265c2 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.core.Message; +import org.springframework.integration.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/RendezvousChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/RendezvousChannel.java index 005baa0e2b..91680a3309 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.core.Message; +import org.springframework.integration.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 cb7bfad048..28abff9683 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.channel.ChannelInterceptor; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java index 651257eb20..6291946454 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/channel/interceptor/GlobalChannelInterceptorWrapper.java @@ -16,8 +16,8 @@ package org.springframework.integration.channel.interceptor; import org.springframework.core.Ordered; +import org.springframework.integration.Message; import org.springframework.integration.channel.ChannelInterceptor; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; /** 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 e84368561f..f8b3980e6d 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,7 +19,7 @@ package org.springframework.integration.channel.interceptor; import java.util.Arrays; import java.util.List; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageSelector; 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 36083742d3..55d085f3e1 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 @@ -20,8 +20,8 @@ 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.channel.ChannelInterceptor; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageHistoryWritingMessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageHistoryWritingMessageHandler.java index 127d6205c8..5531e90d64 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/config/MessageHistoryWritingMessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/config/MessageHistoryWritingMessageHandler.java @@ -17,7 +17,7 @@ package org.springframework.integration.config; import org.springframework.core.Ordered; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.history.MessageHistoryWriter; import org.springframework.integration.history.NamedComponent; 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 b4de7a9131..277db8ea94 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,7 @@ import org.w3c.dom.Element; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.ParserContext; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; import org.springframework.util.StringUtils; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java index 300bfd1e0c..cf2a11c66d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/context/IntegrationObjectSupport.java @@ -26,8 +26,8 @@ import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.core.convert.ConversionService; +import org.springframework.integration.Message; import org.springframework.integration.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.history.MessageHistoryWriter; import org.springframework.integration.history.NamedComponent; import org.springframework.scheduling.TaskScheduler; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/GenericMessage.java b/spring-integration-core/src/main/java/org/springframework/integration/core/GenericMessage.java index a7649157b8..53999daad9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/GenericMessage.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/GenericMessage.java @@ -20,6 +20,8 @@ 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; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageBuilder.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageBuilder.java index 87e7424f21..ce16d38c82 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageBuilder.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageBuilder.java @@ -22,6 +22,8 @@ import java.util.Map; import java.util.Set; import java.util.UUID; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageChannel.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageChannel.java index 72c6a1115d..d93c2f1e62 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageChannel.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageChannel.java @@ -16,6 +16,8 @@ package org.springframework.integration.core; +import org.springframework.integration.Message; + /** * Base channel interface defining common behavior for message sending and receiving. * diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageDeliveryException.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageDeliveryException.java index 711aa9a7bb..f72352eb0c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageDeliveryException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageDeliveryException.java @@ -16,6 +16,8 @@ package org.springframework.integration.core; +import org.springframework.integration.Message; + /** * Exception that indicates an error during message delivery. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java index 1af3a2b14a..14f7ab6e3c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandler.java @@ -16,6 +16,8 @@ package org.springframework.integration.core; +import org.springframework.integration.Message; + /** * Base interface for any component that handles Messages. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandlingException.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandlingException.java index 6a375e99e6..6ca9b4d716 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandlingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageHandlingException.java @@ -16,6 +16,8 @@ package org.springframework.integration.core; +import org.springframework.integration.Message; + /** * Exception that indicates an error during message handling. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageRejectedException.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageRejectedException.java index b3d01dc1a5..60534c6aee 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessageRejectedException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessageRejectedException.java @@ -16,6 +16,8 @@ package org.springframework.integration.core; +import org.springframework.integration.Message; + /** * Exception that indicates a message has been rejected by a selector. 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 01e8e74cfc..147f827c76 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,6 +16,8 @@ package org.springframework.integration.core; +import org.springframework.integration.Message; + /** * Strategy interface for message selection. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingException.java b/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingException.java index ead1bd36e5..baaa445a14 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/core/MessagingException.java @@ -16,6 +16,8 @@ package org.springframework.integration.core; +import org.springframework.integration.Message; + /** * The base exception for any failures within the messaging system. * 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 index 52caff1b00..9a44a2fca2 100644 --- 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 @@ -24,6 +24,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.MessageHeaders; import org.springframework.transaction.PlatformTransactionManager; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.support.TransactionCallback; 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 index 8525611caf..46a64d50d8 100644 --- 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 @@ -16,6 +16,8 @@ package org.springframework.integration.core; +import org.springframework.integration.Message; + /** * Interface for Message Channels from which Messages may be actively received through polling. 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 9bf9863309..e4cca4b030 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,7 +16,7 @@ package org.springframework.integration.dispatcher; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageDeliveryException; import java.util.Collections; 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 24a57f00d8..2d80e25a21 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 @@ -20,10 +20,10 @@ import java.util.List; import java.util.UUID; import java.util.concurrent.Executor; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagingException; /** 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 08e5ebaed1..79d1debe22 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,7 +18,7 @@ package org.springframework.integration.dispatcher; import java.util.Iterator; import java.util.List; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; /** 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 4634405da4..bd8a26fd17 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,7 +16,7 @@ package org.springframework.integration.dispatcher; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; /** 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 868d0fb996..7c0ba7ef29 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 @@ -21,7 +21,7 @@ import java.util.Iterator; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; /** 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 aff1dbb7e1..3d664fa46c 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,7 +23,7 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessagingException; 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 43f802bb29..e49882aa33 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,7 +16,7 @@ package org.springframework.integration.endpoint; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.core.MessagingTemplate; 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 fb28911e3c..9de73d9168 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 @@ -16,7 +16,7 @@ package org.springframework.integration.endpoint; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.PollableChannel; 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 993673ee1a..005ac37c6c 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,7 +16,7 @@ package org.springframework.integration.endpoint; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.message.MessageSource; 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 47d53bf7cc..af729e3306 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.core.Message; +import org.springframework.integration.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 4eab8bd68a..49bfd7ea41 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,10 +17,10 @@ package org.springframework.integration.filter; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java index c182256047..f14fe8e66a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractMessagingGateway.java @@ -16,8 +16,8 @@ package org.springframework.integration.gateway; +import org.springframework.integration.Message; import org.springframework.integration.core.ErrorMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java index b87d0451fa..031744f0f9 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/AbstractRemotingOutboundGateway.java @@ -18,7 +18,7 @@ package org.springframework.integration.gateway; import java.io.Serializable; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandlingException; 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 6d7fb04bd2..569ea24371 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 @@ -32,9 +32,9 @@ import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.core.convert.ConversionService; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Gateway; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.AbstractEndpoint; import org.springframework.integration.handler.ArgumentArrayMessageMapper; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RemotingInboundGatewaySupport.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RemotingInboundGatewaySupport.java index 6b57aa8662..88c0962264 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/RemotingInboundGatewaySupport.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/RemotingInboundGatewaySupport.java @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Support class for inbound Messaging Gateways. 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 0ae0809c58..3e1d22742c 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.core.Message; +import org.springframework.integration.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 091a9fbb69..124b693560 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,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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/SimpleMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java index aa7e0d0238..0025ff3150 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessageMapper.java @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.InboundMessageMapper; import org.springframework.integration.message.OutboundMessageMapper; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java index c4e1ea90e4..54cdaeb59c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/gateway/SimpleMessagingGateway.java @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.InboundMessageMapper; import org.springframework.integration.message.OutboundMessageMapper; 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 6a0b5ed744..6d3cc97c21 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 @@ -19,10 +19,10 @@ package org.springframework.integration.handler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.core.Ordered; +import org.springframework.integration.Message; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.ChannelResolutionException; import org.springframework.integration.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; 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 c0bfb88270..78d692c3cc 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 @@ -21,7 +21,7 @@ import org.springframework.expression.EvaluationException; import org.springframework.expression.Expression; import org.springframework.expression.spel.support.StandardEvaluationContext; import org.springframework.expression.spel.support.StandardTypeConverter; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandlingException; /** 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 83a08d3f3b..7870a5b30c 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 @@ -16,13 +16,13 @@ package org.springframework.integration.handler; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandlingException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessageProducer; import org.springframework.integration.core.MessagingTemplate; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractScriptExecutingMessageProcessor.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractScriptExecutingMessageProcessor.java index 979bd681d2..1d4d859c76 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractScriptExecutingMessageProcessor.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/AbstractScriptExecutingMessageProcessor.java @@ -16,7 +16,7 @@ package org.springframework.integration.handler; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandlingException; import org.springframework.scripting.ScriptSource; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java index 19c2353829..6c0bf46b9c 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/ArgumentArrayMessageMapper.java @@ -34,10 +34,10 @@ 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.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.InboundMessageMapper; 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 969a4952d3..142dadf2f3 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.core.Message; +import org.springframework.integration.Message; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/DelayHandler.java index 3a78a5a92a..f79c54feb4 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 @@ -24,17 +24,17 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.core.Ordered; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.context.IntegrationObjectSupport; import org.springframework.integration.core.ChannelResolutionException; import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.ErrorMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.store.MessageStore; import org.springframework.integration.store.SimpleMessageStore; 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 6948e7ee06..0249fc6aa3 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 @@ -27,7 +27,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.core.Message; +import org.springframework.integration.Message; /** * A {@link MessageProcessor} implementation that evaluates a SpEL expression diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/HandlerMethodResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/HandlerMethodResolver.java index c9b9130e0a..e91e21ee1a 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/HandlerMethodResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/HandlerMethodResolver.java @@ -18,7 +18,7 @@ package org.springframework.integration.handler; import java.lang.reflect.Method; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Strategy interface for resolving a Method that should be responsible for 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 a3a9e532fd..433e9d620e 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 @@ -24,7 +24,7 @@ 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.core.Message; +import org.springframework.integration.Message; 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 ff4913a8d1..568569ce03 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 @@ -20,8 +20,8 @@ import java.util.HashSet; import java.util.List; import org.springframework.core.Ordered; +import org.springframework.integration.Message; import org.springframework.integration.context.IntegrationObjectSupport; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; 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 17a1eb2eeb..d48c2fc806 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.core.Message; +import org.springframework.integration.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 bc93ec1f54..a86afdae69 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 @@ -19,7 +19,7 @@ package org.springframework.integration.handler; import java.lang.reflect.Method; import org.springframework.core.Ordered; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessagingException; 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 f9a0b6d9a7..48390cd9fb 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 @@ -40,10 +40,10 @@ import org.springframework.core.annotation.AnnotationUtils; 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.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; import org.springframework.integration.util.ClassUtils; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/PayloadTypeMatchingHandlerMethodResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/PayloadTypeMatchingHandlerMethodResolver.java index 1820934eaa..185aa5ed49 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/PayloadTypeMatchingHandlerMethodResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/PayloadTypeMatchingHandlerMethodResolver.java @@ -26,7 +26,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.util.ClassUtils; import org.springframework.util.Assert; 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 d22a134f42..3227ca7703 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,8 +18,8 @@ package org.springframework.integration.handler; import java.lang.reflect.Method; +import org.springframework.integration.Message; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandlingException; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/handler/StaticHandlerMethodResolver.java b/spring-integration-core/src/main/java/org/springframework/integration/handler/StaticHandlerMethodResolver.java index 08439ec033..ce59f088b0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/handler/StaticHandlerMethodResolver.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/handler/StaticHandlerMethodResolver.java @@ -18,7 +18,7 @@ package org.springframework.integration.handler; import java.lang.reflect.Method; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.util.Assert; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java index eb6055d47d..6532b4cdb0 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/InboundJsonMessageMapper.java @@ -29,9 +29,9 @@ import org.codehaus.jackson.map.ObjectMapper; import org.codehaus.jackson.map.type.TypeFactory; import org.codehaus.jackson.type.JavaType; import org.codehaus.jackson.type.TypeReference; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.InboundMessageMapper; import org.springframework.util.Assert; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/json/OutboundJsonMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/json/OutboundJsonMessageMapper.java index eb2d1d9713..7d47d07e80 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/json/OutboundJsonMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/json/OutboundJsonMessageMapper.java @@ -3,7 +3,7 @@ package org.springframework.integration.json; import java.io.StringWriter; import org.codehaus.jackson.map.ObjectMapper; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.message.OutboundMessageMapper; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java index c534131b75..622171b517 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/HeaderMapper.java @@ -18,7 +18,7 @@ package org.springframework.integration.message; import java.util.Map; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * Generic strategy interface for mapping {@link MessageHeaders} to and from other diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/InboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/message/InboundMessageMapper.java index 6a2add363b..afd2769db7 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/InboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/InboundMessageMapper.java @@ -16,7 +16,7 @@ package org.springframework.integration.message; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Strategy interface for mapping from an Object to a{@link Message}. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageMappingException.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageMappingException.java index 5ff3d372c4..8cba1823e1 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageMappingException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageMappingException.java @@ -16,7 +16,7 @@ package org.springframework.integration.message; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageSource.java index 550878f166..70489205f2 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageSource.java @@ -16,7 +16,7 @@ package org.springframework.integration.message; -import org.springframework.integration.core.Message; +import org.springframework.integration.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/message/MessageTimeoutException.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java index 54e2f78bf5..999390ce1f 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MessageTimeoutException.java @@ -16,7 +16,7 @@ package org.springframework.integration.message; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandlingException; /** diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java b/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java index 74b971e13b..505353dd80 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/MethodInvokingMessageSource.java @@ -20,8 +20,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import org.springframework.beans.factory.InitializingBean; +import org.springframework.integration.Message; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.util.DefaultMethodInvoker; import org.springframework.integration.util.MethodInvoker; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java b/spring-integration-core/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java index 474943cc61..9bcf4f57bb 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/message/OutboundMessageMapper.java @@ -16,7 +16,7 @@ package org.springframework.integration.message; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Strategy interface for mapping from a {@link Message} to an Object. diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java index b1998420e5..de018513d8 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractChannelNameResolvingMessageRouter.java @@ -23,9 +23,9 @@ import java.util.List; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.integration.Message; import org.springframework.integration.core.ChannelResolutionException; import org.springframework.integration.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; import org.springframework.util.Assert; 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 f4c9b930cc..cee94bf2b0 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.ArrayList; import java.util.List; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.core.Message; +import org.springframework.integration.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 aa862f4902..9b4e3c7088 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 @@ -19,11 +19,11 @@ package org.springframework.integration.router; import java.util.Collection; import java.util.UUID; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.handler.AbstractMessageHandler; diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java index be1d972803..9ba06ed75d 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelNameRouter.java @@ -19,7 +19,7 @@ package org.springframework.integration.router; import java.util.ArrayList; import java.util.List; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Extends {@link AbstractChannelNameResolvingMessageRouter} to support router diff --git a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java index be54f56583..ca38e75aaf 100644 --- a/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java +++ b/spring-integration-core/src/main/java/org/springframework/integration/router/AbstractSingleChannelRouter.java @@ -19,7 +19,7 @@ package org.springframework.integration.router; import java.util.Collection; import java.util.Collections; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; /** 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 c1c1bee1e3..3cbd69b6cb 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,7 +19,7 @@ package org.springframework.integration.router; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; 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 c036dd6e4c..0553a50fba 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.core.Message; +import org.springframework.integration.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; 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 c38c406447..f9e3eb3005 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 @@ -19,7 +19,7 @@ package org.springframework.integration.router; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.util.ClassUtils; import org.springframework.util.Assert; 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 64e3ea2db4..97a23073d9 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 @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageSelector; import org.springframework.util.Assert; 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 b7c756a478..095e3ef950 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.core.Message; +import org.springframework.integration.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 c5cc3e44c0..d2d03978b1 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.core.Message; +import org.springframework.integration.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 493468f39d..892e2384ad 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,7 +16,7 @@ package org.springframework.integration.selector; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageSelector; /** 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 edc2b9647e..6547a45845 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 @@ -18,7 +18,7 @@ package org.springframework.integration.splitter; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.core.convert.ConversionService; -import org.springframework.integration.core.Message; +import org.springframework.integration.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 9888bc11e3..291593d160 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 @@ -21,10 +21,10 @@ import java.util.Collection; import java.util.List; import java.util.UUID; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; /** 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 d902a50a09..98bbd17cfa 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.core.Message; +import org.springframework.integration.Message; /** * The default Message Splitter implementation. Returns individual Messages 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 0fcdc8c05b..5dd7bc2dd1 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 @@ -1,6 +1,6 @@ package org.springframework.integration.store; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import java.util.Collection; 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 b7150a64e0..53a61dc72e 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 @@ -22,7 +22,7 @@ import java.util.Iterator; import java.util.concurrent.BlockingQueue; import java.util.concurrent.TimeUnit; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * A {@link BlockingQueue} that is backed by a {@link MessageGroupStore}. Can be used to ensure guaranteed delivery in 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 c2998e2619..8c59f9d117 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 @@ -12,7 +12,7 @@ */ package org.springframework.integration.store; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Interface for storage operations on groups of messages linked by a group id. 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 6a44fa0e9c..99b6a44e0f 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.core.Message; +import org.springframework.integration.Message; /** * Strategy interface for storing and retrieving messages. 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 ca3d0932ef..cd0f297d55 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,7 @@ import java.util.Collections; import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Represents a mutable group of correlated messages that is bound to a certain {@link MessageStore} and group id. The 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 c9bdae026c..33134b165c 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 @@ -19,7 +19,7 @@ import java.util.UUID; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.util.UpperBound; import org.springframework.util.Assert; 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 fa7fd4813a..e6945b93a9 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,8 +19,8 @@ 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.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; 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 8a65bcbd9c..0e4f19d4ad 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.core.Message; +import org.springframework.integration.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 5c653a0974..fdeda958ca 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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 9637a01384..6fa7703f97 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.store.MessageStore; 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 d6afa2b93a..53a1d21ade 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.store.MessageStore; import org.springframework.util.Assert; 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 6c66711f48..be3a37a88f 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,7 +24,7 @@ import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; 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 46e581f886..98ffe866ce 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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 d94e3969a8..f86de2aa51 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,7 +16,7 @@ package org.springframework.integration.transformer; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; /** 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 6564e54c0c..9535f8ab0f 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,9 +16,9 @@ package org.springframework.integration.transformer; +import org.springframework.integration.Message; import org.springframework.integration.channel.ChannelInterceptor; import org.springframework.integration.channel.interceptor.ChannelInterceptorAdapter; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; /** 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 dead8a1202..6714d0d5b4 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,11 +17,11 @@ package org.springframework.integration.transformer; import org.springframework.beans.factory.BeanFactoryAware; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.util.Assert; 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 e1a17ebe9a..68a9ab2741 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.core.Message; +import org.springframework.integration.Message; /** * Strategy interface for transforming a {@link Message}. 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 8883e0e06a..ab831e36d8 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 @@ -27,8 +27,8 @@ import java.util.List; import java.util.Map; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.store.MessageGroup; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests.java index f2c2cef356..d47733139a 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/AggregatorReplyChannelTests.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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 c50bf293db..b24d8af7b0 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 @@ -25,12 +25,12 @@ import java.util.concurrent.TimeUnit; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandlingException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageStore; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ConcurrentAggregatorTests.java index 4ecb142944..47a7c54710 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 @@ -30,13 +30,13 @@ 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.MessageHeaders; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupStore; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTest.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTest.java index bb0a924ac4..a9f43f0d97 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTest.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/CorrelatingMessageBarrierTest.java @@ -17,7 +17,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.store.MessageGroup; 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 bd28ecb526..1d980a50ba 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 @@ -22,7 +22,7 @@ import static org.mockito.Mockito.verify; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.store.MessageGroupStore; 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 c8a5e76eb4..7f6da8b362 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 @@ -37,7 +37,7 @@ import org.mockito.Mock; import org.mockito.internal.stubbing.answers.DoesNothing; import org.mockito.internal.stubbing.answers.ThrowsException; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandlingException; 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 d7745e9f46..312aa767db 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,8 +19,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.util.ReflectionUtils; 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 049863196a..0f89ca6e8f 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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 30ed43722b..b6504343f6 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.StringMessage; 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 3f42812edd..02f13044eb 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 @@ -38,11 +38,11 @@ import org.mockito.runners.MockitoJUnitRunner; import org.springframework.aop.framework.ProxyFactory; import org.springframework.beans.DirectFieldAccessor; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.Header; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ReleaseStrategyAdapterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ReleaseStrategyAdapterTests.java index 29c0e6158a..c6d61d1452 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ReleaseStrategyAdapterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/ReleaseStrategyAdapterTests.java @@ -23,8 +23,8 @@ import java.util.List; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.SimpleMessageGroup; 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 63cdb0d30a..03fa8b670d 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 @@ -27,8 +27,8 @@ import java.util.Comparator; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.store.MessageGroupStore; 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 29d550ecae..16d45d6126 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.store.SimpleMessageGroup; 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 42117b3a34..860344a6d9 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.store.SimpleMessageGroup; 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 f75a2a3602..72bbe7aeb7 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 @@ -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.MessageHeaders; import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.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/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/DefaultMessageAggregatorIntegrationTests.java index 5822c4eeaa..cb0977e7fd 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 @@ -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.MessageHeaders; import org.springframework.integration.core.GenericMessage; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.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/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aggregator/integration/MethodInvokingAggregatorReturningMessageTests.java index 65b86b72da..a67cccf18a 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 @@ -25,8 +25,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.channel.DirectChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.PollableChannel; import org.springframework.test.context.ContextConfiguration; 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 88d45b5851..f7a4712dd2 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,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.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.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/aop/AnnotationConfigRegistrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/AnnotationConfigRegistrationTests.java index 43b4c3b14f..1e67b4335c 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,10 +22,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.annotation.Header; import org.springframework.integration.annotation.Payload; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; 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/MessagePublishingAnnotationUsageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingAnnotationUsageTests.java index eae5156e9a..901b4c02a7 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,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.annotation.Header; import org.springframework.integration.annotation.Payload; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; 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/MessagePublishingInterceptorTests.java b/spring-integration-core/src/test/java/org/springframework/integration/aop/MessagePublishingInterceptorTests.java index beb5b16899..90c23521c2 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,9 +28,9 @@ import org.junit.Before; import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; +import org.springframework.integration.Message; import org.springframework.integration.channel.MapBasedChannelResolver; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; /** * @author Mark Fisher 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 1aebc2c023..0095a2feda 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,8 +21,8 @@ import junit.framework.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.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; 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 1397b499fd..d99b06c491 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 @@ -24,8 +24,8 @@ import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.support.StaticApplicationContext; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; /** * @author Mark Fisher 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 681648134d..6f6de2d439 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 @@ -24,10 +24,10 @@ import org.junit.Test; import org.springframework.aop.framework.ProxyFactory; import org.springframework.context.support.StaticApplicationContext; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Payload; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.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 e10d5f2f7b..505b981c44 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 @@ -27,12 +27,12 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.Message; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.context.IntegrationContextUtils; import org.springframework.integration.core.ErrorMessage; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; 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 bfa4f13942..25cbe22f7e 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 @@ -20,13 +20,13 @@ import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; 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.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; 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 5bd74f55c2..3cef4068ee 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; 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 b4de52afcc..2159a41476 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 @@ -25,7 +25,7 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; import org.springframework.integration.dispatcher.UnicastingDispatcher; 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 4a47a8f138..984b641ea8 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 @@ -28,9 +28,9 @@ 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.channel.DirectChannel; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; 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 feb779ed78..0707a72f7b 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,7 +30,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; import org.springframework.core.task.SimpleAsyncTaskExecutor; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; import org.springframework.integration.message.StringMessage; 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 2acab8af88..2b53325638 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.core.Message; +import org.springframework.integration.Message; /** * @author Mark Fisher diff --git a/spring-integration-core/src/test/java/org/springframework/integration/channel/MessagingTemplateTests.java b/spring-integration-core/src/test/java/org/springframework/integration/channel/MessagingTemplateTests.java index e25429eb6c..5499362a54 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/MessagingTemplateTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/MessagingTemplateTests.java @@ -30,7 +30,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; 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 96ec22a610..5230d4922a 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 @@ -27,7 +27,7 @@ import org.mockito.stubbing.Answer; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.task.SimpleAsyncTaskExecutor; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; 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 1c3943e9cb..d5c27a9eca 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 @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.StringMessage; 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 6841537be6..65886b57ad 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,8 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.UnexpiredMessageSelector; 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 d6a05a059a..a96c46a255 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,12 +33,12 @@ 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.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.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; 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 8f5d7b77cf..061d999a9e 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.StringMessage; 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 8483a3e388..57b6639282 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.transformer.Transformer; 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 d6490e9475..118fa9a801 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 @@ -30,9 +30,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.integration.channel.AbstractMessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; 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 e87a28aee3..48446dd521 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 @@ -24,9 +24,9 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.Ordered; +import org.springframework.integration.Message; import org.springframework.integration.channel.AbstractMessageChannel; import org.springframework.integration.channel.ChannelInterceptor; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; /** 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 93051cd77d..a0d1346e85 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/channel/interceptor/MessageSelectingInterceptorTests.java @@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; 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 30064740ba..59736ac8a0 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,8 +22,8 @@ import static org.junit.Assert.assertNull; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; 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 1492261741..b8c6100d16 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 @@ -23,8 +23,8 @@ import org.springframework.beans.DirectFieldAccessor; 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.integration.aggregator.*; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 89e74e4805..b9fd0f53ec 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,10 +21,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.aggregator.ReleaseStrategy; import org.springframework.integration.aggregator.CorrelationStrategy; import org.springframework.integration.annotation.Aggregator; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 cd7f2c077d..7167ce8352 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,7 +22,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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.store.MessageGroupStore; 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 c076f66d65..eb0b2e3024 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 @@ -32,7 +32,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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 450d1065f5..174e491b15 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 @@ -27,10 +27,10 @@ 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.channel.DirectChannel; import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.core.ChannelResolutionException; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; 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 8cfebee00b..cb56646448 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,7 +24,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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 5e7df4e937..407fc815a2 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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 2a71c38c48..3b2230aa87 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 @@ -25,7 +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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessageSelector; 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 7c8f15f27d..cc4fa8f1c9 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 @@ -27,13 +27,13 @@ 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.aggregator.CorrelatingMessageHandler; import org.springframework.integration.aggregator.CorrelationStrategy; import org.springframework.integration.aggregator.CorrelationStrategyAdapter; import org.springframework.integration.aggregator.ReleaseStrategyAdapter; import org.springframework.integration.aggregator.ResequencingMessageGroupProcessor; import org.springframework.integration.channel.NullChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 08d7911d9c..9074f8da26 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,7 +23,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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 f3d0422375..782d2584a0 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; import org.springframework.integration.selector.MessageSelectorChain; 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 3888eab6a6..5280f802ce 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 @@ -27,8 +27,8 @@ import org.aopalliance.aop.Advice; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.StringMessage; import org.springframework.integration.scheduling.PollerMetadata; 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 8160375efd..886f699dec 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.core.Message; +import org.springframework.integration.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 53deb69e41..9bde659c7f 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,9 +22,9 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.springframework.integration.Message; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** 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 8e54924419..02d00e8c36 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.channel.interceptor.ChannelInterceptorAdapter; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; /** 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 be6e06b763..f7615c83fc 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,7 +16,7 @@ package org.springframework.integration.config; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; /** 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 a54d3688af..71c16e8f69 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,8 +16,8 @@ package org.springframework.integration.config; +import org.springframework.integration.Message; import org.springframework.integration.aggregator.CorrelationStrategy; -import org.springframework.integration.core.Message; /** * @author Marius Bogoevici 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 3beddc8d3a..9d70bad5ee 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,8 +18,8 @@ package org.springframework.integration.config; import java.util.concurrent.CountDownLatch; +import org.springframework.integration.Message; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.core.Message; /** * @author Mark Fisher 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 ea029eeb50..762006863a 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.core.Message; +import org.springframework.integration.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 d69b4ff147..01c1e748b9 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.message.MessageSource; import org.springframework.integration.message.StringMessage; 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 8f2ba29d6e..f5845266c0 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,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.channel.interceptor.WireTap; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; 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 1ff1922f60..c522c8d5f2 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 @@ -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.context.support.AbstractApplicationContext; +import org.springframework.integration.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.PollableChannel; 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 aa97e087e3..aff804cc12 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 @@ -22,11 +22,11 @@ import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Filter; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.test.util.TestUtils.TestApplicationContext; 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 d4674f6349..2387144573 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,9 +29,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.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.core.SubscribableChannel; 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 facc62dff6..c3fe793372 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 @@ -28,6 +28,7 @@ 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.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.annotation.Transformer; @@ -35,7 +36,6 @@ import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 61b6e1a955..cc22268b9d 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,11 +21,11 @@ import static org.junit.Assert.assertEquals; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.Router; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.test.util.TestUtils.TestApplicationContext; 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 ffb5477eca..b30226b213 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,11 +23,11 @@ import static org.junit.Assert.assertNull; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.Splitter; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.integration.test.util.TestUtils; import org.springframework.integration.test.util.TestUtils.TestApplicationContext; 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 9a93f7fc32..e511d9f55a 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,10 +27,10 @@ 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.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.dispatcher.RoundRobinLoadBalancingStrategy; 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 09206508e4..e142ab95fd 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,9 +22,9 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.springframework.integration.Message; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; import org.springframework.stereotype.Component; 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 65ac4c7903..e7cf36fff2 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,10 +22,10 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.springframework.integration.Message; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.MessageEndpoint; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** 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 259449622e..0af8d3a831 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,11 +22,11 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; +import org.springframework.integration.Message; import org.springframework.integration.aggregator.MessageSequenceComparator; import org.springframework.integration.annotation.Aggregator; import org.springframework.integration.annotation.ReleaseStrategy; import org.springframework.integration.annotation.MessageEndpoint; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** 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 72778597a4..1e0bd62628 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 @@ -23,8 +23,8 @@ import org.hamcrest.Matcher; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; 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 9289ecc318..10d4ae4b4a 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 @@ -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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 969cff40f0..8602cdd9c7 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,8 +23,8 @@ 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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 7b09f10232..38fe827874 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 @@ -24,7 +24,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 20a939cb80..62464f0d61 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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; 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 808b849cd1..3d3ddcf6f1 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 @@ -25,8 +25,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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 c8909e2e15..d46101ffa0 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 @@ -27,7 +27,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 53561c57cf..08829545b5 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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.test.context.ContextConfiguration; 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 c7ba01a4e9..7b315b857c 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 @@ -25,11 +25,11 @@ 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.MessageHeaders; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.message.StringMessage; 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 0ff6eec9a9..a897132503 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,7 +30,7 @@ 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 8ca616bddc..3211f8f53c 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 @@ -26,7 +26,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.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/ObjectToMapTransformerParserTests.java b/spring-integration-core/src/test/java/org/springframework/integration/config/xml/ObjectToMapTransformerParserTests.java index b5fd935df0..1434d7f75c 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 @@ -34,7 +34,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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 f5fcbe1da6..0b0ee7d757 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 @@ -24,8 +24,8 @@ 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.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; 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 ab263b9bbd..9047eb1c88 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 @@ -29,8 +29,8 @@ 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.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.transformer.MessageTransformationException; 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 e805af3738..99f9e1a04e 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 @@ -29,8 +29,8 @@ 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.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; 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 329b3b388f..15322390c9 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,7 +29,7 @@ import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.SubscribableChannel; import org.springframework.test.context.ContextConfiguration; 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 e83195172b..54f653b64f 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 @@ -19,7 +19,7 @@ package org.springframework.integration.dispatcher; import org.junit.Ignore; import org.junit.Test; import org.junit.matchers.JUnitMatchers; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.message.StringMessage; 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 f823e441ec..52a091cf56 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,7 +35,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.core.task.TaskExecutor; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessagingException; 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 e4a40d5d6a..ce3b87cb71 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 @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.handler.ServiceActivatingHandler; 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 94187aebbc..e4a3b61a19 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 @@ -23,7 +23,7 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; 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 b6211d5721..f1c9561a7d 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 @@ -20,7 +20,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageRejectedException; 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 f662e2a79b..cd26fc7a64 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,7 +25,7 @@ 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessagingException; 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 0b6e01589c..790aecb198 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 @@ -21,9 +21,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.message.StringMessage; 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 6da03480e4..12785c2def 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 @@ -34,7 +34,7 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.PollableChannel; 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 e9682d2969..10c081a0f6 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,8 +22,8 @@ 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.ErrorMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.PollableChannel; /** 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 1338982e56..045a1855b2 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 @@ -23,8 +23,8 @@ 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.core.ChannelResolutionException; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ScheduledMessageProducerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ScheduledMessageProducerTests.java index 72b6be8bcb..ba8f02c94c 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ScheduledMessageProducerTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/endpoint/ScheduledMessageProducerTests.java @@ -26,8 +26,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.scheduling.Trigger; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; import org.springframework.scheduling.support.PeriodicTrigger; 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 9e8f46f8f5..1202bd7c1e 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 @@ -23,9 +23,9 @@ import static org.junit.Assert.assertNull; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; 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 c923014582..1cfb6249c0 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,9 +20,9 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.handler.ServiceActivatingHandler; import org.springframework.integration.message.StringMessage; 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 a040c7d386..e81b21d89c 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,9 +16,9 @@ package org.springframework.integration.endpoint.annotation; +import org.springframework.integration.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** 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 81adfb3236..619040aab8 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,10 +23,10 @@ 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.integration.annotation.Filter; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.config.FilterFactoryBean; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; 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 a5221cd842..91a971dcc4 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,7 +23,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/filter/MessageFilterTests.java index d3818d427a..2184cdee53 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,9 +23,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.endpoint.EventDrivenConsumer; 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 8b34b7f615..0826bed0de 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,8 +23,8 @@ import java.lang.reflect.Method; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayInvokingMessageHandlerTests.java index c8d8f12db2..535036aad2 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 @@ -22,7 +22,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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; 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 7ac613f861..3bcd11f39e 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 @@ -34,10 +34,10 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.core.convert.support.GenericConversionService; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.PollableChannel; 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 e1b9aa3edd..9529faef74 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,11 +28,11 @@ 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.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessagingException; /** 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 92b89f94e5..51b349b759 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 @@ -23,8 +23,8 @@ 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.annotation.Header; -import org.springframework.integration.core.MessageHeaders; 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/GatewayWithPayloadExpressionTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/GatewayWithPayloadExpressionTests.java index 0cc4b911ac..bb3049f3b9 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,7 +22,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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 c787940c36..a0872f3b8e 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 @@ -26,11 +26,11 @@ 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.MessageHeaders; import org.springframework.integration.annotation.Header; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandler; -import org.springframework.integration.core.MessageHeaders; 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/MultipleEndpointGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/MultipleEndpointGatewayTests.java index cbc647c0d2..57ec34a0b6 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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 9799bf7e94..b19c35446e 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,8 +20,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java b/spring-integration-core/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java index 9fad42847c..6dc4b6d336 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java @@ -33,10 +33,10 @@ import org.junit.Before; import org.junit.Ignore; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.test.util.TestUtils; 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 86cbfbfe6e..6dcc4c0d3a 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.channel.interceptor.ChannelInterceptorAdapter; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; /** 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 ea4f76f72f..1c39c37d35 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.core.Message; +import org.springframework.integration.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 9092b953c2..a8ee2844cf 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 @@ -16,7 +16,7 @@ package org.springframework.integration.gateway; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * @author Mark Fisher 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 aa000319d6..2e7bd8cf3e 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,7 +25,7 @@ import org.junit.matchers.JUnitMatchers; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java index fa86e0749b..abc7236bbb 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/ArgumentArrayMessageMapperToMessageTests.java @@ -25,11 +25,11 @@ import java.util.Map; import org.junit.Test; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.handler.ArgumentArrayMessageMapper; /** 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 14ee70fef1..199091fc4d 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,8 +22,8 @@ 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.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.PollableChannel; 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 c8a721ef89..8cfd25d83e 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 @@ -30,8 +30,8 @@ import java.util.Set; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.splitter.AbstractMessageSplitter; 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 0ca04b52ef..34d675993a 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,8 +25,8 @@ 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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 ec1eb2a5aa..d7fd437307 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 @@ -29,9 +29,9 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.StaticApplicationContext; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; 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 d4323106d9..f458b522ce 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 @@ -21,11 +21,11 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.annotation.Header; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.transformer.MessageTransformingHandler; import org.springframework.integration.transformer.MethodInvokingTransformer; 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 c5b9bb37bb..8015999ae2 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 @@ -24,7 +24,7 @@ import java.util.List; import org.junit.Test; import org.springframework.beans.factory.support.DefaultListableBeanFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; 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 67a82e1c7b..3b7d20271e 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,8 +23,8 @@ import java.util.Map; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.core.Message; import org.springframework.integration.core.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 cc27a9b1f2..6f92f001a7 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 @@ -27,10 +27,10 @@ import java.util.Properties; import org.junit.Assert; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; 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 d82d9a497c..3c9f39bfde 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,10 +33,10 @@ import org.junit.Test; import org.junit.internal.matchers.TypeSafeMatcher; import org.junit.rules.ExpectedException; import org.springframework.core.convert.ConversionFailedException; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.message.StringMessage; 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 0783ddf7b2..86bd359ecd 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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/handler/PayloadTypeMatchingHandlerMethodResolverWithMessageParameterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/handler/PayloadTypeMatchingHandlerMethodResolverWithMessageParameterTests.java index 7b56a3c2da..8ad73e76a6 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/handler/PayloadTypeMatchingHandlerMethodResolverWithMessageParameterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/handler/PayloadTypeMatchingHandlerMethodResolverWithMessageParameterTests.java @@ -24,9 +24,9 @@ import java.util.Date; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java b/spring-integration-core/src/test/java/org/springframework/integration/history/MessageHistoryIntegrationTests.java index 78b3ee4632..ee208f4609 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 @@ -32,9 +32,9 @@ 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.channel.DirectChannel; import org.springframework.integration.config.ConsumerEndpointFactoryBean; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/InboundJsonMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/InboundJsonMessageMapperTests.java index e4d7f71da6..99b0d1e707 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/InboundJsonMessageMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/InboundJsonMessageMapperTests.java @@ -35,9 +35,9 @@ import org.codehaus.jackson.type.TypeReference; import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageMatcher; /** diff --git a/spring-integration-core/src/test/java/org/springframework/integration/json/OutboundJsonMessageMapperTests.java b/spring-integration-core/src/test/java/org/springframework/integration/json/OutboundJsonMessageMapperTests.java index 739415791b..9444fd4002 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/json/OutboundJsonMessageMapperTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/json/OutboundJsonMessageMapperTests.java @@ -26,7 +26,7 @@ import org.codehaus.jackson.JsonParser; import org.codehaus.jackson.JsonToken; import org.codehaus.jackson.map.ObjectMapper; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; /** 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 5101b3ffa6..31120668ee 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,8 +23,8 @@ import java.util.Map; import org.junit.Test; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.MessageHeaders; /** * @author Mark Fisher 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 967aac0c16..b01851bf8b 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 @@ -25,9 +25,9 @@ import java.util.UUID; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.core.MessageHeaders; /** * @author Mark Fisher 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 86647a850d..62f81b2003 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.core.MessageHeaders; +import org.springframework.integration.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 d81fe9b959..dc8fd68ee5 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.core.Message; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; /** * Matcher to make assertions about message equality easier. Usage: 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 83d72e98a7..625ae678e7 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,9 +26,9 @@ import java.util.concurrent.TimeUnit; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessagingException; 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/MethodInvokingSourceTests.java b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java index 7be1fb2f8f..efc008ee3f 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/message/MethodInvokingSourceTests.java @@ -21,7 +21,7 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.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 3501d7397d..bf6d72ccf7 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,10 +30,10 @@ import java.util.Properties; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.annotation.Payload; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.handler.ServiceActivatingHandler; 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 aa2812a087..628cd317c4 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.core.Message; +import org.springframework.integration.Message; /** * Factory for handler beans that are useful for testing. 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 f3043bd7f3..cb3902b163 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.selector.UnexpiredMessageSelector; 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 0267752427..5b1b9bd4fc 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,10 +24,10 @@ import java.util.Map; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.ErrorMessage; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandlingException; 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 b9b5067f93..579b528a77 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 @@ -25,9 +25,9 @@ import org.springframework.beans.factory.config.RuntimeBeanReference; 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.channel.MapBasedChannelResolver; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; 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 58224b5233..4f10bdeea8 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 @@ -25,12 +25,12 @@ import java.util.ArrayList; import java.util.List; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; 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 d66bcee2f9..8253a37fb9 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 @@ -22,9 +22,9 @@ import static org.junit.Assert.assertNotNull; import java.util.List; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.StringMessage; import org.springframework.util.CollectionUtils; 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 458a73d06f..ff1d446d69 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 @@ -26,9 +26,9 @@ import java.util.concurrent.ConcurrentHashMap; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.message.StringMessage; 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 726317384a..b897a9a43b 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 @@ -27,8 +27,8 @@ import java.util.List; import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageSelector; 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 b75550aa87..e54e2926e1 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 @@ -24,9 +24,9 @@ import java.util.List; import org.junit.Test; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessagingException; diff --git a/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java b/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java index ab0b327be6..4d5fae80b0 100644 --- a/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java +++ b/spring-integration-core/src/test/java/org/springframework/integration/router/SingleChannelRouterTests.java @@ -21,9 +21,9 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.channel.TestChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.StringMessage; 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 0726ef95cc..66facd7262 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,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 9269194677..af9361ab84 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,7 +23,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ConfigurableApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.PollableChannel; import org.springframework.test.context.ContextConfiguration; 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 71f5ba9aff..a8047005f1 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 @@ -29,7 +29,7 @@ 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.PollableChannel; import org.springframework.test.context.ContextConfiguration; 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 8d18e4eb82..45883853cf 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 @@ -27,8 +27,8 @@ 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.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.router.RecipientListRouter; 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 7522e44c40..893dd4c1bb 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 @@ -28,10 +28,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.annotation.Router; import org.springframework.integration.core.ChannelResolver; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessagingTemplate; 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 d738b94e30..97e4918357 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 @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 14e183f924..3225a8e057 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,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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 3fbd079109..b90d28f591 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,8 +27,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.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 763d63d23d..af5dd1b209 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 @@ -22,7 +22,7 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; 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 e4a2fad0d5..83986a7c3d 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.core.Message; +import org.springframework.integration.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 7a2805ef4c..f7fdb1c3e3 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.message.StringMessage; 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 1aaa67519c..f249cec7a3 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 @@ -25,9 +25,9 @@ import java.util.List; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.endpoint.EventDrivenConsumer; 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 46b8c1b2a4..0cf0aee742 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,10 +26,10 @@ import java.util.List; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Splitter; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.StringMessage; 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 d47fa661d7..aafa7540db 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,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 253f3c4427..bdfcb900cd 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 @@ -27,11 +27,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.annotation.MessageEndpoint; import org.springframework.integration.annotation.ServiceActivator; import org.springframework.integration.annotation.Splitter; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.test.context.ContextConfiguration; 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 a0a77eee93..94ced0d2f3 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 @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.message.StringMessage; /** 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 e4ea578bc5..e366b47402 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.message.StringMessage; 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 80503954ee..6d7296e930 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 @@ -6,7 +6,7 @@ import static org.junit.Assert.assertThat; import java.util.Collections; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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 10fd47c257..8db6c44d0f 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,7 +27,7 @@ import java.util.Collection; import java.util.List; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.test.util.ReflectionTestUtils; 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 2e513a42fe..481b55301b 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 @@ -31,10 +31,10 @@ 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.channel.MessagePublishingErrorHandler; import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; 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 74a81b925b..6d55acddc5 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.store.MessageStore; import org.springframework.integration.store.SimpleMessageStore; 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 cb02e929c3..422a3d2cf6 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,8 +24,8 @@ import java.util.UUID; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.transformer.HeaderFilter; import org.springframework.integration.transformer.MessageTransformingHandler; 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 cb1d8d91c1..4935136bb9 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 @@ -32,7 +32,7 @@ import org.springframework.context.support.StaticApplicationContext; import org.springframework.core.convert.converter.Converter; import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.core.convert.support.GenericConversionService; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; /** 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 0d0323ffa2..79e3ca3046 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 @@ -21,8 +21,8 @@ import static org.junit.Assert.*; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** 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 016a839ba8..9ed3541bdd 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,10 +24,10 @@ import java.util.Properties; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Transformer; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.handler.MethodInvokingMessageProcessor; 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 4f19614eac..4183d90a24 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 @@ -30,7 +30,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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; /** 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 28978cf400..b44175b67e 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 @@ -20,8 +20,8 @@ import static org.junit.Assert.assertEquals; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** 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 43834b9f20..9dd3c77e54 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 @@ -25,8 +25,8 @@ import java.io.Serializable; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; /** * @author Mark Fisher 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 ce207046f6..20c26e2152 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 @@ -26,8 +26,8 @@ import java.io.Serializable; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.message.StringMessage; /** 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 30c7b637e3..f9979dc5d6 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.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.StringMessage; 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 88cf38d834..dfe67ee109 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 @@ -23,7 +23,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 c23daed5d3..daef9fcbb3 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 @@ -23,7 +23,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 d1fb24c098..4c68e981f9 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,7 +22,7 @@ import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandler.java b/spring-integration-event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandler.java index 0ef9e12f4a..2959c27761 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandler.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandler.java @@ -19,7 +19,7 @@ package org.springframework.integration.event; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.context.ApplicationEventPublisherAware; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.util.Assert; diff --git a/spring-integration-event/src/main/java/org/springframework/integration/event/MessagingEvent.java b/spring-integration-event/src/main/java/org/springframework/integration/event/MessagingEvent.java index 5ff65dce17..8be2fe1eb5 100644 --- a/spring-integration-event/src/main/java/org/springframework/integration/event/MessagingEvent.java +++ b/spring-integration-event/src/main/java/org/springframework/integration/event/MessagingEvent.java @@ -17,7 +17,7 @@ package org.springframework.integration.event; import org.springframework.context.ApplicationEvent; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * A subclass of {@link ApplicationEvent} that wraps a {@link Message}. diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapterTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapterTests.java index 0b948395d0..818331ec83 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapterTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/ApplicationEventInboundChannelAdapterTests.java @@ -30,8 +30,8 @@ import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.ContextStartedEvent; import org.springframework.context.event.ContextStoppedEvent; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.PollableChannel; /** diff --git a/spring-integration-event/src/test/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandlerTests.java b/spring-integration-event/src/test/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandlerTests.java index 593eca4ac1..c24a895eba 100644 --- a/spring-integration-event/src/test/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandlerTests.java +++ b/spring-integration-event/src/test/java/org/springframework/integration/event/ApplicationEventPublishingMessageHandlerTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.message.StringMessage; /** 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 92be752f92..8211e1fb84 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 @@ -24,7 +24,7 @@ import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationEvent; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.event.ApplicationEventInboundChannelAdapter; 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 3767bf73e1..6f8cf19776 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 @@ -26,9 +26,9 @@ 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.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.event.ApplicationEventPublishingMessageHandler; 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 0cb861650a..ad46cc549b 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.core.Message; +import org.springframework.integration.Message; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/spring-integration-file/src/main/java/org/springframework/integration/file/FileHeaders.java b/spring-integration-file/src/main/java/org/springframework/integration/file/FileHeaders.java index d6fdcdcc7c..d14537ddfb 100644 --- a/spring-integration-file/src/main/java/org/springframework/integration/file/FileHeaders.java +++ b/spring-integration-file/src/main/java/org/springframework/integration/file/FileHeaders.java @@ -16,7 +16,7 @@ package org.springframework.integration.file; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * Pre-defined header names to be used when storing or retrieving 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 d838ec4d5b..7fda8e92a3 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.core.Message; +import org.springframework.integration.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 ce5ba3b425..ba8842d983 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 @@ -19,8 +19,8 @@ package org.springframework.integration.file; 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.aggregator.ResequencingMessageGroupProcessor; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageSource; 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 cfe8a80761..335322817d 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 @@ -18,7 +18,7 @@ package org.springframework.integration.file; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; 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 91b5338e33..6050d21fb3 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,7 +21,7 @@ import java.io.File; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.file.FileHeaders; 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 40751cb2e8..543f05f694 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 @@ -22,7 +22,7 @@ import java.io.File; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; /** 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 ffe21812bd..addeb2e11f 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 @@ -35,8 +35,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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.file.FileHeaders; 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 be06120137..44ae3e5845 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 @@ -20,7 +20,7 @@ import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.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 6dd07a92bd..244e5bb49a 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 @@ -21,7 +21,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import java.io.File; import java.io.IOException; 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 16e2ffa21e..ae0b43b06d 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 @@ -19,7 +19,7 @@ package org.springframework.integration.file; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; 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/FileWritingMessageHandlerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/FileWritingMessageHandlerTests.java index c58c49d31b..b9ca0b2c45 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 @@ -18,10 +18,10 @@ package org.springframework.integration.file; import org.junit.*; import org.junit.rules.TemporaryFolder; +import org.springframework.integration.Message; import org.springframework.integration.channel.NullChannel; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; import org.springframework.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 0c9d5680a1..1959fe125f 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 @@ -18,7 +18,7 @@ package org.springframework.integration.file.config; import java.util.Date; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.file.FileNameGenerator; /** 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 290cf3cf93..680d8fdba3 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,7 +20,7 @@ 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; 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/transformer/AbstractFilePayloadTransformerTests.java b/spring-integration-file/src/test/java/org/springframework/integration/file/transformer/AbstractFilePayloadTransformerTests.java index 14e005d7dd..ea250f2a02 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.file.FileHeaders; 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 3f66b89c74..1c966e771f 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 @@ -23,7 +23,7 @@ import static org.junit.Assert.assertThat; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.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 2c0d9a70fc..76e8840975 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 @@ -24,7 +24,7 @@ import static org.junit.Assert.assertThat; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * @author Alex Peters 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 9eda0fa6b2..d7ff899320 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 @@ -21,7 +21,7 @@ import groovy.lang.GString; import groovy.lang.GroovyObject; import groovy.lang.Script; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.handler.AbstractScriptExecutingMessageProcessor; import org.springframework.scripting.ScriptSource; import org.springframework.scripting.groovy.GroovyObjectCustomizer; 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 ea517e96c6..d597beadc9 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 @@ -25,7 +25,7 @@ import java.io.InputStream; import org.junit.Test; import org.springframework.core.io.AbstractResource; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.handler.MessageProcessor; import org.springframework.scripting.ScriptSource; 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 ecbd13e63d..ea54d7f8a6 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 @@ -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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; 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 4fc30e0107..68e644ba63 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 @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; 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 a6f7009b56..43c8212b51 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 @@ -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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.test.context.ContextConfiguration; 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 13b68a7ace..661b1c486d 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 @@ -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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.test.context.ContextConfiguration; 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 2ec164b625..c4a2c091b8 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 @@ -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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.test.context.ContextConfiguration; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/DataBindingInboundRequestMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/DataBindingInboundRequestMapper.java index 0633a63c65..cb4fc1bd58 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/DataBindingInboundRequestMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/DataBindingInboundRequestMapper.java @@ -24,7 +24,7 @@ import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanFactory; import org.springframework.beans.factory.BeanFactoryAware; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.util.Assert; import org.springframework.web.bind.ServletRequestDataBinder; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultHttpHeaderMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultHttpHeaderMapper.java index 9b4d67fd74..fa17ea27b8 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultHttpHeaderMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultHttpHeaderMapper.java @@ -19,7 +19,7 @@ package org.springframework.integration.http; import java.util.Map; import org.springframework.http.HttpHeaders; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.message.HeaderMapper; /** diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultInboundRequestMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultInboundRequestMapper.java index dff66a4715..6971995a1a 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultInboundRequestMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultInboundRequestMapper.java @@ -35,7 +35,7 @@ import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.util.FileCopyUtils; import org.springframework.util.LinkedMultiValueMap; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultOutboundRequestMapper.java b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultOutboundRequestMapper.java index 5ef47bdbf8..5d36ce7d6f 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultOutboundRequestMapper.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultOutboundRequestMapper.java @@ -26,8 +26,8 @@ import org.springframework.http.HttpEntity; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -import org.springframework.integration.core.Message; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.util.Assert; /** diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterExtractor.java b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterExtractor.java index 129d148021..77c9bebb56 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterExtractor.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/DefaultParameterExtractor.java @@ -22,7 +22,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.expression.Expression; import org.springframework.expression.spel.standard.SpelExpressionParser; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * @author Dave Syer diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpHeaders.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpHeaders.java index 8aac0db522..395a9ded20 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpHeaders.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpHeaders.java @@ -16,7 +16,7 @@ package org.springframework.integration.http; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * @author Mark Fisher diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java index 10ca02fc81..08cf344030 100755 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestExecutingMessageHandler.java @@ -26,7 +26,7 @@ import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java index 6dcabace11..2c60a1f66e 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/HttpRequestHandlingEndpointSupport.java @@ -39,7 +39,7 @@ 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.gateway.AbstractMessagingGateway; diff --git a/spring-integration-http/src/main/java/org/springframework/integration/http/ParameterExtractor.java b/spring-integration-http/src/main/java/org/springframework/integration/http/ParameterExtractor.java index 7344ebf6da..337154a364 100644 --- a/spring-integration-http/src/main/java/org/springframework/integration/http/ParameterExtractor.java +++ b/spring-integration-http/src/main/java/org/springframework/integration/http/ParameterExtractor.java @@ -17,7 +17,7 @@ package org.springframework.integration.http; import java.util.Map; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * @author Dave Syer diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/DataBindingInboundRequestMapperTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/DataBindingInboundRequestMapperTests.java index 8c671f3a14..dcb20e57ba 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/DataBindingInboundRequestMapperTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/DataBindingInboundRequestMapperTests.java @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.beans.MutablePropertyValues; import org.springframework.context.support.StaticApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.http.DataBindingInboundRequestMapper; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.web.bind.support.ConfigurableWebBindingInitializer; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultInboundRequestMapperTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultInboundRequestMapperTests.java index 1dd2164ef3..a6019f11c9 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultInboundRequestMapperTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultInboundRequestMapperTests.java @@ -26,7 +26,7 @@ import java.util.HashMap; import java.util.Map; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.handler.ExpressionEvaluatingMessageProcessor; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.util.FileCopyUtils; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultOutboundRequestMapperTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultOutboundRequestMapperTests.java index fd89ae45a5..df8982ce58 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultOutboundRequestMapperTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/DefaultOutboundRequestMapperTests.java @@ -32,7 +32,7 @@ import org.junit.Test; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.MediaType; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; /** diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpRequestHandlingControllerTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpRequestHandlingControllerTests.java index 4bca0e20ff..4f80db507d 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpRequestHandlingControllerTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpRequestHandlingControllerTests.java @@ -23,9 +23,9 @@ import static org.junit.Assert.assertTrue; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.web.servlet.ModelAndView; diff --git a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpRequestHandlingMessagingGatewayTests.java b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpRequestHandlingMessagingGatewayTests.java index fef8faf69a..0ffcf6cfe2 100644 --- a/spring-integration-http/src/test/java/org/springframework/integration/http/HttpRequestHandlingMessagingGatewayTests.java +++ b/spring-integration-http/src/test/java/org/springframework/integration/http/HttpRequestHandlingMessagingGatewayTests.java @@ -21,9 +21,9 @@ import static org.junit.Assert.assertNotNull; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.util.LinkedMultiValueMap; 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 513ffb0036..79eb81e8a3 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 @@ -34,7 +34,7 @@ import org.junit.runner.RunWith; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpMethod; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.http.HttpRequestHandlingMessagingGateway; import org.springframework.integration.http.MockHttpServletRequest; 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 f80a75ba55..ead8ea842c 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 @@ -29,7 +29,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.http.HttpRequestHandlingMessagingGateway; diff --git a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java b/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java index 38a57e9beb..13e96a0e28 100644 --- a/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java +++ b/spring-integration-httpinvoker/src/test/java/org/springframework/integration/httpinvoker/HttpInvokerInboundGatewayTests.java @@ -29,8 +29,8 @@ import java.util.concurrent.Executors; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.httpinvoker.HttpInvokerInboundGateway; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/IpHeaders.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/IpHeaders.java index 041f6f36ca..20788b9a64 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/IpHeaders.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/IpHeaders.java @@ -16,7 +16,7 @@ package org.springframework.integration.ip; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * Headers for Messages mapped from IP datagram packets. diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java index 47074d42fc..b10c3ff2db 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/AbstractTcpSendingMessageHandler.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.net.Socket; import java.net.SocketException; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessageRejectedException; @@ -92,7 +92,7 @@ public abstract class AbstractTcpSendingMessageHandler extends /** * Writes the message payload to the underlying socket, using the specified * message format. - * @see org.springframework.integration.core.MessageHandler#handleMessage(org.springframework.integration.core.Message) + * @see org.springframework.integration.core.MessageHandler#handleMessage(org.springframework.integration.Message) */ public void handleMessage(final Message message) throws MessageRejectedException, MessageHandlingException, MessageDeliveryException { diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java index 29445d7f5c..d9b9152361 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetInboundGateway.java @@ -20,7 +20,7 @@ import java.net.Socket; import java.net.SocketException; import java.util.concurrent.Executor; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.gateway.AbstractMessagingGateway; import org.springframework.integration.message.MessageMappingException; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGateway.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGateway.java index db44d7b513..09be78471f 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGateway.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGateway.java @@ -18,7 +18,7 @@ package org.springframework.integration.ip.tcp; import java.io.IOException; import java.net.Socket; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java index 792d6d95b2..ea9957c63f 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/SocketMessageMapper.java @@ -18,7 +18,7 @@ package org.springframework.integration.ip.tcp; import java.io.IOException; import java.io.UnsupportedEncodingException; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.ip.IpHeaders; diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java index 2af42e1088..e6888559e8 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNetReceivingChannelAdapter.java @@ -22,7 +22,7 @@ import java.net.Socket; import javax.net.ServerSocketFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Tcp Receiving Channel adapter that uses a {@link Socket}. Each diff --git a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioReceivingChannelAdapter.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioReceivingChannelAdapter.java index 7ac98bedc5..054093a892 100644 --- a/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioReceivingChannelAdapter.java +++ b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/TcpNioReceivingChannelAdapter.java @@ -29,7 +29,7 @@ import java.nio.channels.SocketChannel; import java.util.Iterator; import java.util.Set; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Tcp Receiving Channel adapter that uses a {@link java.nio.channels.SocketChannel}. 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 4b313148d9..23ec752cca 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 @@ -17,7 +17,7 @@ package org.springframework.integration.ip.tcp; import java.net.ServerSocket; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.endpoint.MessageProducerSupport; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory; 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 70527fe79f..b2d427806f 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,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; @@ -76,7 +76,7 @@ public class TcpSendingMessageHandler implements MessageHandler, TcpSender { /** * Writes the message payload to the underlying socket, using the specified * message format. - * @see org.springframework.integration.core.MessageHandler#handleMessage(org.springframework.integration.core.Message) + * @see org.springframework.integration.core.MessageHandler#handleMessage(org.springframework.integration.Message) */ public void handleMessage(final Message message) throws MessageRejectedException, MessageHandlingException, MessageDeliveryException { 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 11fdb6e878..994ce31542 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.commons.serializer.InputStreamingConverter; import org.springframework.commons.serializer.OutputStreamingConverter; -import org.springframework.integration.core.Message; +import org.springframework.integration.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/TcpListener.java b/spring-integration-ip/src/main/java/org/springframework/integration/ip/tcp/connection/TcpListener.java index 9b6df926b6..dce17577c9 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.core.Message; +import org.springframework.integration.Message; /** * Classes that implement this interface may register with a 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 d789ae74a3..d7a23d3b35 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 @@ -17,7 +17,7 @@ package org.springframework.integration.ip.tcp.connection; import java.io.UnsupportedEncodingException; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.ip.IpHeaders; 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 a4cf5d14f0..685e6e7f52 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 @@ -20,7 +20,7 @@ import java.net.Socket; import java.net.SocketTimeoutException; import org.springframework.commons.serializer.InputStreamingConverter; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.ip.tcp.SocketIoUtils; import org.springframework.integration.ip.tcp.converter.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 399a593971..cc4947bffd 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 @@ -28,7 +28,7 @@ import java.nio.channels.SocketChannel; import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.ip.tcp.SocketIoUtils; import org.springframework.integration.ip.tcp.converter.SoftEndOfStreamException; 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 7a45bfe798..503cc4d879 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,10 +23,10 @@ import java.util.UUID; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.util.RegexUtils; import org.springframework.integration.message.InboundMessageMapper; 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 2825f758c9..6ea7a954c9 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,8 +26,8 @@ import java.net.SocketTimeoutException; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.springframework.integration.core.Message; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.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 e3e409c1f7..e8229f6245 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 @@ -33,7 +33,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/IpChannelAdapterParserTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/IpChannelAdapterParserTests.java index 5d51e4cb22..55baae8b66 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/IpChannelAdapterParserTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/config/IpChannelAdapterParserTests.java @@ -23,8 +23,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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.tcp.TcpNetReceivingChannelAdapter; import org.springframework.integration.ip.tcp.TcpNetSendingMessageHandler; 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 0834820414..d2b7098552 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 @@ -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.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.tcp.TcpReceivingChannelAdapter; import org.springframework.integration.ip.tcp.connection.AbstractClientConnectionFactory; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/MultiClientTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/MultiClientTests.java index 2f4e407f4c..255d90c6a6 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/MultiClientTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/MultiClientTests.java @@ -20,8 +20,8 @@ import junit.framework.Assert; import org.junit.Ignore; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.util.SocketUtils; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; 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 f9f9003b45..99e8bb480c 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 @@ -25,8 +25,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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.ip.tcp.connection.TcpListener; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests.java index f449607767..52de3a9c3f 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SimpleTcpNetOutboundGatewayTests.java @@ -29,7 +29,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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.core.SubscribableChannel; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SocketMessageMapperTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SocketMessageMapperTests.java index 3cc339f8a4..001433ef4b 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SocketMessageMapperTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/tcp/SocketMessageMapperTests.java @@ -23,7 +23,7 @@ import java.net.Socket; import java.net.UnknownHostException; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.IpHeaders; @@ -56,7 +56,7 @@ public class SocketMessageMapperTests { } /** - * Test method for {@link org.springframework.integration.ip.tcp.SocketMessageMapper#fromMessage(org.springframework.integration.core.Message)}. + * Test method for {@link org.springframework.integration.ip.tcp.SocketMessageMapper#fromMessage(org.springframework.integration.Message)}. * @throws Exception */ @Test 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 4b423e909c..d1391438cb 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 @@ -34,8 +34,8 @@ import java.util.concurrent.Executors; import javax.net.SocketFactory; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.ip.AbstractInternetProtocolReceivingChannelAdapter; import org.springframework.integration.ip.tcp.connection.AbstractServerConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpNetServerConnectionFactory; 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 f7dce3dd73..2b0e8592b6 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 @@ -37,8 +37,8 @@ import javax.net.ServerSocketFactory; import org.junit.Test; import org.springframework.commons.serializer.java.JavaStreamingConverter; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.tcp.connection.AbstractConnectionFactory; import org.springframework.integration.ip.tcp.connection.TcpNetClientConnectionFactory; 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 ebd3c75b87..a6021da673 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.nio.ByteBuffer; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.udp.DatagramPacketMessageMapper; 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 89c34ec0a3..582fd25589 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 org.apache.commons.logging.LogFactory; import org.junit.Ignore; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.IpHeaders; import org.springframework.integration.ip.udp.DatagramPacketMessageMapper; 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 a063c6ae05..9b3097dad4 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,8 +20,8 @@ import junit.framework.Assert; import org.junit.Ignore; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.util.SocketUtils; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; 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 1903b8b73d..efe2ceb709 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 @@ -11,8 +11,8 @@ import java.net.InetSocketAddress; import org.apache.commons.logging.LogFactory; import org.junit.Ignore; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ip.util.SocketUtils; import org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler; 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 5c88c7b7ac..0d906437f4 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 @@ -29,10 +29,10 @@ 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.channel.QueueChannel; import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.StringMessage; 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 453afe561c..a7a69feecb 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 @@ -28,10 +28,10 @@ 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.channel.QueueChannel; import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java index cc5362ff44..ca7c325421 100644 --- a/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java +++ b/spring-integration-ip/src/test/java/org/springframework/integration/ip/util/RegexUtilsTests.java @@ -21,7 +21,7 @@ import static org.springframework.integration.ip.util.RegexUtils.escapeRegExSpec import org.junit.Test; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * @author Gary Russell 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 8d8be79249..aca096d2ad 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 @@ -15,7 +15,7 @@ package org.springframework.integration.jdbc; import javax.sql.DataSource; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; 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 825cf130ba..65a7470d9f 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 @@ -26,7 +26,7 @@ import javax.sql.DataSource; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.jdbc.util.SerializationUtils; import org.springframework.integration.store.AbstractMessageGroupStore; 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 e11af48bf1..89b2fd82d1 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.MessageSource; import org.springframework.jdbc.core.ColumnMapRowMapper; 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 96dced5744..872193c986 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 @@ -7,7 +7,7 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.StringMessage; import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; 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 5368845a28..d55752b73d 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 @@ -17,7 +17,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.store.MessageGroup; import org.springframework.integration.store.MessageGroupCallback; 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 b138be5cb9..c6dc3f5c06 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 @@ -13,7 +13,7 @@ import java.util.Map; import org.junit.After; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.namedparam.SqlParameterSource; import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; 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 a125c76f24..ed657bd381 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 @@ -11,7 +11,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; 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 04ce8cddd1..a7bb2e7cf9 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 @@ -30,7 +30,7 @@ import org.junit.After; import org.junit.Test; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.core.PollableChannel; import org.springframework.jdbc.core.namedparam.AbstractSqlParameterSource; 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 8fdb2fbb12..dbc82538e1 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 @@ -26,7 +26,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.gateway.AbstractMessagingGateway; import org.springframework.jms.listener.SessionAwareMessageListener; 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 52df23c090..0827000087 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 @@ -29,7 +29,7 @@ import javax.jms.JMSException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; import org.springframework.util.StringUtils; /** diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultMessageConverter.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultMessageConverter.java index c39382d5f1..8b9f7ea579 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultMessageConverter.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/DefaultMessageConverter.java @@ -22,7 +22,7 @@ import javax.jms.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.jms.support.converter.MessageConversionException; import org.springframework.jms.support.converter.MessageConverter; import org.springframework.jms.support.converter.SimpleMessageConverter; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannel.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannel.java index 08556d4b6d..a561201939 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannel.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannel.java @@ -23,7 +23,7 @@ import javax.jms.MessageListener; import org.springframework.beans.factory.BeanNameAware; import org.springframework.beans.factory.InitializingBean; import org.springframework.context.SmartLifecycle; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessagingException; 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 b63b51a17c..6ae4c110f1 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 @@ -21,7 +21,7 @@ import java.util.Map; import javax.jms.ConnectionFactory; import javax.jms.Destination; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageSource; diff --git a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaders.java b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaders.java index c7e883ca7e..ed73cfb12c 100644 --- a/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaders.java +++ b/spring-integration-jms/src/main/java/org/springframework/integration/jms/JmsHeaders.java @@ -16,7 +16,7 @@ package org.springframework.integration.jms; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * Pre-defined names and prefixes to be used for setting and/or retrieving JMS 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 bf54170b1e..b37f88fcc0 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 @@ -29,7 +29,7 @@ import javax.jms.TemporaryQueue; import javax.jms.TemporaryTopic; import javax.jms.Topic; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandlingException; 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 c968487734..c3ebc7cb97 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 @@ -19,7 +19,7 @@ package org.springframework.integration.jms; import javax.jms.JMSException; import org.springframework.core.Ordered; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.jms.core.JmsTemplate; import org.springframework.jms.core.MessagePostProcessor; 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 cc93296394..c0187ebedd 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 @@ -26,8 +26,8 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.core.task.SimpleAsyncTaskExecutor; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; 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 bc6ec7027e..90868770c0 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 @@ -29,7 +29,7 @@ import javax.jms.JMSException; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.jms.DefaultJmsHeaderMapper; import org.springframework.integration.jms.JmsHeaders; diff --git a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannelTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannelTests.java index 2eec7ea301..2d6757a2cf 100644 --- a/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannelTests.java +++ b/spring-integration-jms/src/test/java/org/springframework/integration/jms/JmsDestinationBackedMessageChannelTests.java @@ -23,7 +23,7 @@ import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.context.support.StaticApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.message.StringMessage; 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 603319c0b9..6537c4403a 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 @@ -110,7 +110,7 @@ public class ExceptionHandlingSiConsumerTests { } public static class SampleErrorMessageMapper implements InboundMessageMapper{ - public org.springframework.integration.core.Message toMessage( + public org.springframework.integration.Message toMessage( 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/JmsHeaderEnricherTests.java b/spring-integration-jms/src/test/java/org/springframework/integration/jms/config/JmsHeaderEnricherTests.java index 611be1af26..f7b34380fd 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 @@ -23,7 +23,7 @@ import javax.jms.Destination; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.jms.DefaultJmsHeaderMapper; 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 ad8635cc6b..888323d13e 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 @@ -25,7 +25,7 @@ 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; /** 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 3e0f4a0df1..776b6622b0 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 @@ -28,7 +28,7 @@ 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.jms.JmsMessageDrivenEndpoint; import org.springframework.jms.connection.JmsTransactionManager; 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 5745848721..5269da993f 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 @@ -23,7 +23,7 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.jms.JmsMessageDrivenEndpoint; import org.springframework.jms.support.destination.JmsDestinationAccessor; 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 a55836bca0..a967ce6e59 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 @@ -24,13 +24,13 @@ import org.junit.Test; import org.mockito.Mockito; 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.channel.DirectChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.MessageRejectedException; import org.springframework.integration.core.MessagingException; import org.springframework.integration.core.PollableChannel; 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 6f8493c88b..753cd8c3d4 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 @@ -26,7 +26,7 @@ import javax.xml.transform.stream.StreamSource; import org.junit.Test; import org.springframework.context.ApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.message.StringMessage; 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 c40ac07b5a..5129adaeee 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.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.jms.JmsHeaderMapper; /** diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/control/ControlBus.java b/spring-integration-jmx/src/main/java/org/springframework/integration/control/ControlBus.java index e2678169b4..d66ec33db4 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/control/ControlBus.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/control/ControlBus.java @@ -35,12 +35,12 @@ import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.InitializingBean; import org.springframework.beans.factory.ListableBeanFactory; import org.springframework.context.Lifecycle; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.core.SubscribableChannel; import org.springframework.integration.endpoint.AbstractEndpoint; 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 8be072c163..416d0859cb 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.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.gateway.SimpleMessageMapper; import org.springframework.integration.message.InboundMessageMapper; 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 4c00023ed2..ced1d292a7 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.message.OutboundMessageMapper; import org.springframework.util.Assert; diff --git a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/JmxHeaders.java b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/JmxHeaders.java index b5dc8cca4a..8f4ebb7c37 100644 --- a/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/JmxHeaders.java +++ b/spring-integration-jmx/src/main/java/org/springframework/integration/jmx/JmxHeaders.java @@ -16,7 +16,7 @@ package org.springframework.integration.jmx; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * Constants for JMX related Message Header keys. 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 c46b2c30c5..d49b5518dc 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 @@ -27,7 +27,7 @@ import javax.management.ObjectName; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.endpoint.MessageProducerSupport; 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 a6c8a1f742..f8ad90fc4b 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.handler.AbstractMessageHandler; import org.springframework.integration.message.OutboundMessageMapper; import org.springframework.jmx.export.MBeanExporter; 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 a5e4868cd8..9cf3c5b050 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 @@ -31,7 +31,7 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; import org.springframework.beans.factory.InitializingBean; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.core.MessagingException; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java index 1835bd1633..9e78df45ac 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusOperationChannelTests.java @@ -25,8 +25,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.channel.DirectChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; diff --git a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java index 16d14bca59..9ba87d9b33 100644 --- a/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java +++ b/spring-integration-jmx/src/test/java/org/springframework/integration/control/ControlBusTests.java @@ -34,9 +34,9 @@ import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.config.RuntimeBeanReference; import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.context.support.GenericApplicationContext; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.endpoint.EventDrivenConsumer; 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 007414b2e4..450bd049e3 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.core.Message; +import org.springframework.integration.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/NotificationListeningMessageProducerTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/NotificationListeningMessageProducerTests.java index a6a01b6c7f..4f46e8fc11 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,8 +32,8 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.jmx.export.MBeanExporter; import org.springframework.jmx.export.notification.NotificationPublisher; import org.springframework.jmx.export.notification.NotificationPublisherAware; 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 a7f20b64ac..1e96cb404d 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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.jmx.support.MBeanServerFactoryBean; 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 366e96459a..26ea48543f 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 @@ -23,7 +23,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.test.context.ContextConfiguration; 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 62535c6b76..9ac72dc5b1 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 @@ -26,7 +26,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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/NotificationPublishingChannelAdapterParserTests.java b/spring-integration-jmx/src/test/java/org/springframework/integration/jmx/config/NotificationPublishingChannelAdapterParserTests.java index 5054993806..f76668f121 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 @@ -27,7 +27,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.jmx.JmxHeaders; 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 a3da6e938e..4ce0e92be5 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 @@ -22,7 +22,7 @@ import org.junit.After; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.jmx.JmxHeaders; diff --git a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailHeaders.java b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailHeaders.java index 503a30a19e..08904861c4 100644 --- a/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailHeaders.java +++ b/spring-integration-mail/src/main/java/org/springframework/integration/mail/MailHeaders.java @@ -16,7 +16,7 @@ package org.springframework.integration.mail; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * Pre-defined header names to be used for setting and/or retrieving Mail 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 5bdcee8616..e3fa51ff3b 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 @@ -23,7 +23,7 @@ import java.util.concurrent.ConcurrentLinkedQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageSource; 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 a3945b9037..02f7158ef3 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.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageMappingException; import org.springframework.mail.MailMessage; import org.springframework.mail.SimpleMailMessage; 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 aa12fc54bc..2418cee6f6 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,7 +25,7 @@ import javax.mail.Message.RecipientType; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.mail.MailHeaders; 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 32409d81d1..46f894df31 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 @@ -72,7 +72,7 @@ public class MailSendingMessageHandlerContextTests { @Test public void byteArrayMessage() throws Exception { byte[] payload = {1, 2, 3}; - org.springframework.integration.core.Message message = + org.springframework.integration.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 1a2589cbb2..40078228d5 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 @@ -71,7 +71,7 @@ public class MailSendingMessageHandlerTests { @Test public void byteArrayMessage() throws Exception { byte[] payload = {1, 2, 3}; - org.springframework.integration.core.Message message = + org.springframework.integration.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 f20707b8c4..444a3f2a86 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 @@ -16,7 +16,7 @@ package org.springframework.integration.mail; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.mail.SimpleMailMessage; 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 8f0d0f8e0c..8414c6d5dc 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 @@ -25,7 +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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.mail.MailHeaders; 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 c35524430e..46aa3a65d5 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 @@ -27,9 +27,9 @@ 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.context.BeanFactoryChannelResolver; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 b01f12da21..98d179009f 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 @@ -25,9 +25,9 @@ import java.rmi.RemoteException; import org.junit.Before; import org.junit.Test; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageHandlingException; import org.springframework.integration.gateway.RequestReplyExchanger; 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 02524a23c6..d0e1656306 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 @@ -24,8 +24,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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.message.StringMessage; import org.springframework.integration.rmi.RmiInboundGateway; diff --git a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java index d533900a12..66363ca854 100644 --- a/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java +++ b/spring-integration-samples/cafe/src/main/java/org/springframework/integration/samples/cafe/Cafe.java @@ -22,7 +22,7 @@ import org.springframework.integration.annotation.Gateway; * The entry point for Cafe Demo. The demo's main() method invokes the * 'placeOrder' method on a generated MessagingGateway proxy. * The gateway then passes the {@link Order} as the payload of a - * {@link org.springframework.integration.core.Message} to the + * {@link org.springframework.integration.Message} to the * configured requestChannel. The channel ('orders') is * defined in the 'cafeDemo.xml' file. * diff --git a/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java index f940c57870..1f347b662d 100644 --- a/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java +++ b/spring-integration-samples/errorhandling/src/main/java/org/springframework/integration/samples/errorhandling/ErrorUnwrapper.java @@ -15,9 +15,9 @@ package org.springframework.integration.samples.errorhandling; +import org.springframework.integration.Message; import org.springframework.integration.annotation.MessageEndpoint; import org.springframework.integration.annotation.Transformer; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.ErrorMessage; diff --git a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java index 37983e3870..f1f0bed50a 100644 --- a/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java +++ b/spring-integration-samples/loan-broker/src/main/java/org/springframework/integration/samples/loanbroker/LoanQuoteAggregator.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.samples.loanbroker.domain.LoanQuote; /** diff --git a/spring-integration-samples/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java b/spring-integration-samples/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java index cab52fc1cc..8a6ad3de62 100644 --- a/spring-integration-samples/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java +++ b/spring-integration-samples/ws-inbound-gateway/src/test/java/org/springframework/integration/samples/ws/InboundGatewayTests.java @@ -28,7 +28,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.ws.SimpleWebServiceInboundGateway; import org.springframework.integration.xml.source.DomSourceFactory; diff --git a/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java b/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java index e7814177d8..853145575f 100644 --- a/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java +++ b/spring-integration-samples/ws-outbound-gateway/src/main/java/org/springframework/integration/samples/ws/WebServiceDemo.java @@ -17,9 +17,9 @@ package org.springframework.integration.samples.ws; import org.springframework.context.support.ClassPathXmlApplicationContext; +import org.springframework.integration.Message; import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.core.ChannelResolver; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; 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 9e89ec4428..e7adb91146 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,7 +18,7 @@ package org.springframework.integration.security.channel; import org.aopalliance.intercept.MethodInvocation; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.util.Assert; 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 c0b608d720..b304e66c48 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,7 +19,7 @@ package org.springframework.integration.security.channel; import java.util.ArrayList; import java.util.List; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; /** 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 6d1c6127ad..e4ed664473 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 @@ -35,9 +35,9 @@ 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.channel.AbstractPollableChannel; import org.springframework.integration.channel.ChannelInterceptor; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageSelector; import org.springframework.integration.security.channel.ChannelAccessPolicy; 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 debacda342..401232f352 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.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.message.MessageSource; 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 dfbaee1d0e..041a562aad 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,7 +23,7 @@ import java.io.OutputStream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessagingException; 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 dccb899fb9..cbec254328 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 @@ -27,7 +27,7 @@ import java.io.Writer; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessagingException; import org.springframework.util.Assert; 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 f6bae1dde9..3e61b4b2cd 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.core.Message; +import org.springframework.integration.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 49b67f437b..c4520db2fb 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.core.Message; +import org.springframework.integration.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 1611bda56e..a4eec26c9b 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 @@ -32,7 +32,7 @@ import org.junit.Test; import org.springframework.beans.DirectFieldAccessor; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.endpoint.SourcePollingChannelAdapter; import org.springframework.integration.message.MessageSource; 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 408c5eb0ac..04b45301e7 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 @@ -19,8 +19,8 @@ import org.hamcrest.Description; import org.hamcrest.Factory; import org.hamcrest.Matcher; import org.junit.Assert; -import org.springframework.integration.core.Message; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import java.util.Date; import java.util.Map; 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 7fe43c0d77..727851144a 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.core.Message; +import org.springframework.integration.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 4f84df2147..b3ff6e3e44 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 @@ -10,8 +10,8 @@ import org.hamcrest.BaseMatcher; import org.hamcrest.Description; import org.hamcrest.Factory; import org.hamcrest.Matcher; -import org.springframework.integration.core.Message; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; /** * Matcher to make assertions about message equality easier. Usage: 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 538de02d2b..4a19ffccc8 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.core.Message; +import org.springframework.integration.Message; /** *

Is the payload of a {@link Message} equal to a given value or is matching 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 3ee4e699e4..68d51f0e11 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 @@ -29,10 +29,10 @@ 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.channel.MessagePublishingErrorHandler; import org.springframework.integration.context.BeanFactoryChannelResolver; import org.springframework.integration.context.IntegrationContextUtils; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; 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 d8c015fb8c..2acae3c66d 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 @@ -41,7 +41,7 @@ import java.util.UUID; import org.hamcrest.Matcher; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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 6dcfcb74fd..31bf561e14 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,7 +21,7 @@ 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageHandler; 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 e1db6be989..456c6427a6 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 @@ -25,7 +25,7 @@ import static org.springframework.integration.test.matcher.PayloadMatcher.hasPay import java.math.BigDecimal; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; /** 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 776c3968e9..dd4d8503cb 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 @@ -18,7 +18,7 @@ package org.springframework.integration.ws; import java.io.IOException; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; import org.springframework.integration.handler.AbstractReplyProducingMessageHandler; 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 e510eec898..a1034a7685 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 @@ -27,7 +27,7 @@ import javax.xml.transform.dom.DOMSource; import org.w3c.dom.Document; import org.springframework.expression.ExpressionException; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.gateway.SimpleMessagingGateway; diff --git a/spring-integration-ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java b/spring-integration-ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java index 3c542d92bb..ff298fa0a4 100644 --- a/spring-integration-ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java +++ b/spring-integration-ws/src/main/java/org/springframework/integration/ws/WebServiceHeaders.java @@ -16,7 +16,7 @@ package org.springframework.integration.ws; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * Pre-defined header names to be used when storing or retrieving 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 83e04256f3..9643e270a9 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 @@ -25,8 +25,8 @@ 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.channel.DirectChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.ws.WebServiceMessage; 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 ee6535c16e..6c119d9e64 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 @@ -25,7 +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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.message.StringMessage; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java index 5e8553855c..3da132a52a 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathMultiChannelRouter.java @@ -19,7 +19,7 @@ package org.springframework.integration.xml.router; import java.util.List; import java.util.Map; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.xml.XmlPayloadConverter; import org.springframework.util.Assert; import org.springframework.xml.xpath.NodeMapper; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java index 1b686e60c1..cba735ed54 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XPathSingleChannelRouter.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; 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/XmlPayloadValidatingRouter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XmlPayloadValidatingRouter.java index e64b127f70..b4b661b4b6 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XmlPayloadValidatingRouter.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/router/XmlPayloadValidatingRouter.java @@ -16,7 +16,7 @@ package org.springframework.integration.xml.router; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.router.AbstractSingleChannelNameRouter; 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/selector/BooleanTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/BooleanTestXPathMessageSelector.java index 3116f62419..638721aa20 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.core.Message; +import org.springframework.integration.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/StringValueTestXPathMessageSelector.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/selector/StringValueTestXPathMessageSelector.java index ae1c21e468..bb4bb6a566 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.core.Message; +import org.springframework.integration.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/splitter/XPathMessageSplitter.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/splitter/XPathMessageSplitter.java index 08fd2262a7..fb49418d8b 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 @@ -34,7 +34,7 @@ import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.splitter.AbstractMessageSplitter; import org.springframework.integration.xml.DefaultXmlPayloadConverter; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/DefaultTransformerConfigurer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/DefaultTransformerConfigurer.java index 3ae96e3ae0..9964e65425 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/DefaultTransformerConfigurer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/DefaultTransformerConfigurer.java @@ -21,8 +21,8 @@ import java.util.Map; import javax.xml.transform.Transformer; -import org.springframework.integration.core.Message; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; /** * {@link TransformerConfigurer} instance which looks for headers and uses them 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 c8b158f3eb..f7d62bfda7 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,7 +21,7 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Result; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.transformer.AbstractTransformer; import org.springframework.integration.xml.result.DomResultFactory; diff --git a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/TransformerConfigurer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/TransformerConfigurer.java index a3fc566366..3cac0c49aa 100644 --- a/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/TransformerConfigurer.java +++ b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/TransformerConfigurer.java @@ -18,7 +18,7 @@ package org.springframework.integration.xml.transformer; import javax.xml.transform.Transformer; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; /** * Allows customization of the transformer based on the received message prior to transformation. 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 5d2592dffe..808f8e39bf 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.transformer.HeaderEnricher; 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/XPathTransformer.java b/spring-integration-xml/src/main/java/org/springframework/integration/xml/transformer/XPathTransformer.java index 4199f67b9b..b785b4ef4a 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.core.Message; +import org.springframework.integration.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 d373314d2f..5454c3cc36 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 @@ -30,7 +30,7 @@ import javax.xml.transform.stream.StreamSource; import org.w3c.dom.Document; import org.springframework.core.io.Resource; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.transformer.AbstractTransformer; import org.springframework.integration.xml.result.DomResultFactory; 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 029be1c042..6b49eb398d 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,8 +27,8 @@ 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.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.xml.config.StubResultFactory.StubStringResult; 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 5e9a0016bf..335b993338 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,8 +26,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.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingException; import org.springframework.integration.core.PollableChannel; 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 afc890f8a2..89efe81e65 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,8 +28,8 @@ 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.channel.QueueChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 52c29021dc..6e4b4d5a2f 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,9 +26,9 @@ 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.channel.QueueChannel; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.endpoint.EventDrivenConsumer; import org.springframework.integration.xml.util.XmlTestUtil; 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 b4b94726b8..0e627c8a1b 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,7 +33,7 @@ import org.w3c.dom.Node; import org.xml.sax.InputSource; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; 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 704e790655..89e4fdf1b7 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 @@ -27,8 +27,8 @@ 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.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.PollableChannel; import org.springframework.integration.xml.config.StubResultFactory.StubStringResult; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XmlPayloadValidatingRouterTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XmlPayloadValidatingRouterTests.java index de28df118a..39bae33656 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XmlPayloadValidatingRouterTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/router/XmlPayloadValidatingRouterTests.java @@ -23,7 +23,7 @@ import org.junit.Before; */ import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; public class XmlPayloadValidatingRouterTests { 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 fb0675c7a3..6308eced3f 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,9 +27,9 @@ import org.junit.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; +import org.springframework.integration.Message; import org.springframework.integration.channel.QueueChannel; import org.springframework.integration.core.GenericMessage; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/DefaultTransformerConfigurerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/DefaultTransformerConfigurerTests.java index 93e3cd6cfc..61106f5849 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/DefaultTransformerConfigurerTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/DefaultTransformerConfigurerTests.java @@ -31,7 +31,7 @@ import javax.xml.transform.URIResolver; import org.junit.Before; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; /** 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 33d480704d..83e3eb9149 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.message.StringMessage; 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/UnmarshallingTransformerTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/transformer/UnmarshallingTransformerTests.java index ea3afab670..124e69c506 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.StringMessage; 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 d78262532a..d17349ff13 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,9 +25,9 @@ import java.util.Map; import org.junit.Test; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.xml.transformer.XPathHeaderEnricher; import org.springframework.integration.xml.transformer.XPathHeaderEnricher.XPathExpressionEvaluatingHeaderValueMessageProcessor; import org.springframework.integration.xml.xpath.XPathEvaluationType; 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 ef73274eff..e9c5f05b8a 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.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.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 a1ba090831..27a0fafa0c 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 @@ -31,7 +31,7 @@ import org.w3c.dom.Document; import org.springframework.core.io.ByteArrayResource; import org.springframework.core.io.Resource; import org.springframework.core.io.ClassPathResource; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessagingException; import org.springframework.integration.xml.util.XmlTestUtil; 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 de144a8ea5..cc8fb0fcb9 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 @@ -15,12 +15,12 @@ */ package org.springframework.integration.xmpp; -import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.MessageHeaders; /** * - * Used as keys for {@link org.springframework.integration.core.Message} objects + * Used as keys for {@link org.springframework.integration.Message} objects * that handle XMPP events. * * @author Mario Gray diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java index 7fc0893aa5..d4926bbec1 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageDrivenEndpoint.java @@ -39,7 +39,7 @@ import org.springframework.integration.xmpp.XmppHeaders; * to work. It takes any message from a given XMPP session (as established by * the current {@link XMPPConnection}) and forwards the * {@link org.jivesoftware.smack.packet.Message} as the payload of the Spring - * Integration {@link org.springframework.integration.core.Message}. The + * Integration {@link org.springframework.integration.Message}. The * {@link org.jivesoftware.smack.Chat} instance that's used is passed along as a * header (under {@link org.springframework.integration.xmpp.XmppHeaders#CHAT}). * Additionally, the {@link org.jivesoftware.smack.packet.Message.Type} is diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandler.java index 01563d3268..6540bd4520 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/messages/XmppMessageSendingMessageHandler.java @@ -42,7 +42,7 @@ public class XmppMessageSendingMessageHandler implements MessageHandler, Lifecyc this.xmppConnection = xmppConnection; } - public void handleMessage(final org.springframework.integration.core.Message message) { + public void handleMessage(final org.springframework.integration.Message message) { try { // pre-reqs: user to send, string to send as msg body String messageBody = null; diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppPresenceMessageMapper.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppPresenceMessageMapper.java index f2985399f1..7816498bca 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppPresenceMessageMapper.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppPresenceMessageMapper.java @@ -20,9 +20,9 @@ import org.apache.commons.logging.LogFactory; import org.jivesoftware.smack.packet.Presence; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.core.MessageBuilder; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.InboundMessageMapper; import org.springframework.integration.message.OutboundMessageMapper; import org.springframework.integration.xmpp.XmppHeaders; @@ -43,7 +43,7 @@ public class XmppPresenceMessageMapper implements OutboundMessageMapper message) throws Exception { diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java index 262ad21edb..9dc8c098ad 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageDrivenEndpoint.java @@ -27,7 +27,7 @@ import org.jivesoftware.smack.packet.Presence; import org.springframework.context.Lifecycle; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageChannel; import org.springframework.integration.core.MessagingTemplate; import org.springframework.integration.endpoint.AbstractEndpoint; @@ -37,7 +37,7 @@ import java.util.Collection; /** - * Describes an endpoint that is able to login as usual with a {@link org.springframework.integration.xmpp.XmppConnectionFactory} and then emit {@link org.springframework.integration.core.Message}s when a particular event happens to the logged in users {@link org.jivesoftware.smack.Roster}. We try + * Describes an endpoint that is able to login as usual with a {@link org.springframework.integration.xmpp.XmppConnectionFactory} and then emit {@link org.springframework.integration.Message}s when a particular event happens to the logged in users {@link org.jivesoftware.smack.Roster}. We try * and generically propagate these events. In practical terms, there are a few events worth being notified of:
  • the {@link org.jivesoftware.smack.packet.Presence} of a user in the {@link org.jivesoftware.smack.Roster} has changed.
  • the actual makeup of the logged-in user's {@link * org.jivesoftware.smack.Roster} has changed: entries added, deleted, etc.
* diff --git a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java index f20a9976c6..7d37d2b743 100644 --- a/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java +++ b/spring-integration-xmpp/src/main/java/org/springframework/integration/xmpp/presence/XmppRosterEventMessageSendingHandler.java @@ -5,7 +5,7 @@ import org.apache.commons.logging.LogFactory; import org.jivesoftware.smack.XMPPConnection; import org.jivesoftware.smack.packet.Presence; import org.springframework.context.Lifecycle; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; import org.springframework.integration.core.MessageHandlingException; 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 d1e90b1f29..4b79e90cc2 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 @@ -24,8 +24,8 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Value; +import org.springframework.integration.Message; import org.springframework.integration.channel.DirectChannel; -import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.core.MessageDeliveryException; import org.springframework.integration.core.MessageHandler; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageProducer.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageProducer.java index ec7cdd6968..5b9f9e570f 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageProducer.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/messages/XmppMessageProducer.java @@ -18,7 +18,7 @@ package org.springframework.integration.xmpp.messages; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.MessageSource; import org.springframework.integration.xmpp.XmppHeaders; diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventConsumer.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventConsumer.java index c34f3e19c8..c84fc188a1 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventConsumer.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventConsumer.java @@ -17,9 +17,9 @@ package org.springframework.integration.xmpp.presence; import org.apache.commons.lang.StringUtils; +import org.springframework.integration.Message; +import org.springframework.integration.MessageHeaders; import org.springframework.integration.annotation.ServiceActivator; -import org.springframework.integration.core.Message; -import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.xmpp.XmppHeaders; /** diff --git a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java index f94ea22f90..9f70338aa7 100644 --- a/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java +++ b/spring-integration-xmpp/src/test/java/org/springframework/integration/xmpp/presence/XmppRosterEventProducer.java @@ -20,7 +20,7 @@ import org.apache.commons.lang.StringUtils; import org.jivesoftware.smack.packet.Presence; -import org.springframework.integration.core.Message; +import org.springframework.integration.Message; import org.springframework.integration.core.MessageBuilder; import org.springframework.integration.message.*; import org.springframework.integration.xmpp.XmppHeaders;