Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
c3f0f312
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 搜索 >>
提交
c3f0f312
编写于
11月 08, 2011
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
SPR-8819 Fix issue in setting best matching pattern.
上级
b9a3d457
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
17 addition
and
6 deletion
+17
-6
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
.../servlet/mvc/method/RequestMappingInfoHandlerMapping.java
+4
-3
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
...let/mvc/method/RequestMappingInfoHandlerMappingTests.java
+13
-3
未找到文件。
org.springframework.web.servlet/src/main/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMapping.java
浏览文件 @
c3f0f312
...
...
@@ -85,10 +85,11 @@ public abstract class RequestMappingInfoHandlerMapping extends AbstractHandlerMe
protected
void
handleMatch
(
RequestMappingInfo
info
,
String
lookupPath
,
HttpServletRequest
request
)
{
super
.
handleMatch
(
info
,
lookupPath
,
request
);
String
pattern
=
info
.
getPatternsCondition
().
getPatterns
().
iterator
().
next
();
request
.
setAttribute
(
BEST_MATCHING_PATTERN_ATTRIBUTE
,
pattern
);
Set
<
String
>
patterns
=
info
.
getPatternsCondition
().
getPatterns
();
String
bestPattern
=
patterns
.
isEmpty
()
?
lookupPath
:
patterns
.
iterator
().
next
();
request
.
setAttribute
(
BEST_MATCHING_PATTERN_ATTRIBUTE
,
bestPattern
);
Map
<
String
,
String
>
uriTemplateVariables
=
getPathMatcher
().
extractUriTemplateVariables
(
p
attern
,
lookupPath
);
Map
<
String
,
String
>
uriTemplateVariables
=
getPathMatcher
().
extractUriTemplateVariables
(
bestP
attern
,
lookupPath
);
request
.
setAttribute
(
HandlerMapping
.
URI_TEMPLATE_VARIABLES_ATTRIBUTE
,
uriTemplateVariables
);
if
(!
info
.
getProducesCondition
().
getProducibleMediaTypes
().
isEmpty
())
{
...
...
org.springframework.web.servlet/src/test/java/org/springframework/web/servlet/mvc/method/RequestMappingInfoHandlerMappingTests.java
浏览文件 @
c3f0f312
...
...
@@ -204,12 +204,22 @@ public class RequestMappingInfoHandlerMappingTests {
@Test
public
void
bestMatchingPatternAttribute
()
{
PatternsRequestCondition
patterns
=
new
PatternsRequestCondition
(
"/
1/2"
,
"/{path1}/2
"
);
PatternsRequestCondition
patterns
=
new
PatternsRequestCondition
(
"/
{path1}/2"
,
"/**
"
);
RequestMappingInfo
key
=
new
RequestMappingInfo
(
patterns
,
null
,
null
,
null
,
null
,
null
,
null
);
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/1/2"
);
String
lookupPath
=
new
UrlPathHelper
().
getLookupPathForRequest
(
request
);
this
.
mapping
.
handleMatch
(
key
,
lookupPath
,
request
);
this
.
mapping
.
handleMatch
(
key
,
"/1/2"
,
request
);
assertEquals
(
"/{path1}/2"
,
request
.
getAttribute
(
HandlerMapping
.
BEST_MATCHING_PATTERN_ATTRIBUTE
));
}
@Test
public
void
bestMatchingPatternAttributeNoPatternsDefined
()
{
PatternsRequestCondition
patterns
=
new
PatternsRequestCondition
();
RequestMappingInfo
key
=
new
RequestMappingInfo
(
patterns
,
null
,
null
,
null
,
null
,
null
,
null
);
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/1/2"
);
this
.
mapping
.
handleMatch
(
key
,
"/1/2"
,
request
);
assertEquals
(
"/1/2"
,
request
.
getAttribute
(
HandlerMapping
.
BEST_MATCHING_PATTERN_ATTRIBUTE
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录