Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix startup exception related to ResourceWebHandler

Browse Source 
Issue: SPR-14735
This commit is contained in:
Rossen Stoyanchev
2016-09-19 21:15:42 -04:00
parent d71f6fe366
commit adc69097fa
3 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
View File

@@ -150,7 +150,7 @@ public class ResourceHandlerRegistry {
} }
SimpleUrlHandlerMapping handlerMapping = new SimpleUrlHandlerMapping(); SimpleUrlHandlerMapping handlerMapping = new SimpleUrlHandlerMapping();
handlerMapping.setOrder(order); handlerMapping.setOrder(this.order);
handlerMapping.setUrlMap(urlMap); handlerMapping.setUrlMap(urlMap);
return handlerMapping; return handlerMapping;
} }

9
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java
View File

@@ -198,11 +198,12 @@ public class WebReactiveConfiguration implements ApplicationContextAware {
AbstractHandlerMapping handlerMapping = registry.getHandlerMapping(); AbstractHandlerMapping handlerMapping = registry.getHandlerMapping();
if (handlerMapping != null) { if (handlerMapping != null) {
if (getPathMatchConfigurer() != null) { PathMatchConfigurer pathMatchConfigurer = getPathMatchConfigurer();
handlerMapping.setPathMatcher(getPathMatchConfigurer().getPathMatcher()); if (pathMatchConfigurer.getPathMatcher() != null) {
handlerMapping.setPathMatcher(pathMatchConfigurer.getPathMatcher());
} }
if (getPathMatchConfigurer() != null) { if (pathMatchConfigurer.getPathHelper() != null) {
handlerMapping.setPathHelper(getPathMatchConfigurer().getPathHelper()); handlerMapping.setPathHelper(pathMatchConfigurer.getPathHelper());
} }
} }
else { else {

31
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java
View File

@@ -50,6 +50,8 @@ import org.springframework.util.MimeTypeUtils;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;
import org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean; import org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean;
import org.springframework.web.reactive.accept.RequestedContentTypeResolver; import org.springframework.web.reactive.accept.RequestedContentTypeResolver;
import org.springframework.web.reactive.handler.AbstractHandlerMapping;
import org.springframework.web.reactive.handler.SimpleUrlHandlerMapping;
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerAdapter; import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerAdapter;
import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.reactive.result.method.annotation.RequestMappingHandlerMapping;
import org.springframework.web.reactive.result.method.annotation.ResponseBodyResultHandler; import org.springframework.web.reactive.result.method.annotation.ResponseBodyResultHandler;
@@ -61,6 +63,7 @@ import org.springframework.web.reactive.result.view.ViewResolver;
import org.springframework.web.reactive.result.view.freemarker.FreeMarkerConfigurer; import org.springframework.web.reactive.result.view.freemarker.FreeMarkerConfigurer;
import org.springframework.web.reactive.result.view.freemarker.FreeMarkerViewResolver; import org.springframework.web.reactive.result.view.freemarker.FreeMarkerViewResolver;
import org.springframework.web.server.ServerWebExchange; import org.springframework.web.server.ServerWebExchange;
import org.springframework.web.server.WebHandler;
import org.springframework.web.server.adapter.DefaultServerWebExchange; import org.springframework.web.server.adapter.DefaultServerWebExchange;
import org.springframework.web.server.session.MockWebSessionManager; import org.springframework.web.server.session.MockWebSessionManager;
@@ -246,6 +249,24 @@ public class WebReactiveConfigurationTests {
assertEquals(type, views.get(0).getSupportedMediaTypes().get(0)); assertEquals(type, views.get(0).getSupportedMediaTypes().get(0));
} }
@Test
public void resourceHandler() throws Exception {
ApplicationContext context = loadConfig(CustomResourceHandlingConfig.class);
String name = "resourceHandlerMapping";
AbstractHandlerMapping handlerMapping = context.getBean(name, AbstractHandlerMapping.class);
assertNotNull(handlerMapping);
assertEquals(Ordered.LOWEST_PRECEDENCE -1, handlerMapping.getOrder());
assertNotNull(handlerMapping.getPathHelper());
assertNotNull(handlerMapping.getPathMatcher());
SimpleUrlHandlerMapping urlHandlerMapping = (SimpleUrlHandlerMapping) handlerMapping;
WebHandler webHandler = (WebHandler) urlHandlerMapping.getUrlMap().get("/images/**");
assertNotNull(webHandler);
}
private void assertHasMessageReader(List<HttpMessageReader<?>> readers, Class<?> clazz, MediaType mediaType) { private void assertHasMessageReader(List<HttpMessageReader<?>> readers, Class<?> clazz, MediaType mediaType) {
ResolvableType type = ResolvableType.forClass(clazz); ResolvableType type = ResolvableType.forClass(clazz);
@@ -321,6 +342,16 @@ public class WebReactiveConfigurationTests {
} }
@Configuration
static class CustomResourceHandlingConfig extends WebReactiveConfiguration {
@Override
protected void addResourceHandlers(ResourceHandlerRegistry registry) {
registry.addResourceHandler("/images/**").addResourceLocations("/images/");
}
}
@XmlRootElement @XmlRootElement
static class TestBean { static class TestBean {
} }