From 2c120d0d283716db6d968193ea18aabcac7152d7 Mon Sep 17 00:00:00 2001
From: Sam Brannen <sam@sambrannen.com>
Date: Thu, 13 Aug 2015 16:04:52 +0200
Subject: [PATCH] Clean up warnings in spring-web tests

---
 .../test/java/org/springframework/http/HttpHeadersTests.java | 5 +++--
 .../http/converter/json/SpringHandlerInstantiatorTests.java  | 3 ++-
 .../src/test/java/org/springframework/protobuf/Msg.java      | 3 ++-
 .../test/java/org/springframework/protobuf/SecondMsg.java    | 3 ++-
 .../support/RequestPartServletServerHttpRequestTests.java    | 1 -
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
index 8f61b060ba7..d88038b904e 100644
--- a/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
+++ b/spring-web/src/test/java/org/springframework/http/HttpHeadersTests.java
@@ -30,13 +30,14 @@ import java.util.Locale;
 import java.util.TimeZone;
 
 import org.hamcrest.Matchers;
+
+import org.junit.Test;
+
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNull;
-import org.junit.Before;
-import org.junit.Test;
 
 /**
  * Unit tests for {@link org.springframework.http.HttpHeaders}.
diff --git a/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java b/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java
index 6cd0848a99e..687df9c9938 100644
--- a/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java
+++ b/spring-web/src/test/java/org/springframework/http/converter/json/SpringHandlerInstantiatorTests.java
@@ -47,6 +47,7 @@ import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
 import com.fasterxml.jackson.databind.jsontype.TypeSerializer;
 import com.fasterxml.jackson.databind.jsontype.impl.StdTypeResolverBuilder;
 import com.fasterxml.jackson.databind.type.TypeFactory;
+
 import org.junit.Before;
 import org.junit.Test;
 
@@ -86,7 +87,6 @@ public class SpringHandlerInstantiatorTests {
 		User user = new User("bob");
 		String json = this.objectMapper.writeValueAsString(user);
 		assertEquals("{\"username\":\"BOB\"}", json);
-
 	}
 
 	@Test
@@ -198,6 +198,7 @@ public class SpringHandlerInstantiatorTests {
 		}
 
 		@Override
+		@SuppressWarnings("deprecation")
 		public JavaType typeFromId(String s) {
 			return TypeFactory.defaultInstance().constructFromCanonical(s);
 		}
diff --git a/spring-web/src/test/java/org/springframework/protobuf/Msg.java b/spring-web/src/test/java/org/springframework/protobuf/Msg.java
index cdd69dd66cb..0d111ad213d 100644
--- a/spring-web/src/test/java/org/springframework/protobuf/Msg.java
+++ b/spring-web/src/test/java/org/springframework/protobuf/Msg.java
@@ -36,7 +36,8 @@ public  final class Msg extends
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     initFields();
-    int mutable_bitField0_ = 0;
+    @SuppressWarnings("unused")
+	int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
diff --git a/spring-web/src/test/java/org/springframework/protobuf/SecondMsg.java b/spring-web/src/test/java/org/springframework/protobuf/SecondMsg.java
index 9e3ec7639a3..efd418e3462 100644
--- a/spring-web/src/test/java/org/springframework/protobuf/SecondMsg.java
+++ b/spring-web/src/test/java/org/springframework/protobuf/SecondMsg.java
@@ -36,7 +36,8 @@ public  final class SecondMsg extends
       com.google.protobuf.ExtensionRegistryLite extensionRegistry)
       throws com.google.protobuf.InvalidProtocolBufferException {
     initFields();
-    int mutable_bitField0_ = 0;
+    @SuppressWarnings("unused")
+	int mutable_bitField0_ = 0;
     com.google.protobuf.UnknownFieldSet.Builder unknownFields =
         com.google.protobuf.UnknownFieldSet.newBuilder();
     try {
diff --git a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
index df611a2b192..f9bff37de01 100644
--- a/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
+++ b/spring-web/src/test/java/org/springframework/web/multipart/support/RequestPartServletServerHttpRequestTests.java
@@ -19,7 +19,6 @@ package org.springframework.web.multipart.support;
 import java.net.URI;
 import java.nio.charset.Charset;
 
-import org.junit.Before;
 import org.junit.Test;
 
 import org.springframework.http.HttpHeaders;