Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
adc69097
S
spring-framework
项目概览
爱吃血肠
/
spring-framework
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
spring-framework
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
adc69097
编写于
9月 19, 2016
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix startup exception related to ResourceWebHandler
Issue: SPR-14735
上级
d71f6fe3
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
37 addition
and
5 deletion
+37
-5
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
...ramework/web/reactive/config/ResourceHandlerRegistry.java
+1
-1
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java
...amework/web/reactive/config/WebReactiveConfiguration.java
+5
-4
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java
...rk/web/reactive/config/WebReactiveConfigurationTests.java
+31
-0
未找到文件。
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/ResourceHandlerRegistry.java
浏览文件 @
adc69097
...
...
@@ -150,7 +150,7 @@ public class ResourceHandlerRegistry {
}
SimpleUrlHandlerMapping
handlerMapping
=
new
SimpleUrlHandlerMapping
();
handlerMapping
.
setOrder
(
order
);
handlerMapping
.
setOrder
(
this
.
order
);
handlerMapping
.
setUrlMap
(
urlMap
);
return
handlerMapping
;
}
...
...
spring-web-reactive/src/main/java/org/springframework/web/reactive/config/WebReactiveConfiguration.java
浏览文件 @
adc69097
...
...
@@ -198,11 +198,12 @@ public class WebReactiveConfiguration implements ApplicationContextAware {
AbstractHandlerMapping
handlerMapping
=
registry
.
getHandlerMapping
();
if
(
handlerMapping
!=
null
)
{
if
(
getPathMatchConfigurer
()
!=
null
)
{
handlerMapping
.
setPathMatcher
(
getPathMatchConfigurer
().
getPathMatcher
());
PathMatchConfigurer
pathMatchConfigurer
=
getPathMatchConfigurer
();
if
(
pathMatchConfigurer
.
getPathMatcher
()
!=
null
)
{
handlerMapping
.
setPathMatcher
(
pathMatchConfigurer
.
getPathMatcher
());
}
if
(
getPathMatchConfigur
er
()
!=
null
)
{
handlerMapping
.
setPathHelper
(
getPathMatchConfigurer
()
.
getPathHelper
());
if
(
pathMatchConfigurer
.
getPathHelp
er
()
!=
null
)
{
handlerMapping
.
setPathHelper
(
pathMatchConfigurer
.
getPathHelper
());
}
}
else
{
...
...
spring-web-reactive/src/test/java/org/springframework/web/reactive/config/WebReactiveConfigurationTests.java
浏览文件 @
adc69097
...
...
@@ -50,6 +50,8 @@ import org.springframework.util.MimeTypeUtils;
import
org.springframework.validation.Validator
;
import
org.springframework.validation.beanvalidation.OptionalValidatorFactoryBean
;
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.RequestMappingHandlerMapping
;
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.FreeMarkerViewResolver
;
import
org.springframework.web.server.ServerWebExchange
;
import
org.springframework.web.server.WebHandler
;
import
org.springframework.web.server.adapter.DefaultServerWebExchange
;
import
org.springframework.web.server.session.MockWebSessionManager
;
...
...
@@ -246,6 +249,24 @@ public class WebReactiveConfigurationTests {
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
)
{
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
static
class
TestBean
{
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录