Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
爱吃血肠
spring-framework
提交
48b22292
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 搜索 >>
提交
48b22292
编写于
11月 06, 2019
作者:
R
Rossen Stoyanchev
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix issue with path matching options
Closes gh-23907
上级
e0faaa48
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
21 addition
and
2 deletion
+21
-2
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
...esult/method/annotation/RequestMappingHandlerMapping.java
+1
-1
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
...t/mvc/method/annotation/RequestMappingHandlerMapping.java
+1
-1
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
.../method/annotation/RequestMappingHandlerMappingTests.java
+19
-0
未找到文件。
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/annotation/RequestMappingHandlerMapping.java
浏览文件 @
48b22292
...
...
@@ -153,7 +153,7 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
if
(
this
.
embeddedValueResolver
!=
null
)
{
prefix
=
this
.
embeddedValueResolver
.
resolveStringValue
(
prefix
);
}
info
=
RequestMappingInfo
.
paths
(
prefix
).
build
().
combine
(
info
);
info
=
RequestMappingInfo
.
paths
(
prefix
).
options
(
this
.
config
).
build
().
combine
(
info
);
break
;
}
}
...
...
spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMapping.java
浏览文件 @
48b22292
...
...
@@ -226,7 +226,7 @@ public class RequestMappingHandlerMapping extends RequestMappingInfoHandlerMappi
}
String
prefix
=
getPathPrefix
(
handlerType
);
if
(
prefix
!=
null
)
{
info
=
RequestMappingInfo
.
paths
(
prefix
).
build
().
combine
(
info
);
info
=
RequestMappingInfo
.
paths
(
prefix
).
options
(
this
.
config
).
build
().
combine
(
info
);
}
}
return
info
;
...
...
spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerMappingTests.java
浏览文件 @
48b22292
...
...
@@ -33,6 +33,7 @@ import org.junit.Test;
import
org.springframework.core.annotation.AliasFor
;
import
org.springframework.http.MediaType
;
import
org.springframework.mock.web.test.MockHttpServletRequest
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.web.accept.ContentNegotiationManager
;
import
org.springframework.web.accept.PathExtensionContentNegotiationStrategy
;
...
...
@@ -153,6 +154,24 @@ public class RequestMappingHandlerMappingTests {
assertEquals
(
Collections
.
singleton
(
"/api/user/{id}"
),
info
.
getPatternsCondition
().
getPatterns
());
}
@Test
// gh-23907
public
void
pathPrefixPreservesPathMatchingSettings
()
throws
NoSuchMethodException
{
this
.
handlerMapping
.
setUseSuffixPatternMatch
(
false
);
this
.
handlerMapping
.
setPathPrefixes
(
Collections
.
singletonMap
(
"/api"
,
HandlerTypePredicate
.
forAnyHandlerType
()));
this
.
handlerMapping
.
afterPropertiesSet
();
Method
method
=
ComposedAnnotationController
.
class
.
getMethod
(
"get"
);
RequestMappingInfo
info
=
this
.
handlerMapping
.
getMappingForMethod
(
method
,
ComposedAnnotationController
.
class
);
assertNotNull
(
info
);
MockHttpServletRequest
request
=
new
MockHttpServletRequest
(
"GET"
,
"/api/get"
);
assertNotNull
(
info
.
getPatternsCondition
().
getMatchingCondition
(
request
));
request
=
new
MockHttpServletRequest
(
"GET"
,
"/api/get.pdf"
);
assertNull
(
info
.
getPatternsCondition
().
getMatchingCondition
(
request
));
}
@Test
public
void
resolveRequestMappingViaComposedAnnotation
()
throws
Exception
{
RequestMappingInfo
info
=
assertComposedAnnotationMapping
(
"postJson"
,
"/postJson"
,
RequestMethod
.
POST
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录