From 4b682275c953770b3b7514ac17413285e2e421eb Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Sat, 14 Nov 2015 22:57:33 +0100
Subject: [PATCH] Clean up warnings in spring-test

---
 .../test/web/servlet/htmlunit/MockMvcWebConnectionTests.java   | 2 ++
 .../samples/context/AsyncControllerJavaConfigTests.java        | 2 --
 .../test/web/servlet/samples/context/JavaConfigTests.java      | 1 -
 .../test/web/servlet/setup/StandaloneMockMvcBuilderTests.java  | 3 ---
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionTests.java
index 299553b2d3..726c4f0bb6 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/htmlunit/MockMvcWebConnectionTests.java
@@ -85,11 +85,13 @@ public class MockMvcWebConnectionTests {
 	}
 
 	@Test(expected = IllegalArgumentException.class)
+	@SuppressWarnings("resource")
 	public void contextPathDoesNotStartWithSlash() throws IOException {
 		new MockMvcWebConnection(this.mockMvc, "context");
 	}
 
 	@Test(expected = IllegalArgumentException.class)
+	@SuppressWarnings("resource")
 	public void contextPathEndsWithSlash() throws IOException {
 		new MockMvcWebConnection(this.mockMvc, "/context/");
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java
index 4edb425922..319435124e 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/AsyncControllerJavaConfigTests.java
@@ -101,7 +101,6 @@ public class AsyncControllerJavaConfigTests {
 
 	@Configuration
 	@EnableWebMvc
-	@SuppressWarnings("unused")
 	static class WebConfig extends WebMvcConfigurerAdapter {
 
 		@Override
@@ -122,7 +121,6 @@ public class AsyncControllerJavaConfigTests {
 	}
 
 	@RestController
-	@SuppressWarnings("unused")
 	static class AsyncController {
 
 		@RequestMapping(path = "/callable")
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
index 507d47ebdb..221f33b4de 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/context/JavaConfigTests.java
@@ -143,7 +143,6 @@ public class JavaConfigTests {
 
 	@Configuration
 	@EnableWebMvc
-	@SuppressWarnings("unused")
 	static class WebConfig extends WebMvcConfigurerAdapter {
 
 		@Autowired
diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
index fb441308fe..a0763af521 100644
--- a/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
+++ b/spring-test/src/test/java/org/springframework/test/web/servlet/setup/StandaloneMockMvcBuilderTests.java
@@ -28,7 +28,6 @@ import org.junit.Test;
 import org.springframework.http.converter.json.SpringHandlerInstantiator;
 import org.springframework.mock.web.test.MockHttpServletRequest;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.context.WebApplicationContext;
 import org.springframework.web.context.support.WebApplicationContextUtils;
@@ -138,7 +137,6 @@ public class StandaloneMockMvcBuilderTests {
 
 
 	@Controller
-	@SuppressWarnings("unused")
 	private static class PlaceholderController {
 
 		@RequestMapping(value = "${sys.login.ajax}")
@@ -162,7 +160,6 @@ public class StandaloneMockMvcBuilderTests {
 	}
 
 	@Controller
-	@SuppressWarnings("unused")
 	private static class PersonController {
 
 		@RequestMapping(value="/persons")
-- 
GitLab