* Return values from the annotated method may be of any type. If the return * value is not a Message, a reply Message will be created with that object diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/Header.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Header.java similarity index 95% rename from org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/Header.java rename to org.springframework.integration/src/main/java/org/springframework/integration/annotation/Header.java index 88c7d89896..efbe990fa9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/Header.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Header.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.integration.handler.annotation; +package org.springframework.integration.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java index 2f6af0826f..d58523d5a9 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Router.java @@ -32,9 +32,7 @@ import java.lang.annotation.Target; * 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 - * Message parameters by using the - * {@link org.springframework.integration.handler.annotation.Header @Header} - * parameter annotation. + * Message parameters by using the {@link Header @Header} parameter annotation. *
* Return values from the annotated method may be either a Collection or Array * whose elements are either diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java index e41e98ed09..7837577081 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/annotation/Splitter.java @@ -31,9 +31,7 @@ import java.lang.annotation.Target; * 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 - * Message parameters by using the - * {@link org.springframework.integration.handler.annotation.Header @Header} - * parameter annotation. + * Message parameters by using the {@link Header @Header} parameter annotation. *
* Return values from the annotated method may be either a Collection or Array * with elements of any type. If the type is not a Message, each will be used diff --git a/org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapper.java b/org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapper.java index 061d38ed37..90d914433f 100644 --- a/org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapper.java +++ b/org.springframework.integration/src/main/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapper.java @@ -24,6 +24,7 @@ import org.springframework.core.GenericTypeResolver; import org.springframework.core.LocalVariableTableParameterNameDiscoverer; import org.springframework.core.MethodParameter; import org.springframework.core.ParameterNameDiscoverer; +import org.springframework.integration.annotation.Header; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageHandlingException; import org.springframework.integration.message.MessageHeaders; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/DefaultMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/DefaultMessageHandlerTests.java index 4b96914d1a..12e3930d49 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/DefaultMessageHandlerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/DefaultMessageHandlerTests.java @@ -25,7 +25,7 @@ import java.util.Properties; import org.junit.Test; import org.springframework.integration.annotation.Handler; -import org.springframework.integration.handler.annotation.Header; +import org.springframework.integration.annotation.Header; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapperTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapperTests.java index 3440beab19..415d88e041 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapperTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/handler/annotation/MethodArgumentMessageMapperTests.java @@ -27,6 +27,7 @@ import java.util.Properties; import org.junit.Test; import org.springframework.integration.annotation.Handler; +import org.springframework.integration.annotation.Header; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; import org.springframework.integration.message.MessageHandlingException; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterMessageHandlerTests.java index 003f20f457..c6689156d5 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterMessageHandlerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/router/RouterMessageHandlerTests.java @@ -26,12 +26,12 @@ import java.util.List; import org.junit.Test; +import org.springframework.integration.annotation.Header; import org.springframework.integration.channel.ChannelRegistry; import org.springframework.integration.channel.ChannelRegistryAware; import org.springframework.integration.channel.DefaultChannelRegistry; import org.springframework.integration.channel.MessageChannel; import org.springframework.integration.channel.QueueChannel; -import org.springframework.integration.handler.annotation.Header; import org.springframework.integration.message.CompositeMessage; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterMessageHandlerTests.java index e0137fb17a..501c58ad3c 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterMessageHandlerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/splitter/SplitterMessageHandlerTests.java @@ -26,7 +26,7 @@ import java.util.List; import org.junit.Test; -import org.springframework.integration.handler.annotation.Header; +import org.springframework.integration.annotation.Header; import org.springframework.integration.message.CompositeMessage; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder; diff --git a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerMessageHandlerTests.java b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerMessageHandlerTests.java index ff4af0c648..d651f21e6a 100644 --- a/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerMessageHandlerTests.java +++ b/org.springframework.integration/src/test/java/org/springframework/integration/transformer/TransformerMessageHandlerTests.java @@ -24,8 +24,8 @@ import java.util.Properties; import org.junit.Test; +import org.springframework.integration.annotation.Header; import org.springframework.integration.annotation.Transformer; -import org.springframework.integration.handler.annotation.Header; import org.springframework.integration.message.GenericMessage; import org.springframework.integration.message.Message; import org.springframework.integration.message.MessageBuilder;