|
|
|
@ -66,7 +66,6 @@ import org.springframework.context.ResourceLoaderAware;
|
|
|
|
|
import org.springframework.context.annotation.Bean;
|
|
|
|
|
import org.springframework.context.annotation.Configuration;
|
|
|
|
|
import org.springframework.context.annotation.Import;
|
|
|
|
|
import org.springframework.context.annotation.Primary;
|
|
|
|
|
import org.springframework.core.Ordered;
|
|
|
|
|
import org.springframework.core.annotation.Order;
|
|
|
|
|
import org.springframework.core.io.Resource;
|
|
|
|
@ -435,18 +434,6 @@ public class WebMvcAutoConfiguration {
|
|
|
|
|
return super.createRequestMappingHandlerAdapter();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Bean
|
|
|
|
|
@Primary
|
|
|
|
|
@Override
|
|
|
|
|
public RequestMappingHandlerMapping requestMappingHandlerMapping(
|
|
|
|
|
@Qualifier("mvcContentNegotiationManager") ContentNegotiationManager contentNegotiationManager,
|
|
|
|
|
@Qualifier("mvcConversionService") FormattingConversionService conversionService,
|
|
|
|
|
@Qualifier("mvcResourceUrlProvider") ResourceUrlProvider resourceUrlProvider) {
|
|
|
|
|
// Must be @Primary for MvcUriComponentsBuilder to work
|
|
|
|
|
return super.requestMappingHandlerMapping(contentNegotiationManager, conversionService,
|
|
|
|
|
resourceUrlProvider);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Bean
|
|
|
|
|
public WelcomePageHandlerMapping welcomePageHandlerMapping(ApplicationContext applicationContext,
|
|
|
|
|
FormattingConversionService mvcConversionService, ResourceUrlProvider mvcResourceUrlProvider) {
|
|
|
|
|