Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Meiracle
spring-framework
提交
e4566c11
S
spring-framework
项目概览
Meiracle
/
spring-framework
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
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,发现更多精彩内容 >>
提交
e4566c11
编写于
1月 22, 2021
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Apply PathPatternParser also to BeanNameUrlHandlerMapping
Closes gh-26414
上级
9d8910d8
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
2 deletion
+21
-2
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
...servlet/config/annotation/WebMvcConfigurationSupport.java
+11
-1
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
...config/annotation/DelegatingWebMvcConfigurationTests.java
+10
-1
未找到文件。
spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurationSupport.java
浏览文件 @
e4566c11
/*
* Copyright 2002-202
0
the original author or authors.
* Copyright 2002-202
1
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -514,6 +514,16 @@ public class WebMvcConfigurationSupport implements ApplicationContextAware, Serv
BeanNameUrlHandlerMapping
mapping
=
new
BeanNameUrlHandlerMapping
();
mapping
.
setOrder
(
2
);
PathMatchConfigurer
pathConfig
=
getPathMatchConfigurer
();
if
(
pathConfig
.
getPatternParser
()
!=
null
)
{
mapping
.
setPatternParser
(
pathConfig
.
getPatternParser
());
}
else
{
mapping
.
setUrlPathHelper
(
pathConfig
.
getUrlPathHelperOrDefault
());
mapping
.
setPathMatcher
(
pathConfig
.
getPathMatcherOrDefault
());
}
mapping
.
setInterceptors
(
getInterceptors
(
conversionService
,
resourceUrlProvider
));
mapping
.
setCorsConfigurations
(
getCorsConfigurations
());
return
mapping
;
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/config/annotation/DelegatingWebMvcConfigurationTests.java
浏览文件 @
e4566c11
/*
* Copyright 2002-202
0
the original author or authors.
* Copyright 2002-202
1
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -38,6 +38,7 @@ import org.springframework.web.context.support.GenericWebApplicationContext;
import
org.springframework.web.method.support.HandlerMethodArgumentResolver
;
import
org.springframework.web.method.support.HandlerMethodReturnValueHandler
;
import
org.springframework.web.servlet.HandlerExceptionResolver
;
import
org.springframework.web.servlet.handler.BeanNameUrlHandlerMapping
;
import
org.springframework.web.servlet.handler.HandlerExceptionResolverComposite
;
import
org.springframework.web.servlet.handler.SimpleUrlHandlerMapping
;
import
org.springframework.web.servlet.mvc.annotation.ResponseStatusExceptionResolver
;
...
...
@@ -332,6 +333,14 @@ public class DelegatingWebMvcConfigurationTests {
assertThat
(
mapping
.
getPatternParser
()).
isSameAs
(
patternParser
);
configAssertion
.
accept
(
mapping
.
getUrlPathHelper
(),
mapping
.
getPathMatcher
());
BeanNameUrlHandlerMapping
beanNameMapping
=
webMvcConfig
.
beanNameHandlerMapping
(
webMvcConfig
.
mvcConversionService
(),
webMvcConfig
.
mvcResourceUrlProvider
());
assertThat
(
beanNameMapping
).
isNotNull
();
assertThat
(
beanNameMapping
.
getPatternParser
()).
isSameAs
(
patternParser
);
configAssertion
.
accept
(
beanNameMapping
.
getUrlPathHelper
(),
mapping
.
getPathMatcher
());
assertThat
(
webMvcConfig
.
mvcResourceUrlProvider
().
getUrlPathHelper
()).
isSameAs
(
pathHelper
);
assertThat
(
webMvcConfig
.
mvcResourceUrlProvider
().
getPathMatcher
()).
isSameAs
(
pathMatcher
);
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录