Skip to content

Restore mixed usage support with uri() and queryParam() for query parameters in AbstractMockHttpServletRequestBuilder.buildRequest() #35329

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
+10 −1
Closed

Restore mixed usage support with uri() and queryParam() for query parameters in AbstractMockHttpServletRequestBuilder.buildRequest() #35329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...a/org/springframework/test/web/servlet/request/AbstractMockHttpServletRequestBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,7 +826,7 @@ public final MockHttpServletRequest buildRequest(ServletContext servletContext)
addRequestParams(request, UriComponentsBuilder.fromUri(uri).build().getQueryParams());

this.parameters.forEach((name, values) ->
request.setParameter(name, values.toArray(new String[0])));
request.addParameter(name, values.toArray(new String[0])));

if (!this.formFields.isEmpty()) {
if (this.content != null && this.content.length > 0) {
Expand Down
9 changes: 9 additions & 0 deletions ...java/org/springframework/test/web/servlet/request/MockHttpServletRequestBuilderTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,6 +273,15 @@ void queryParameterWithoutValues() {
assertThat(request.getParameterMap().get("foo")).containsExactly();
}

@Test
void queryParametersWithUriAndQueryParam() {
this.builder = new MockHttpServletRequestBuilder(GET).uri("/path?param1=value1");
this.builder.queryParam("param1", "value2");
MockHttpServletRequest request = this.builder.buildRequest(this.servletContext);

assertThat(request.getParameterMap().get("param1")).containsExactly("value1", "value2");
}

@Test
void queryParameterMap() {
this.builder = new MockHttpServletRequestBuilder(GET).uri("/");
Expand Down