diff --git a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHeaderMapper.java b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHeaderMapper.java index a3f8622871..0da496fda3 100644 --- a/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHeaderMapper.java +++ b/org.springframework.integration.adapter/src/main/java/org/springframework/integration/adapter/MessageHeaderMapper.java @@ -18,7 +18,7 @@ package org.springframework.integration.adapter; import java.util.Map; -import org.springframework.integration.message.MessageHeaders; +import org.springframework.integration.core.MessageHeaders; /** * Strategy interface for mapping between a source or target object and an diff --git a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java index 8d2887022b..ff913b4b09 100644 --- a/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java +++ b/org.springframework.integration.jms/src/main/java/org/springframework/integration/jms/DefaultJmsHeaderMapper.java @@ -29,7 +29,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.integration.adapter.MessageHeaderMapper; -import org.springframework.integration.message.MessageHeaders; +import org.springframework.integration.core.MessageHeaders; import org.springframework.util.StringUtils; /** diff --git a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageHeaderMapper.java b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageHeaderMapper.java index 89caffadd5..ecec7269a4 100644 --- a/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageHeaderMapper.java +++ b/org.springframework.integration.jms/src/test/java/org/springframework/integration/jms/config/TestMessageHeaderMapper.java @@ -22,7 +22,7 @@ import java.util.Map; import javax.jms.Message; import org.springframework.integration.adapter.MessageHeaderMapper; -import org.springframework.integration.message.MessageHeaders; +import org.springframework.integration.core.MessageHeaders; /** * @author Mark Fisher diff --git a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java index 49f2af1efc..c37221e234 100644 --- a/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java +++ b/org.springframework.integration.mail/src/main/java/org/springframework/integration/mail/MailSendingMessageConsumer.java @@ -22,8 +22,8 @@ import javax.mail.internet.MimeMessage; import org.springframework.core.io.ByteArrayResource; import org.springframework.integration.adapter.MessageMappingException; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageConsumer; -import org.springframework.integration.message.MessageHeaders; import org.springframework.mail.MailMessage; import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java index d994a48863..f2a9e2f336 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/aggregator/Resequencer.java @@ -19,7 +19,7 @@ package org.springframework.integration.aggregator; import java.util.List; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessageHeaders; +import org.springframework.integration.core.MessageHeaders; /** * An {@link AbstractMessageBarrierConsumer} that waits for a group of diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/core/Message.java b/org.springframework.integration/src/main/java/org/springframework/integration/core/Message.java index 07db342609..1af36b0d2f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/core/Message.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/core/Message.java @@ -16,8 +16,6 @@ package org.springframework.integration.core; -import org.springframework.integration.message.MessageHeaders; - /** * The central interface that any Message type must implement. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHeaders.java b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java similarity index 97% rename from org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHeaders.java rename to org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java index 249d4899de..a431dc249f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageHeaders.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.core; import java.io.Serializable; import java.util.Collection; @@ -24,7 +24,7 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.springframework.integration.core.Message; +import org.springframework.integration.message.MessagePriority; /** * The headers for a {@link Message}. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java index 946fdd256b..90e4232341 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/endpoint/AbstractReplyProducingMessageConsumer.java @@ -23,9 +23,9 @@ import org.springframework.integration.channel.ChannelResolver; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.MessageChannelTemplate; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; -import org.springframework.integration.message.MessageHeaders; import org.springframework.integration.message.MessageProducer; import org.springframework.integration.message.MessageRejectedException; import org.springframework.integration.message.MessagingException; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/GenericMessage.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/GenericMessage.java index a3ceacbb4f..f0b8b85519 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/GenericMessage.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/GenericMessage.java @@ -21,6 +21,7 @@ import java.util.HashMap; import java.util.Map; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageHeaders; import org.springframework.util.Assert; /** diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java index 257cfc0555..857877365a 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MessageBuilder.java @@ -23,6 +23,7 @@ import java.util.Set; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageHeaders; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java index c9ae8122bb..cf97b7959b 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/message/MethodParameterMessageMapper.java @@ -29,6 +29,7 @@ import org.springframework.core.ParameterNameDiscoverer; import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Headers; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageHeaders; import org.springframework.util.Assert; import org.springframework.util.ObjectUtils; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java index 0eba58f6f8..481c782c58 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/aggregator/integration/ConcurrentAggregatorIntegrationTests.java @@ -12,8 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; +import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.GenericMessage; -import org.springframework.integration.message.MessageHeaders; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java index 8f2218aa61..c502b3187b 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/gateway/SimpleMessagingGatewayTests.java @@ -35,8 +35,8 @@ import org.springframework.integration.bus.MessageBus; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageHeaders; import org.springframework.integration.message.MessageDeliveryException; -import org.springframework.integration.message.MessageHeaders; /** * @author Iwein Fuld diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/GenericMessageTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/GenericMessageTests.java index a3653b180f..64f2303f9f 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/GenericMessageTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/GenericMessageTests.java @@ -23,6 +23,8 @@ import java.util.Map; import org.junit.Test; +import org.springframework.integration.core.MessageHeaders; + /** * @author Mark Fisher */ diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java index fb241d99ed..591636ea1d 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageBuilderTests.java @@ -24,6 +24,7 @@ import java.util.Date; import org.junit.Test; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessageHeaders; /** * @author Mark Fisher diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageHeadersTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageHeadersTests.java index 1e3d4647cd..a1cb1dbd26 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageHeadersTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/message/MessageHeadersTests.java @@ -27,6 +27,8 @@ import java.util.Set; import org.junit.Test; +import org.springframework.integration.core.MessageHeaders; + /** * @author Mark Fisher */