From 7a154e8e98c30abb3d0a08718aeea6e77df1544a Mon Sep 17 00:00:00 2001 From: Juergen Hoeller Date: Fri, 6 Dec 2013 21:50:47 +0100 Subject: [PATCH] Renamed handler.support to handler.invocation --- .../support/AbstractNamedValueMethodArgumentResolver.java | 2 +- .../support/AnnotationExceptionHandlerMethodResolver.java | 2 +- .../annotation/support/HeadersMethodArgumentResolver.java | 2 +- .../annotation/support/MessageMethodArgumentResolver.java | 2 +- .../annotation/support/PayloadArgumentResolver.java | 2 +- .../AbstractExceptionHandlerMethodResolver.java | 2 +- .../AbstractMethodMessageHandler.java | 2 +- .../HandlerMethodArgumentResolver.java | 4 ++-- .../HandlerMethodArgumentResolverComposite.java | 2 +- .../HandlerMethodReturnValueHandler.java | 2 +- .../HandlerMethodReturnValueHandlerComposite.java | 2 +- .../{support => invocation}/InvocableHandlerMethod.java | 2 +- .../messaging/handler/invocation/package-info.java | 4 ++++ .../springframework/messaging/handler/package-info.java | 2 +- .../messaging/handler/support/package-info.java | 4 ---- .../support/PrincipalMethodArgumentResolver.java | 2 +- .../support/SendToMethodReturnValueHandler.java | 2 +- .../support/SimpAnnotationMethodMessageHandler.java | 8 ++++---- .../support/SubscriptionMethodReturnValueHandler.java | 2 +- 19 files changed, 25 insertions(+), 25 deletions(-) rename spring-messaging/src/main/java/org/springframework/messaging/handler/{support => invocation}/AbstractExceptionHandlerMethodResolver.java (98%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/{support => invocation}/AbstractMethodMessageHandler.java (99%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/{support => invocation}/HandlerMethodArgumentResolver.java (94%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/{support => invocation}/HandlerMethodArgumentResolverComposite.java (98%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/{support => invocation}/HandlerMethodReturnValueHandler.java (96%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/{support => invocation}/HandlerMethodReturnValueHandlerComposite.java (98%) rename spring-messaging/src/main/java/org/springframework/messaging/handler/{support => invocation}/InvocableHandlerMethod.java (99%) create mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/invocation/package-info.java delete mode 100644 spring-messaging/src/main/java/org/springframework/messaging/handler/support/package-info.java 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 4bf522e833..ed7d0daa3b 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 e0897eca28..dfd85a0a79 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 e7c52b8202..079fa62117 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 1c6a2df49a..c057e46643 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 82d57a10b8..ebba7db716 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 49de381ffb..9dd2eba0a6 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 0dee6c8645..e52be029e2 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 bcb51e9b23..0654d25065 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 46ad68f5bc..71cdc08367 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 7f3fb64601..4aab0acfc7 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 533c8d029c..5e7aff6bc8 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 c664649fb6..b0005f8ce1 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 0000000000..a05588b792 --- /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 16b99139ea..481a9d7fb4 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 e42d320a56..0000000000 --- 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 8cea1a5908..dedbaed0c6 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 e439bd02c2..d47ea95fc6 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 75ab0e944b..1d53770fc9 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 83db9531dd..9bca795fd4 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;