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

Author: jhoeller

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java

@@ -60,7 +60,7 @@
 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;
 

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;
+

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;
 

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;
+

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/AbstractMessageConverterMethodArgumentResolver.java renamed to 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;

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/AbstractMessageConverterMethodProcessor.java renamed to 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;

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java

@@ -36,9 +36,9 @@
 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.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 @@ protected ModelAndView doResolveHandlerMethodException(HttpServletRequest reques
 	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);
 	}
 
 	/**

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;

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/HttpEntityMethodProcessor.java renamed to 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;

org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/annotation/support/ModelAndViewMethodReturnValueHandler.java renamed to 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;