diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java index 7b6448f119..f0d09aaff7 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java @@ -60,7 +60,7 @@ import org.springframework.web.servlet.mvc.annotation.ResponseStatusExceptionRes import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletWebArgumentResolverAdapter; +import org.springframework.web.servlet.mvc.method.annotation.ServletWebArgumentResolverAdapter; import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver; import org.w3c.dom.Element; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java new file mode 100644 index 0000000000..5fe9ead604 --- /dev/null +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/annotation/package-info.java @@ -0,0 +1,8 @@ + +/** + * + * Annotation-based setup for Spring MVC. + * + */ +package org.springframework.web.servlet.config.annotation; + diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/package-info.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/package-info.java index b3817d1ae6..00dc575506 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/package-info.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/package-info.java @@ -1,6 +1,8 @@ /** - * Defines the Spring MVC configuration namespace. + * + * Defines the XML configuration namespace for Spring MVC. + * */ package org.springframework.web.servlet.config; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java new file mode 100644 index 0000000000..1bd6310988 --- /dev/null +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/condition/package-info.java @@ -0,0 +1,8 @@ + +/** + * + * Common MVC logic for matching incoming requests based on conditions. + * + */ +package org.springframework.web.servlet.mvc.condition; + diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/AbstractMessageConverterMethodArgumentResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/AbstractMessageConverterMethodArgumentResolver.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java index 884f01ae4f..ef2b4d96d9 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/AbstractMessageConverterMethodArgumentResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.io.IOException; import java.util.ArrayList; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/AbstractMessageConverterMethodProcessor.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java similarity index 99% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/AbstractMessageConverterMethodProcessor.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java index b964d70028..b111c58d46 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/AbstractMessageConverterMethodProcessor.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/AbstractMessageConverterMethodProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.io.IOException; import java.util.ArrayList; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java index 8139a275d6..0f181499f5 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java @@ -36,9 +36,9 @@ import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.annotation.ExceptionHandlerMethodResolver; -import org.springframework.web.method.annotation.support.MapMethodProcessor; -import org.springframework.web.method.annotation.support.ModelAttributeMethodProcessor; -import org.springframework.web.method.annotation.support.ModelMethodProcessor; +import org.springframework.web.method.annotation.MapMethodProcessor; +import org.springframework.web.method.annotation.ModelAttributeMethodProcessor; +import org.springframework.web.method.annotation.ModelMethodProcessor; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolverComposite; import org.springframework.web.method.support.HandlerMethodReturnValueHandler; @@ -47,13 +47,6 @@ import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.View; import org.springframework.web.servlet.handler.AbstractHandlerMethodExceptionResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.HttpEntityMethodProcessor; -import org.springframework.web.servlet.mvc.method.annotation.support.ModelAndViewMethodReturnValueHandler; -import org.springframework.web.servlet.mvc.method.annotation.support.RequestResponseBodyMethodProcessor; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletRequestMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletResponseMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ViewMethodReturnValueHandler; -import org.springframework.web.servlet.mvc.method.annotation.support.ViewNameMethodReturnValueHandler; /** * An {@link AbstractHandlerMethodExceptionResolver} that resolves exceptions @@ -310,7 +303,7 @@ public class ExceptionHandlerExceptionResolver extends AbstractHandlerMethodExce protected ServletInvocableHandlerMethod getExceptionHandlerMethod(HandlerMethod handlerMethod, Exception exception) { Class handlerType = handlerMethod.getBeanType(); Method method = getExceptionHandlerMethodResolver(handlerType).resolveMethod(exception); - return (method != null) ? new ServletInvocableHandlerMethod(handlerMethod.getBean(), method) : null; + return (method != null ? new ServletInvocableHandlerMethod(handlerMethod.getBean(), method) : null); } /** diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java index fd83e2be92..dd1cd4479d 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExtendedServletRequestDataBinder.java @@ -17,7 +17,6 @@ package org.springframework.web.servlet.mvc.method.annotation; import java.util.Map; - import javax.servlet.ServletRequest; import org.springframework.beans.MutablePropertyValues; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/HttpEntityMethodProcessor.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/HttpEntityMethodProcessor.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java index fca99efe26..cbf434d4c0 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/HttpEntityMethodProcessor.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.io.IOException; import java.lang.reflect.Array; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewMethodReturnValueHandler.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java similarity index 97% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewMethodReturnValueHandler.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java index 771a2c9ec8..661e403b72 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewMethodReturnValueHandler.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import org.springframework.core.MethodParameter; import org.springframework.web.context.request.NativeWebRequest; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewResolverMethodReturnValueHandler.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java similarity index 96% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewResolverMethodReturnValueHandler.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java index 521737cdef..121ad3ecc0 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewResolverMethodReturnValueHandler.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.lang.reflect.Method; import java.util.List; @@ -22,7 +22,7 @@ import java.util.List; import org.springframework.core.MethodParameter; import org.springframework.ui.ExtendedModelMap; import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.method.annotation.support.ModelAttributeMethodProcessor; +import org.springframework.web.method.annotation.ModelAttributeMethodProcessor; import org.springframework.web.method.support.HandlerMethodReturnValueHandler; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.ModelAndView; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/PathVariableMethodArgumentResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java similarity index 92% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/PathVariableMethodArgumentResolver.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java index 82c1208a8c..b74b6309e5 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/PathVariableMethodArgumentResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.util.HashMap; import java.util.Map; @@ -26,7 +26,7 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.ValueConstants; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.method.annotation.support.AbstractNamedValueMethodArgumentResolver; +import org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.View; @@ -36,7 +36,7 @@ import org.springframework.web.servlet.View; * *

An @{@link PathVariable} is a named value that gets resolved from a URI template variable. It is always * required and does not have a default value to fall back on. See the base class - * {@link AbstractNamedValueMethodArgumentResolver} for more information on how named values are processed. + * {@link org.springframework.web.method.annotation.AbstractNamedValueMethodArgumentResolver} for more information on how named values are processed. * *

A {@link WebDataBinder} is invoked to apply type conversion to resolved path variable values that * don't yet match the method parameter type. diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/RedirectAttributesMethodArgumentResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java similarity index 85% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/RedirectAttributesMethodArgumentResolver.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java index e2d2db4b00..272ab04ff9 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/RedirectAttributesMethodArgumentResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RedirectAttributesMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.util.Map; @@ -24,8 +24,6 @@ import org.springframework.ui.ModelMap; import org.springframework.validation.DataBinder; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.method.annotation.support.MapMethodProcessor; -import org.springframework.web.method.annotation.support.ModelMethodProcessor; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.mvc.support.RedirectAttributes; @@ -34,8 +32,8 @@ import org.springframework.web.servlet.mvc.support.RedirectAttributesModelMap; /** * Resolves method arguments of type {@link RedirectAttributes}. * - *

This resolver must be listed ahead of {@link ModelMethodProcessor} and - * {@link MapMethodProcessor}, which support {@link Map} and {@link Model} + *

This resolver must be listed ahead of {@link org.springframework.web.method.annotation.ModelMethodProcessor} and + * {@link org.springframework.web.method.annotation.MapMethodProcessor}, which support {@link Map} and {@link Model} * arguments both of which are "super" types of {@code RedirectAttributes} * and would also attempt to resolve a {@code RedirectAttributes} argument. * diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index 14db8301aa..c2e030e9e6 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -56,18 +56,18 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.request.WebRequest; import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethodSelector; +import org.springframework.web.method.annotation.ErrorsMethodArgumentResolver; +import org.springframework.web.method.annotation.MapMethodProcessor; +import org.springframework.web.method.annotation.ModelAttributeMethodProcessor; import org.springframework.web.method.annotation.ModelFactory; +import org.springframework.web.method.annotation.ModelMethodProcessor; +import org.springframework.web.method.annotation.RequestHeaderMapMethodArgumentResolver; +import org.springframework.web.method.annotation.RequestParamMapMethodArgumentResolver; import org.springframework.web.method.annotation.SessionAttributesHandler; -import org.springframework.web.method.annotation.support.ErrorsMethodArgumentResolver; -import org.springframework.web.method.annotation.support.ExpressionValueMethodArgumentResolver; -import org.springframework.web.method.annotation.support.MapMethodProcessor; -import org.springframework.web.method.annotation.support.ModelAttributeMethodProcessor; -import org.springframework.web.method.annotation.support.ModelMethodProcessor; -import org.springframework.web.method.annotation.support.RequestHeaderMapMethodArgumentResolver; -import org.springframework.web.method.annotation.support.RequestHeaderMethodArgumentResolver; -import org.springframework.web.method.annotation.support.RequestParamMapMethodArgumentResolver; -import org.springframework.web.method.annotation.support.RequestParamMethodArgumentResolver; -import org.springframework.web.method.annotation.support.SessionStatusMethodArgumentResolver; +import org.springframework.web.method.annotation.SessionStatusMethodArgumentResolver; +import org.springframework.web.method.annotation.ExpressionValueMethodArgumentResolver; +import org.springframework.web.method.annotation.RequestHeaderMethodArgumentResolver; +import org.springframework.web.method.annotation.RequestParamMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodArgumentResolverComposite; import org.springframework.web.method.support.HandlerMethodReturnValueHandler; @@ -78,20 +78,6 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.View; import org.springframework.web.servlet.mvc.annotation.ModelAndViewResolver; import org.springframework.web.servlet.mvc.method.AbstractHandlerMethodAdapter; -import org.springframework.web.servlet.mvc.method.annotation.support.HttpEntityMethodProcessor; -import org.springframework.web.servlet.mvc.method.annotation.support.ModelAndViewMethodReturnValueHandler; -import org.springframework.web.servlet.mvc.method.annotation.support.ModelAndViewResolverMethodReturnValueHandler; -import org.springframework.web.servlet.mvc.method.annotation.support.PathVariableMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.RedirectAttributesMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.RequestPartMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.RequestResponseBodyMethodProcessor; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletCookieValueMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletModelAttributeMethodProcessor; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletRequestMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletResponseMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.UriComponentsBuilderMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ViewMethodReturnValueHandler; -import org.springframework.web.servlet.mvc.method.annotation.support.ViewNameMethodReturnValueHandler; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.support.RequestContextUtils; import org.springframework.web.util.WebUtils; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartMethodArgumentResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java similarity index 97% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartMethodArgumentResolver.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java index 4d5b546287..6b1c1125c0 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartMethodArgumentResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.lang.annotation.Annotation; import java.util.Collection; @@ -28,13 +28,13 @@ import org.springframework.http.HttpInputMessage; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.util.Assert; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.method.annotation.support.MethodArgumentNotValidException; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.multipart.MultipartException; import org.springframework.web.multipart.MultipartFile; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestResponseBodyMethodProcessor.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java similarity index 96% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestResponseBodyMethodProcessor.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java index a8f268213c..d2cd0e08a4 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestResponseBodyMethodProcessor.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.io.IOException; import java.lang.annotation.Annotation; @@ -26,12 +26,12 @@ import org.springframework.core.annotation.AnnotationUtils; import org.springframework.http.converter.HttpMessageConverter; import org.springframework.validation.BindingResult; import org.springframework.web.HttpMediaTypeNotAcceptableException; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.method.annotation.support.MethodArgumentNotValidException; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolver; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletCookieValueMethodArgumentResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java similarity index 88% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletCookieValueMethodArgumentResolver.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java index 8e3013da68..d2a64b7987 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletCookieValueMethodArgumentResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -22,12 +22,12 @@ import javax.servlet.http.HttpServletRequest; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.core.MethodParameter; import org.springframework.web.context.request.NativeWebRequest; -import org.springframework.web.method.annotation.support.AbstractCookieValueMethodArgumentResolver; +import org.springframework.web.method.annotation.AbstractCookieValueMethodArgumentResolver; import org.springframework.web.util.UrlPathHelper; import org.springframework.web.util.WebUtils; /** - * An {@link AbstractCookieValueMethodArgumentResolver} that resolves cookie + * An {@link org.springframework.web.method.annotation.AbstractCookieValueMethodArgumentResolver} that resolves cookie * values from an {@link HttpServletRequest}. * * @author Rossen Stoyanchev diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletModelAttributeMethodProcessor.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java similarity index 94% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletModelAttributeMethodProcessor.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java index c22d9c6b6c..e2865dc166 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletModelAttributeMethodProcessor.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletModelAttributeMethodProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.util.Collections; import java.util.Map; @@ -32,12 +32,11 @@ import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.RequestAttributes; -import org.springframework.web.method.annotation.support.ModelAttributeMethodProcessor; +import org.springframework.web.method.annotation.ModelAttributeMethodProcessor; import org.springframework.web.servlet.HandlerMapping; -import org.springframework.web.servlet.mvc.method.annotation.ServletRequestDataBinderFactory; /** - * A Servlet-specific {@link ModelAttributeMethodProcessor} that applies data + * A Servlet-specific {@link org.springframework.web.method.annotation.ModelAttributeMethodProcessor} that applies data * binding through a WebDataBinder of type {@link ServletRequestDataBinder}. * *

Also adds a fall-back strategy to instantiate the model attribute from a diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletRequestMethodArgumentResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java similarity index 98% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletRequestMethodArgumentResolver.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java index 03ac3dff47..6976861adb 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletRequestMethodArgumentResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.io.IOException; import java.io.InputStream; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletResponseMethodArgumentResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java similarity index 97% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletResponseMethodArgumentResolver.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java index de3a9c25ae..f0514bd488 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletResponseMethodArgumentResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.io.IOException; import java.io.OutputStream; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletWebArgumentResolverAdapter.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java similarity index 84% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletWebArgumentResolverAdapter.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java index 58674345f0..b19d0f362a 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletWebArgumentResolverAdapter.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ServletWebArgumentResolverAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import org.springframework.web.bind.support.WebArgumentResolver; import org.springframework.web.context.request.NativeWebRequest; @@ -22,16 +22,16 @@ import org.springframework.web.context.request.RequestAttributes; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletRequestAttributes; import org.springframework.web.context.request.ServletWebRequest; -import org.springframework.web.method.annotation.support.AbstractWebArgumentResolverAdapter; +import org.springframework.web.method.annotation.AbstractWebArgumentResolverAdapter; /** - * A Servlet-specific {@link AbstractWebArgumentResolverAdapter} that creates a + * A Servlet-specific {@link org.springframework.web.method.annotation.AbstractWebArgumentResolverAdapter} that creates a * {@link NativeWebRequest} from {@link ServletRequestAttributes}. * *

Note: This class is provided for backwards compatibility. * However it is recommended to re-write a {@code WebArgumentResolver} as * {@code HandlerMethodArgumentResolver}. For more details see javadoc of - * {@link AbstractWebArgumentResolverAdapter}. + * {@link org.springframework.web.method.annotation.AbstractWebArgumentResolverAdapter}. * * @author Rossen Stoyanchev * @since 3.1 diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/UriComponentsBuilderMethodArgumentResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java similarity index 96% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/UriComponentsBuilderMethodArgumentResolver.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java index 7045c0f1ef..2cf1905d1c 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/UriComponentsBuilderMethodArgumentResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import javax.servlet.http.HttpServletRequest; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewMethodReturnValueHandler.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java similarity index 97% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewMethodReturnValueHandler.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java index e90cd3a20d..88a1b4d28e 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewMethodReturnValueHandler.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import org.springframework.core.MethodParameter; import org.springframework.web.context.request.NativeWebRequest; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewNameMethodReturnValueHandler.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java similarity index 97% rename from org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewNameMethodReturnValueHandler.java rename to org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java index 8b983d688d..aa7dc816f0 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewNameMethodReturnValueHandler.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandler.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import org.springframework.core.MethodParameter; import org.springframework.web.context.request.NativeWebRequest; diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java new file mode 100644 index 0000000000..32a80b0471 --- /dev/null +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/package-info.java @@ -0,0 +1,10 @@ + +/** + * + * MVC infrastructure for annotation-based handler method processing, + * building on the org.springframework.web.method.annotation package. + * Entry points are {@link RequestMappingHandlerMapping} and {@link RequestMappingHandlerAdapter}. + * + */ +package org.springframework.web.servlet.mvc.method.annotation; + diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java new file mode 100644 index 0000000000..abeebd1039 --- /dev/null +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/package-info.java @@ -0,0 +1,9 @@ + +/** + * + * Servlet-based infrastructure for handler method processing, + * building on the org.springframework.web.method package. + * + */ +package org.springframework.web.servlet.mvc.method; + diff --git a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java index 6de0aeced4..acd0cd1102 100644 --- a/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java +++ b/org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolver.java @@ -35,11 +35,11 @@ import org.springframework.util.StringUtils; import org.springframework.web.HttpMediaTypeNotAcceptableException; import org.springframework.web.HttpMediaTypeNotSupportedException; import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.ServletRequestBindingException; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestPart; -import org.springframework.web.method.annotation.support.MethodArgumentNotValidException; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.support.MissingServletRequestPartException; import org.springframework.web.servlet.ModelAndView; diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java index 0fdbd553b1..0e08da83bd 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParserTests.java @@ -42,7 +42,7 @@ import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerAdapter; import org.springframework.web.servlet.mvc.method.annotation.ExceptionHandlerExceptionResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletWebArgumentResolverAdapter; +import org.springframework.web.servlet.mvc.method.annotation.ServletWebArgumentResolverAdapter; /** * Test fixture for the configuration in mvc-config-annotation-driven.xml. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java index 3c3a863e3a..3f5fbef0e9 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupportTests.java @@ -46,7 +46,7 @@ import org.springframework.validation.beanvalidation.LocalValidatorFactoryBean; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.support.ConfigurableWebBindingInitializer; import org.springframework.web.context.support.StaticWebApplicationContext; -import org.springframework.web.method.annotation.support.ModelAttributeMethodProcessor; +import org.springframework.web.method.annotation.ModelAttributeMethodProcessor; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodReturnValueHandler; import org.springframework.web.servlet.HandlerExceptionResolver; diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java index 1f58d10d3a..bef84ec23b 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolverTests.java @@ -37,12 +37,10 @@ import org.springframework.util.ClassUtils; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.method.HandlerMethod; -import org.springframework.web.method.annotation.support.ModelMethodProcessor; +import org.springframework.web.method.annotation.ModelMethodProcessor; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodReturnValueHandler; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletRequestMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ViewNameMethodReturnValueHandler; /** * Test fixture with {@link ExceptionHandlerExceptionResolver}. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/HttpEntityMethodProcessorTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java similarity index 98% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/HttpEntityMethodProcessorTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java index 47467740cf..1b42aff0ed 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/HttpEntityMethodProcessorTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.easymock.EasyMock.capture; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.eq; @@ -52,6 +52,7 @@ import org.springframework.web.HttpMediaTypeNotSupportedException; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; +import org.springframework.web.servlet.mvc.method.annotation.HttpEntityMethodProcessor; /** * Test fixture with {@link HttpEntityMethodProcessor} and mock {@link HttpMessageConverter}. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewMethodReturnValueHandlerTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java similarity index 95% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewMethodReturnValueHandlerTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java index 4d88b14bbb..cb99e9566b 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewMethodReturnValueHandlerTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewMethodReturnValueHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,6 +29,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.ModelAndView; +import org.springframework.web.servlet.mvc.method.annotation.ModelAndViewMethodReturnValueHandler; import org.springframework.web.servlet.view.RedirectView; /** diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewResolverMethodReturnValueHandlerTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java similarity index 96% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewResolverMethodReturnValueHandlerTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java index d574bfc130..ae2c1f425c 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewResolverMethodReturnValueHandlerTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ModelAndViewResolverMethodReturnValueHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -37,6 +37,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.annotation.ModelAndViewResolver; +import org.springframework.web.servlet.mvc.method.annotation.ModelAndViewResolverMethodReturnValueHandler; /** * Test fixture with {@link ModelAndViewResolverMethodReturnValueHandler}. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/PathVariableMethodArgumentResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java similarity index 96% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/PathVariableMethodArgumentResolverTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java index 86bd1882bb..6d10d9648f 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/PathVariableMethodArgumentResolverTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/PathVariableMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -37,6 +37,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.View; +import org.springframework.web.servlet.mvc.method.annotation.PathVariableMethodArgumentResolver; /** * Test fixture with {@link PathVariableMethodArgumentResolver}. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java index 33dd364f29..8531f97fd2 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterIntegrationTests.java @@ -85,7 +85,6 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.InvocableHandlerMethod; import org.springframework.web.servlet.HandlerMapping; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletWebArgumentResolverAdapter; import org.springframework.web.util.UriComponentsBuilder; /** diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java index d7f4328a7e..da2df3d150 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapterTests.java @@ -31,16 +31,13 @@ import org.springframework.ui.Model; import org.springframework.web.bind.annotation.SessionAttributes; import org.springframework.web.context.support.GenericWebApplicationContext; import org.springframework.web.method.HandlerMethod; -import org.springframework.web.method.annotation.support.ModelMethodProcessor; +import org.springframework.web.method.annotation.ModelMethodProcessor; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.HandlerMethodReturnValueHandler; import org.springframework.web.method.support.InvocableHandlerMethod; import org.springframework.web.servlet.FlashMap; import org.springframework.web.servlet.FlashMapManager; import org.springframework.web.servlet.ModelAndView; -import org.springframework.web.servlet.mvc.method.annotation.support.RedirectAttributesMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletRequestMethodArgumentResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ViewNameMethodReturnValueHandler; /** * Unit tests for {@link RequestMappingHandlerAdapter}. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartIntegrationTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java similarity index 98% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartIntegrationTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java index 2695e06a30..fe203d3820 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartIntegrationTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartIntegrationTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.junit.Assert.assertEquals; diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartMethodArgumentResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java similarity index 98% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartMethodArgumentResolverTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java index efab531147..afbaf311d3 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestPartMethodArgumentResolverTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestPartMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.eq; @@ -58,12 +58,13 @@ import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; -import org.springframework.web.method.annotation.support.MethodArgumentNotValidException; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.multipart.MultipartException; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.support.MissingServletRequestPartException; import org.springframework.web.multipart.support.RequestPartServletServerHttpRequest; +import org.springframework.web.servlet.mvc.method.annotation.RequestPartMethodArgumentResolver; /** * Test fixture with {@link RequestPartMethodArgumentResolver} and mock {@link HttpMessageConverter}. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestResponseBodyMethodProcessorTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java similarity index 98% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestResponseBodyMethodProcessorTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java index a01bc028bc..a98820751d 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/RequestResponseBodyMethodProcessorTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.eq; @@ -59,9 +59,10 @@ import org.springframework.web.bind.annotation.ResponseBody; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; -import org.springframework.web.method.annotation.support.MethodArgumentNotValidException; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.HandlerMapping; +import org.springframework.web.servlet.mvc.method.annotation.RequestResponseBodyMethodProcessor; /** * Test fixture with {@link RequestResponseBodyMethodProcessor} and mock {@link HttpMessageConverter}. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java index 64732552f5..9e0e626df1 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/SerlvetModelAttributeMethodProcessorTests.java @@ -36,7 +36,6 @@ import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.HandlerMapping; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletModelAttributeMethodProcessor; /** * Test fixture for {@link ServletModelAttributeMethodProcessor} specific tests. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index 6d16ce4b12..879961db77 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -138,7 +138,6 @@ import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.View; import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.mvc.annotation.ModelAndViewResolver; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletWebArgumentResolverAdapter; import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.support.RequestContextUtils; import org.springframework.web.servlet.view.InternalResourceViewResolver; diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletCookieValueMethodArgumentResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java similarity index 94% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletCookieValueMethodArgumentResolverTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java index a672b4567e..7f421f983c 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletCookieValueMethodArgumentResolverTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletCookieValueMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.junit.Assert.assertEquals; @@ -29,6 +29,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.web.bind.annotation.CookieValue; import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ServletCookieValueMethodArgumentResolver; /** * Test fixture with {@link ServletCookieValueMethodArgumentResolver}. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java index 34e9896151..00a7a3abf5 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java @@ -27,7 +27,6 @@ import org.junit.Before; import org.junit.Test; import org.springframework.core.MethodParameter; import org.springframework.http.HttpStatus; -import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.http.converter.HttpMessageNotWritableException; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; @@ -38,7 +37,6 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolverCompo import org.springframework.web.method.support.HandlerMethodReturnValueHandler; import org.springframework.web.method.support.HandlerMethodReturnValueHandlerComposite; import org.springframework.web.method.support.ModelAndViewContainer; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletResponseMethodArgumentResolver; /** * Test fixture with {@link ServletInvocableHandlerMethod}. diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletRequestMethodArgumentResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java similarity index 96% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletRequestMethodArgumentResolverTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java index 8f9be5cbd5..1c5631b42e 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletRequestMethodArgumentResolverTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletRequestMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.io.InputStream; import java.io.Reader; @@ -35,7 +35,7 @@ import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.request.WebRequest; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.multipart.MultipartRequest; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletRequestMethodArgumentResolver; +import org.springframework.web.servlet.mvc.method.annotation.ServletRequestMethodArgumentResolver; import static org.junit.Assert.*; diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletResponseMethodArgumentResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java similarity index 91% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletResponseMethodArgumentResolverTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java index 062ec1e6ff..5ea3c893e6 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ServletResponseMethodArgumentResolverTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletResponseMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import java.io.OutputStream; import java.io.Writer; @@ -29,12 +29,12 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; -import org.springframework.web.servlet.mvc.method.annotation.support.ServletResponseMethodArgumentResolver; +import org.springframework.web.servlet.mvc.method.annotation.ServletResponseMethodArgumentResolver; import static org.junit.Assert.*; /** - * Test fixture with {@link ServletRequestMethodArgumentResolver}. + * Test fixture with {@link org.springframework.web.servlet.mvc.method.annotation.ServletRequestMethodArgumentResolver}. * * @author Arjen Poutsma */ diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/UriComponentsBuilderMethodArgumentResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java similarity index 94% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/UriComponentsBuilderMethodArgumentResolverTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java index 3ebe78307a..8e35d8c020 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/UriComponentsBuilderMethodArgumentResolverTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/UriComponentsBuilderMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -29,6 +29,7 @@ import org.springframework.core.MethodParameter; import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; +import org.springframework.web.servlet.mvc.method.annotation.UriComponentsBuilderMethodArgumentResolver; import org.springframework.web.servlet.support.ServletUriComponentsBuilder; import org.springframework.web.util.UriComponentsBuilder; diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewMethodReturnValueHandlerTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java similarity index 95% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewMethodReturnValueHandlerTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java index d49891708b..0282976aee 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewMethodReturnValueHandlerTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewMethodReturnValueHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; @@ -29,6 +29,7 @@ import org.springframework.ui.ModelMap; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; import org.springframework.web.servlet.View; +import org.springframework.web.servlet.mvc.method.annotation.ViewMethodReturnValueHandler; import org.springframework.web.servlet.mvc.support.RedirectAttributesModelMap; import org.springframework.web.servlet.view.InternalResourceView; import org.springframework.web.servlet.view.RedirectView; diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewNameMethodReturnValueHandlerTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java similarity index 94% rename from org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewNameMethodReturnValueHandlerTests.java rename to org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java index f4b7d64288..9a806e4888 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/support/ViewNameMethodReturnValueHandlerTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ViewNameMethodReturnValueHandlerTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.servlet.mvc.method.annotation.support; +package org.springframework.web.servlet.mvc.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; @@ -29,6 +29,7 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.ui.ModelMap; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.method.support.ModelAndViewContainer; +import org.springframework.web.servlet.mvc.method.annotation.ViewNameMethodReturnValueHandler; import org.springframework.web.servlet.mvc.support.RedirectAttributesModelMap; /** diff --git a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java index 1d9d90d98b..db9b60af79 100644 --- a/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java +++ b/org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/support/DefaultHandlerExceptionResolverTests.java @@ -35,9 +35,9 @@ import org.springframework.mock.web.MockHttpServletResponse; import org.springframework.validation.BeanPropertyBindingResult; import org.springframework.web.HttpMediaTypeNotSupportedException; import org.springframework.web.HttpRequestMethodNotSupportedException; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.ServletRequestBindingException; -import org.springframework.web.method.annotation.support.MethodArgumentNotValidException; import org.springframework.web.multipart.support.MissingServletRequestPartException; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.multiaction.NoSuchRequestHandlingMethodException; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/MethodArgumentNotValidException.java b/org.springframework.web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java similarity index 77% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/MethodArgumentNotValidException.java rename to org.springframework.web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java index 1f509aa016..3c7534327c 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/MethodArgumentNotValidException.java +++ b/org.springframework.web/src/main/java/org/springframework/web/bind/MethodArgumentNotValidException.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.bind; import org.springframework.core.MethodParameter; import org.springframework.validation.BindingResult; import org.springframework.validation.ObjectError; /** - * Thrown when validation on an argument annotated with {@code @Valid} fails. - * + * Exception to be thrown when validation on an argument annotated with {@code @Valid} fails. + * * @author Rossen Stoyanchev * @since 3.1 */ -@SuppressWarnings("serial") public class MethodArgumentNotValidException extends Exception { private final MethodParameter parameter; private final BindingResult bindingResult; + /** * Constructor for {@link MethodArgumentNotValidException}. * @param parameter the parameter that failed validation @@ -47,23 +47,24 @@ public class MethodArgumentNotValidException extends Exception { * Return the method parameter that failed validation. */ public MethodParameter getParameter() { - return parameter; + return this.parameter; } /** * Return the results of the failed validation. */ public BindingResult getBindingResult() { - return bindingResult; + return this.bindingResult; } + @Override public String getMessage() { - StringBuilder sb = new StringBuilder("Validation failed for argument at index [") - .append(parameter.getParameterIndex()).append("] in method: ") - .append(parameter.getMethod().toGenericString()) - .append(", with ").append(bindingResult.getErrorCount()).append(" error(s): "); - for (ObjectError error : bindingResult.getAllErrors()) { + StringBuilder sb = new StringBuilder("Validation failed for argument at index ") + .append(this.parameter.getParameterIndex()).append(" in method: ") + .append(this.parameter.getMethod().toGenericString()) + .append(", with ").append(this.bindingResult.getErrorCount()).append(" error(s): "); + for (ObjectError error : this.bindingResult.getAllErrors()) { sb.append("[").append(error).append("] "); } return sb.toString(); diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractCookieValueMethodArgumentResolver.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java similarity index 97% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractCookieValueMethodArgumentResolver.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java index c70f9d1152..df485e1b0a 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractCookieValueMethodArgumentResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractCookieValueMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import org.springframework.beans.factory.config.ConfigurableBeanFactory; import org.springframework.core.MethodParameter; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractNamedValueMethodArgumentResolver.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java similarity index 99% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractNamedValueMethodArgumentResolver.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java index 37d2599377..dceda243b5 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractNamedValueMethodArgumentResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractNamedValueMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractWebArgumentResolverAdapter.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java similarity index 98% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractWebArgumentResolverAdapter.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java index a6b08e627a..af7e95c2ac 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/AbstractWebArgumentResolverAdapter.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/AbstractWebArgumentResolverAdapter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ErrorsMethodArgumentResolver.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java similarity index 97% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ErrorsMethodArgumentResolver.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java index b80b1c5068..89d7af0705 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ErrorsMethodArgumentResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ErrorsMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import java.util.ArrayList; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ExpressionValueMethodArgumentResolver.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java similarity index 97% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ExpressionValueMethodArgumentResolver.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java index 292312056c..7877e7923c 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ExpressionValueMethodArgumentResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import javax.servlet.ServletException; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/MapMethodProcessor.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java similarity index 97% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/MapMethodProcessor.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java index bd265bb9a5..064a76e85a 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/MapMethodProcessor.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/MapMethodProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import java.util.Map; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ModelAttributeMethodProcessor.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java similarity index 99% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ModelAttributeMethodProcessor.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java index 4dc2c7fe8a..a1521296aa 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ModelAttributeMethodProcessor.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import java.lang.annotation.Annotation; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ModelMethodProcessor.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java similarity index 97% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ModelMethodProcessor.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java index 5fb9818080..b3952424e2 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/ModelMethodProcessor.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/ModelMethodProcessor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import org.springframework.core.MethodParameter; import org.springframework.ui.Model; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestHeaderMapMethodArgumentResolver.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java similarity index 98% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestHeaderMapMethodArgumentResolver.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java index 72204f2376..a58d96cc27 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestHeaderMapMethodArgumentResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import java.util.Iterator; import java.util.LinkedHashMap; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestHeaderMethodArgumentResolver.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java similarity index 98% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestHeaderMethodArgumentResolver.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java index beaf0f81b5..1c5c3cf04f 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestHeaderMethodArgumentResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import java.util.Map; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestParamMapMethodArgumentResolver.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java similarity index 98% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestParamMapMethodArgumentResolver.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java index 6d89e0e051..435aafdbb8 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestParamMapMethodArgumentResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import java.util.LinkedHashMap; import java.util.Map; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestParamMethodArgumentResolver.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java similarity index 99% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestParamMethodArgumentResolver.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java index 10cc58b0c3..c659d699d2 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/RequestParamMethodArgumentResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import java.beans.PropertyEditor; import java.util.Collection; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/SessionStatusMethodArgumentResolver.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java similarity index 96% rename from org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/SessionStatusMethodArgumentResolver.java rename to org.springframework.web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java index 11af589df1..3f20380045 100644 --- a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/support/SessionStatusMethodArgumentResolver.java +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/SessionStatusMethodArgumentResolver.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import org.springframework.core.MethodParameter; import org.springframework.web.bind.support.SessionStatus; diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/annotation/package-info.java b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/package-info.java new file mode 100644 index 0000000000..db95fbe4a3 --- /dev/null +++ b/org.springframework.web/src/main/java/org/springframework/web/method/annotation/package-info.java @@ -0,0 +1,8 @@ + +/** + * + * Support classes for annotation-based handler method processing. + * + */ +package org.springframework.web.method.annotation; + diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/package-info.java b/org.springframework.web/src/main/java/org/springframework/web/method/package-info.java new file mode 100644 index 0000000000..55225b41f0 --- /dev/null +++ b/org.springframework.web/src/main/java/org/springframework/web/method/package-info.java @@ -0,0 +1,9 @@ + +/** + * + * Common infrastructure for handler method processing, as used by + * Spring MVC's org.springframework.web.servlet.mvc.method package. + * + */ +package org.springframework.web.method; + diff --git a/org.springframework.web/src/main/java/org/springframework/web/method/support/package-info.java b/org.springframework.web/src/main/java/org/springframework/web/method/support/package-info.java new file mode 100644 index 0000000000..ee561dd1f3 --- /dev/null +++ b/org.springframework.web/src/main/java/org/springframework/web/method/support/package-info.java @@ -0,0 +1,8 @@ + +/** + * + * Generic support classes for handler method processing. + * + */ +package org.springframework.web.method.support; + diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/CookieValueMethodArgumentResolverTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java similarity index 93% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/CookieValueMethodArgumentResolverTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java index bfbb375fd9..506503d273 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/CookieValueMethodArgumentResolverTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/CookieValueMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -34,9 +34,10 @@ import org.springframework.web.bind.ServletRequestBindingException; import org.springframework.web.bind.annotation.CookieValue; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.method.annotation.AbstractCookieValueMethodArgumentResolver; /** - * Test fixture with {@link AbstractCookieValueMethodArgumentResolver}. + * Test fixture with {@link org.springframework.web.method.annotation.AbstractCookieValueMethodArgumentResolver}. * * @author Arjen Poutsma * @author Rossen Stoyanchev diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ErrorsMethodHandlerArgumentResolverTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java similarity index 95% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ErrorsMethodHandlerArgumentResolverTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java index 496e521ec1..96d1233a20 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ErrorsMethodHandlerArgumentResolverTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ErrorsMethodHandlerArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.junit.Assert.assertSame; @@ -27,6 +27,7 @@ import org.springframework.validation.Errors; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.method.annotation.ErrorsMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; /** diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ExpressionValueMethodArgumentResolverTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java similarity index 95% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ExpressionValueMethodArgumentResolverTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java index f32c6c2940..ee9d3a8e24 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ExpressionValueMethodArgumentResolverTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ExpressionValueMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -33,7 +33,7 @@ import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.support.GenericWebApplicationContext; -import org.springframework.web.method.annotation.support.ExpressionValueMethodArgumentResolver; +import org.springframework.web.method.annotation.ExpressionValueMethodArgumentResolver; /** * Test fixture with {@link ExpressionValueMethodArgumentResolver}. diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java index 3b69854f05..a9a0beb433 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/InitBinderDataBinderFactoryTests.java @@ -38,7 +38,6 @@ import org.springframework.web.bind.support.DefaultDataBinderFactory; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; -import org.springframework.web.method.annotation.support.RequestParamMethodArgumentResolver; import org.springframework.web.method.support.InvocableHandlerMethod; import org.springframework.web.method.support.HandlerMethodArgumentResolverComposite; diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/MapMethodProcessorTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java similarity index 92% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/MapMethodProcessorTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java index 475e57fd03..860c769895 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/MapMethodProcessorTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/MapMethodProcessorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; @@ -30,10 +30,11 @@ import org.springframework.mock.web.MockHttpServletRequest; import org.springframework.ui.ModelMap; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.method.annotation.MapMethodProcessor; import org.springframework.web.method.support.ModelAndViewContainer; /** - * Test fixture with {@link MapMethodProcessor}. + * Test fixture with {@link org.springframework.web.method.annotation.MapMethodProcessor}. * * @author Rossen Stoyanchev */ diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ModelAttributeMethodProcessorTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java similarity index 98% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ModelAttributeMethodProcessorTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java index 91eddbc95e..823d26ae93 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ModelAttributeMethodProcessorTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import java.lang.annotation.Retention; import java.lang.annotation.Target; @@ -36,6 +36,7 @@ import org.springframework.web.bind.support.WebRequestDataBinder; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.request.WebRequest; +import org.springframework.web.method.annotation.ModelAttributeMethodProcessor; import org.springframework.web.method.support.ModelAndViewContainer; import static java.lang.annotation.ElementType.*; diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java index 6357216c03..8df3f87b36 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelFactoryTests.java @@ -44,7 +44,6 @@ import org.springframework.web.bind.support.SessionAttributeStore; import org.springframework.web.bind.support.WebDataBinderFactory; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; -import org.springframework.web.method.annotation.support.ModelMethodProcessor; import org.springframework.web.method.support.HandlerMethodArgumentResolverComposite; import org.springframework.web.method.support.InvocableHandlerMethod; import org.springframework.web.method.support.ModelAndViewContainer; diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ModelMethodProcessorTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java similarity index 92% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ModelMethodProcessorTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java index 108bec635d..0ce5524748 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/ModelMethodProcessorTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/ModelMethodProcessorTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertSame; @@ -30,10 +30,11 @@ import org.springframework.ui.ExtendedModelMap; import org.springframework.ui.Model; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.method.annotation.ModelMethodProcessor; import org.springframework.web.method.support.ModelAndViewContainer; /** - * Test fixture with {@link ModelMethodProcessor}. + * Test fixture with {@link org.springframework.web.method.annotation.ModelMethodProcessor}. * * @author Rossen Stoyanchev */ diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestHeaderMapMethodArgumentResolverTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java similarity index 96% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestHeaderMapMethodArgumentResolverTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java index 2d96566617..f814b31d50 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestHeaderMapMethodArgumentResolverTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMapMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -35,6 +35,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.method.annotation.RequestHeaderMapMethodArgumentResolver; /** * Text fixture with {@link RequestHeaderMapMethodArgumentResolver}. diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestHeaderMethodArgumentResolverTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java similarity index 95% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestHeaderMethodArgumentResolverTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java index e677ffb184..f54ccba695 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestHeaderMethodArgumentResolverTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestHeaderMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -37,9 +37,10 @@ import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.RequestContextHolder; import org.springframework.web.context.request.ServletWebRequest; import org.springframework.web.context.support.GenericWebApplicationContext; +import org.springframework.web.method.annotation.RequestHeaderMethodArgumentResolver; /** - * Test fixture with {@link RequestHeaderMethodArgumentResolver}. + * Test fixture with {@link org.springframework.web.method.annotation.RequestHeaderMethodArgumentResolver}. * * @author Arjen Poutsma * @author Rossen Stoyanchev diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestParamMapMethodArgumentResolverTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java similarity index 96% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestParamMapMethodArgumentResolverTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java index 9dce83f453..eca74a03d1 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestParamMapMethodArgumentResolverTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMapMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -34,6 +34,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.method.annotation.RequestParamMapMethodArgumentResolver; /** * Test fixture with {@link RequestParamMapMethodArgumentResolver}. diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestParamMethodArgumentResolverTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java similarity index 97% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestParamMethodArgumentResolverTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java index 32689e6ae3..38af0e20a1 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/RequestParamMethodArgumentResolverTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; @@ -45,11 +45,12 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestPart; import org.springframework.web.context.request.NativeWebRequest; import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.method.annotation.RequestParamMethodArgumentResolver; import org.springframework.web.multipart.MultipartException; import org.springframework.web.multipart.MultipartFile; /** - * Test fixture with {@link RequestParamMethodArgumentResolver}. + * Test fixture with {@link org.springframework.web.method.annotation.RequestParamMethodArgumentResolver}. * * @author Arjen Poutsma * @author Rossen Stoyanchev diff --git a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/WebArgumentResolverAdapterTests.java b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java similarity index 98% rename from org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/WebArgumentResolverAdapterTests.java rename to org.springframework.web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java index 23fe296ab9..c163cde03d 100644 --- a/org.springframework.web/src/test/java/org/springframework/web/method/annotation/support/WebArgumentResolverAdapterTests.java +++ b/org.springframework.web/src/test/java/org/springframework/web/method/annotation/WebArgumentResolverAdapterTests.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.web.method.annotation.support; +package org.springframework.web.method.annotation; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect;