CommonsMultipartResolver supports configurable HTTP methods

Closes gh-27161
This commit is contained in:
Juergen Hoeller
2021-07-12 23:19:08 +02:00
parent 1ff8da3635
commit e1c0f3b067
2 changed files with 97 additions and 4 deletions

View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2019 the original author or authors.
* Copyright 2002-2021 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.
@@ -46,6 +46,7 @@ import org.apache.commons.fileupload.servlet.ServletFileUpload;
import org.junit.jupiter.api.Test;
import org.springframework.beans.MutablePropertyValues;
import org.springframework.http.MediaType;
import org.springframework.util.MultiValueMap;
import org.springframework.web.bind.ServletRequestDataBinder;
import org.springframework.web.context.WebApplicationContext;
@@ -71,6 +72,65 @@ import static org.assertj.core.api.Assertions.assertThat;
*/
public class CommonsMultipartResolverTests {
@Test
public void isMultipartWithDefaultSetting() {
CommonsMultipartResolver resolver = new CommonsMultipartResolver();
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
assertThat(resolver.isMultipart(request)).isFalse();
request.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
assertThat(resolver.isMultipart(request)).isTrue();
request.setContentType(MediaType.MULTIPART_MIXED_VALUE);
assertThat(resolver.isMultipart(request)).isTrue();
request.setContentType(MediaType.MULTIPART_RELATED_VALUE);
assertThat(resolver.isMultipart(request)).isTrue();
request = new MockHttpServletRequest("PUT", "/");
assertThat(resolver.isMultipart(request)).isFalse();
request.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
assertThat(resolver.isMultipart(request)).isFalse();
request.setContentType(MediaType.MULTIPART_MIXED_VALUE);
assertThat(resolver.isMultipart(request)).isFalse();
request.setContentType(MediaType.MULTIPART_RELATED_VALUE);
assertThat(resolver.isMultipart(request)).isFalse();
}
@Test
public void isMultipartWithSupportedMethods() {
CommonsMultipartResolver resolver = new CommonsMultipartResolver();
resolver.setSupportedMethods("POST", "PUT");
MockHttpServletRequest request = new MockHttpServletRequest("POST", "/");
assertThat(resolver.isMultipart(request)).isFalse();
request.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
assertThat(resolver.isMultipart(request)).isTrue();
request.setContentType(MediaType.MULTIPART_MIXED_VALUE);
assertThat(resolver.isMultipart(request)).isTrue();
request.setContentType(MediaType.MULTIPART_RELATED_VALUE);
assertThat(resolver.isMultipart(request)).isTrue();
request = new MockHttpServletRequest("PUT", "/");
assertThat(resolver.isMultipart(request)).isFalse();
request.setContentType(MediaType.MULTIPART_FORM_DATA_VALUE);
assertThat(resolver.isMultipart(request)).isTrue();
request.setContentType(MediaType.MULTIPART_MIXED_VALUE);
assertThat(resolver.isMultipart(request)).isTrue();
request.setContentType(MediaType.MULTIPART_RELATED_VALUE);
assertThat(resolver.isMultipart(request)).isTrue();
}
@Test
public void withApplicationContext() throws Exception {
doTestWithApplicationContext(false);