Apache/struts
1
0
Fork 0
mirror of https://github.com/apache/struts.git synced 2026-08-06 07:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #954 from apache/fix/WW-5423-query-params

Browse Source 
[WW-5423] Fixes returning null instead of empty array in case of non-existing param
This commit is contained in:
Lukasz Lenart
2024-06-10 07:02:27 +02:00
committed by GitHub
parent baab7dd36c 5015ea0d90
commit 62eac8f58f
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequest.java
+5 -2
View File
@@ -372,8 +372,11 @@ public abstract class AbstractMultiPartRequest implements MultiPartRequest {
* @see org.apache.struts2.dispatcher.multipart.MultiPartRequest#getParameterValues(java.lang.String)
*/
public String[] getParameterValues(String name) {
return parameters.getOrDefault(name, Collections.emptyList())
.toArray(String[]::new);
List<String> values = parameters.get(name);
if (values == null) {
return null;
}
return values.toArray(new String[0]);
}
/* (non-Javadoc)
core/src/main/java/org/apache/struts2/dispatcher/multipart/MultiPartRequest.java
+1
View File
@@ -95,6 +95,7 @@ public interface MultiPartRequest {
/**
* Returns a list of all parameter values associated with a parameter name. If there is only
* one parameter value per name the resulting array will be of length 1.
* If the parameter doesn't exist, null should be returned instead of empty array.
*
* @param name the name of the parameter.
* @return an array of all values associated with the parameter name.
core/src/test/java/org/apache/struts2/dispatcher/multipart/AbstractMultiPartRequestTest.java
+8 -6
View File
@@ -93,7 +93,7 @@ abstract class AbstractMultiPartRequestTest {
.isEmpty();
assertThat(multiPart.getFileParameterNames().asIterator()).toIterable()
.asList()
.asInstanceOf(InstanceOfAssertFactories.LIST)
.containsOnly("file1", "file2");
assertThat(multiPart.getFile("file1")).allSatisfy(file -> {
assertThat(file.isFile())
@@ -142,7 +142,7 @@ abstract class AbstractMultiPartRequestTest {
.isEmpty();
assertThat(multiPart.getFileParameterNames().asIterator()).toIterable()
.asList()
.asInstanceOf(InstanceOfAssertFactories.LIST)
.containsOnly("file1");
assertThat(multiPart.getFile("file1")).allSatisfy(file -> {
if (Objects.equals(file.getName(), "test1.csv")) {
@@ -193,7 +193,7 @@ abstract class AbstractMultiPartRequestTest {
.isEmpty();
assertThat(multiPart.getFileParameterNames().asIterator()).toIterable()
.asList()
.asInstanceOf(InstanceOfAssertFactories.LIST)
.containsOnly("file1", "file2");
assertThat(multiPart.getFile("file1")).allSatisfy(file -> {
assertThat(file.isFile())
@@ -240,7 +240,7 @@ abstract class AbstractMultiPartRequestTest {
.isEmpty();
assertThat(multiPart.getFileParameterNames().asIterator()).toIterable()
.asList()
.asInstanceOf(InstanceOfAssertFactories.LIST)
.containsOnly("file1", "file2");
assertThat(multiPart.getFile("file1")).allSatisfy(file -> {
assertThat(file.isFile())
@@ -306,7 +306,7 @@ abstract class AbstractMultiPartRequestTest {
.containsExactly("struts.messages.upload.error.FileUploadContentTypeException");
assertThat(multiPart.getFileParameterNames().asIterator()).toIterable()
.asList()
.asInstanceOf(InstanceOfAssertFactories.LIST)
.isEmpty();
}
@@ -410,7 +410,7 @@ abstract class AbstractMultiPartRequestTest {
.isEmpty();
assertThat(multiPart.getFileParameterNames().asIterator()).toIterable()
.asList()
.asInstanceOf(InstanceOfAssertFactories.LIST)
.containsOnly("file1");
assertThat(multiPart.getFile("file1")).allSatisfy(file -> {
assertThat(file.isFile())
@@ -458,6 +458,8 @@ abstract class AbstractMultiPartRequestTest {
.isEqualTo("short text");
assertThat(multiPart.getParameterValues("multi"))
.containsOnly("multi1", "multi2");
assertThat(multiPart.getParameterValues("not-existing"))
.isNull();
}
@Test