Polish

src/main/java/org/springframework/samples/mvc/async/CallableController.java

@@ -29,48 +29,36 @@ public String call() throws Exception {
 
 	@RequestMapping("/view")
 	public Callable<String> callableWithView(final Model model) {
-
-		return new Callable<String>() {
-			@Override
-			public String call() throws Exception {
-				Thread.sleep(2000);
-				model.addAttribute("foo", "bar");
-				model.addAttribute("fruit", "apple");
-				return "views/html";
-			}
+		return () -> {
+			Thread.sleep(2000);
+			model.addAttribute("foo", "bar");
+			model.addAttribute("fruit", "apple");
+			return "views/html";
 		};
 	}
 
 	@RequestMapping("/exception")
 	public @ResponseBody Callable<String> callableWithException(
 			final @RequestParam(required=false, defaultValue="true") boolean handled) {
 
-		return new Callable<String>() {
-			@Override
-			public String call() throws Exception {
-				Thread.sleep(2000);
-				if (handled) {
-					// see handleException method further below
-					throw new IllegalStateException("Callable error");
-				}
-				else {
-					throw new IllegalArgumentException("Callable error");
-				}
+		return () -> {
+			Thread.sleep(2000);
+			if (handled) {
+				// see handleException method further below
+				throw new IllegalStateException("Callable error");
+			}
+			else {
+				throw new IllegalArgumentException("Callable error");
 			}
 		};
 	}
 
 	@RequestMapping("/custom-timeout-handling")
 	public @ResponseBody WebAsyncTask<String> callableWithCustomTimeoutHandling() {
-
-		Callable<String> callable = new Callable<String>() {
-			@Override
-			public String call() throws Exception {
-				Thread.sleep(2000);
-				return "Callable result";
-			}
+		Callable<String> callable = () -> {
+			Thread.sleep(2000);
+			return "Callable result";
 		};
-
 		return new WebAsyncTask<String>(1000, callable);
 	}
 

src/main/java/org/springframework/samples/mvc/async/DeferredResultController.java

@@ -15,30 +15,30 @@
 @RequestMapping("/async")
 public class DeferredResultController {
 
-	private final Queue<DeferredResult<String>> responseBodyQueue = new ConcurrentLinkedQueue<DeferredResult<String>>();
+	private final Queue<DeferredResult<String>> responseBodyQueue = new ConcurrentLinkedQueue<>();
 
-	private final Queue<DeferredResult<ModelAndView>> mavQueue = new ConcurrentLinkedQueue<DeferredResult<ModelAndView>>();
+	private final Queue<DeferredResult<ModelAndView>> mavQueue = new ConcurrentLinkedQueue<>();
 
-	private final Queue<DeferredResult<String>> exceptionQueue = new ConcurrentLinkedQueue<DeferredResult<String>>();
+	private final Queue<DeferredResult<String>> exceptionQueue = new ConcurrentLinkedQueue<>();
 
 
 	@RequestMapping("/deferred-result/response-body")
 	public @ResponseBody DeferredResult<String> deferredResult() {
-		DeferredResult<String> result = new DeferredResult<String>();
+		DeferredResult<String> result = new DeferredResult<>();
 		this.responseBodyQueue.add(result);
 		return result;
 	}
 
 	@RequestMapping("/deferred-result/model-and-view")
 	public DeferredResult<ModelAndView> deferredResultWithView() {
-		DeferredResult<ModelAndView> result = new DeferredResult<ModelAndView>();
+		DeferredResult<ModelAndView> result = new DeferredResult<>();
 		this.mavQueue.add(result);
 		return result;
 	}
 
 	@RequestMapping("/deferred-result/exception")
 	public @ResponseBody DeferredResult<String> deferredResultWithException() {
-		DeferredResult<String> result = new DeferredResult<String>();
+		DeferredResult<String> result = new DeferredResult<>();
 		this.exceptionQueue.add(result);
 		return result;
 	}
@@ -49,7 +49,7 @@ public DeferredResult<ModelAndView> deferredResultWithView() {
 		// Provide a default result in case of timeout and override the timeout value
 		// set in src/main/webapp/WEB-INF/spring/appServlet/servlet-context.xml
 
-		return new DeferredResult<String>(1000L, "Deferred result after timeout");
+		return new DeferredResult<>(1000L, "Deferred result after timeout");
 	}
 
 	@Scheduled(fixedRate=2000)

src/main/java/org/springframework/samples/mvc/async/TimeoutCallableProcessingInterceptor.java

@@ -8,7 +8,7 @@
 public class TimeoutCallableProcessingInterceptor extends CallableProcessingInterceptorAdapter {
 
 	@Override
-	public <T> Object handleTimeout(NativeWebRequest request, Callable<T> task) throws Exception {
+	public <T> Object handleTimeout(NativeWebRequest request, Callable<T> task) {
 		throw new IllegalStateException("[" + task.getClass().getName() + "] timed out");
 	}
 

src/main/java/org/springframework/samples/mvc/data/custom/CustomArgumentResolver.java

@@ -13,8 +13,10 @@ public boolean supportsParameter(MethodParameter parameter) {
 		return parameter.getParameterAnnotation(RequestAttribute.class) != null;
 	}
 
-	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest,
-			WebDataBinderFactory binderFactory) throws Exception {
+	public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer,
+			NativeWebRequest webRequest, WebDataBinderFactory binderFactory)
+			throws Exception {
+
 		RequestAttribute attr = parameter.getParameterAnnotation(RequestAttribute.class);
 		return webRequest.getAttribute(attr.value(), WebRequest.SCOPE_REQUEST);
 	}

src/main/java/org/springframework/samples/mvc/fileupload/FileUploadController.java

@@ -26,7 +26,7 @@ public void fileUploadForm() {
 	}
 
 	@RequestMapping(method=RequestMethod.POST)
-	public void processUpload(@RequestParam MultipartFile file, Model model) throws IOException {
+	public void processUpload(@RequestParam MultipartFile file, Model model) {
 		model.addAttribute("message", "File '" + file.getOriginalFilename() + "' uploaded successfully");
 	}
 

src/test/java/org/springframework/samples/mvc/data/CustomArgumentControllerTests.java

@@ -14,7 +14,7 @@ public class CustomArgumentControllerTests {
 	private MockMvc mockMvc;
 
 	@Before
-	public void setup() throws Exception {
+	public void setup() {
 		this.mockMvc = standaloneSetup(new CustomArgumentController())
 				.setCustomArgumentResolvers(new CustomArgumentResolver()).build();
 	}

src/test/java/org/springframework/samples/mvc/exceptions/ExceptionControllerTests.java

@@ -18,7 +18,7 @@ public class ExceptionControllerTests extends AbstractContextControllerTests {
 	private MockMvc mockMvc;
 
 	@Before
-	public void setup() throws Exception {
+	public void setup() {
 		this.mockMvc = webAppContextSetup(this.wac).build();
 	}
 

src/test/java/org/springframework/samples/mvc/form/FormControllerTests.java

@@ -24,7 +24,7 @@ public class FormControllerTests {
 	private MockMvc mockMvc;
 
 	@Before
-	public void setup() throws Exception {
+	public void setup() {
 
 		InternalResourceViewResolver viewResolver = new InternalResourceViewResolver();
 		viewResolver.setPrefix("/WEB-INF/");

src/test/java/org/springframework/samples/mvc/mapping/MappingControllerTests.java

@@ -23,7 +23,7 @@ public class MappingControllerTests extends AbstractContextControllerTests {
 	private MockMvc mockMvc;
 
 	@Before
-	public void setup() throws Exception {
+	public void setup() {
 		this.mockMvc = webAppContextSetup(this.wac).alwaysExpect(status().isOk()).build();
 	}
 

src/test/java/org/springframework/samples/mvc/redirect/RedirectControllerTests.java

@@ -17,7 +17,7 @@ public class RedirectControllerTests {
 	@Before
 	public void setup() throws Exception {
 		this.mockMvc = standaloneSetup(new RedirectController(new DefaultFormattingConversionService()))
-				.alwaysExpect(status().isMovedTemporarily()).build();
+				.alwaysExpect(status().isFound()).build();
 	}
 
 	@Test

src/test/java/org/springframework/samples/mvc/response/ResponseControllerTests.java

@@ -1,24 +1,23 @@
 package org.springframework.samples.mvc.response;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
-
 import java.nio.charset.Charset;
 
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*;
+
 public class ResponseControllerTests {
 
 	private MockMvc mockMvc;
 
 	@Before
-	public void setup() throws Exception {
+	public void setup() {
 		this.mockMvc = standaloneSetup(new ResponseController()).build();
 	}
 

src/test/java/org/springframework/samples/mvc/validation/ValidationControllerTests.java

@@ -1,20 +1,20 @@
 package org.springframework.samples.mvc.validation;
 
-import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
-import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
-import static org.springframework.test.web.servlet.setup.MockMvcBuilders.standaloneSetup;
-
 import org.junit.Before;
 import org.junit.Test;
+
 import org.springframework.test.web.servlet.MockMvc;
 
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.*;
+import static org.springframework.test.web.servlet.setup.MockMvcBuilders.*;
+
 public class ValidationControllerTests {
 
 	private MockMvc mockMvc;
 
 	@Before
-	public void setup() throws Exception {
+	public void setup() {
 		this.mockMvc = standaloneSetup(new ValidationController()).alwaysExpect(status().isOk()).build();
 	}
 

src/test/java/org/springframework/samples/mvc/views/ViewsControllerTests.java

@@ -20,7 +20,7 @@ public class ViewsControllerTests extends AbstractContextControllerTests {
 	private MockMvc mockMvc;
 
 	@Before
-	public void setup() throws Exception {
+	public void setup() {
 		this.mockMvc = webAppContextSetup(this.wac).alwaysExpect(status().isOk()).build();
 	}