default config for web binding initializer and formatting/conversion system w/ mvc namespace

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

@@ -23,6 +23,8 @@ import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.beans.factory.xml.BeanDefinitionParser;
 import org.springframework.beans.factory.xml.ParserContext;
+import org.springframework.format.support.FormattingConversionServiceFactoryBean;
+import org.springframework.web.bind.support.ConfigurableWebBindingInitializer;
 import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter;
 import org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping;
 import org.w3c.dom.Element;
@@ -39,7 +41,7 @@ public class AnnotatedControllersBeanDefinitionParser implements BeanDefinitionP
 		Object source = parserContext.extractSource(element);
 		BeanDefinitionHolder handlerMappingHolder = registerDefaultAnnotationHandlerMapping(element, source, parserContext);
 		BeanDefinitionHolder handlerAdapterHolder = registerAnnotationMethodHandlerAdapter(element, source, parserContext);
-
+		
 		CompositeComponentDefinition compDefinition = new CompositeComponentDefinition(element.getTagName(), source);
 		parserContext.pushContainingComponent(compDefinition);
 		parserContext.registerComponent(new BeanComponentDefinition(handlerMappingHolder));
@@ -50,21 +52,41 @@ public class AnnotatedControllersBeanDefinitionParser implements BeanDefinitionP
 	}
 	
 	private BeanDefinitionHolder registerDefaultAnnotationHandlerMapping(Element element, Object source, ParserContext context) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(DefaultAnnotationHandlerMapping.class);
+		BeanDefinitionBuilder builder = createBeanBuilder(DefaultAnnotationHandlerMapping.class, source);
 		builder.addPropertyValue("order", 0);
-		builder.getRawBeanDefinition().setSource(source);
 		return registerBeanDefinition(new BeanDefinitionHolder(builder.getBeanDefinition(), "defaultAnnotationHandlerMapping"), context);
 	}
 
 	private BeanDefinitionHolder registerAnnotationMethodHandlerAdapter(Element element, Object source, ParserContext context) {
-		BeanDefinitionBuilder builder = BeanDefinitionBuilder.rootBeanDefinition(AnnotationMethodHandlerAdapter.class);
-		builder.getRawBeanDefinition().setSource(source);
+		BeanDefinitionBuilder builder = createBeanBuilder(AnnotationMethodHandlerAdapter.class, source);
+		builder.addPropertyValue("webBindingInitializer", createWebBindingInitializer(element, source, context));
 		return registerBeanDefinition(new BeanDefinitionHolder(builder.getBeanDefinition(), "annotationMethodHandlerAdapter"), context);	
 	}
 
+	private BeanDefinition createWebBindingInitializer(Element element, Object source, ParserContext context) {
+		BeanDefinitionBuilder builder = createBeanBuilder(ConfigurableWebBindingInitializer.class, source);
+		if (context.getRegistry().containsBeanDefinition("conversionService")) {
+			builder.addPropertyReference("conversionService", "conversionService");
+		} else {
+			builder.addPropertyValue("conversionService", createFormattingConversionService(element, source, context));
+		}
+		return builder.getBeanDefinition();
+	}
+	
+	private BeanDefinition createFormattingConversionService(Element element, Object source, ParserContext context) {
+		BeanDefinitionBuilder builder = createBeanBuilder(FormattingConversionServiceFactoryBean.class, source);
+		return builder.getBeanDefinition();
+	}
+
 	private BeanDefinitionHolder registerBeanDefinition(BeanDefinitionHolder holder, ParserContext context) {
 		context.getRegistry().registerBeanDefinition(holder.getBeanName(), holder.getBeanDefinition());
 		return holder;
 	}
+	
+	private BeanDefinitionBuilder createBeanBuilder(Class<?> clazz, Object source) {
+		BeanDefinitionBuilder builder = BeanDefinitionBuilder.genericBeanDefinition(clazz);
+		builder.getRawBeanDefinition().setSource(source);
+		return builder;
+	}
 
 }

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/config/MvcNamespaceTests.java

@@ -3,11 +3,22 @@ package org.springframework.web.servlet.config;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
+import java.util.Date;
+import java.util.Locale;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.context.i18n.LocaleContextHolder;
 import org.springframework.core.io.ClassPathResource;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.format.annotation.DateTimeFormat.Style;
+import org.springframework.mock.web.MockHttpServletRequest;
+import org.springframework.mock.web.MockHttpServletResponse;
 import org.springframework.mock.web.MockServletContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.context.support.GenericWebApplicationContext;
 import org.springframework.web.servlet.mvc.annotation.AnnotationMethodHandlerAdapter;
 import org.springframework.web.servlet.mvc.annotation.DefaultAnnotationHandlerMapping;
@@ -20,10 +31,12 @@ public class MvcNamespaceTests {
 	public void setUp() {
 		container = new GenericWebApplicationContext();
 		container.setServletContext(new MockServletContext());
+		
+		LocaleContextHolder.setLocale(Locale.US);
 	}
 	
 	@Test
-	public void testDefaultConfig() {
+	public void testDefaultConfig() throws Exception {
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(container);
 		reader.loadBeanDefinitions(new ClassPathResource("mvc-config.xml", getClass()));
 		assertEquals(2, container.getBeanDefinitionCount());
@@ -32,5 +45,22 @@ public class MvcNamespaceTests {
 		assertEquals(0, mapping.getOrder());
 		AnnotationMethodHandlerAdapter adapter = container.getBean("annotationMethodHandlerAdapter", AnnotationMethodHandlerAdapter.class);
 		assertNotNull(adapter);
+
+		TestController handler = new TestController();
+
+		// default web binding initializer behavior test
+		MockHttpServletRequest request = new MockHttpServletRequest();
+		request.addParameter("date", "Oct 31, 2009");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		adapter.handle(request, response, handler);
+	}
+	
+	@Controller
+	public static class TestController {
+		
+		@RequestMapping
+		public void testBind(@RequestParam @DateTimeFormat(dateStyle=Style.MEDIUM) Date date) {
+			System.out.println(date);
+		}
 	}
 }

org.springframework.web.servlet/src/test/resources/log4j.xml

@@ -15,7 +15,7 @@
 		<level value="warn" />
 	</logger>
 
-	<logger name="org.springframework.binding">
+	<logger name="org.springframework.core.convert">
 		<level value="debug" />
 	</logger>