root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Drop support for CommonsMultipartResolver 

Closes gh-28782
This commit is contained in:
Andy Wilkinson 2021-11-23 11:21:33 +00:00
parent f26995307e
commit 22cc9ca6fa
2 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfiguration.java
View File

@ -30,7 +30,6 @@ import org.springframework.boot.web.servlet.context.ServletWebServerApplicationC
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import org.springframework.web.multipart.support.StandardServletMultipartResolver;
import org.springframework.web.servlet.DispatcherServlet;
@ -63,7 +62,7 @@ public class MultipartAutoConfiguration {
}
@Bean
@ConditionalOnMissingBean({ MultipartConfigElement.class, CommonsMultipartResolver.class })
@ConditionalOnMissingBean(MultipartConfigElement.class)
public MultipartConfigElement multipartConfigElement() {
return this.multipartProperties.createMultipartConfig();
}

20
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/servlet/MultipartAutoConfigurationTests.java
View File

@ -43,7 +43,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.client.RestTemplate;
import org.springframework.web.multipart.MultipartResolver;
import org.springframework.web.multipart.commons.CommonsMultipartResolver;
import org.springframework.web.multipart.support.StandardServletMultipartResolver;
import org.springframework.web.servlet.DispatcherServlet;
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
@ -188,15 +187,6 @@ class MultipartAutoConfigurationTests {
assertThat(this.context.getBeansOfType(MultipartConfigElement.class)).hasSize(1);
}
@Test
void containerWithCommonsMultipartResolver() {
this.context = new AnnotationConfigServletWebServerApplicationContext(
ContainerWithCommonsMultipartResolver.class, BaseConfiguration.class);
MultipartResolver multipartResolver = this.context.getBean(MultipartResolver.class);
assertThat(multipartResolver).isInstanceOf(CommonsMultipartResolver.class);
assertThat(this.context.getBeansOfType(MultipartConfigElement.class)).hasSize(0);
}
@Test
void configureResolveLazily() {
this.context = new AnnotationConfigServletWebServerApplicationContext();
@ -406,16 +396,6 @@ class MultipartAutoConfigurationTests {
}
@Configuration(proxyBeanMethods = false)
static class ContainerWithCommonsMultipartResolver {
@Bean
CommonsMultipartResolver multipartResolver() {
return mock(CommonsMultipartResolver.class);
}
}
@Controller
static class WebController {