diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java index c61722fec1..228ca2454f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/channel/PriorityChannel.java @@ -22,7 +22,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; import org.springframework.integration.core.Message; -import org.springframework.integration.message.MessagePriority; +import org.springframework.integration.core.MessagePriority; /** * A message channel that prioritizes messages based on a {@link Comparator}. diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java index a431dc249f..44243f1101 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessageHeaders.java @@ -24,8 +24,6 @@ import java.util.Map; import java.util.Set; import java.util.UUID; -import org.springframework.integration.message.MessagePriority; - /** * The headers for a {@link Message}. * diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagePriority.java b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessagePriority.java similarity index 94% rename from org.springframework.integration/src/main/java/org/springframework/integration/message/MessagePriority.java rename to org.springframework.integration/src/main/java/org/springframework/integration/core/MessagePriority.java index 7479a253f5..cfafd18126 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/message/MessagePriority.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/core/MessagePriority.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.message; +package org.springframework.integration.core; /** * An enumeration of the possible values for a message's priority. 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 857877365a..e8ce6c0eae 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 @@ -24,6 +24,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.integration.core.MessagePriority; import org.springframework.util.Assert; import org.springframework.util.StringUtils; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java index 59a676b7e4..e52a0cbcb6 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/PriorityChannelTests.java @@ -25,8 +25,8 @@ import java.util.Comparator; import org.junit.Test; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagePriority; import org.springframework.integration.message.MessageBuilder; -import org.springframework.integration.message.MessagePriority; import org.springframework.integration.message.StringMessage; /** diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java index 401893f81a..8f89c86898 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/channel/config/ChannelParserTests.java @@ -33,10 +33,10 @@ import org.springframework.integration.channel.PollableChannel; import org.springframework.integration.channel.PublishSubscribeChannel; import org.springframework.integration.config.TestChannelInterceptor; import org.springframework.integration.core.Message; +import org.springframework.integration.core.MessagePriority; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageDeliveryException; -import org.springframework.integration.message.MessagePriority; import org.springframework.integration.message.StringMessage; /** 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 591636ea1d..07a547891f 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 @@ -25,6 +25,7 @@ import org.junit.Test; import org.springframework.integration.core.Message; import org.springframework.integration.core.MessageHeaders; +import org.springframework.integration.core.MessagePriority; /** * @author Mark Fisher