mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-08-29 03:06:45 +08:00
Fix spring.factories so MultipartAutoConfigure loads propertly [BS-157]
After discovering that MultipartAutoConfigure wasn't loading when used, realized I needed to register it with spring.factories. Added it there, but it broke some tests. So tweaked it so that it only loads if the specified bean is detected.
This commit is contained in:
parent
13d2422f19
commit
a99809f5f7
@ -32,6 +32,7 @@ import org.springframework.web.multipart.support.StandardServletMultipartResolve
|
||||
* @author Greg Turnquist
|
||||
*/
|
||||
@Configuration
|
||||
@ConditionalOnBean(MultipartConfigElement.class)
|
||||
public class MultipartAutoConfiguration {
|
||||
|
||||
@Bean
|
||||
|
@ -10,6 +10,7 @@ org.springframework.bootstrap.autoconfigure.orm.jpa.HibernateJpaAutoConfiguratio
|
||||
org.springframework.bootstrap.autoconfigure.thymeleaf.ThymeleafAutoConfiguration,\
|
||||
org.springframework.bootstrap.autoconfigure.web.EmbeddedServletContainerAutoConfiguration,\
|
||||
org.springframework.bootstrap.autoconfigure.web.ServerPropertiesAutoConfiguration,\
|
||||
org.springframework.bootstrap.autoconfigure.web.MultipartAutoConfiguration,\
|
||||
org.springframework.bootstrap.autoconfigure.web.WebMvcAutoConfiguration
|
||||
|
||||
# Application Context Initializers
|
||||
|
Loading…
Reference in New Issue
Block a user