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

Return null in case of no matching part even for array/collection parameter

Browse Source 
Closes gh-25819
This commit is contained in:
Juergen Hoeller
2020-10-12 17:59:48 +02:00
parent 50b9542402
commit 83bfee9201
2 changed files with 89 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
spring-web/src/test/java/org/springframework/web/method/annotation/RequestParamMethodArgumentResolverTests.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2020 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.
@@ -199,6 +199,17 @@ public class RequestParamMethodArgumentResolverTests {
assertThat(result).isEqualTo(Arrays.asList(expected1, expected2));
}
@Test
public void resolveMultipartFileListMissing() throws Exception {
MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();
request.addFile(new MockMultipartFile("other", "Hello World 3".getBytes()));
webRequest = new ServletWebRequest(request);
MethodParameter param = this.testMethod.annotPresent(RequestParam.class).arg(List.class, MultipartFile.class);
assertThatExceptionOfType(MissingServletRequestPartException.class).isThrownBy(() ->
resolver.resolveArgument(param, null, webRequest, null));
}
@Test
public void resolveMultipartFileArray() throws Exception {
MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();
@@ -220,6 +231,17 @@ public class RequestParamMethodArgumentResolverTests {
assertThat(expected2).isEqualTo(parts[1]);
}
@Test
public void resolveMultipartFileArrayMissing() throws Exception {
MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();
request.addFile(new MockMultipartFile("other", "Hello World 3".getBytes()));
webRequest = new ServletWebRequest(request);
MethodParameter param = this.testMethod.annotPresent(RequestParam.class).arg(MultipartFile[].class);
assertThatExceptionOfType(MissingServletRequestPartException.class).isThrownBy(() ->
resolver.resolveArgument(param, null, webRequest, null));
}
@Test
public void resolvePart() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -257,6 +279,19 @@ public class RequestParamMethodArgumentResolverTests {
assertThat(result).isEqualTo(Arrays.asList(expected1, expected2));
}
@Test
public void resolvePartListMissing() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setMethod("POST");
request.setContentType("multipart/form-data");
request.addPart(new MockPart("other", "Hello World 3".getBytes()));
webRequest = new ServletWebRequest(request);
MethodParameter param = this.testMethod.annotPresent(RequestParam.class).arg(List.class, Part.class);
assertThatExceptionOfType(MissingServletRequestPartException.class).isThrownBy(() ->
resolver.resolveArgument(param, null, webRequest, null));
}
@Test
public void resolvePartArray() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
@@ -280,6 +315,19 @@ public class RequestParamMethodArgumentResolverTests {
assertThat(expected2).isEqualTo(parts[1]);
}
@Test
public void resolvePartArrayMissing() throws Exception {
MockHttpServletRequest request = new MockHttpServletRequest();
request.setMethod("POST");
request.setContentType("multipart/form-data");
request.addPart(new MockPart("other", "Hello World 3".getBytes()));
webRequest = new ServletWebRequest(request);
MethodParameter param = this.testMethod.annotPresent(RequestParam.class).arg(Part[].class);
assertThatExceptionOfType(MissingServletRequestPartException.class).isThrownBy(() ->
resolver.resolveArgument(param, null, webRequest, null));
}
@Test
public void resolveMultipartFileNotAnnot() throws Exception {
MockMultipartHttpServletRequest request = new MockMultipartHttpServletRequest();