Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
9833a4c3
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 搜索 >>
提交
9833a4c3
编写于
4月 02, 2012
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Improvement in AntPathMatcher.combine method
Issues: SPR-7970
上级
4653dbe7
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
11 addition
and
8 deletion
+11
-8
spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
...rc/main/java/org/springframework/util/AntPathMatcher.java
+3
-1
spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java
...st/java/org/springframework/util/AntPathMatcherTests.java
+8
-7
未找到文件。
spring-core/src/main/java/org/springframework/util/AntPathMatcher.java
浏览文件 @
9833a4c3
...
...
@@ -299,7 +299,9 @@ public class AntPathMatcher implements PathMatcher {
else
if
(!
StringUtils
.
hasText
(
pattern2
))
{
return
pattern1
;
}
else
if
(!
pattern1
.
contains
(
"{"
)
&&
match
(
pattern1
,
pattern2
))
{
else
if
(!
pattern1
.
equals
(
pattern2
)
&&
!
pattern1
.
contains
(
"{"
)
&&
match
(
pattern1
,
pattern2
))
{
// /* + /hotel -> /hotel ; "/*.*" + "/*.html" -> /*.html
// However /user + /user -> /usr/user ; /{foo} + /bar -> /{foo}/bar
return
pattern2
;
}
else
if
(
pattern1
.
endsWith
(
"/*"
))
{
...
...
spring-core/src/test/java/org/springframework/util/AntPathMatcherTests.java
浏览文件 @
9833a4c3
...
...
@@ -348,13 +348,13 @@ public class AntPathMatcherTests {
assertEquals
(
"com.example"
,
result
.
get
(
"symbolicName"
));
assertEquals
(
"1.0.0"
,
result
.
get
(
"version"
));
}
// SPR-7787
@Test
public
void
extractUriTemplateVarsRegexQualifiers
()
{
Map
<
String
,
String
>
result
=
pathMatcher
.
extractUriTemplateVariables
(
"{symbolicName:[\\p{L}\\.]+}-sources-{version:[\\p{N}\\.]+}.jar"
,
"{symbolicName:[\\p{L}\\.]+}-sources-{version:[\\p{N}\\.]+}.jar"
,
"com.example-sources-1.0.0.jar"
);
assertEquals
(
"com.example"
,
result
.
get
(
"symbolicName"
));
assertEquals
(
"1.0.0"
,
result
.
get
(
"version"
));
...
...
@@ -376,18 +376,18 @@ public class AntPathMatcherTests {
}
// SPR-8455
@Test
public
void
extractUriTemplateVarsRegexCapturingGroups
()
{
try
{
pathMatcher
.
extractUriTemplateVariables
(
"/web/{id:foo(bar)?}"
,
"/web/foobar"
);
fail
(
"Expected exception"
);
}
catch
(
IllegalArgumentException
e
)
{
assertTrue
(
"Expected helpful message on the use of capturing groups"
,
assertTrue
(
"Expected helpful message on the use of capturing groups"
,
e
.
getMessage
().
contains
(
"The number of capturing groups in the pattern"
));
}
}
@Test
public
void
combine
()
{
assertEquals
(
""
,
pathMatcher
.
combine
(
null
,
null
));
...
...
@@ -410,7 +410,8 @@ public class AntPathMatcherTests {
assertEquals
(
"/*.html"
,
pathMatcher
.
combine
(
"/**"
,
"/*.html"
));
assertEquals
(
"/*.html"
,
pathMatcher
.
combine
(
"/*"
,
"/*.html"
));
assertEquals
(
"/*.html"
,
pathMatcher
.
combine
(
"/*.*"
,
"/*.html"
));
assertEquals
(
"/{foo}/bar"
,
pathMatcher
.
combine
(
"/{foo}"
,
"/bar"
));
assertEquals
(
"/{foo}/bar"
,
pathMatcher
.
combine
(
"/{foo}"
,
"/bar"
));
// SPR-8858
assertEquals
(
"/user/user"
,
pathMatcher
.
combine
(
"/user"
,
"/user"
));
// SPR-7970
}
@Test
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录