Skip to content

Commit

Permalink
Polishing
Browse files Browse the repository at this point in the history
  • Loading branch information
jhoeller committed Apr 12, 2022
1 parent 949c3d4 commit 0cf7f7b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -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");
Expand All @@ -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;
Expand Down Expand Up @@ -309,7 +308,6 @@ private static class StubRequestDataBinder extends WebRequestDataBinder {

private boolean validateInvoked;


public StubRequestDataBinder(Object target, String objectName) {
super(target, objectName);
}
Expand Down Expand Up @@ -345,7 +343,7 @@ public void validate(Object... validationHints) {
}


@SessionAttributes(types=TestBean.class)
@SessionAttributes(types = TestBean.class)
private static class ModelAttributeHandler {

@SuppressWarnings("unused")
Expand All @@ -360,22 +358,23 @@ public void modelAttribute(
}
}


static class TestBeanWithConstructorArgs {

final List<String> listOfStrings;

public TestBeanWithConstructorArgs(List<String> listOfStrings) {
this.listOfStrings = listOfStrings;
}

}

@ModelAttribute("modelAttrName") @SuppressWarnings("unused")

@ModelAttribute("modelAttrName")
@SuppressWarnings("unused")
private String annotatedReturnValue() {
return null;
}


@SuppressWarnings("unused")
private TestBean notAnnotatedReturnValue() {
return null;
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -2236,6 +2236,7 @@ void routerFunction() throws ServletException, IOException {
assertThat(response.getContentAsString()).isEqualTo("foo-body");
}


@Controller
static class ControllerWithEmptyValueMapping {

Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 0cf7f7b

Please sign in to comment.