Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix [serial] compiler warnings

Browse Source 
Fix serialization warnings by applying @SuppressWarnings("serial")
when appropriate.

In certain cases and for unknown reasons, a correctly-placed
@SuppressWarnings("serial") annotation will fix the warning at the
javac level (i.e. the Gradle command-line), but will produce an
"unnecessary @SuppressWarnings" warning within Eclipse. In these
cases, a private static final serialVersionUID field has been added
with the default value of 1L.
This commit is contained in:
Phillip Webb
2012-12-19 14:35:57 -08:00
committed by Chris Beams
parent 7f0aa5cfb2
commit b0986049a3
550 changed files with 705 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-webmvc/src/test/java/org/springframework/beans/Colour.java
View File

@@ -21,6 +21,7 @@ import org.springframework.core.enums.ShortCodedLabeledEnum;
/**
* @author Rob Harrop
*/
@SuppressWarnings("serial")
public class Colour extends ShortCodedLabeledEnum {
public static final Colour RED = new Colour(0, "RED");
@@ -32,4 +33,4 @@ public class Colour extends ShortCodedLabeledEnum {
super(code, label);
}
}
}

3
spring-webmvc/src/test/java/org/springframework/beans/DerivedTestBean.java
View File

@@ -25,6 +25,7 @@ import org.springframework.beans.factory.DisposableBean;
* @author Juergen Hoeller
* @since 21.08.2003
*/
@SuppressWarnings("serial")
public class DerivedTestBean extends TestBean implements Serializable, BeanNameAware, DisposableBean {
private String beanName;
@@ -82,4 +83,4 @@ public class DerivedTestBean extends TestBean implements Serializable, BeanNameA
return destroyed;
}
}
}

3
spring-webmvc/src/test/java/org/springframework/beans/SerializablePerson.java
View File

@@ -25,6 +25,7 @@ import org.springframework.util.ObjectUtils;
*
* @author Rod Johnson
*/
@SuppressWarnings("serial")
public class SerializablePerson implements Person, Serializable {
private String name;
@@ -61,4 +62,4 @@ public class SerializablePerson implements Person, Serializable {
return p.age == age && ObjectUtils.nullSafeEquals(name, p.name);
}
}
}

2
spring-webmvc/src/test/java/org/springframework/web/servlet/handler/SimpleMappingExceptionResolverTests.java
View File

@@ -278,11 +278,13 @@ public class SimpleMappingExceptionResolverTests {
}
@SuppressWarnings("serial")
private static class SomeOddException extends Exception {
}
@SuppressWarnings("serial")
private static class AnotherOddException extends Exception {
}

3
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/CgLibProxyServletAnnotationTests.java
View File

@@ -76,6 +76,7 @@ public class CgLibProxyServletAnnotationTests {
}
@SuppressWarnings("serial")
private void initServlet(final Class<?> controllerclass) throws ServletException {
servlet = new DispatcherServlet() {
@Override
@@ -128,4 +129,4 @@ public class CgLibProxyServletAnnotationTests {
}
}
}
}

1
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/JdkProxyServletAnnotationTests.java
View File

@@ -76,6 +76,7 @@ public class JdkProxyServletAnnotationTests {
}
@SuppressWarnings("serial")
private void initServlet(final Class<?> controllerclass) throws ServletException {
servlet = new DispatcherServlet() {
@Override

2
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/annotation/ResponseStatusExceptionResolverTests.java
View File

@@ -55,11 +55,13 @@ public class ResponseStatusExceptionResolverTests {
}
@ResponseStatus(HttpStatus.BAD_REQUEST)
@SuppressWarnings("serial")
private static class StatusCodeException extends Exception {
}
@ResponseStatus(value = HttpStatus.GONE, reason = "You suck!")
@SuppressWarnings("serial")
private static class StatusCodeAndReasonException extends Exception {
}

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

@@ -161,6 +161,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void emptyRequestMapping() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -185,6 +186,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void emptyValueMapping() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -271,6 +273,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void defaultExpressionParameters() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -300,6 +303,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void typeNestedSetBinding() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -348,6 +352,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void proxiedStandardHandleMethod() throws Exception {
DispatcherServlet servlet = new DispatcherServlet() {
@Override
@@ -560,6 +565,7 @@ public class ServletAnnotationControllerTests {
doTestAdaptedHandleMethods(MyAdaptedController3.class);
}
@SuppressWarnings("serial")
private void initServlet(final Class<?> controllerClass) throws ServletException {
servlet = new DispatcherServlet() {
@Override
@@ -656,6 +662,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void proxiedFormController() throws Exception {
DispatcherServlet servlet = new DispatcherServlet() {
@Override
@@ -1583,6 +1590,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void controllerClassNameNoTypeLevelAnn() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -1617,6 +1625,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void simpleUrlHandlerMapping() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -1667,6 +1676,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void requestMappingInterfaceWithProxy() throws Exception {
DispatcherServlet servlet = new DispatcherServlet() {
@Override
@@ -1865,6 +1875,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void parameterCsvAsIntegerArray() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -1893,6 +1904,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void parameterCsvAsIntegerSet() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -1921,6 +1933,7 @@ public class ServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void parameterCsvAsIntegerSetWithCustomSeparator() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -2436,6 +2449,7 @@ public class ServletAnnotationControllerTests {
}
}
@SuppressWarnings("serial")
@Controller
@RequestMapping("/myPath.do")
private static class MyParameterDispatchingController implements Serializable {

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

@@ -94,6 +94,7 @@ public class UriTemplateServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void doubles() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -266,6 +267,7 @@ public class UriTemplateServletAnnotationControllerTests {
}
@SuppressWarnings("serial")
private void initServlet(final Class<?> controllerclass) throws ServletException {
servlet = new DispatcherServlet() {
@Override
@@ -281,6 +283,7 @@ public class UriTemplateServletAnnotationControllerTests {
}
@Test
@SuppressWarnings("serial")
public void noDefaultSuffixPattern() throws Exception {
servlet = new DispatcherServlet() {
@Override
@@ -378,6 +381,7 @@ public class UriTemplateServletAnnotationControllerTests {
// SPR-6906
@Test
@SuppressWarnings("serial")
public void controllerClassName() throws Exception {
servlet = new DispatcherServlet() {
@Override

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/BindTagTests.java
View File

@@ -976,6 +976,7 @@ public class BindTagTests extends AbstractTagTests {
/**
* SPR-4022
*/
@SuppressWarnings("serial")
public void testNestingInFormTag() throws JspException {
PageContext pc = createPageContext();
TestBean tb = new TestBean();

5
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/HtmlEscapeTagTests.java
View File

@@ -30,6 +30,7 @@ import org.springframework.web.util.WebUtils;
*/
public class HtmlEscapeTagTests extends AbstractTagTests {
@SuppressWarnings("serial")
public void testHtmlEscapeTag() throws JspException {
PageContext pc = createPageContext();
HtmlEscapeTag tag = new HtmlEscapeTag();
@@ -107,6 +108,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
assertTrue("Correctly disabled", !tag.getRequestContext().isDefaultHtmlEscape());
}
@SuppressWarnings("serial")
public void testEscapeBody() throws JspException {
PageContext pc = createPageContext();
final StringBuffer result = new StringBuffer();
@@ -124,6 +126,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
assertEquals("test text", result.toString());
}
@SuppressWarnings("serial")
public void testEscapeBodyWithHtmlEscape() throws JspException {
PageContext pc = createPageContext();
final StringBuffer result = new StringBuffer();
@@ -142,6 +145,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
assertEquals("test &amp; text", result.toString());
}
@SuppressWarnings("serial")
public void testEscapeBodyWithJavaScriptEscape() throws JspException {
PageContext pc = createPageContext();
final StringBuffer result = new StringBuffer();
@@ -160,6 +164,7 @@ public class HtmlEscapeTagTests extends AbstractTagTests {
assertEquals("Correct content", "\\' test & text \\\\", result.toString());
}
@SuppressWarnings("serial")
public void testEscapeBodyWithHtmlEscapeAndJavaScriptEscape() throws JspException {
PageContext pc = createPageContext();
final StringBuffer result = new StringBuffer();

20
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/MessageTagTests.java
View File

@@ -38,6 +38,7 @@ import org.springframework.web.servlet.support.RequestContextUtils;
*/
public class MessageTagTests extends AbstractTagTests {
@SuppressWarnings("serial")
public void testMessageTagWithMessageSourceResolvable1() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -52,6 +53,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test message", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithMessageSourceResolvable2() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -67,6 +69,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test message", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCode1() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -81,6 +84,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test message", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCode2() throws JspException {
PageContext pc = createPageContext();
MockHttpServletRequest request = (MockHttpServletRequest) pc.getRequest();
@@ -99,6 +103,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "Canadian &amp; test message", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithNullCode() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -113,6 +118,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "null", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndArgument() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -128,6 +134,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test arg1 message {1}", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndArguments() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -143,6 +150,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test arg1 message arg2", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndStringArgumentWithCustomSeparator() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -159,6 +167,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test arg1,1 message arg2,2", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndArrayArgument() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -174,6 +183,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test arg1 message 5", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndObjectArgument() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -189,6 +199,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test 5 message {1}", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndExpressionArgument() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -205,6 +216,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test my,value message {1}", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndExpressionArguments() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -222,6 +234,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test my,value message 5", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndExpressionArgumentArray() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -238,6 +251,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test my,value message 5", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndExpressionArgumentFormat() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -255,6 +269,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test my,value message 5.14 X", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndText1() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -270,6 +285,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test message", (message.toString()));
}
@SuppressWarnings("serial")
public void testMessageTagWithCodeAndText2() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -286,6 +302,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test & text", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithText() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -301,6 +318,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test &amp; text", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithTextAndExpressionArgumentFormat() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -318,6 +336,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "test my,value message 5.14 X", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithTextAndJavaScriptEscape() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();
@@ -333,6 +352,7 @@ public class MessageTagTests extends AbstractTagTests {
assertEquals("Correct message", "\\' test & text \\\\", message.toString());
}
@SuppressWarnings("serial")
public void testMessageTagWithTextAndHtmlEscapeAndJavaScriptEscape() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ParamTagTests.java
View File

@@ -92,6 +92,7 @@ public class ParamTagTests extends AbstractTagTests {
}
}
@SuppressWarnings("serial")
private class MockParamSupportTag extends TagSupport implements ParamAware {
private Param param;

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/ThemeTagTests.java
View File

@@ -35,6 +35,7 @@ import org.springframework.web.servlet.support.RequestContext;
*/
public class ThemeTagTests extends AbstractTagTests {
@SuppressWarnings("serial")
public void testThemeTag() throws JspException {
PageContext pc = createPageContext();
final StringBuffer message = new StringBuffer();

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxTagTests.java
View File

@@ -50,6 +50,7 @@ public class CheckboxTagTests extends AbstractFormTagTests {
private TestBean bean;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new CheckboxTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/CheckboxesTagTests.java
View File

@@ -59,6 +59,7 @@ public class CheckboxesTagTests extends AbstractFormTagTests {
private TestBean bean;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new CheckboxesTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/ErrorsTagTests.java
View File

@@ -48,6 +48,7 @@ public class ErrorsTagTests extends AbstractFormTagTests {
private ErrorsTag tag;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new ErrorsTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/FormTagTests.java
View File

@@ -47,6 +47,7 @@ public class FormTagTests extends AbstractHtmlElementTagTests {
private MockHttpServletRequest request;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new FormTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/InputTagTests.java
View File

@@ -385,6 +385,7 @@ public class InputTagTests extends AbstractFormTagTests {
assertTrue("Tag not opened properly", output.startsWith("<input "));
}
@SuppressWarnings("serial")
protected InputTag createTag(final Writer writer) {
return new InputTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/LabelTagTests.java
View File

@@ -34,6 +34,7 @@ public class LabelTagTests extends AbstractFormTagTests {
private LabelTag tag;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new LabelTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagEnumTests.java
View File

@@ -32,6 +32,7 @@ public class OptionTagEnumTests extends AbstractHtmlElementTagTests {
private SelectTag parentTag;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new OptionTag() {
protected TagWriter createTagWriter() {

2
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionTagTests.java
View File

@@ -51,6 +51,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
private SelectTag parentTag;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new OptionTag() {
protected TagWriter createTagWriter() {
@@ -529,6 +530,7 @@ public class OptionTagTests extends AbstractHtmlElementTagTests {
}
@SuppressWarnings("serial")
public static class RulesVariant implements Serializable {
private String rules;

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/OptionsTagTests.java
View File

@@ -54,6 +54,7 @@ public final class OptionsTagTests extends AbstractHtmlElementTagTests {
private SelectTag selectTag;
private OptionsTag tag;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new OptionsTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/PasswordInputTagTests.java
View File

@@ -100,6 +100,7 @@ public class PasswordInputTagTests extends InputTagTests {
return "password";
}
@SuppressWarnings("serial")
protected InputTag createTag(final Writer writer) {
return new PasswordInputTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonTagTests.java
View File

@@ -43,6 +43,7 @@ public class RadioButtonTagTests extends AbstractFormTagTests {
private TestBean bean;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new RadioButtonTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/RadioButtonsTagTests.java
View File

@@ -53,6 +53,7 @@ public final class RadioButtonsTagTests extends AbstractFormTagTests {
private TestBean bean;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new RadioButtonsTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/SelectTagTests.java
View File

@@ -64,6 +64,7 @@ public class SelectTagTests extends AbstractFormTagTests {
private TestBeanWithRealCountry bean;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new SelectTag() {
protected TagWriter createTagWriter() {

1
spring-webmvc/src/test/java/org/springframework/web/servlet/tags/form/TextareaTagTests.java
View File

@@ -33,6 +33,7 @@ public class TextareaTagTests extends AbstractFormTagTests {
private TestBean rob;
@SuppressWarnings("serial")
protected void onSetUp() {
this.tag = new TextareaTag() {
protected TagWriter createTagWriter() {