diff --git a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java index bc3be0e7aa99..c3ab1ed07256 100644 --- a/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java +++ b/spring-web/src/test/java/org/springframework/web/method/annotation/ModelAttributeMethodProcessorTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2022 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. @@ -269,7 +269,7 @@ public void handleNotAnnotatedReturnValue() throws Exception { assertThat(this.container.getModel().get("testBean")).isSameAs(testBean); } - @Test // gh-25182 + @Test // gh-25182 public void resolveConstructorListArgumentFromCommaSeparatedRequestParameter() throws Exception { MockHttpServletRequest mockRequest = new MockHttpServletRequest(); mockRequest.addParameter("listOfStrings", "1,2"); @@ -279,7 +279,6 @@ public void resolveConstructorListArgumentFromCommaSeparatedRequestParameter() t given(factory.createBinder(any(), any(), eq("testBeanWithConstructorArgs"))) .willAnswer(invocation -> { WebRequestDataBinder binder = new WebRequestDataBinder(invocation.getArgument(1)); - // Add conversion service which will convert "1,2" to a list binder.setConversionService(new DefaultFormattingConversionService()); return binder; @@ -309,7 +308,6 @@ private static class StubRequestDataBinder extends WebRequestDataBinder { private boolean validateInvoked; - public StubRequestDataBinder(Object target, String objectName) { super(target, objectName); } @@ -345,7 +343,7 @@ public void validate(Object... validationHints) { } - @SessionAttributes(types=TestBean.class) + @SessionAttributes(types = TestBean.class) private static class ModelAttributeHandler { @SuppressWarnings("unused") @@ -360,6 +358,7 @@ public void modelAttribute( } } + static class TestBeanWithConstructorArgs { final List listOfStrings; @@ -367,15 +366,15 @@ static class TestBeanWithConstructorArgs { public TestBeanWithConstructorArgs(List listOfStrings) { this.listOfStrings = listOfStrings; } - } - @ModelAttribute("modelAttrName") @SuppressWarnings("unused") + + @ModelAttribute("modelAttrName") + @SuppressWarnings("unused") private String annotatedReturnValue() { return null; } - @SuppressWarnings("unused") private TestBean notAnnotatedReturnValue() { return null; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java index aeaf049adb23..2b9d7125d7d7 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2021 the original author or authors. + * Copyright 2002-2022 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. @@ -2236,6 +2236,7 @@ void routerFunction() throws ServletException, IOException { assertThat(response.getContentAsString()).isEqualTo("foo-body"); } + @Controller static class ControllerWithEmptyValueMapping { @@ -3573,7 +3574,6 @@ public void httpHeaders(@RequestHeader HttpHeaders headers, Writer writer) throw assertThat(headers.getContentType()).as("Invalid Content-Type").isEqualTo(new MediaType("text", "html")); multiValueMap(headers, writer); } - } @Controller