SPR-6378 - RC2: Issue with RequestMethod.GET differs from M2

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/BookController.java

@@ -0,0 +1,52 @@
+/*
+ * Copyright 2002-2009 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.web.servlet.mvc.annotation;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * Used for testing the combination of ControllerClassNameHandlerMapping/SimpleUrlHandlerMapping with @RequestParam in
+ * {@link ServletAnnotationControllerTests}. Implemented as a top-level class (rather than an inner class) to make the
+ * ControllerClassNameHandlerMapping work.
+ *
+ * @author Arjen Poutsma
+ */
+@Controller
+public class BookController {
+
+	@RequestMapping("list")
+	public void list(Writer writer) throws IOException {
+		writer.write("list");
+	}
+
+	@RequestMapping("show")
+	public void show(@RequestParam(required = true) Long id, Writer writer) throws IOException {
+		writer.write("show-id=" + id);
+	}
+
+	@RequestMapping(method = RequestMethod.POST)
+	public void create(Writer writer) throws IOException {
+		writer.write("create");
+	}
+
+}

org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/annotation/ServletAnnotationControllerTests.java

@@ -55,6 +55,7 @@ import org.springframework.aop.support.DefaultPointcutAdvisor;
 import org.springframework.beans.DerivedTestBean;
 import org.springframework.beans.ITestBean;
 import org.springframework.beans.TestBean;
+import org.springframework.beans.BeansException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.beans.factory.config.PropertyPlaceholderConfigurer;
@@ -107,6 +108,7 @@ import org.springframework.web.servlet.DispatcherServlet;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.View;
 import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.handler.SimpleUrlHandlerMapping;
 import org.springframework.web.servlet.mvc.AbstractController;
 import org.springframework.web.servlet.mvc.multiaction.InternalPathMethodNameResolver;
 import org.springframework.web.servlet.mvc.support.ControllerClassNameHandlerMapping;
@@ -1159,6 +1161,75 @@ public class ServletAnnotationControllerTests {
 		assertEquals("Content-Type=[text/html],Custom-Header=[value21,value22]", response.getContentAsString());
 	}
 
+	@Test
+	public void controllerClassNameNoTypeLevelAnn() throws Exception {
+		servlet = new DispatcherServlet() {
+			@Override
+			protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent)
+					throws BeansException {
+				GenericWebApplicationContext wac = new GenericWebApplicationContext();
+				wac.registerBeanDefinition("controller", new RootBeanDefinition(BookController.class));
+				RootBeanDefinition mapping = new RootBeanDefinition(ControllerClassNameHandlerMapping.class);
+				mapping.getPropertyValues().add("excludedPackages", null);
+				wac.registerBeanDefinition("handlerMapping", mapping);
+				wac.refresh();
+				return wac;
+			}
+		};
+		servlet.init(new MockServletConfig());
+
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/book/list");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		servlet.service(request, response);
+		assertEquals("list", response.getContentAsString());
+
+		request = new MockHttpServletRequest("GET", "/book/show");
+		request.addParameter("id", "12");
+		response = new MockHttpServletResponse();
+		servlet.service(request, response);
+		assertEquals("show-id=12", response.getContentAsString());
+
+		request = new MockHttpServletRequest("POST", "/book");
+		response = new MockHttpServletResponse();
+		servlet.service(request, response);
+		assertEquals("create", response.getContentAsString());
+	}
+
+	@Test
+	public void simpleUrlHandlerMapping() throws Exception {
+		servlet = new DispatcherServlet() {
+			@Override
+			protected WebApplicationContext createWebApplicationContext(WebApplicationContext parent)
+					throws BeansException {
+				GenericWebApplicationContext wac = new GenericWebApplicationContext();
+				wac.registerBeanDefinition("controller", new RootBeanDefinition(BookController.class));
+				RootBeanDefinition hmDef = new RootBeanDefinition(SimpleUrlHandlerMapping.class);
+				hmDef.getPropertyValues().add("mappings", "/book/*=controller\n/book=controller");
+				wac.registerBeanDefinition("handlerMapping", hmDef);
+				wac.refresh();
+				return wac;
+			}
+		};
+		servlet.init(new MockServletConfig());
+
+		MockHttpServletRequest request = new MockHttpServletRequest("GET", "/book/list");
+		MockHttpServletResponse response = new MockHttpServletResponse();
+		servlet.service(request, response);
+		assertEquals("list", response.getContentAsString());
+
+		request = new MockHttpServletRequest("GET", "/book/show");
+		request.addParameter("id", "12");
+		response = new MockHttpServletResponse();
+		servlet.service(request, response);
+		assertEquals("show-id=12", response.getContentAsString());
+
+		request = new MockHttpServletRequest("POST", "/book");
+		response = new MockHttpServletResponse();
+		servlet.service(request, response);
+		assertEquals("create", response.getContentAsString());
+	}
+
+
 
 	/*
 	 * Controllers
@@ -2033,5 +2104,5 @@ public class ServletAnnotationControllerTests {
 
 	}
 
-
+	
 }