Clean up warnings in spring-webmvc

spring-webmvc/src/main/java/org/springframework/web/servlet/config/AnnotationDrivenBeanDefinitionParser.java

@@ -449,7 +449,6 @@ class AnnotationDrivenBeanDefinitionParser implements BeanDefinitionParser {
 		return null;
 	}
 
-	@SuppressWarnings("deprecation")
 	private ManagedList<?> getMessageConverters(Element element, Object source, ParserContext parserContext) {
 		Element convertersElement = DomUtils.getChildElementByTagName(element, "message-converters");
 		ManagedList<? super Object> messageConverters = new ManagedList<Object>();

spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java

@@ -538,7 +538,6 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
 	 * Subclasses can call this method from {@link #configureMessageConverters(List)}.
 	 * @param messageConverters the list to add the default message converters to
 	 */
-	@SuppressWarnings("deprecation")
 	protected final void addDefaultHttpMessageConverters(List<HttpMessageConverter<?>> messageConverters) {
 		StringHttpMessageConverter stringConverter = new StringHttpMessageConverter();
 		stringConverter.setWriteAcceptCharset(false);

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/HttpHeadersReturnValueHandler.java

@@ -40,6 +40,7 @@ public class HttpHeadersReturnValueHandler implements HandlerMethodReturnValueHa
 	}
 
 	@Override
+	@SuppressWarnings("resource")
 	public void handleReturnValue(Object returnValue, MethodParameter returnType,
 			ModelAndViewContainer mavContainer, NativeWebRequest webRequest) throws Exception {
 
@@ -55,4 +56,5 @@ public class HttpHeadersReturnValueHandler implements HandlerMethodReturnValueHa
 			outputMessage.getBody(); // flush headers
 		}
 	}
+
 }

spring-webmvc/src/main/java/org/springframework/web/servlet/support/AbstractDispatcherServletInitializer.java

@@ -30,7 +30,6 @@ import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.AbstractContextLoaderInitializer;
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.filter.DelegatingFilterProxy;
 import org.springframework.web.servlet.DispatcherServlet;
 
 /**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -156,6 +156,7 @@ import org.springframework.web.util.NestedServletException;
  * @author Arjen Poutsma
  * @since 2.5
  */
+@SuppressWarnings("deprecation")
 public class ServletAnnotationControllerTests {
 
 	private DispatcherServlet servlet;

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/UriTemplateServletAnnotationControllerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -50,6 +50,7 @@ import static org.junit.Assert.*;
  * @author Arjen Poutsma
  * @author Rossen Stoyanchev
  */
+@SuppressWarnings("deprecation")
 public class UriTemplateServletAnnotationControllerTests {
 
 	private DispatcherServlet servlet;

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/HttpEntityMethodProcessorTests.java

@@ -173,6 +173,7 @@ public class HttpEntityMethodProcessorTests {
 			return name;
 		}
 
+		@SuppressWarnings("unused")
 		public void setName(String name) {
 			this.name = name;
 		}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestResponseBodyMethodProcessorTests.java

@@ -334,6 +334,7 @@ public class RequestResponseBodyMethodProcessorTests {
 			return name;
 		}
 
+		@SuppressWarnings("unused")
 		public void setName(String name) {
 			this.name = name;
 		}

spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletInvocableHandlerMethodTests.java

@@ -240,6 +240,7 @@ public class ServletInvocableHandlerMethodTests {
 
 	private static class ResponseEntityHandler {
 
+		@SuppressWarnings("unused")
 		public DeferredResult<ResponseEntity<String>> handle() {
 			return new DeferredResult<>();
 		}

spring-webmvc/src/test/java/org/springframework/web/servlet/view/document/ExcelViewTests.java

@@ -21,6 +21,7 @@ import java.lang.reflect.Field;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -32,6 +33,7 @@ import jxl.read.biff.WorkbookParser;
 import jxl.write.Label;
 import jxl.write.WritableSheet;
 import jxl.write.WritableWorkbook;
+
 import org.apache.poi.hssf.usermodel.HSSFCell;
 import org.apache.poi.hssf.usermodel.HSSFRow;
 import org.apache.poi.hssf.usermodel.HSSFSheet;
@@ -56,6 +58,7 @@ import static org.junit.Assert.*;
  * @author Alef Arendsen
  * @author Bram Smeets
  */
+@SuppressWarnings("deprecation")
 public class ExcelViewTests {
 
 	private MockServletContext servletCtx;

spring-webmvc/src/test/java/org/springframework/web/servlet/view/jasperreports/ExporterParameterTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -17,7 +17,6 @@
 package org.springframework.web.servlet.view.jasperreports;
 
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.Locale;
 import java.util.Map;
 
@@ -36,17 +35,20 @@ import static org.junit.Assert.*;
 
 /**
  * @author Rob Harrop
+ * @author Sam Brannen
  */
 public class ExporterParameterTests extends AbstractJasperReportsTests {
 
 	@Test
-	public void testParameterParsing() throws Exception {
-		Map params = new HashMap();
+	public void parameterParsing() throws Exception {
+		Map<String, String> params = new HashMap<String, String>();
 		params.put("net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI", "/foo/bar");
 
 		AbstractJasperReportsView view = new AbstractJasperReportsView() {
+
 			@Override
-			protected void renderReport(JasperPrint filledReport, Map model, HttpServletResponse response)
+			@SuppressWarnings("deprecation")
+			protected void renderReport(JasperPrint filledReport, Map<String, Object> model, HttpServletResponse response)
 					throws Exception {
 
 				assertEquals("Invalid number of exporter parameters", 1, getConvertedExporterParameters().size());
@@ -58,29 +60,6 @@ public class ExporterParameterTests extends AbstractJasperReportsTests {
 				assertEquals("Incorrect value for parameter", "/foo/bar", value);
 			}
 
-			/**
-			 * Merges the configured {@link net.sf.jasperreports.engine.JRExporterParameter JRExporterParameters} with any specified
-			 * in the supplied model data. {@link net.sf.jasperreports.engine.JRExporterParameter JRExporterParameters} in the model
-			 * override those specified in the configuration.
-			 * @see #setExporterParameters(java.util.Map)
-			 */
-			protected Map mergeExporterParameters(Map model) {
-				Map mergedParameters = new HashMap(getConvertedExporterParameters());
-				for (Iterator iterator = model.keySet().iterator(); iterator.hasNext();) {
-					Object key = iterator.next();
-
-					if (key instanceof JRExporterParameter) {
-						Object value = model.get(key);
-						if (value instanceof String) {
-							mergedParameters.put(key, value);
-						}
-						else {
-							logger.warn("Ignoring exporter parameter [" + key + "]. Value is not a String.");
-						}
-					}
-				}
-				return mergedParameters;
-			}
 		};
 
 		view.setExporterParameters(params);
@@ -88,64 +67,45 @@ public class ExporterParameterTests extends AbstractJasperReportsTests {
 		view.render(getModel(), request, response);
 	}
 
-	@Test
-	public void testInvalidClass() throws Exception {
-		Map params = new HashMap();
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidClass() throws Exception {
+		Map<String, String> params = new HashMap<String, String>();
 		params.put("foo.net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI", "/foo");
 
 		AbstractJasperReportsView view = new JasperReportsHtmlView();
 		setViewProperties(view);
 
-		try {
-			view.setExporterParameters(params);
-			view.convertExporterParameters();
-			fail("Should have thrown IllegalArgumentException");
-		}
-		catch (IllegalArgumentException ex) {
-			// expected
-		}
+		view.setExporterParameters(params);
+		view.convertExporterParameters();
 	}
 
-	@Test
-	public void testInvalidField() {
-		Map params = new HashMap();
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidField() {
+		Map<String, String> params = new HashMap<String, String>();
 		params.put("net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IMAGES_URI_FOO", "/foo");
 
 		AbstractJasperReportsView view = new JasperReportsHtmlView();
 		setViewProperties(view);
 
-		try {
-			view.setExporterParameters(params);
-			view.convertExporterParameters();
-			fail("Should have thrown IllegalArgumentException");
-		}
-		catch (IllegalArgumentException ex) {
-			// expected
-		}
+		view.setExporterParameters(params);
+		view.convertExporterParameters();
 	}
 
-	@Test
-	public void testInvalidType() {
-		Map params = new HashMap();
+	@Test(expected = IllegalArgumentException.class)
+	public void invalidType() {
+		Map<String, String> params = new HashMap<String, String>();
 		params.put("java.lang.Boolean.TRUE", "/foo");
 
 		AbstractJasperReportsView view = new JasperReportsHtmlView();
 		setViewProperties(view);
 
-		try {
-			view.setExporterParameters(params);
-			view.convertExporterParameters();
-			fail("Should have thrown IllegalArgumentException");
-		}
-		catch (IllegalArgumentException ex) {
-			// expected
-		}
+		view.setExporterParameters(params);
+		view.convertExporterParameters();
 	}
 
-
 	@Test
-	public void testTypeConversion() {
-		Map params = new HashMap();
+	public void typeConversion() {
+		Map<String, String> params = new HashMap<String, String>();
 		params.put("net.sf.jasperreports.engine.export.JRHtmlExporterParameter.IS_USING_IMAGES_TO_ALIGN", "true");
 
 		AbstractJasperReportsView view = new JasperReportsHtmlView();