From 527b778bf9d4159697603b465d768739dc7ad7b8 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Thu, 27 Aug 2015 22:12:14 +0200 Subject: [PATCH] Clean up warnings in spring-test --- .../test/web/servlet/setup/StubWebApplicationContext.java | 2 -- .../samples/standalone/FileUploadControllerTests.java | 1 - .../web/servlet/setup/StandaloneMockMvcBuilderTests.java | 6 ++++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java index c67dc79eb6b..9506223a72a 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/StubWebApplicationContext.java @@ -370,13 +370,11 @@ class StubWebApplicationContext implements WebApplicationContext { } @Override - @SuppressWarnings("rawtypes") public Object createBean(Class beanClass, int autowireMode, boolean dependencyCheck) { return BeanUtils.instantiate(beanClass); } @Override - @SuppressWarnings("rawtypes") public Object autowire(Class beanClass, int autowireMode, boolean dependencyCheck) { return BeanUtils.instantiate(beanClass); } diff --git a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java index 094c1799b9f..04f8be9f1e1 100644 --- a/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java +++ b/spring-test/src/test/java/org/springframework/test/web/servlet/samples/standalone/FileUploadControllerTests.java @@ -83,7 +83,6 @@ public class FileUploadControllerTests { } - @SuppressWarnings("unused") @Controller private static class MultipartController { 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 10216412495..41595c37856 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 @@ -23,8 +23,6 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.ser.impl.UnknownSerializer; import org.junit.Test; import org.springframework.http.converter.json.SpringHandlerInstantiator; @@ -38,6 +36,9 @@ import org.springframework.web.method.HandlerMethod; import org.springframework.web.servlet.HandlerExecutionChain; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.ser.impl.UnknownSerializer; + import static org.junit.Assert.*; /** @@ -100,6 +101,7 @@ public class StandaloneMockMvcBuilderTests { } @Test // SPR-13375 + @SuppressWarnings("rawtypes") public void springHandlerInstantiator() { TestStandaloneMockMvcBuilder builder = new TestStandaloneMockMvcBuilder(new PersonController()); builder.build();