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

Add check for mixing @EnableWebMvc and @EnableWebFlux 

Issue: SPR-16609
This commit is contained in:
Rossen Stoyanchev 2018-07-24 20:45:48 -04:00
parent 0be8c20fca
commit 32faf09a80
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurationSupport.java
View File

@ -24,6 +24,7 @@ import reactor.core.publisher.Mono;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.BeanInitializationException; import org.springframework.beans.factory.BeanInitializationException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware; import org.springframework.context.ApplicationContextAware;
import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Bean;
@ -38,6 +39,7 @@ import org.springframework.format.support.DefaultFormattingConversionService;
import org.springframework.format.support.FormattingConversionService; import org.springframework.format.support.FormattingConversionService;
import org.springframework.http.codec.ServerCodecConfigurer; import org.springframework.http.codec.ServerCodecConfigurer;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.validation.Errors; import org.springframework.validation.Errors;
import org.springframework.validation.MessageCodesResolver; import org.springframework.validation.MessageCodesResolver;
@ -93,6 +95,7 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
@Override @Override
public void setApplicationContext(@Nullable ApplicationContext applicationContext) { public void setApplicationContext(@Nullable ApplicationContext applicationContext) {
this.applicationContext = applicationContext; this.applicationContext = applicationContext;
assertWebMvcNotEnabled(applicationContext);
} }
@Nullable @Nullable
@ -100,6 +103,19 @@ public class WebFluxConfigurationSupport implements ApplicationContextAware {
return this.applicationContext; return this.applicationContext;
} }
private static void assertWebMvcNotEnabled(@Nullable ApplicationContext applicationContext) {
try {
if (applicationContext != null) {
Assert.isNull(applicationContext.getType("mvcContentNegotiationManager"),
"The Java/XML config for Spring MVC and Spring WebFlux cannot both be enabled, " +
"e.g. via @EnableWebMvc and @EnableWebFlux, in the same application.");
}
}
catch (NoSuchBeanDefinitionException ex) {
// Expected...
}
}
@Bean @Bean
public DispatcherHandler webHandler() { public DispatcherHandler webHandler() {