diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java index 4bf522e833c5f8128d601b5806749baa66868fa8..ed7d0daa3be50475a1d8a9fea016a098dcf9047f 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java @@ -29,7 +29,7 @@ import org.springframework.core.convert.TypeDescriptor; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.ValueConstants; -import org.springframework.messaging.handler.support.HandlerMethodArgumentResolver; +import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java index e0897eca28406dddd00a5319055950882003fa67..dfd85a0a798c02a350161d2be7c36406eece3364 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AnnotationExceptionHandlerMethodResolver.java @@ -25,7 +25,7 @@ import java.util.Map; import org.springframework.core.annotation.AnnotationUtils; import org.springframework.messaging.handler.annotation.MessageExceptionHandler; -import org.springframework.messaging.handler.support.AbstractExceptionHandlerMethodResolver; +import org.springframework.messaging.handler.invocation.AbstractExceptionHandlerMethodResolver; import org.springframework.messaging.handler.HandlerMethodSelector; import org.springframework.util.ReflectionUtils.MethodFilter; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolver.java index e7c52b8202f8681e3dbbe6ce2ea6e1ae11ca7d87..079fa62117ded45def6ba3fe0dfd872a54edc7ef 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/HeadersMethodArgumentResolver.java @@ -24,7 +24,7 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageHeaders; import org.springframework.messaging.handler.annotation.Header; import org.springframework.messaging.handler.annotation.Headers; -import org.springframework.messaging.handler.support.HandlerMethodArgumentResolver; +import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; import org.springframework.messaging.support.MessageHeaderAccessor; import org.springframework.util.ClassUtils; import org.springframework.util.ReflectionUtils; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolver.java index 1c6a2df49a5fda3e9970ab961597905a27d1c5df..c057e466438eecb2eca78aa41a8795c0baf7df4d 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/MessageMethodArgumentResolver.java @@ -18,7 +18,7 @@ package org.springframework.messaging.handler.annotation.support; import org.springframework.core.MethodParameter; import org.springframework.messaging.Message; -import org.springframework.messaging.handler.support.HandlerMethodArgumentResolver; +import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; /** * A {@link HandlerMethodArgumentResolver} for {@link Message} parameters. diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java index 82d57a10b8f5d017412b60abf66810c1548f2642..ebba7db716bf95f77f079ea38f486d469766bd35 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/PayloadArgumentResolver.java @@ -19,7 +19,7 @@ package org.springframework.messaging.handler.annotation.support; import org.springframework.core.MethodParameter; import org.springframework.messaging.Message; import org.springframework.messaging.handler.annotation.Payload; -import org.springframework.messaging.handler.support.HandlerMethodArgumentResolver; +import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; import org.springframework.messaging.converter.MessageConverter; import org.springframework.util.Assert; import org.springframework.util.ClassUtils; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/AbstractExceptionHandlerMethodResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.java similarity index 98% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/support/AbstractExceptionHandlerMethodResolver.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.java index 49de381ffb889dd3df6ab249e77623e24a48cd9d..9dd2eba0a67157811f29607f976ebc01d106c416 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/AbstractExceptionHandlerMethodResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractExceptionHandlerMethodResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.support; +package org.springframework.messaging.handler.invocation; import org.springframework.core.ExceptionDepthComparator; import org.springframework.util.Assert; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/AbstractMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java similarity index 99% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/support/AbstractMethodMessageHandler.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java index 0dee6c864569bf0a12677960971fea31a080b3c8..e52be029e28047638692658e6951a47ce37c2438 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/AbstractMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/AbstractMethodMessageHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.support; +package org.springframework.messaging.handler.invocation; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver.java similarity index 94% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodArgumentResolver.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver.java index bcb51e9b23c54bae2932be8d8005502d0430deee..0654d250654d13ed51738c88a0dfcfc72a76baa1 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.support; +package org.springframework.messaging.handler.invocation; import org.springframework.core.MethodParameter; import org.springframework.messaging.Message; @@ -43,7 +43,7 @@ public interface HandlerMethodArgumentResolver { * have previously been passed to * {@link #supportsParameter(org.springframework.core.MethodParameter)} * and it must have returned {@code true} - * @param message + * @param message the currently processed message * @return the resolved argument value, or {@code null}. * @throws Exception in case of errors with the preparation of argument values */ diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodArgumentResolverComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java similarity index 98% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodArgumentResolverComposite.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java index 46ad68f5bc9004f0208348b38e62c87f3d5378fc..71cdc08367c328831a35f034970b9a8788d9dd70 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodArgumentResolverComposite.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodArgumentResolverComposite.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.support; +package org.springframework.messaging.handler.invocation; import java.util.Collections; import java.util.LinkedList; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler.java similarity index 96% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodReturnValueHandler.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler.java index 7f3fb64601157239d004ca02a83bd267c0a981b5..4aab0acfc7b2becb0cebb00b6450ac3739be2119 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodReturnValueHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.support; +package org.springframework.messaging.handler.invocation; import org.springframework.core.MethodParameter; import org.springframework.messaging.Message; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodReturnValueHandlerComposite.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandlerComposite.java similarity index 98% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodReturnValueHandlerComposite.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandlerComposite.java index 533c8d029cef508964f9d07d90c3f347ca383702..5e7aff6bc8ea8aa73e29bef6fb5e0f9bd65e927c 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/HandlerMethodReturnValueHandlerComposite.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/HandlerMethodReturnValueHandlerComposite.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.support; +package org.springframework.messaging.handler.invocation; import java.util.ArrayList; import java.util.Collections; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/InvocableHandlerMethod.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java similarity index 99% rename from spring-messaging/src/main/java/org/springframework/messaging/handler/support/InvocableHandlerMethod.java rename to spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java index c664649fb61da978a186d6476ad4670cda0310de..b0005f8ce1d53af285264e88510b76cf11359df8 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/InvocableHandlerMethod.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/InvocableHandlerMethod.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.messaging.handler.support; +package org.springframework.messaging.handler.invocation; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..a05588b7925efcc562691812369dab584f3910f3 --- /dev/null +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/package-info.java @@ -0,0 +1,4 @@ +/** + * Common infrastructure for invoking message handler methods. + */ +package org.springframework.messaging.handler.invocation; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/package-info.java index 16b99139ea1f6cc6957e01e5477399834e4f6374..481a9d7fb45a1441e77d6ccaac33f81c42b43eed 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/package-info.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/package-info.java @@ -1,4 +1,4 @@ /** - * Basic abstractions for working with message handlers. + * Basic abstractions for working with message handler methods. */ package org.springframework.messaging.handler; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/package-info.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/support/package-info.java deleted file mode 100644 index e42d320a56dca7e0a90368db445af3762ea9da03..0000000000000000000000000000000000000000 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/support/package-info.java +++ /dev/null @@ -1,4 +0,0 @@ -/** - * Abstractions and classes for working with message-handling methods. - */ -package org.springframework.messaging.handler.support; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java index 8cea1a59086c3f4577b9e9c06d724ed184dddf19..dedbaed0c6168aac9fce1ef335f0023668130c7e 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/PrincipalMethodArgumentResolver.java @@ -20,7 +20,7 @@ import java.security.Principal; import org.springframework.core.MethodParameter; import org.springframework.messaging.Message; -import org.springframework.messaging.handler.support.HandlerMethodArgumentResolver; +import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; import org.springframework.messaging.simp.SimpMessageHeaderAccessor; /** diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java index e439bd02c21cc5367c7675d9b009ddfb454cd4f2..d47ea95fc64c868e4ea3d23c3e5784011613b9e0 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SendToMethodReturnValueHandler.java @@ -24,7 +24,7 @@ import org.springframework.messaging.Message; import org.springframework.messaging.MessageChannel; import org.springframework.messaging.core.MessagePostProcessor; import org.springframework.messaging.handler.annotation.SendTo; -import org.springframework.messaging.handler.support.HandlerMethodReturnValueHandler; +import org.springframework.messaging.handler.invocation.HandlerMethodReturnValueHandler; import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.messaging.simp.SimpMessageSendingOperations; import org.springframework.messaging.simp.annotation.SendToUser; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java index 75ab0e944b6f034c6bb7892aa839f9e565fa7c17..1d53770fc9fe6ad3b239fc16313b68ea9f5803c4 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SimpAnnotationMethodMessageHandler.java @@ -47,11 +47,11 @@ import org.springframework.messaging.handler.annotation.support.HeadersMethodArg import org.springframework.messaging.handler.annotation.support.MessageMethodArgumentResolver; import org.springframework.messaging.handler.annotation.support.PathVariableMethodArgumentResolver; import org.springframework.messaging.handler.annotation.support.PayloadArgumentResolver; -import org.springframework.messaging.handler.support.AbstractExceptionHandlerMethodResolver; -import org.springframework.messaging.handler.support.AbstractMethodMessageHandler; +import org.springframework.messaging.handler.invocation.AbstractExceptionHandlerMethodResolver; +import org.springframework.messaging.handler.invocation.AbstractMethodMessageHandler; import org.springframework.messaging.handler.DestinationPatternsMessageCondition; -import org.springframework.messaging.handler.support.HandlerMethodArgumentResolver; -import org.springframework.messaging.handler.support.HandlerMethodReturnValueHandler; +import org.springframework.messaging.handler.invocation.HandlerMethodArgumentResolver; +import org.springframework.messaging.handler.invocation.HandlerMethodReturnValueHandler; import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.messaging.simp.SimpMessageSendingOperations; import org.springframework.messaging.simp.SimpMessagingTemplate; diff --git a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java index 83db9531dd2cd3f723b0f2dbb02b04b0991ffbec..9bca795fd41f1ef2ffe047d185e8b50dd67d2037 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/simp/annotation/support/SubscriptionMethodReturnValueHandler.java @@ -21,7 +21,7 @@ import org.springframework.messaging.Message; import org.springframework.messaging.core.MessagePostProcessor; import org.springframework.messaging.core.MessageSendingOperations; import org.springframework.messaging.handler.annotation.SendTo; -import org.springframework.messaging.handler.support.HandlerMethodReturnValueHandler; +import org.springframework.messaging.handler.invocation.HandlerMethodReturnValueHandler; import org.springframework.messaging.simp.SimpMessageHeaderAccessor; import org.springframework.messaging.simp.SimpMessageType; import org.springframework.messaging.simp.annotation.SendToUser;