overhaul of support package arrangements for handler method processing; added missing package-info files

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

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;
 
 /**

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}.

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;
 

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
  */

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.*;

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;

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
  */

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}.

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

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}.

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

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;